You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/12/20 01:15:06 UTC
[iotdb] 03/03: Merge remote-tracking branch 'origin/rel/1.0' into ty/tsbs
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty/tsbs
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit e56755cc1ffccc7b8f6e5b4029ee7c139c3f748c
Merge: 61ede164f8 abc82e519b
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Dec 20 09:14:36 2022 +0800
Merge remote-tracking branch 'origin/rel/1.0' into ty/tsbs
.../assembly/resources/sbin/start-confignode.bat | 55 ++-
.../assembly/resources/sbin/start-confignode.sh | 22 +-
.../src/assembly/resources/sbin/stop-confignode.sh | 19 +-
.../it/IoTDBClusterRegionLeaderBalancingIT.java | 25 +-
.../src/assembly/resources/sbin/iotdb-common.sh | 137 ++++++
.../src/assembly/resources/sbin/start-datanode.bat | 103 ++++-
.../src/assembly/resources/sbin/start-datanode.sh | 20 +-
.../src/assembly/resources/sbin/stop-datanode.bat | 8 +-
.../src/assembly/resources/sbin/stop-datanode.sh | 16 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 4 +-
.../schemaregion/impl/SchemaRegionPlanFactory.java | 6 +
.../exchange/IMPPDataExchangeManager.java | 2 +
.../db/mpp/execution/exchange/ISinkHandle.java | 3 +
.../db/mpp/execution/exchange/ISourceHandle.java | 3 +
.../db/mpp/execution/exchange/LocalSinkHandle.java | 11 +-
.../mpp/execution/exchange/LocalSourceHandle.java | 5 +
.../execution/exchange/MPPDataExchangeManager.java | 21 +-
.../mpp/execution/exchange/SharedTsBlockQueue.java | 59 ++-
.../db/mpp/execution/exchange/SinkHandle.java | 50 ++-
.../db/mpp/execution/exchange/SourceHandle.java | 62 ++-
.../mpp/execution/memory/LocalMemoryManager.java | 2 +-
.../iotdb/db/mpp/execution/memory/MemoryPool.java | 206 ++++++---
.../plan/execution/memory/MemorySourceHandle.java | 3 +
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 30 ++
.../plan/planner/MemoryDistributionCalculator.java | 469 +++++++++++++++++++++
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 1 +
.../schemaRegion/SchemaRegionBasicTest.java | 35 ++
.../execution/exchange/LocalSinkHandleTest.java | 63 ++-
.../execution/exchange/LocalSourceHandleTest.java | 4 +-
.../execution/exchange/SharedTsBlockQueueTest.java | 5 +-
.../db/mpp/execution/exchange/SinkHandleTest.java | 77 +++-
.../mpp/execution/exchange/SourceHandleTest.java | 10 +-
.../db/mpp/execution/exchange/StubSinkHandle.java | 3 +
.../iotdb/db/mpp/execution/exchange/Utils.java | 52 ++-
.../db/mpp/execution/memory/MemoryPoolTest.java | 182 ++++----
37 files changed, 1532 insertions(+), 245 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
index dfa4f69e8b,cda072ff0f..66eda2e0f8
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
@@@ -23,9 -23,9 +23,10 @@@ import org.apache.iotdb.common.rpc.thri
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
import org.apache.iotdb.commons.utils.TestOnly;
+ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager.SourceHandleListener;
import org.apache.iotdb.db.mpp.execution.memory.LocalMemoryManager;
+import org.apache.iotdb.db.mpp.statistics.QueryStatistics;
import org.apache.iotdb.db.utils.SetThreadName;
import org.apache.iotdb.mpp.rpc.thrift.TAcknowledgeDataBlockEvent;
import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceId;
@@@ -136,9 -137,7 +147,8 @@@ public class SourceHandle implements IS
@Override
public synchronized ByteBuffer getSerializedTsBlock() {
+ long startTime = System.nanoTime();
try (SetThreadName sourceHandleName = new SetThreadName(threadName)) {
-
checkState();
if (!blocked.isDone()) {