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/04/06 03:39:43 UTC
[iotdb] 01/04: Merge branch 'master' into xingtanzjr/query_execution
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/query_execution
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 61304abf9240b181813f778aaa8506e7dc9b13f9
Merge: 08b659f9eb fbfb3ebe2c
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed Apr 6 10:17:33 2022 +0800
Merge branch 'master' into xingtanzjr/query_execution
.github/workflows/{client.yml => client-cpp.yml} | 2 +-
.github/workflows/client-python.yml | 63 ++++
cli/pom.xml | 2 +
client-py/SessionAlignedTimeseriesTest.py | 280 -----------------
client-py/SessionTest.py | 336 ---------------------
client-py/requirements_dev.txt | 2 +-
client-py/tests/test_aligned_timeseries.py | 279 +++++++++++++++++
client-py/tests/test_dataframe.py | 6 +-
client-py/tests/test_session.py | 335 ++++++++++++++++++++
client-py/tests/test_todf.py | 12 +-
.../cluster/log/snapshot/FileSnapshotTest.java | 10 +-
.../log/snapshot/PartitionedSnapshotTest.java | 4 +-
.../cluster/log/snapshot/PullSnapshotTaskTest.java | 2 +-
.../cluster/server/member/DataGroupMemberTest.java | 2 +-
.../iotdb/db/integration/IoTDBFilePathUtilsIT.java | 2 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 70 +++--
.../integration/IoTDBManageTsFileResourceIT.java | 8 +-
.../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 64 ++--
.../iotdb/commons/partition/DataPartition.java | 20 +-
.../commons/partition/DataPartitionQueryParam.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 23 +-
.../engine/compaction/CompactionTaskManager.java | 95 +++---
.../cross/AbstractCrossSpaceCompactionTask.java | 9 +
.../task/RewriteCrossSpaceCompactionTask.java | 4 +
.../inner/AbstractInnerSpaceCompactionTask.java | 9 +
.../inner/sizetiered/SizeTieredCompactionTask.java | 6 +-
.../compaction/task/AbstractCompactionTask.java | 20 +-
.../db/engine/storagegroup/TsFileResourceList.java | 5 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 40 ++-
.../virtualSg/StorageGroupManager.java | 14 +-
.../db/mpp/common/schematree/PathPatternTree.java | 13 +
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 6 +
.../apache/iotdb/db/mpp/sql/analyze/Analysis.java | 16 +-
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 72 +++--
.../db/mpp/sql/analyze/ClusterSchemaFetcher.java | 8 +
.../db/mpp/sql/analyze/FakeSchemaFetcherImpl.java | 8 +
.../iotdb/db/mpp/sql/analyze/ISchemaFetcher.java | 5 +
.../mpp/sql/analyze/StandaloneSchemaFetcher.java | 8 +
.../db/mpp/sql/parser/StatementGenerator.java | 52 +++-
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 43 ++-
.../sql/planner/plan/node/write/InsertNode.java | 69 ++++-
.../sql/planner/plan/node/write/InsertRowNode.java | 48 ++-
.../planner/plan/node/write/InsertTabletNode.java | 198 +++++++++++-
.../db/mpp/sql/statement/StatementVisitor.java | 10 +-
.../sql/statement/crud/InsertBaseStatement.java | 59 ++++
.../mpp/sql/statement/crud/InsertRowStatement.java | 203 +++++++++++++
.../sql/statement/crud/InsertTabletStatement.java | 96 ++++++
.../iotdb/db/query/control/SessionManager.java | 15 +
.../db/service/thrift/impl/TSServiceImpl.java | 57 +++-
.../storagegroup/StorageGroupProcessorTest.java | 58 +++-
.../iotdb/db/engine/storagegroup/TTLTest.java | 4 +-
.../db/metadata/idtable/IDTableFlushTimeTest.java | 6 +-
.../db/sync/receiver/load/FileLoaderTest.java | 14 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 2 +-
54 files changed, 1947 insertions(+), 851 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index 5033b667c4,315620643e..e348836021
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@@ -37,8 -37,10 +37,10 @@@ import org.apache.iotdb.db.metadata.pat
import org.apache.iotdb.db.metadata.template.TemplateQueryType;
import org.apache.iotdb.db.mpp.common.QueryId;
import org.apache.iotdb.db.mpp.execution.Coordinator;
-import org.apache.iotdb.db.mpp.execution.ExecutionResult;
+import org.apache.iotdb.db.mpp.execution.ExecutionStatus;
import org.apache.iotdb.db.mpp.sql.analyze.QueryType;
+ import org.apache.iotdb.db.mpp.sql.parser.StatementGenerator;
+ import org.apache.iotdb.db.mpp.sql.statement.crud.InsertRowStatement;
import org.apache.iotdb.db.mpp.sql.statement.crud.InsertTabletStatement;
import org.apache.iotdb.db.qp.logical.Operator.OperatorType;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;