Merge branch 'master' into get_partition_meta

Author: JackShi148

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.oceanbase</groupId>
     <artifactId>obkv-table-client</artifactId>
-    <version>1.2.14-SNAPSHOT</version>
+    <version>1.3.1-SNAPSHOT</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>OceanBase JavaClient for TableApi</description>
@@ -157,12 +157,12 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>jdbc</artifactId>
-            <scope>test</scope>
             <version>1.15.3</version>
+            <scope>test</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>org.rnorth.visible-assertions</groupId>
                     <artifactId>visible-assertions</artifactId>
+                    <groupId>org.rnorth.visible-assertions</groupId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -380,7 +380,7 @@
                                 </goals>
                                 <configuration>
                                     <rules>
-                                        <DependencyConvergence/>
+                                        <DependencyConvergence />
                                     </rules>
                                 </configuration>
                             </execution>
@@ -390,4 +390,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>

src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java

@@ -1757,11 +1757,21 @@ public ObPair<Long, ObTableParam> getTable(String tableName, ObTableQuery query,
             Object[] start = new Object[startKeySize];
             Object[] end = new Object[endKeySize];
             for (int i = 0; i < startKeySize; i++) {
-                start[i] = startKey.getObj(i).getValue();
+                ObObj curStart = startKey.getObj(i);
+                if (curStart.isMinObj()) {
+                    start[i] = curStart;
+                } else {
+                    start[i] = curStart.getValue();
+                }
             }
 
             for (int i = 0; i < endKeySize; i++) {
-                end[i] = endKey.getObj(i).getValue();
+                ObObj curEnd = endKey.getObj(i);
+                if (curEnd.isMaxObj()) {
+                    end[i] = curEnd;
+                } else {
+                    end[i] = curEnd.getValue();
+                }
             }
             ObBorderFlag borderFlag = rang.getBorderFlag();
             List<ObPair<Long, ObTableParam>> pairList = getTables(tableName, query, start,
@@ -3573,36 +3583,36 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
         if (request instanceof ObTableOperationRequest) {
             ObTableBatchOperation batchOperation = new ObTableBatchOperation();
             batchOperation.addTableOperation(((ObTableOperationRequest) request)
-                .getTableOperation());
+                    .getTableOperation());
             ObTableClientBatchOpsImpl batchOps = new ObTableClientBatchOpsImpl(
-                request.getTableName(), batchOperation, this);
+                    request.getTableName(), batchOperation, this);
             batchOps.setEntityType(request.getEntityType());
             ObTableBatchOperationResult batchOpsResult = new ObClusterTableBatchOps(batchOps)
-                .executeInternal();
+                    .executeInternal();
             return batchOpsResult.getResults().get(0);
         } else if (request instanceof ObTableQueryRequest) {
             // TableGroup -> TableName
             String tableName = request.getTableName();
             ObTableClientQueryImpl tableQuery = new ObTableClientQueryImpl(tableName,
-                ((ObTableQueryRequest) request).getTableQuery(), this);
+                    ((ObTableQueryRequest) request).getTableQuery(), this);
             tableQuery.setEntityType(request.getEntityType());
             return new ObClusterTableQuery(tableQuery).executeInternal();
         } else if (request instanceof ObTableQueryAsyncRequest) {
             // TableGroup -> TableName
             String tableName = request.getTableName();
             ObTableClientQueryImpl tableQuery = new ObTableClientQueryImpl(tableName,
-                ((ObTableQueryAsyncRequest) request).getObTableQueryRequest().getTableQuery(), this);
+                    ((ObTableQueryAsyncRequest) request).getObTableQueryRequest().getTableQuery(), this);
             tableQuery.setEntityType(request.getEntityType());
             return new ObClusterTableQuery(tableQuery).asyncExecuteInternal();
         } else if (request instanceof ObTableBatchOperationRequest) {
             ObTableClientBatchOpsImpl batchOps = new ObTableClientBatchOpsImpl(
-                request.getTableName(),
-                ((ObTableBatchOperationRequest) request).getBatchOperation(), this);
+                    request.getTableName(),
+                    ((ObTableBatchOperationRequest) request).getBatchOperation(), this);
             batchOps.setEntityType(request.getEntityType());
             return new ObClusterTableBatchOps(runtimeBatchExecutor, batchOps).executeInternal();
         } else if (request instanceof ObTableQueryAndMutateRequest) {
             ObTableQueryAndMutate tableQueryAndMutate = ((ObTableQueryAndMutateRequest) request)
-                .getTableQueryAndMutate();
+                    .getTableQueryAndMutate();
             ObTableQuery tableQuery = tableQueryAndMutate.getTableQuery();
             // fill a whole range if no range is added explicitly.
             if (tableQuery.getKeyRanges().isEmpty()) {
@@ -3716,7 +3726,7 @@ public ObPayload execute(final ObTableAbstractOperationRequest request) throws E
         }
 
         throw new FeatureNotSupportedException("request type " + request.getClass().getSimpleName()
-                                               + "is not supported. make sure the correct version");
+                + "is not supported. make sure the correct version");
     }
 
     private ObTableQueryAndMutate buildObTableQueryAndMutate(ObTableQuery obTableQuery,
@@ -4216,7 +4226,7 @@ public String getPhyTableNameFromTableGroup(ObTableEntityType type, String table
         }
         return tableName;
     }
-
+    
     /*
      * Get the start keys of different tablets, byte[0] = [] = EMPTY_START_ROW = EMPTY_END_ROW
      * Example:

src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObConnectionFactory.java

@@ -22,9 +22,7 @@
 import com.alipay.remoting.codec.Codec;
 import com.alipay.remoting.config.ConfigManager;
 import com.alipay.remoting.config.ConfigurableInstance;
-import com.alipay.remoting.connection.AbstractConnectionFactory;
 import com.alipay.remoting.connection.ConnectionFactory;
-import com.alipay.remoting.log.BoltLoggerFactory;
 import com.alipay.remoting.rpc.RpcHandler;
 import com.alipay.remoting.rpc.protocol.UserProcessor;
 import com.alipay.remoting.util.NettyEventLoopUtil;
@@ -35,14 +33,14 @@
 import io.netty.channel.*;
 import io.netty.channel.socket.SocketChannel;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class ObConnectionFactory implements ConnectionFactory {
 
-    private static final Logger         logger      = BoltLoggerFactory
-                                                        .getLogger(AbstractConnectionFactory.class);
+    private static final Logger         logger      = LoggerFactory.getLogger(ObConnectionFactory.class);
 
     private static final EventLoopGroup workerGroup = NettyEventLoopUtil.newEventLoopGroup(Runtime
                                                         .getRuntime().availableProcessors() + 1,

src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObTableConnection.java

@@ -173,8 +173,12 @@ private void login() throws Exception {
                     credential = result.getCredential();
                     tenantId = result.getTenantId();
                     // Set version if missing
-                    if (ObGlobal.obVsnMajor() == 0 && !result.getServerVersion().isEmpty()) {
+                    if (ObGlobal.obVsnMajor() == 0) {
                         // version should be set before login when direct mode
+                        if (result.getServerVersion().isEmpty()) {
+                            throw new RuntimeException(
+                                "Failed to get server version from login result");
+                        }
                         LocationUtil.parseObVerionFromLogin(result.getServerVersion());
                         LOGGER.info("The OB_VERSION parsed from login result is: {}",
                             ObGlobal.OB_VERSION);