You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/06/21 03:48:40 UTC

[iotdb] 01/03: remove some test codes

This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch xingtanzjr/write_opt_version1
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit feb198b2f8f06c31385c95b3d943494fe5a5eb7d
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Tue Jun 21 11:38:10 2022 +0800

    remove some test codes
---
 .../org/apache/iotdb/confignode/manager/PartitionManager.java |  8 +++++++-
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java   |  2 +-
 .../java/org/apache/iotdb/db/mpp/execution/StateMachine.java  |  7 +------
 .../iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java       | 11 -----------
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
index 9b0d07a03c..ac1ae22eea 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
@@ -325,7 +325,13 @@ public class PartitionManager {
               getNodeManager().getOnlineDataNodeCount()
                   / ConfigNodeDescriptor.getInstance().getConf().getSchemaReplicationFactor());
     } else {
-      regionNum = 1;
+      regionNum =
+          Math.max(
+              2,
+              (int)
+                  (getNodeManager().getTotalCpuCoreCount()
+                      * 0.3
+                      / ConfigNodeDescriptor.getInstance().getConf().getDataReplicationFactor()));
     }
 
     // Do Region allocation for those StorageGroups who get the particle
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 91492a28ac..bd1e33a41a 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -2926,7 +2926,7 @@ public class IoTDBConfig {
   public void setTriggerForwardMQTTPoolSize(int triggerForwardMQTTPoolSize) {
     this.triggerForwardMQTTPoolSize = triggerForwardMQTTPoolSize;
   }
-  
+
   public int getCoordinatorReadExecutorSize() {
     return coordinatorReadExecutorSize;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
index e53c2cb02d..c1b7e76360 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
@@ -13,8 +13,6 @@
  */
 package org.apache.iotdb.db.mpp.execution;
 
-import org.apache.iotdb.db.mpp.plan.StepTracker;
-
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -272,7 +270,6 @@ public class StateMachine<T> {
    * execution. The listener is notified immediately of the current state.
    */
   public void addStateChangeListener(StateChangeListener<T> stateChangeListener) {
-    long startTime = System.nanoTime();
     requireNonNull(stateChangeListener, "stateChangeListener is null");
 
     boolean inTerminalState;
@@ -284,7 +281,7 @@ public class StateMachine<T> {
         stateChangeListeners.add(stateChangeListener);
       }
     }
-    StepTracker.trace("addStateListener", startTime, System.nanoTime());
+
     // fire state change listener with the current state
     // always fire listener callbacks from a different thread
     safeExecute(() -> stateChangeListener.stateChanged(currentState));
@@ -313,8 +310,6 @@ public class StateMachine<T> {
 
   private void safeExecute(Runnable command) {
     try {
-      //      new Thread(command).start();
-      //      command.run();
       executor.execute(command);
     } catch (RejectedExecutionException e) {
       if ((executor instanceof ExecutorService) && ((ExecutorService) executor).isShutdown()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
index 9f72dc4802..84db6df7f7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
@@ -96,21 +96,10 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
     schemaFetchStatement.setSchemaPartition(schemaPartition);
 
     SchemaTree result = executeSchemaFetchQuery(schemaFetchStatement);
-    //    SchemaTree result = mockFetch(patternTree);
     result.setStorageGroups(storageGroups);
     return result;
   }
 
-  public SchemaTree mockFetch(PathPatternTree patternTree) {
-    SchemaTree tree = new SchemaTree();
-    List<PartialPath> paths = patternTree.getAllPathPatterns();
-    for (PartialPath path : paths) {
-      tree.appendSingleMeasurement(
-          path, new MeasurementSchema(path.getMeasurement(), TSDataType.FLOAT), null, false);
-    }
-    return tree;
-  }
-
   private SchemaTree executeSchemaFetchQuery(SchemaFetchStatement schemaFetchStatement) {
     long queryId = SessionManager.getInstance().requestQueryId(false);
     try {