Merge branch 'master' of https://github.com/apache/iotdb into rel/0.14.0-preview2

Author: HTHou

confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/PartitionRegionStateMachine.java

@@ -21,6 +21,7 @@
 import org.apache.iotdb.common.rpc.thrift.TEndPoint;
 import org.apache.iotdb.common.rpc.thrift.TSStatus;
 import org.apache.iotdb.commons.auth.AuthException;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.consensus.ConsensusGroupId;
 import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
 import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
@@ -31,7 +32,6 @@
 import org.apache.iotdb.consensus.common.DataSet;
 import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest;
 import org.apache.iotdb.consensus.common.request.IConsensusRequest;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.rpc.TSStatusCode;
 
 import org.slf4j.Logger;
@@ -167,6 +167,6 @@ public void stop() {
 
   @Override
   public boolean isReadOnly() {
-    return IoTDBDescriptor.getInstance().getConfig().isReadOnly();
+    return CommonDescriptor.getInstance().getConfig().isReadOnly();
   }
 }

influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java

@@ -128,7 +128,9 @@ public void init() throws IoTDBConnectionException {
           RpcTransportFactory.INSTANCE.getTransport(
               // as there is a try-catch already, we do not need to use TSocket.wrap
               defaultEndPoint.getIp(), defaultEndPoint.getPort(), connectionTimeoutInMs);
-      transport.open();
+      if (!transport.isOpen()) {
+        transport.open();
+      }
     } catch (TTransportException e) {
       throw new IoTDBConnectionException(e);
     }

integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java

