[iotdb] branch benchants_branch updated: comment SetThreadName method, modify init value in TsBlockBuilder

[caogaofei]

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

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


The following commit(s) were added to refs/heads/benchants_branch by this push:
     new 576d995f63b comment SetThreadName method, modify init value in 
TsBlockBuilder
576d995f63b is described below

commit 576d995f63b5bd1064130c21d87db24aa109aac3
Author: Beyyes <cgf1...@foxmail.com>
AuthorDate: Thu Jun 1 21:54:17 2023 +0800

    comment SetThreadName method, modify init value in TsBlockBuilder
---
 .../AbstractSeriesAggregationScanOperator.java     |  2 +-
 .../org/apache/iotdb/db/utils/SetThreadName.java   | 22 ++++++++++------------
 .../tsfile/read/common/block/TsBlockBuilder.java   |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
index 67b42a4319f..819625c53ee 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/source/AbstractSeriesAggregationScanOperator.java
@@ -90,7 +90,7 @@ public abstract class AbstractSeriesAggregationScanOperator 
extends AbstractData
     for (Aggregator aggregator : aggregators) {
       dataTypes.addAll(Arrays.asList(aggregator.getOutputType()));
     }
-    this.resultTsBlockBuilder = new TsBlockBuilder(dataTypes);
+    this.resultTsBlockBuilder = new TsBlockBuilder(60, dataTypes);
 
     this.cachedRawDataSize =
         (1L + subSensorSize) * 
TSFileDescriptor.getInstance().getConfig().getPageSizeInByte();
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 43adca20b2a..204494f37b9 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,24 +20,22 @@ 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;
+  // 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
   public void close() {
-    Thread.currentThread().setName(originalThreadName);
+    //    Thread.currentThread().setName(originalThreadName);
   }
 }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
index c309835a09f..b13c6ded4d9 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlockBuilder.java
@@ -44,7 +44,7 @@ public class TsBlockBuilder {
   // so the underlying data is larger than the object overhead, and the size 
is power of 2.
   //
   // This could be any other small number.
-  private static final int DEFAULT_INITIAL_EXPECTED_ENTRIES = 8;
+  private static final int DEFAULT_INITIAL_EXPECTED_ENTRIES = 60;
 
   private static final int MAX_LINE_NUMBER =
       TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber();