Merge branch 'master' into obkv-table-client-1.3.0.1-shaded

Author: GroundWu

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.oceanbase</groupId>
     <artifactId>obkv-table-client</artifactId>
-    <version>1.3.0.1</version>
+    <version>1.3.0.1-SNAPSHOT</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>OceanBase JavaClient for TableApi</description>
@@ -27,7 +27,7 @@
 
     <scm>
         <connection>scm:git:https://github.com/oceanbase/obkv-table-client-java.git</connection>
-        <tag>obkv-table-client-1.3.0</tag>
+        <tag>HEAD</tag>
         <url>https://github.com/oceanbase/obkv-table-client-java</url>
     </scm>
 
@@ -380,7 +380,7 @@
                                 </goals>
                                 <configuration>
                                     <rules>
-                                        <DependencyConvergence></DependencyConvergence>
+                                        <DependencyConvergence />
                                     </rules>
                                 </configuration>
                             </execution>

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);

src/main/java/com/alipay/oceanbase/rpc/protocol/payload/impl/execute/query/AbstractQueryStreamResult.java

@@ -231,10 +231,11 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
                         }
                     } else if (e instanceof ObTableException) {
                         if ((((ObTableException) e).getErrorCode() == ResultCodes.OB_TABLE_NOT_EXIST.errorCode || ((ObTableException) e)
-                                .getErrorCode() == ResultCodes.OB_NOT_SUPPORTED.errorCode)
-                                && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest) request).getObTableQueryRequest().getTableQuery().isHbaseQuery())
-                                || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest) request).getTableQuery().isHbaseQuery()))
-                                && client.getTableGroupInverted().get(indexTableName) != null) {
+                            .getErrorCode() == ResultCodes.OB_NOT_SUPPORTED.errorCode)
+                            && ((request instanceof ObTableQueryAsyncRequest && ((ObTableQueryAsyncRequest) request)
+                                .getObTableQueryRequest().getTableQuery().isHbaseQuery()) || (request instanceof ObTableQueryRequest && ((ObTableQueryRequest) request)
+                                .getTableQuery().isHbaseQuery()))
+                            && client.getTableGroupInverted().get(indexTableName) != null) {
                             // table not exists && hbase mode && table group exists , three condition both
                             client.eraseTableGroupFromCache(tableName);
                         }
@@ -254,7 +255,7 @@ protected ObPayload commonExecute(ObTableClient client, Logger logger,
                                         ((ObTableException) e).getErrorCode(), tryTimes, e);
                                 // tablet not exists, refresh table entry
                                 if (e instanceof ObTableNeedFetchAllException) {
-                                    client.getOrRefreshTableEntry(tableName, true, true, true);
+                                    client.getOrRefreshTableEntry(indexTableName, true, true, true);
                                     throw e;
                                 }
                             } else {

src/main/java/com/alipay/oceanbase/rpc/table/ObTableClientQueryImpl.java

@@ -241,6 +241,7 @@ public Map<Long, ObPair<Long, ObTableParam>> initPartitions(ObTableQuery tableQu
 
         if (!this.obTableClient.isOdpMode()) {
             indexTableName = obTableClient.getIndexTableName(tableName, indexName, tableQuery.getScanRangeColumns(), false);
+            this.indexTableName = indexTableName;
         }
 
         for (ObNewRange range : tableQuery.getKeyRanges()) {
@@ -262,6 +263,7 @@ public Map<Long, ObPair<Long, ObTableParam>> initPartitions(ObTableQuery tableQu
             }
             if (this.entityType == ObTableEntityType.HKV && obTableClient.isTableGroupName(tableName)) {
                 indexTableName = obTableClient.tryGetTableNameFromTableGroupCache(tableName, false);
+                this.indexTableName = indexTableName;
             }
             ObBorderFlag borderFlag = range.getBorderFlag();
             List<ObPair<Long, ObTableParam>> pairs = this.obTableClient.getTables(indexTableName,