@@ -271,6 +271,15 @@ public void testShowPathsSetOrUsingSchemaTemplate() throws SQLException {
     statement.execute("SET SCHEMA TEMPLATE t1 TO root.sg2.d2");
     statement.execute("SET SCHEMA TEMPLATE t2 TO root.sg3.d1");
     statement.execute("SET SCHEMA TEMPLATE t2 TO root.sg3.d2");
+    statement.execute("INSERT INTO root.sg3.d2.verify(time, show) VALUES (1, 1)");
+
+    try (ResultSet resultSet = statement.executeQuery("SHOW PATHS USING SCHEMA TEMPLATE t1")) {
+      String resultRecord;
+      while (resultSet.next()) {
+        resultRecord = resultSet.getString(1);
+        Assert.assertEquals("", resultRecord);
+      }
+    }
 
     // activate schema template
     statement.execute("CREATE TIMESERIES OF SCHEMA TEMPLATE ON root.sg1.d2");

node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java

@@ -18,12 +18,18 @@
  */
 package org.apache.iotdb.commons.conf;
 
+import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.enums.HandleSystemErrorStrategy;
 import org.apache.iotdb.tsfile.fileSystem.FSType;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.util.concurrent.TimeUnit;
 
 public class CommonConfig {
+  private static final Logger logger = LoggerFactory.getLogger(CommonConfig.class);
 
   // Open ID Secret
   private String openIdProviderUrl = "";
@@ -94,6 +100,13 @@ public class CommonConfig {
   /** whether to use thrift compression. */
   private boolean isRpcThriftCompressionEnabled = false;
 
+  /** What will the system do when unrecoverable error occurs. */
+  private HandleSystemErrorStrategy handleSystemErrorStrategy =
+      HandleSystemErrorStrategy.CHANGE_TO_READ_ONLY;
+
+  /** Status of current system. */
+  private volatile NodeStatus status = NodeStatus.Running;
+
   CommonConfig() {}
 
   public void updatePath(String homeDir) {
@@ -233,4 +246,35 @@ public boolean isRpcThriftCompressionEnabled() {
   public void setRpcThriftCompressionEnabled(boolean rpcThriftCompressionEnabled) {
     isRpcThriftCompressionEnabled = rpcThriftCompressionEnabled;
   }
+
+  HandleSystemErrorStrategy getHandleSystemErrorStrategy() {
+    return handleSystemErrorStrategy;
+  }
+
+  void setHandleSystemErrorStrategy(HandleSystemErrorStrategy handleSystemErrorStrategy) {
+    this.handleSystemErrorStrategy = handleSystemErrorStrategy;
+  }
+
+  public boolean isReadOnly() {
+    return status == NodeStatus.ReadOnly
+        || (status == NodeStatus.Error
+            && handleSystemErrorStrategy == HandleSystemErrorStrategy.CHANGE_TO_READ_ONLY);
+  }
+
+  public NodeStatus getNodeStatus() {
+    return status;
+  }
+
+  public void setNodeStatus(NodeStatus newStatus) {
+    if (newStatus == NodeStatus.ReadOnly) {
+      logger.error(
+          "Change system status to read-only! Only query statements are permitted!",
+          new RuntimeException("System mode is set to READ_ONLY"));
+    } else if (newStatus == NodeStatus.Error) {
+      newStatus = handleSystemErrorStrategy.handle();
+    } else {
+      logger.info("Set system mode from {} to {}.", status, newStatus);
+    }
+    this.status = newStatus;
+  }
 }

node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java

@@ -19,6 +19,8 @@
 
 package org.apache.iotdb.commons.conf;
 
+import org.apache.iotdb.commons.enums.HandleSystemErrorStrategy;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -95,5 +97,10 @@ public void loadCommonProps(Properties properties) {
             properties.getProperty(
                 "selector_thread_nums_of_client_manager",
                 String.valueOf(config.getSelectorNumOfClientManager()))));
+
+    config.setHandleSystemErrorStrategy(
+        HandleSystemErrorStrategy.valueOf(
+            properties.getProperty(
+                "handle_system_error", String.valueOf(config.getHandleSystemErrorStrategy()))));
   }
 }

…/db/utils/HandleSystemErrorStrategy.java …ons/enums/HandleSystemErrorStrategy.javaserver/src/main/java/org/apache/iotdb/db/utils/HandleSystemErrorStrategy.java renamed to node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java server/src/main/java/org/apache/iotdb/db/utils/HandleSystemErrorStrategy.java renamed to node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.iotdb.db.utils;
+package org.apache.iotdb.commons.enums;
 
 import org.apache.iotdb.commons.cluster.NodeStatus;
 

server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java

@@ -160,7 +160,9 @@ public void connect(TEndPoint endpoint) throws TException {
           RpcTransportFactory.INSTANCE.getTransport(
               // as there is a try-catch already, we do not need to use TSocket.wrap
               endpoint.getIp(), endpoint.getPort(), (int) connectionTimeout);
-      transport.open();
+      if (!transport.isOpen()) {
+        transport.open();
+      }
       configNode = endpoint;
     } catch (TTransportException e) {
       throw new TException(e);

server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java

@@ -19,7 +19,6 @@
 package org.apache.iotdb.db.conf;
 
 import org.apache.iotdb.common.rpc.thrift.TEndPoint;
-import org.apache.iotdb.commons.cluster.NodeStatus;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.consensus.ConsensusFactory;
 import org.apache.iotdb.db.conf.directories.DirectoryManager;
@@ -35,7 +34,6 @@
 import org.apache.iotdb.db.metadata.LocalSchemaProcessor;
 import org.apache.iotdb.db.service.thrift.impl.InfluxDBServiceImpl;
 import org.apache.iotdb.db.service.thrift.impl.TSServiceImpl;
-import org.apache.iotdb.db.utils.HandleSystemErrorStrategy;
 import org.apache.iotdb.db.wal.utils.WALMode;
 import org.apache.iotdb.rpc.RpcTransportFactory;
 import org.apache.iotdb.rpc.RpcUtils;
@@ -85,13 +83,6 @@ public class IoTDBConfig {
 
   public static final Pattern NODE_PATTERN = Pattern.compile(NODE_MATCHER);
 
-  /** What will the system do when unrecoverable error occurs. */
-  private HandleSystemErrorStrategy handleSystemErrorStrategy =
-      HandleSystemErrorStrategy.CHANGE_TO_READ_ONLY;
-
-  /** Status of current system. */
-  private volatile NodeStatus status = NodeStatus.Running;
-
   /** whether to enable the mqtt service. */
   private boolean enableMQTTService = false;
 
@@ -1557,37 +1548,6 @@ public void setSessionTimeoutThreshold(int sessionTimeoutThreshold) {
     this.sessionTimeoutThreshold = sessionTimeoutThreshold;
   }
 
-  public HandleSystemErrorStrategy getHandleSystemErrorStrategy() {
-    return handleSystemErrorStrategy;
-  }
-
-  public void setHandleSystemErrorStrategy(HandleSystemErrorStrategy handleSystemErrorStrategy) {
-    this.handleSystemErrorStrategy = handleSystemErrorStrategy;
-  }
-
-  public boolean isReadOnly() {
-    return status == NodeStatus.ReadOnly
-        || (status == NodeStatus.Error
-            && handleSystemErrorStrategy == HandleSystemErrorStrategy.CHANGE_TO_READ_ONLY);
-  }
-
-  public NodeStatus getNodeStatus() {
-    return status;
-  }
-
-  public void setNodeStatus(NodeStatus newStatus) {
-    if (newStatus == NodeStatus.ReadOnly) {
-      logger.error(
-          "Change system status to read-only! Only query statements are permitted!",
-          new RuntimeException("System mode is set to READ_ONLY"));
-    } else if (newStatus == NodeStatus.Error) {
-      newStatus = handleSystemErrorStrategy.handle();
-    } else {
-      logger.info("Set system mode from {} to {}.", status, newStatus);
-    }
-    this.status = newStatus;
-  }
-
   public String getRpcImplClassName() {
     return rpcImplClassName;
   }

server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java

@@ -37,7 +37,6 @@
 import org.apache.iotdb.db.exception.query.QueryProcessException;
 import org.apache.iotdb.db.qp.utils.DatetimeUtils;
 import org.apache.iotdb.db.service.metrics.MetricService;
-import org.apache.iotdb.db.utils.HandleSystemErrorStrategy;
 import org.apache.iotdb.db.wal.WALManager;
 import org.apache.iotdb.db.wal.utils.WALMode;
 import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
@@ -717,11 +716,6 @@ public void loadProperties(Properties properties) {
     conf.setKerberosPrincipal(
         properties.getProperty("kerberos_principal", conf.getKerberosPrincipal()));
 
-    conf.setHandleSystemErrorStrategy(
-        HandleSystemErrorStrategy.valueOf(
-            properties.getProperty(
-                "handle_system_error", String.valueOf(conf.getHandleSystemErrorStrategy()))));
-
     // the num of memtables in each storage group
     conf.setConcurrentWritingTimePartition(
         Integer.parseInt(

server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java

@@ -19,6 +19,7 @@
 package org.apache.iotdb.db.conf.directories;
 
 import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.conf.IoTDBConstant;
 import org.apache.iotdb.commons.utils.TestOnly;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -147,7 +148,7 @@ public String getNextFolderForSequenceFile() throws DiskSpaceInsufficientExcepti
       return sequenceFileFolders.get(sequenceStrategy.nextFolderIndex());
     } catch (DiskSpaceInsufficientException e) {
       logger.error("All disks of wal folders are full, change system mode to read-only.", e);
-      IoTDBDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+      CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
       throw e;
     }
   }
@@ -161,7 +162,7 @@ public String getNextFolderForUnSequenceFile() throws DiskSpaceInsufficientExcep
       return unsequenceFileFolders.get(unsequenceStrategy.nextFolderIndex());
     } catch (DiskSpaceInsufficientException e) {
       logger.error("All disks of wal folders are full, change system mode to read-only.", e);
-      IoTDBDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+      CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
       throw e;
     }
   }