Skip to content

hbase tablename bug fix #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shenyunlong merged 1 commit into from
Nov 20, 2024
Merged

hbase tablename bug fix #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,6 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
} else if (request instanceof ObTableQueryRequest) {
// TableGroup -> TableName
String tableName = request.getTableName();
tableName = getPhyTableNameFromTableGroup(((ObTableQueryRequest) request), tableName);
ObTableClientQueryImpl tableQuery = new ObTableClientQueryImpl(tableName,
((ObTableQueryRequest) request).getTableQuery(), this);
tableQuery.setEntityType(request.getEntityType());
Expand Down
13 changes: 4 additions & 9 deletions src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientQueryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.alipay.oceanbase.rpc.protocol.payload.ObPayload;
import com.alipay.oceanbase.rpc.protocol.payload.ResultCodes;
import com.alipay.oceanbase.rpc.protocol.payload.impl.ObRowKey;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.ObTableEntityType;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.aggregation.ObTableAggregationType;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.*;
import com.alipay.oceanbase.rpc.stream.ObTableClientQueryAsyncStreamResult;
Expand Down Expand Up @@ -192,14 +193,6 @@ private AbstractQueryStreamResult commonExecute(InitQueryResultCallback<Abstract
}
}

// set correct table group name for hbase
if (tableQuery.isHbaseQuery()
&& obTableClient.getTableGroupInverted().containsKey(tableName)
&& tableName.equalsIgnoreCase(obTableClient.getTableGroupCache().get(
obTableClient.getTableGroupInverted().get(tableName)))) {
tableName = obTableClient.getTableGroupInverted().get(tableName);
}

// init query stream result
AbstractQueryStreamResult streamResult = callable.execute();

Expand Down Expand Up @@ -267,7 +260,9 @@ public Map<Long, ObPair<Long, ObTableParam>> initPartitions(ObTableQuery tableQu
end[i] = endKey.getObj(i).isMinObj() || endKey.getObj(i).isMaxObj() ?
endKey.getObj(i) : endKey.getObj(i).getValue();
}

if (this.entityType == ObTableEntityType.HKV && obTableClient.isTableGroupName(tableName)) {
indexTableName = obTableClient.tryGetTableNameFromTableGroupCache(tableName, false);
}
ObBorderFlag borderFlag = range.getBorderFlag();
List<ObPair<Long, ObTableParam>> pairs = this.obTableClient.getTables(indexTableName,
tableQuery, start, borderFlag.isInclusiveStart(), end, borderFlag.isInclusiveEnd(),
Expand Down