Skip to content

Commit f5a013e

Browse files
author
unknown
committed
fix
1 parent 70113f6 commit f5a013e

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import com.alipay.oceanbase.rpc.stream.ObTableClientQueryAsyncStreamResult;
4040
import com.alipay.oceanbase.rpc.stream.ObTableClientQueryStreamResult;
4141
import com.alipay.sofa.common.thread.SofaThreadPoolExecutor;
42-
import com.alipay.oceanbase.hbase.exception.OperationTimeoutException;
4342

4443
import com.google.protobuf.Descriptors;
4544
import com.google.protobuf.Message;
@@ -418,8 +417,9 @@ public void getKeyValueFromResult(AbstractQueryStreamResult clientQueryStreamRes
418417

419418
public String getTargetTableName(String tableNameString) {
420419
if (configuration.getBoolean(HBASE_HTABLE_TEST_LOAD_ENABLE, false)) {
421-
return tableNameString + configuration.get(HBASE_HTABLE_TEST_LOAD_SUFFIX,
422-
DEFAULT_HBASE_HTABLE_TEST_LOAD_SUFFIX);
420+
return tableNameString
421+
+ configuration.get(HBASE_HTABLE_TEST_LOAD_SUFFIX,
422+
DEFAULT_HBASE_HTABLE_TEST_LOAD_SUFFIX);
423423
}
424424
return tableNameString;
425425
}
@@ -447,7 +447,8 @@ public Result call() throws IOException {
447447
get.getMaxVersions(), null);
448448
obTableQuery = buildObTableQuery(filter, get.getRow(), true, get.getRow(),
449449
true, -1);
450-
request = buildObTableQueryRequest(obTableQuery, getTargetTableName(tableNameString));
450+
request = buildObTableQueryRequest(obTableQuery,
451+
getTargetTableName(tableNameString));
451452

452453
clientQueryStreamResult = (ObTableClientQueryStreamResult) obTableClient
453454
.execute(request);
@@ -535,7 +536,8 @@ public ResultScanner call() throws IOException {
535536
if (scan.isReversed()) { // reverse scan 时设置为逆序
536537
obTableQuery.setScanOrder(ObScanOrder.Reverse);
537538
}
538-
request = buildObTableQueryAsyncRequest(obTableQuery, getTargetTableName(tableNameString));
539+
request = buildObTableQueryAsyncRequest(obTableQuery,
540+
getTargetTableName(tableNameString));
539541
clientQueryAsyncStreamResult = (ObTableClientQueryAsyncStreamResult) obTableClient
540542
.execute(request);
541543
return new ClientStreamScanner(clientQueryAsyncStreamResult,
@@ -817,19 +819,19 @@ public Result increment(Increment increment) throws IOException {
817819
List<byte[]> qualifiers = new ArrayList<byte[]>();
818820

819821
byte[] rowKey = increment.getRow();
820-
Map.Entry<byte[], List<Cell>> entry = increment.getFamilyCellMap()
821-
.entrySet().iterator().next();
822+
Map.Entry<byte[], List<Cell>> entry = increment.getFamilyCellMap().entrySet()
823+
.iterator().next();
822824

823825
byte[] f = entry.getKey();
824826

825827
ObTableBatchOperation batch = new ObTableBatchOperation();
826-
entry.getValue().forEach(cell -> {
828+
for (Cell cell : entry.getValue()) {
827829
byte[] qualifier = cell.getQualifier();
828830
qualifiers.add(qualifier);
829831
batch.addTableOperation(getInstance(INCREMENT, new Object[] { rowKey, qualifier,
830832
Long.MAX_VALUE }, V_COLUMNS, new Object[] { cell.getValue() }));
831-
});
832-
833+
}
834+
833835
ObHTableFilter filter = buildObHTableFilter(null, increment.getTimeRange(), 1,
834836
qualifiers);
835837

0 commit comments

Comments
 (0)