Skip to content

[Bugfix] Partition information is not refresh after alter table schema #260

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
merged 3 commits into from
Dec 12, 2024
Merged

[Bugfix] Partition information is not refresh after alter table schema #260

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f23797a
fix error hbase table name because of the lack of indexTableName
JackShi148 Dec 4, 2024
42b6f19
Merge branch 'master' of github.com:oceanbase/obkv-table-client-java
JackShi148 Dec 12, 2024
1ec09e2
fix partition information not changed after alter table
JackShi148 Dec 12, 2024
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
34 changes: 21 additions & 13 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 @@ -2048,7 +2048,7 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
boolean refresh, boolean waitForRefresh)
throws Exception {
return getTables(tableName, query, start, startInclusive, end, endInclusive, refresh,
waitForRefresh, getRoute(false));
waitForRefresh, false, getRoute(false));
}

/**
Expand All @@ -2071,8 +2071,16 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
boolean refresh, boolean waitForRefresh,
ObServerRoute route) throws Exception {

return getTables(tableName, query, start, startInclusive, end, endInclusive, refresh, waitForRefresh, false, route);
}

private List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery query,
Object[] start, boolean startInclusive,
Object[] end, boolean endInclusive,
boolean refresh, boolean waitForRefresh,
boolean needFetchAll, ObServerRoute route) throws Exception {
// 1. get TableEntry information
TableEntry tableEntry = getOrRefreshTableEntry(tableName, refresh, waitForRefresh, false);
TableEntry tableEntry = getOrRefreshTableEntry(tableName, refresh, waitForRefresh, needFetchAll);

List<String> scanRangeColumns = query.getScanRangeColumns();
if (scanRangeColumns == null || scanRangeColumns.isEmpty()) {
Expand All @@ -2092,16 +2100,16 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
// ensure the format of column names and values if the current table is a table with partition
if (tableEntry.isPartitionTable()) {
if ((scanRangeColumns == null || scanRangeColumns.isEmpty()) && start.length == 1
&& start[0] instanceof ObObj && ((ObObj) start[0]).isMinObj() && end.length == 1
&& end[0] instanceof ObObj && ((ObObj) end[0]).isMaxObj()) {
&& start[0] instanceof ObObj && ((ObObj) start[0]).isMinObj() && end.length == 1
&& end[0] instanceof ObObj && ((ObObj) end[0]).isMaxObj()) {
// for getPartition to query all partitions
scanRangeColumns = new ArrayList<String>(Collections.nCopies(start.length,
"partition"));
"partition"));
}
// scanRangeColumn may be longer than start/end in prefix scanning situation
if (scanRangeColumns == null || scanRangeColumns.size() < start.length) {
throw new IllegalArgumentException(
"length of key and scan range columns do not match, please use addRowKeyElement or set scan range columns");
"length of key and scan range columns do not match, please use addRowKeyElement or set scan range columns");
}
for (int i = 0; i < start.length; i++) {
startRow.add(scanRangeColumns.get(i), start[i]);
Expand All @@ -2110,7 +2118,7 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
}

List<ObPair<Long, ReplicaLocation>> partIdWithReplicaList = getPartitionReplica(tableEntry,
startRow, startInclusive, endRow, endInclusive, route);
startRow, startInclusive, endRow, endInclusive, route);

// obTableParams -> List<Pair<logicId, obTableParams>>
List<ObPair<Long, ObTableParam>> obTableParams = new ArrayList<ObPair<Long, ObTableParam>>();
Expand All @@ -2122,9 +2130,9 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
boolean addrExpired = addr.isExpired(serverAddressCachingTimeout);
if (addrExpired || obTable == null) {
logger
.warn(
"server address {} is expired={} or can not get ob table. So that will sync refresh metadata",
addr, addrExpired);
.warn(
"server address {} is expired={} or can not get ob table. So that will sync refresh metadata",
addr, addrExpired);
syncRefreshMetadata();
tableEntry = getOrRefreshTableEntry(tableName, true, waitForRefresh, false);
replica = getPartitionLocation(tableEntry, partId, route);
Expand All @@ -2142,7 +2150,7 @@ public List<ObPair<Long, ObTableParam>> getTables(String tableName, ObTableQuery
if (ObGlobal.obVsnMajor() >= 4) {
long partIdx = tableEntry.getPartIdx(partId);
partId = tableEntry.isPartitionTable() ? tableEntry.getPartitionInfo()
.getPartTabletIdMap().get(partIdx) : partId;
.getPartTabletIdMap().get(partIdx) : partId;
param.setLsId(tableEntry.getPartitionEntry().getLsId(partId));
}

Expand Down Expand Up @@ -3127,11 +3135,11 @@ private List<Partition> getAllPartitionInternal(String tableName, boolean refres
if (refresh) {
// List<ObPair<logic partId, obTableParam>>
allTables = getTables(tableName, new ObTableQuery(), new Object[]{ ObObj.getMin() }, true,
new Object[]{ ObObj.getMax() }, true, true, true, getRoute(false));
new Object[]{ ObObj.getMax() }, true, true, true, true, getRoute(false));
} else {
// List<ObPair<logic partId, obTableParam>>
allTables = getTables(tableName, new ObTableQuery(), new Object[]{ ObObj.getMin() }, true,
new Object[]{ ObObj.getMax() }, true, false, false, getRoute(false));
new Object[]{ ObObj.getMax() }, true, false, false, false, getRoute(false));
}
for (ObPair<Long, ObTableParam> table : allTables) {
ObTableParam tableParam = table.getRight();
Expand Down
Loading