You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ca...@apache.org on 2023/05/17 09:06:02 UTC

[iotdb] branch beyyes/optimize_tsbs updated (6a3315d726 -> 82085ef3a1)

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

caogaofei pushed a change to branch beyyes/optimize_tsbs
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 6a3315d726 add TsbsExample
     new 862134d195 comment queryTerminator.terminate(t); in ClusterScheduler
     new 82085ef3a1 comment impl in SetThreadName.java

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java   | 2 +-
 .../org/apache/iotdb/db/mpp/plan/scheduler/SimpleQueryTerminator.java   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)


[iotdb] 02/02: comment impl in SetThreadName.java

Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch beyyes/optimize_tsbs
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 82085ef3a1bda2284069165382b694fa3935cbd3
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed May 17 17:05:42 2023 +0800

    comment impl in SetThreadName.java
---
 .../java/org/apache/iotdb/db/utils/SetThreadName.java  | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java b/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
index 0d645c9fba..e6126b6908 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
@@ -20,20 +20,18 @@ package org.apache.iotdb.db.utils;
 
 import java.io.Closeable;
 
-import static java.util.Objects.requireNonNull;
-
 public class SetThreadName implements Closeable {
   private final String originalThreadName = "";
 
   public SetThreadName(String suffix) {
-//    requireNonNull(suffix, "suffix is null");
-//    originalThreadName = Thread.currentThread().getName();
-//    int index = originalThreadName.indexOf("$");
-//    if (index < 0) {
-//      Thread.currentThread().setName(originalThreadName + '$' + suffix);
-//    } else {
-//      Thread.currentThread().setName(originalThreadName.substring(0, index) + '$' + suffix);
-//    }
+    //    requireNonNull(suffix, "suffix is null");
+    //    originalThreadName = Thread.currentThread().getName();
+    //    int index = originalThreadName.indexOf("$");
+    //    if (index < 0) {
+    //      Thread.currentThread().setName(originalThreadName + '$' + suffix);
+    //    } else {
+    //      Thread.currentThread().setName(originalThreadName.substring(0, index) + '$' + suffix);
+    //    }
   }
 
   @Override


[iotdb] 01/02: comment queryTerminator.terminate(t); in ClusterScheduler

Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

caogaofei pushed a commit to branch beyyes/optimize_tsbs
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 862134d195d21cb73876de77b88312041d18ffe4
Author: Beyyes <cg...@foxmail.com>
AuthorDate: Wed May 17 08:05:52 2023 +0800

    comment queryTerminator.terminate(t); in ClusterScheduler
---
 .../iotdb/db/mpp/plan/scheduler/ClusterScheduler.java  |  2 +-
 .../db/mpp/plan/scheduler/SimpleQueryTerminator.java   |  2 --
 .../java/org/apache/iotdb/db/utils/SetThreadName.java  | 18 ++++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
index 86b63408d8..d118824319 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/ClusterScheduler.java
@@ -163,7 +163,7 @@ public class ClusterScheduler implements IScheduler {
     }
     // TODO: (xingtanzjr) handle the exception when the termination cannot succeed
     if (queryTerminator != null) {
-      queryTerminator.terminate(t);
+      // queryTerminator.terminate(t);
     }
   }
 
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleQueryTerminator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleQueryTerminator.java
index 6aee653bc0..2433f74bbf 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleQueryTerminator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/SimpleQueryTerminator.java
@@ -116,8 +116,6 @@ public class SimpleQueryTerminator implements IQueryTerminator {
         return true;
       }
 
-      logger.error("!!!!!!!!unexpected!!!!!!!!!");
-
       try (SyncDataNodeInternalServiceClient client =
           internalServiceClientManager.borrowClient(endPoint)) {
         client.cancelQuery(new TCancelQueryReq(queryId.getId(), unfinishedFIs, false));
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java b/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
index e6126b6908..0d645c9fba 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/SetThreadName.java
@@ -20,18 +20,20 @@ package org.apache.iotdb.db.utils;
 
 import java.io.Closeable;
 
+import static java.util.Objects.requireNonNull;
+
 public class SetThreadName implements Closeable {
   private final String originalThreadName = "";
 
   public SetThreadName(String suffix) {
-    //    requireNonNull(suffix, "suffix is null");
-    //    originalThreadName = Thread.currentThread().getName();
-    //    int index = originalThreadName.indexOf("$");
-    //    if (index < 0) {
-    //      Thread.currentThread().setName(originalThreadName + '$' + suffix);
-    //    } else {
-    //      Thread.currentThread().setName(originalThreadName.substring(0, index) + '$' + suffix);
-    //    }
+//    requireNonNull(suffix, "suffix is null");
+//    originalThreadName = Thread.currentThread().getName();
+//    int index = originalThreadName.indexOf("$");
+//    if (index < 0) {
+//      Thread.currentThread().setName(originalThreadName + '$' + suffix);
+//    } else {
+//      Thread.currentThread().setName(originalThreadName.substring(0, index) + '$' + suffix);
+//    }
   }
 
   @Override