|
39 | 39 | import com.alipay.oceanbase.rpc.stream.ObTableClientQueryAsyncStreamResult;
|
40 | 40 | import com.alipay.oceanbase.rpc.stream.ObTableClientQueryStreamResult;
|
41 | 41 | import com.alipay.sofa.common.thread.SofaThreadPoolExecutor;
|
42 |
| -import com.alipay.oceanbase.hbase.exception.OperationTimeoutException; |
43 | 42 |
|
44 | 43 | import com.google.protobuf.Descriptors;
|
45 | 44 | import com.google.protobuf.Message;
|
@@ -418,8 +417,9 @@ public void getKeyValueFromResult(AbstractQueryStreamResult clientQueryStreamRes
|
418 | 417 |
|
419 | 418 | public String getTargetTableName(String tableNameString) {
|
420 | 419 | 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); |
423 | 423 | }
|
424 | 424 | return tableNameString;
|
425 | 425 | }
|
@@ -447,7 +447,8 @@ public Result call() throws IOException {
|
447 | 447 | get.getMaxVersions(), null);
|
448 | 448 | obTableQuery = buildObTableQuery(filter, get.getRow(), true, get.getRow(),
|
449 | 449 | true, -1);
|
450 |
| - request = buildObTableQueryRequest(obTableQuery, getTargetTableName(tableNameString)); |
| 450 | + request = buildObTableQueryRequest(obTableQuery, |
| 451 | + getTargetTableName(tableNameString)); |
451 | 452 |
|
452 | 453 | clientQueryStreamResult = (ObTableClientQueryStreamResult) obTableClient
|
453 | 454 | .execute(request);
|
@@ -535,7 +536,8 @@ public ResultScanner call() throws IOException {
|
535 | 536 | if (scan.isReversed()) { // reverse scan 时设置为逆序
|
536 | 537 | obTableQuery.setScanOrder(ObScanOrder.Reverse);
|
537 | 538 | }
|
538 |
| - request = buildObTableQueryAsyncRequest(obTableQuery, getTargetTableName(tableNameString)); |
| 539 | + request = buildObTableQueryAsyncRequest(obTableQuery, |
| 540 | + getTargetTableName(tableNameString)); |
539 | 541 | clientQueryAsyncStreamResult = (ObTableClientQueryAsyncStreamResult) obTableClient
|
540 | 542 | .execute(request);
|
541 | 543 | return new ClientStreamScanner(clientQueryAsyncStreamResult,
|
@@ -817,19 +819,19 @@ public Result increment(Increment increment) throws IOException {
|
817 | 819 | List<byte[]> qualifiers = new ArrayList<byte[]>();
|
818 | 820 |
|
819 | 821 | 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(); |
822 | 824 |
|
823 | 825 | byte[] f = entry.getKey();
|
824 | 826 |
|
825 | 827 | ObTableBatchOperation batch = new ObTableBatchOperation();
|
826 |
| - entry.getValue().forEach(cell -> { |
| 828 | + for (Cell cell : entry.getValue()) { |
827 | 829 | byte[] qualifier = cell.getQualifier();
|
828 | 830 | qualifiers.add(qualifier);
|
829 | 831 | batch.addTableOperation(getInstance(INCREMENT, new Object[] { rowKey, qualifier,
|
830 | 832 | Long.MAX_VALUE }, V_COLUMNS, new Object[] { cell.getValue() }));
|
831 |
| - }); |
832 |
| - |
| 833 | + } |
| 834 | + |
833 | 835 | ObHTableFilter filter = buildObHTableFilter(null, increment.getTimeRange(), 1,
|
834 | 836 | qualifiers);
|
835 | 837 |
|
|
0 commit comments