Skip to content

Fix Hbase append/increment does not correctly refresh tablet location when it needs to refresh table meta #386

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
WeiXinChan merged 1 commit into from
Sep 10, 2025
Merged

Fix Hbase append/increment does not correctly refresh tablet location when it needs to refresh table meta #386

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
27 changes: 15 additions & 12 deletions 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 @@ -29,13 +29,11 @@
import com.alipay.oceanbase.rpc.protocol.payload.ObPayload;
import com.alipay.oceanbase.rpc.protocol.payload.Pcodes;
import com.alipay.oceanbase.rpc.protocol.payload.impl.ObObj;
import com.alipay.oceanbase.rpc.protocol.payload.impl.ObRowKey;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.*;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.aggregation.ObTableAggregation;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.mutate.ObTableQueryAndMutate;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.mutate.ObTableQueryAndMutateRequest;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.mutate.ObTableQueryAndMutateResult;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObBorderFlag;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObNewRange;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObTableQuery;
import com.alipay.oceanbase.rpc.protocol.payload.impl.execute.query.ObTableQueryRequest;
Expand All @@ -48,7 +46,6 @@
import com.alipay.remoting.util.StringUtils;
import org.slf4j.Logger;

import java.lang.reflect.Array;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -710,15 +707,18 @@ private <T> T execute(String tableName, OperationExecuteCallback<T> callback,
if (refreshedTableMeta) {
refreshedTableMeta = false;
boolean isHKV = callback.getQuery().getEntityType() == ObTableEntityType.HKV;
tableRoute.refreshTabletLocationForAtomicQuery(tableName, callback.getQuery().getObTableQuery(), isHKV);
Map<Long, ObTableParam> partIdMapObTable = tableRoute.refreshTabletLocationAndGetPartIdMap(tableName, callback.getQuery().getObTableQuery(), isHKV);
tableParam = partIdMapObTable.entrySet().iterator().next().getValue();
} else {
tableRoute.refreshPartitionLocation(tableName, routeQueryTabletId, null);
}
}
ObTableQuery tableQuery = callback.getQuery().getObTableQuery();
// using scan range
tableParam = tableRoute.getTableParam(tableName, tableQuery.getScanRangeColumns(),
tableQuery.getKeyRanges());
if (tableParam == null) {
ObTableQuery tableQuery = callback.getQuery().getObTableQuery();
// using scan range
tableParam = tableRoute.getTableParam(tableName, tableQuery.getScanRangeColumns(),
tableQuery.getKeyRanges());
}
routeQueryTabletId = tableParam.getPartitionId();
} else {
throw new ObTableException("RowKey or scan range is null");
Expand Down Expand Up @@ -2317,21 +2317,24 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
request.setTimeout(getOdpTable().getObTableOperationTimeout());
return getOdpTable().execute(request);
} else {
Map<Long, ObTableParam> partIdMapObTable = null;
// Recalculate partIdMapObTable
if (needRefreshTabletLocation) {
needRefreshTabletLocation = false;
if (refreshedTableMeta) {
refreshedTableMeta = false;
// need to recalculate routing tablet_id and refresh location
boolean isHKV = request.getEntityType() == ObTableEntityType.HKV;
tableRoute.refreshTabletLocationForAtomicQuery(request.getTableName(), tableQuery, isHKV);
partIdMapObTable = tableRoute.refreshTabletLocationAndGetPartIdMap(request.getTableName(), tableQuery, isHKV);
} else {
tableRoute.refreshPartitionLocation(request.getTableName(), routeTabletId, null);
}
}
Map<Long, ObTableParam> partIdMapObTable = tableRoute.getPartIdParamMapForQuery(
request.getTableName(), tableQuery.getScanRangeColumns(),
tableQuery.getKeyRanges());
if (partIdMapObTable == null) {
partIdMapObTable = tableRoute.getPartIdParamMapForQuery(
request.getTableName(), tableQuery.getScanRangeColumns(),
tableQuery.getKeyRanges());
}

// Check if partIdMapObTable size is greater than 1
boolean isDistributedExecuteSupported = getServerCapacity().isSupportDistributedExecute();
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/alipay/oceanbase/rpc/location/model/TableRoute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ public TableEntry refreshTabletLocationBatch(String tableName) throws Exception
}
}

public void refreshTabletLocationForAtomicQuery(String tableName, ObTableQuery query, boolean isHKV) throws Exception {
public Map<Long, ObTableParam> refreshTabletLocationAndGetPartIdMap(String tableName, ObTableQuery query, boolean isHKV) throws Exception {
Map<Long, ObTableParam> partIdParamMap = getPartIdParamMapForQuery(tableName, query.getScanRangeColumns(), query.getKeyRanges());
if (isHKV) {
// for HBase process, if distributed function is enabled, no need to do routing refresh
Expand All @@ -588,7 +588,7 @@ public void refreshTabletLocationForAtomicQuery(String tableName, ObTableQuery q
throw new ObTablePartitionConsistentException(
"query and mutate must be a atomic operation");
} else if (isDistributedSupported) {
return;
// do nothing
}
} else {
// for table process, distributed function is not supported yet, need to refresh routing
Expand All @@ -604,6 +604,7 @@ public void refreshTabletLocationForAtomicQuery(String tableName, ObTableQuery q
TableEntry tableEntry = getTableEntry(tableName);
long tabletId = entry.getValue().getTabletId();
refreshPartitionLocation(tableName, tabletId, tableEntry);
return partIdParamMap;
}

private Long[] getTabletsFromTableEntry(TableEntry tableEntry) {
Expand Down