You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/10 12:41:45 UTC
[iotdb] branch rename_sg_to_db updated (d0b628627f -> 35c77edeb7)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch rename_sg_to_db
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from d0b628627f Add session method of database and make header config (#7961)
add acd466256f change haeder to Camel type
add 55188e2f30 fix conflict
add 18fc3f391e [IOTDB-4771]BufferedPipeDataQueueTest.testOfferWhileTakingWithDiscontinuousSerialNumber fail (#7954)
add 6a85f6c60c [IOTDB-4838] Adapt SchemaRegionSchemaFileImpl's recovery to Ratis. (#7936)
add 3614ca7899 Remove old storage engine step two (#7959)
add 35c77edeb7 resolve conflict
No new revisions were added by this update.
Summary of changes:
client-py/iotdb/dbapi/tests/test_cursor.py | 8 +-
client-py/iotdb/sqlalchemy/tests/test_dialect.py | 8 +-
client-py/tests/test_aligned_timeseries.py | 6 +-
client-py/tests/test_dataframe.py | 2 +-
client-py/tests/test_session.py | 6 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +-
.../confignode/manager/ClusterSchemaManager.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 6 +-
.../manager/partition/PartitionManager.java | 8 +-
.../persistence/schema/ClusterSchemaInfo.java | 4 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 8 +-
.../impl/schema/DeleteStorageGroupProcedure.java | 6 +-
docs/Blog/Release0_93.md | 2 +-
docs/Download/README.md | 2 +-
docs/UserGuide/API/InfluxDB-Protocol.md | 12 +-
docs/UserGuide/API/Programming-JDBC.md | 2 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 12 +-
docs/UserGuide/API/RestService.md | 14 +-
docs/UserGuide/API/Status-Codes.md | 8 +-
.../Administration-Management/Administration.md | 2 +-
docs/UserGuide/Cluster/Cluster-Concept.md | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 18 +-
docs/UserGuide/Data-Concept/Schema-Template.md | 2 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 2 +-
docs/UserGuide/Data-Modeling/DataRegion.md | 20 +-
docs/UserGuide/Delete-Data/Delete-Data.md | 2 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 6 +-
.../Integration-Test-refactoring-tutorial.md | 8 +-
.../Maintenance-Tools/Maintenance-Command.md | 34 +-
docs/UserGuide/Maintenance-Tools/NodeTool.md | 14 +-
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 12 +-
docs/UserGuide/Operate-Metadata/Storage-Group.md | 33 +-
docs/UserGuide/Process-Data/Continuous-Query.md | 4 +-
docs/UserGuide/Process-Data/Select-Into.md | 6 +-
docs/UserGuide/Query-Data/Aggregate-Query.md | 2 +-
docs/UserGuide/Query-Data/Select-Expression.md | 2 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 8 +-
docs/UserGuide/Reference/SQL-Reference.md | 32 +-
docs/UserGuide/Reference/Syntax-Conventions.md | 4 +-
docs/UserGuide/Reference/TSDB-Comparison.md | 4 +-
docs/zh/UserGuide/API/InfluxDB-Protocol.md | 10 +-
.../UserGuide/API/Programming-Java-Native-API.md | 4 +-
.../UserGuide/API/Programming-Python-Native-API.md | 8 +-
docs/zh/UserGuide/API/RestService.md | 14 +-
.../Data-Concept/Data-Model-and-Terminology.md | 6 +-
.../Integration-Test-refactoring-tutorial.md | 2 +-
.../Maintenance-Tools/Maintenance-Command.md | 28 +-
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 8 +-
.../Operate-Metadata/Auto-Create-MetaData.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Node.md | 18 +-
.../zh/UserGuide/Operate-Metadata/Storage-Group.md | 47 +-
docs/zh/UserGuide/Operate-Metadata/Template.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 14 +-
docs/zh/UserGuide/Query-Data/Select-Expression.md | 2 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 2 +-
docs/zh/UserGuide/Reference/SQL-Reference.md | 18 +-
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 4 +-
.../src/AlignedTimeseriesSessionExample.cpp | 2 +-
example/mqtt/README.md | 2 +-
example/rocketmq/readme.md | 6 +-
.../Apache IoTDB ConfigNode Dashboard v0.14.0.json | 4 +-
.../Apache IoTDB DataNode Dashboard v0.14.0.json | 2 +-
.../standalone/Apache IoTDB Dashboard v0.14.0.json | 2 +-
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBQuotedPathIT.java | 3 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 2 +-
.../iotdb/db/it/query/IoTDBNullOperandIT.java | 2 +-
.../query/IoTDBQueryWithComplexValueFilterIT.java | 2 +-
.../db/it/schema/IoTDBAutoCreateSchemaIT.java | 15 +-
.../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 8 +-
.../db/it/schema/IoTDBCreateTimeseriesIT.java | 4 +-
.../db/it/schema/IoTDBDeactivateTemplateIT.java | 10 +-
.../db/it/schema/IoTDBDeleteStorageGroupIT.java | 8 +-
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 9 +-
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 10 +-
.../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 2 +-
.../db/it/udf/IoTDBUDTFAlignByTimeQueryIT.java | 2 +-
.../iotdb/integration/env/ClusterEnvBase.java | 2 +-
.../iotdb/integration/env/RemoteServerEnv.java | 4 +-
.../IoTDBAlignedTimeSeriesCompactionIT.java | 2 +-
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 4 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 2 +-
.../db/integration/IoTDBFlushQueryMergeIT.java | 2 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 2 +-
.../db/integration/IoTDBRemovePartitionIT.java | 12 +-
.../db/integration/IoTDBSchemaTemplateIT.java | 8 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 2 +-
.../integration/IoTDBSortedShowTimeseriesIT.java | 65 +-
.../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 2 +-
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 10 +-
jdbc/README.md | 4 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 4 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 4 +-
.../resources/conf/iotdb-common.properties | 4 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 6 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 2 +-
.../iotdb/commons/partition/DataPartition.java | 2 +-
.../org/apache/iotdb/commons/path/PartialPath.java | 4 +-
.../apache/iotdb/commons/utils/StatusUtils.java | 6 +-
.../schemaregion/rocksdb/RSchemaRegion.java | 137 +-
schema-engine-tag/README.md | 8 +-
.../metadata/tagSchemaRegion/TagSchemaRegion.java | 85 --
.../utils/PathTagConverterUtils.java | 6 +-
.../utils/ShowTimeSeriesResultUtils.java | 4 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 6 +-
.../apache/iotdb/db/engine/StorageEngineV2.java | 19 +-
.../engine/compaction/CompactionTaskManager.java | 7 +-
.../db/engine/compaction/log/TsFileIdentifier.java | 10 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 8 +-
.../db/engine/querycontext/QueryDataSource.java | 4 +-
.../selectinto/InsertTabletPlanGenerator.java | 252 ----
.../selectinto/InsertTabletPlansIterator.java | 190 ---
.../iotdb/db/engine/snapshot/SnapshotLogger.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 61 +-
.../db/engine/storagegroup/DataRegionInfo.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 3 +-
.../db/engine/trigger/executor/TriggerEngine.java | 64 -
.../trigger/sink/local/LocalIoTDBHandler.java | 12 +-
.../version/SimpleFileVersionController.java | 2 +-
.../iotdb/db/engine/version/VersionController.java | 12 +-
.../iotdb/db/localconfignode/LocalConfigNode.java | 2 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 108 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 3 +-
.../apache/iotdb/db/metadata/idtable/IDTable.java | 3 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 134 --
.../apache/iotdb/db/metadata/mnode/MNodeType.java | 2 +-
.../db/metadata/mnode/StorageGroupEntityMNode.java | 4 +-
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 15 +-
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 63 +-
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 19 +-
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 4 +-
.../db/metadata/mtree/store/CachedMTreeStore.java | 29 +-
.../mtree/store/disk/schemafile/ISchemaFile.java | 9 +-
.../store/disk/schemafile/MockSchemaFile.java | 6 +
.../mtree/store/disk/schemafile/SchemaFile.java | 76 +-
.../db/metadata/mtree/traverser/Traverser.java | 2 +-
.../traverser/collector/StorageGroupCollector.java | 2 +-
.../traverser/counter/StorageGroupCounter.java | 2 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 3 -
.../schemaregion/SchemaRegionMemoryImpl.java | 217 +--
.../schemaregion/SchemaRegionSchemaFileImpl.java | 448 +++---
.../metadata/schemaregion/SchemaRegionUtils.java | 48 -
.../storagegroup/IStorageGroupSchemaManager.java | 60 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 2 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 95 +-
.../mpp/common/schematree/ClusterSchemaTree.java | 8 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 2 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 2 +-
.../db/mpp/plan/analyze/IPartitionFetcher.java | 8 +-
.../plan/analyze/StandalonePartitionFetcher.java | 2 +-
.../db/mpp/plan/analyze/cache/PartitionCache.java | 6 +-
.../config/executor/ClusterConfigTaskExecutor.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 6 +-
.../plan/planner/distribution/SourceRewriter.java | 2 +-
.../planner/plan/node/write/InsertRowsNode.java | 4 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 10 +-
.../planner/plan/node/write/InsertTabletNode.java | 4 +-
.../plan/statement/metadata/CountStatement.java | 2 +-
.../statement/metadata/ShowDevicesStatement.java | 2 +-
.../db/mpp/plan/statement/sys/FlushStatement.java | 2 +-
.../iotdb/db/protocol/influxdb/dto/IoTDBPoint.java | 14 -
.../protocol/influxdb/handler/NewQueryHandler.java | 2 +-
.../influxdb/meta/TagInfluxDBMetaManager.java | 2 +-
.../db/protocol/influxdb/meta/TagInfoRecords.java | 24 -
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 8 +-
.../db/qp/logical/crud/DeleteDataOperator.java | 15 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 31 +-
.../db/qp/logical/sys/DeletePartitionOperator.java | 3 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 24 -
.../db/qp/physical/crud/DeletePartitionPlan.java | 53 -
.../iotdb/db/qp/physical/crud/DeletePlan.java | 221 ---
.../qp/physical/crud/InsertMultiTabletsPlan.java | 453 ------
.../iotdb/db/qp/physical/crud/InsertPlan.java | 239 ----
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 812 -----------
.../physical/crud/InsertRowsOfOneDevicePlan.java | 296 ----
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 302 ----
.../db/qp/physical/crud/InsertTabletPlan.java | 895 ------------
.../apache/iotdb/db/qp/physical/sys/FlushPlan.java | 4 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 8 +-
.../db/query/control/QueryResourceManager.java | 6 +-
.../iotdb/db/query/dataset/ShowDevicesDataSet.java | 4 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 4 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 4 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 15 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 2 +-
.../java/org/apache/iotdb/db/service/NewIoTDB.java | 2 +-
.../service/thrift/impl/ClientRPCServiceImpl.java | 14 +-
.../db/service/thrift/impl/TSServiceImpl.java | 548 +-------
.../iotdb/db/sync/datasource/PipeOpManager.java | 2 +-
.../sync/pipedata/queue/BufferedPipeDataQueue.java | 6 +-
.../iotdb/db/sync/receiver/load/TsFileLoader.java | 2 +-
.../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 4 +-
.../java/org/apache/iotdb/db/tools/WalChecker.java | 2 +-
.../db/tools/schema/SchemaFileSketchTool.java | 7 +
.../java/org/apache/iotdb/db/utils/MemUtils.java | 54 -
.../apache/iotdb/db/wal/buffer/WALEntryType.java | 4 -
.../apache/iotdb/db/wal/buffer/WALInfoEntry.java | 2 +-
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 4 +-
.../iotdb/db/wal/recover/WALRecoverManager.java | 6 +-
.../db/wal/recover/file/TsFilePlanRedoer.java | 28 -
.../iotdb/db/engine/storagegroup/TTLTest.java | 2 +-
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 302 +---
.../org/apache/iotdb/db/metadata/TemplateTest.java | 14 -
.../db/metadata/idtable/IDTableLogFileTest.java | 239 ++--
.../iotdb/db/metadata/idtable/IDTableTest.java | 1479 ++++++++++----------
.../schemaRegion/SchemaRegionBasicTest.java | 124 ++
.../schemaRegion/SchemaRegionSnapshotTest.java | 168 ---
.../schema/SchemaQueryScanOperatorTest.java | 6 +-
.../mpp/plan/analyze/cache/PartitionCacheTest.java | 6 +-
.../iotdb/db/mpp/plan/plan/LogicalPlannerTest.java | 2 +-
.../db/protocol/rest/IoTDBRestServiceTest.java | 12 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 69 +-
.../iotdb/db/qp/logical/LogicalPlanSmallTest.java | 2 +-
.../iotdb/db/query/dataset/ListDataSetTest.java | 6 +-
.../iotdb/db/query/dataset/SingleDataSetTest.java | 8 +-
.../sync/pipedata/BufferedPipeDataQueueTest.java | 1 +
.../apache/iotdb/db/utils/EnvironmentUtils.java | 6 +-
.../db/utils/writelog/LogWriterReaderTest.java | 50 +-
.../db/utils/writelog/MultiFileLogReaderTest.java | 15 +-
.../db/wal/recover/file/TsFilePlanRedoerTest.java | 4 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 4 +-
.../test/java/org/apache/iotdb/db/sync/SyncIT.java | 2 +-
.../src/main/thrift/confignode.thrift | 4 +-
thrift/src/main/thrift/datanode.thrift | 2 +-
.../apache/iotdb/tsfile/utils/FilePathUtils.java | 4 +-
.../tsfile/common/block/TsBlockSerdeTest.java | 4 +-
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 13 +-
233 files changed, 2132 insertions(+), 7662 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/selectinto/InsertTabletPlanGenerator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/selectinto/InsertTabletPlansIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePartitionPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/DeletePlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletsPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionSnapshotTest.java