3636import com .alipay .oceanbase .rpc .protocol .payload .impl .execute .query .*;
3737import com .alipay .oceanbase .rpc .protocol .payload .impl .execute .syncquery .ObTableQueryAsyncRequest ;
3838import com .alipay .oceanbase .rpc .stream .ObTableClientQueryAsyncStreamResult ;
39+ import com .alipay .oceanbase .rpc .stream .ObTableClientQueryStreamResult ;
3940import com .alipay .oceanbase .rpc .table .ObHBaseParams ;
4041import com .alipay .oceanbase .rpc .table .ObKVParams ;
4142import com .alipay .sofa .common .thread .SofaThreadPoolExecutor ;
@@ -856,8 +857,6 @@ public Result get(final Get get) throws IOException {
856857 public Result call () throws IOException {
857858 List <Cell > keyValueList = new ArrayList <>();
858859 byte [] family = new byte [] {};
859- ObTableClientQueryAsyncStreamResult clientQueryStreamResult ;
860- ObTableQueryAsyncRequest request ;
861860 ObTableQuery obTableQuery ;
862861 try {
863862 if (get .getFamilyMap ().keySet () == null
@@ -872,10 +871,10 @@ public Result call() throws IOException {
872871 NavigableSet <byte []> columnFilters = new TreeSet <>(Bytes .BYTES_COMPARATOR );
873872 processColumnFilters (columnFilters , get .getFamilyMap ());
874873 obTableQuery = buildObTableQuery (get , columnFilters );
875- request = buildObTableQueryAsyncRequest (obTableQuery ,
874+ ObTableQueryAsyncRequest request = buildObTableQueryAsyncRequest (obTableQuery ,
876875 getTargetTableName (tableNameString ));
877876
878- clientQueryStreamResult = (ObTableClientQueryAsyncStreamResult ) obTableClient
877+ ObTableClientQueryAsyncStreamResult clientQueryStreamResult = (ObTableClientQueryAsyncStreamResult ) obTableClient
879878 .execute (request );
880879 getMaxRowFromResult (clientQueryStreamResult , keyValueList , true , family );
881880 } else {
@@ -894,10 +893,10 @@ public Result call() throws IOException {
894893 }
895894 }
896895 obTableQuery = buildObTableQuery (get , entry .getValue ());
897- request = buildObTableQueryAsyncRequest (obTableQuery ,
896+ ObTableQueryRequest request = buildObTableQueryRequest (obTableQuery ,
898897 getTargetTableName (tableNameString , Bytes .toString (family ),
899898 configuration ));
900- clientQueryStreamResult = (ObTableClientQueryAsyncStreamResult ) obTableClient
899+ ObTableClientQueryStreamResult clientQueryStreamResult = (ObTableClientQueryStreamResult ) obTableClient
901900 .execute (request );
902901 getMaxRowFromResult (clientQueryStreamResult , keyValueList , false ,
903902 family );
@@ -1923,6 +1922,15 @@ public static ObTableOperation buildObTableOperation(Cell kv, boolean putToAppen
19231922 }
19241923 }
19251924
1925+ private ObTableQueryRequest buildObTableQueryRequest (ObTableQuery obTableQuery ,
1926+ String targetTableName ) {
1927+ ObTableQueryRequest request = new ObTableQueryRequest ();
1928+ request .setEntityType (ObTableEntityType .HKV );
1929+ request .setTableQuery (obTableQuery );
1930+ request .setTableName (targetTableName );
1931+ return request ;
1932+ }
1933+
19261934 private ObTableQueryAsyncRequest buildObTableQueryAsyncRequest (ObTableQuery obTableQuery ,
19271935 String targetTableName ) {
19281936 ObTableQueryRequest request = new ObTableQueryRequest ();
0 commit comments