You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/07/12 15:09:26 UTC

[incubator-iotdb] branch pisa updated (35d00bd -> cce4c1a)

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

sunzesong pushed a change to branch pisa
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


 discard 35d00bd  Merge remote-tracking branch 'origin/master' into pisa
 discard 5bc2749  Delete useless codes
    omit ca7ea84  Make Sonar happy
    omit c2c4484  Merge master and resolve conflicts
    omit b9c6b17  Merge remote-tracking branch 'origin/master' into pisa
    omit 2cbee31  change the way to get MManager (#1431)
    omit d36b33e  Merge master and resolve conflicts
    omit e04f701  Merge remote-tracking branch 'origin/master' into pisa
    omit 2812d40  Delete useless codes
    omit 58b10ff  rename markMeasurementInsertionFailed to markFailedMeasurementInsertion
    omit 22a82b3  Abstract insertPlan
    omit fc019b7  merge master
    omit a56a697  Merge remote-tracking branch 'origin/master' into pisa
    omit 662a8bc  Change name
    omit d1231f6  Fix test
    omit 8146b87  Add version info in MTree snapshot file name
    omit 6da16b4  Comparison IoTDB with other TSDBs (#1189)
    omit a40b5f7  enlarge avg_series_point_num_threshold to 100000
    omit 0589dab  set rpc version to v3
    omit 850c11c  fix insertRecord serialize in Python example
    omit ab5f7cc  fix series reader bug (#1434)
    omit fe913c9  Support partition removal (#1409)

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/pisa (cce4c1a)
            \
             O -- O -- O   (35d00bd)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 LICENSE-binary                                     |  71 +---
 README.md                                          |   2 +-
 README_ZH.md                                       |   2 +-
 antlr/pom.xml                                      |  55 ---
 cli/pom.xml                                        |   1 -
 cli/src/assembly/resources/sbin/start-cli.sh       |   2 +-
 .../java/org/apache/iotdb/cli/AbstractCli.java     |  10 -
 client-py/compile.bat                              |   2 +-
 client-py/compile.sh                               |   2 +-
 client-py/readme.md                                |   2 +-
 client-py/src/client_example.py                    |  13 +-
 distribution/pom.xml                               |   1 -
 docs/Development/ContributeGuide.md                |   6 +-
 docs/SystemDesign/Client/RPC.md                    |  11 +-
 docs/SystemDesign/DataQuery/LastQuery.md           |   2 +-
 docs/SystemDesign/QueryEngine/Planner.md           |   6 +-
 docs/SystemDesign/SchemaManager/SchemaManager.md   |  45 ---
 .../SystemDesign/StorageEngine/DataManipulation.md |   4 +-
 .../Client/Programming - Other Languages.md        |   2 +-
 docs/UserGuide/Comparison/TSDB-Comparison.md       | 386 ------------------
 .../DML Data Manipulation Language.md              |  43 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |  17 +-
 docs/UserGuide/Server/Download.md                  |   2 +-
 docs/zh/Development/ContributeGuide.md             |   4 +-
 docs/zh/SystemDesign/Client/RPC.md                 |  12 +-
 docs/zh/SystemDesign/DataQuery/LastQuery.md        |   2 +-
 docs/zh/SystemDesign/QueryEngine/Planner.md        |   4 +-
 .../zh/SystemDesign/SchemaManager/SchemaManager.md |  41 --
 .../SystemDesign/StorageEngine/DataManipulation.md |   4 +-
 .../Client/Programming - Other Languages.md        |   2 +-
 .../DML Data Manipulation Language.md              |  37 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |  17 +-
 .../org/apache/iotdb/IndexContractExample.java     |   2 +-
 .../main/java/org/apache/iotdb/IndexExample.java   |  21 +-
 .../src/main/java/org/apache/iotdb/Solution.java   |   0
 hadoop/pom.xml                                     |   5 +-
 hive-connector/pom.xml                             |   7 +-
 jdbc/pom.xml                                       |   4 +-
 jdbc/src/main/feature/feature.xml                  |   1 -
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |   2 +-
 licenses/EDL License 1.0                           |  11 +
 pom.xml                                            |  21 +-
 server/pom.xml                                     |  32 +-
 .../resources/conf/iotdb-engine.properties         |  11 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   5 -
 .../iotdb/db/auth/authorizer/BasicAuthorizer.java  |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  21 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   2 +-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   2 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  21 +-
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |  10 +-
 .../db/conf/adapter/ManageDynamicParameters.java   |   4 +-
 .../db/conf/directories/DirectoryManager.java      |   2 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  72 ++--
 .../apache/iotdb/db/engine/cache/ChunkCache.java   |   8 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  41 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |   9 +-
 .../db/engine/memtable/IWritableMemChunk.java      |  10 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |   9 +-
 .../iotdb/db/engine/merge/recover/LogAnalyzer.java |  22 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   6 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  |   3 +-
 .../iotdb/db/engine/merge/task/MergeTask.java      |  22 +-
 .../iotdb/db/engine/modification/Deletion.java     |  47 +--
 .../io/LocalTextModificationAccessor.java          |  20 +-
 .../engine/storagegroup/StorageGroupProcessor.java | 237 ++++-------
 .../db/engine/storagegroup/TsFileProcessor.java    |  23 +-
 .../db/engine/storagegroup/TsFileResource.java     |  50 +--
 .../version/SimpleFileVersionController.java       |  10 +-
 .../iotdb/db/exception/index/IndexException.java   |   4 +-
 .../db/exception/runtime/SQLParserException.java   |   4 +
 .../org/apache/iotdb/db/index/FloatDigest.java     |  23 +-
 .../org/apache/iotdb/db/index/IndexManager.java    |  19 -
 .../java/org/apache/iotdb/db/index/LoadData.java   |  46 +++
 .../java/org/apache/iotdb/db/index/PisaIndex.java  | 334 +++++++++++++---
 .../java/org/apache/iotdb/db/index/QueryData.java  |  31 ++
 .../org/apache/iotdb/db/index/storage/Config.java  |  54 +++
 .../apache/iotdb/db/index/storage/FakeStore.java   |  71 ----
 .../iotdb/db/index/storage/FixWindowPackage.java   |  79 ----
 .../iotdb/db/index/storage/StorageFactory.java     |  43 ++
 .../storage/interfaces/IBackendModelCreator.java   |  30 ++
 .../index/storage/interfaces/IBackendReader.java   |  29 ++
 .../index/storage/interfaces/IBackendWriter.java   |  23 ++
 .../db/index/storage/memory/FakeByteStore.java     | 140 +++++++
 .../iotdb/db/index/storage/memory/FakeStore.java   | 131 +++++++
 .../db/index/storage/model/FixWindowPackage.java   | 112 ++++++
 .../model/serializer/DigestSerializeFactory.java   |  35 ++
 .../storage/model/serializer/DigestSerializer.java |  41 ++
 .../serializer/FixWindowPackageSerializer.java     |  77 ++++
 .../model/serializer/FloatDigestSerializer.java    |  81 ++++
 .../iotdb/db/index/utils/DataDigestUtil.java       | 125 ++++++
 .../apache/iotdb/db/index/utils/DigestUtil.java    |  86 ++--
 .../iotdb/db/index/utils/ForestRootStack.java      |  31 +-
 .../org/apache/iotdb/db/index/utils/MyBytes.java   | 255 ++++++++++++
 .../org/apache/iotdb/db/metadata/MManager.java     |  42 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  74 ++--
 .../apache/iotdb/db/metadata/MetadataConstant.java |  10 +-
 .../iotdb/db/metadata/mnode/StorageGroupMNode.java |   1 +
 .../apache/iotdb/db/monitor/MonitorConstants.java  |   2 +-
 .../org/apache/iotdb/db/monitor/StatMonitor.java   |  28 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |  14 +-
 .../main/java/org/apache/iotdb/db/qp/Planner.java  |   1 -
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   8 +-
 .../apache/iotdb/db/qp/executor/IPlanExecutor.java |  17 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  | 168 +++++---
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   2 +-
 .../db/qp/logical/crud/DeleteDataOperator.java     |  18 +-
 .../db/qp/logical/sys/DeletePartitionOperator.java |  50 ---
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  14 +-
 .../db/qp/physical/crud/DeletePartitionPlan.java   |  51 ---
 .../iotdb/db/qp/physical/crud/DeletePlan.java      |  49 +--
 .../iotdb/db/qp/physical/crud/InsertPlan.java      | 429 ++++++++++++++++++--
 .../iotdb/db/qp/physical/crud/InsertRowPlan.java   | 433 ---------------------
 .../db/qp/physical/crud/InsertTabletPlan.java      | 213 ++++++----
 .../db/qp/physical/sys/ShowTimeSeriesPlan.java     |  18 -
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  75 +---
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  17 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  21 +-
 .../iotdb/db/query/control/TracingManager.java     |   4 +-
 .../db/query/dataset/AlignByDeviceDataSet.java     |  10 +-
 .../db/query/dataset/ShowTimeseriesDataSet.java    |  80 ----
 .../query/dataset/groupby/GroupByFillDataSet.java  |   2 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java |  38 +-
 .../iotdb/db/query/executor/QueryRouter.java       |   7 +-
 .../db/query/executor/RawDataQueryExecutor.java    |  12 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |   4 -
 .../query/timegenerator/ServerTimeGenerator.java   |   7 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   8 +-
 .../org/apache/iotdb/db/service/MQTTService.java   |   2 -
 .../java/org/apache/iotdb/db/service/Monitor.java  |   4 +-
 .../org/apache/iotdb/db/service/MonitorMBean.java  |   2 +-
 .../org/apache/iotdb/db/service/RPCService.java    | 218 +++++++++--
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 202 ++--------
 .../iotdb/db/service/thrift/ThriftService.java     | 150 -------
 .../db/service/thrift/ThriftServiceThread.java     | 143 -------
 .../iotdb/db/sync/receiver/SyncServerManager.java  | 189 ++++++---
 .../db/sync/receiver/SyncServerManagerMBean.java   |  34 --
 .../db/sync/receiver/transfer/SyncServiceImpl.java |  23 +-
 .../db/sync/sender/manage/SyncFileManager.java     |  27 +-
 .../iotdb/db/sync/sender/transfer/SyncClient.java  |   3 +-
 .../iotdb/db/tools/memestimation/MemEstTool.java   |   8 +-
 .../db/tools/memestimation/MemEstToolCmd.java      |   6 +-
 .../org/apache/iotdb/db/utils/CommonUtils.java     |  32 +-
 .../org/apache/iotdb/db/utils/OpenFileNumUtil.java |   2 +-
 .../java/org/apache/iotdb/db/utils/QueryUtils.java | 160 ++------
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |  21 +-
 .../org/apache/iotdb/db/utils/SerializeUtils.java  |  24 +-
 .../apache/iotdb/db/utils/TypeInferenceUtils.java  |   4 +-
 .../iotdb/db/utils/datastructure/TVList.java       |  35 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  95 +++--
 .../writelog/recover/TsFileRecoverPerformer.java   |  23 +-
 .../adapter/IoTDBConfigDynamicAdapterTest.java     |  20 +-
 .../iotdb/db/engine/MetadataManagerHelper.java     |   3 +-
 .../db/engine/cache/ChunkMetadataCacheTest.java    |   6 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |  16 +-
 .../iotdb/db/engine/merge/MergePerfTest.java       |  11 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   2 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |  43 +-
 .../iotdb/db/engine/merge/MergeUpgradeTest.java    |   8 +-
 .../engine/modification/DeletionFileNodeTest.java  |  66 ++--
 .../db/engine/modification/DeletionQueryTest.java  |  94 ++---
 .../engine/modification/ModificationFileTest.java  |   8 +-
 .../storagegroup/FileNodeManagerBenchmark.java     |  18 +-
 .../storagegroup/StorageGroupProcessorTest.java    |  24 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  83 ++--
 .../engine/storagegroup/TsFileProcessorTest.java   |  10 +-
 .../db/integration/IoTDBCreateSnapshotIT.java      |   2 +-
 .../iotdb/db/integration/IoTDBDeletionIT.java      |  37 --
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |  66 +---
 .../db/integration/IoTDBRemovePartitionIT.java     | 193 ---------
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   | 151 -------
 .../iotdb/db/metadata/MManagerAdvancedTest.java    |  18 +-
 .../iotdb/db/metadata/MManagerBasicTest.java       |  15 +-
 .../iotdb/db/metadata/MManagerImproveTest.java     |  22 +-
 .../apache/iotdb/db/mqtt/PublishHandlerTest.java   |   4 +-
 .../java/org/apache/iotdb/db/qp/PlannerTest.java   |  20 +-
 .../iotdb/db/qp/plan/ConcatOptimizerTest.java      |  27 +-
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     | 104 +----
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |  61 +--
 .../apache/iotdb/db/qp/plan/SerializationTest.java |  88 -----
 .../dataset/EngineDataSetWithValueFilterTest.java  |  11 +-
 .../db/query/dataset/GroupByLevelDataSetTest.java  |   5 +-
 .../db/query/dataset/GroupByTimeDataSetTest.java   |   4 +-
 .../iotdb/db/query/reader/ReaderTestHelper.java    |  11 +-
 .../query/reader/series/SeriesReaderTestUtil.java  |  27 +-
 .../db/sync/receiver/load/FileLoaderTest.java      |  11 +-
 .../recover/SyncReceiverLogAnalyzerTest.java       |   7 +-
 .../db/sync/sender/manage/SyncFileManagerTest.java |  27 +-
 .../sender/recover/SyncSenderLogAnalyzerTest.java  |  25 +-
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |   6 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  29 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |  31 +-
 .../iotdb/db/writelog/WriteLogNodeManagerTest.java |   6 +-
 .../apache/iotdb/db/writelog/WriteLogNodeTest.java |  29 +-
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |  12 +-
 .../db/writelog/io/MultiFileLogReaderTest.java     |   2 +-
 .../db/writelog/recover/DeviceStringTest.java      |  15 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |  33 +-
 .../recover/RecoverResourceFromReaderTest.java     |  25 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  31 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  35 +-
 service-rpc/pom.xml                                | 111 +++++-
 {thrift => service-rpc}/rpc-changelist.md          |  13 +-
 .../src/main/thrift/cluster.thrift                 |  34 +-
 {thrift => service-rpc}/src/main/thrift/rpc.thrift |  32 +-
 .../src/main/thrift/sync.thrift                    |  98 ++---
 {thrift => service-rpc}/src/pypi/README.md         |   2 +-
 {thrift => service-rpc}/src/pypi/setup.py          |   0
 session/pom.xml                                    |   2 +-
 .../java/org/apache/iotdb/session/Session.java     |  84 ++--
 site/iotdb-doap.rdf                                |  80 ----
 site/pom.xml                                       |   4 +-
 site/src/main/.vuepress/config.js                  |  10 +-
 site/src/main/.vuepress/theme/styles/index.styl    |   4 +-
 .../apache/iotdb/spark/db/EnvironmentUtils.java    |  28 +-
 thrift/pom.xml                                     | 202 ----------
 tsfile/pom.xml                                     |   3 +-
 .../iotdb/tsfile/file/metadata/ChunkMetadata.java  |  46 +--
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |  17 +-
 .../apache/iotdb/tsfile/read/common/TimeRange.java |  51 +--
 .../read/controller/CachedChunkLoaderImpl.java     |   2 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |  24 +-
 .../read/reader/chunk/ChunkReaderByTimestamp.java  |   4 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |  41 +-
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |  12 +-
 .../tsfile/v1/file/metadata/ChunkMetadataV1.java   |  11 +-
 .../tsfile/v1/read/TsFileSequenceReaderForV1.java  |   2 +-
 .../tsfile/write/schema/MeasurementSchema.java     |   4 -
 .../tsfile/write/schema/TimeseriesSchema.java      | 265 -------------
 .../iotdb/tsfile/read/common/TimeRangeTest.java    |  70 ----
 .../iotdb/tsfile/read/reader/PageReaderTest.java   |  55 ---
 232 files changed, 4187 insertions(+), 5551 deletions(-)
 delete mode 100644 antlr/pom.xml
 delete mode 100644 docs/UserGuide/Comparison/TSDB-Comparison.md
 create mode 100644 example/jdbc/src/main/java/org/apache/iotdb/Solution.java
 create mode 100644 licenses/EDL License 1.0
 rename {antlr => server}/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4 (99%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/LoadData.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/QueryData.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/Config.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/FakeStore.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/FixWindowPackage.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/StorageFactory.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/interfaces/IBackendModelCreator.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/interfaces/IBackendReader.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/interfaces/IBackendWriter.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/memory/FakeByteStore.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/memory/FakeStore.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/model/FixWindowPackage.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/model/serializer/DigestSerializeFactory.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/model/serializer/DigestSerializer.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/model/serializer/FixWindowPackageSerializer.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/storage/model/serializer/FloatDigestSerializer.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/utils/DataDigestUtil.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/index/utils/MyBytes.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/sys/DeletePartitionOperator.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/InsertRowPlan.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/ShowTimeseriesDataSet.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/ThriftService.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/thrift/ThriftServiceThread.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/sync/receiver/SyncServerManagerMBean.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBRemovePartitionIT.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/qp/plan/SerializationTest.java
 rename {thrift => service-rpc}/rpc-changelist.md (94%)
 rename {thrift => service-rpc}/src/main/thrift/cluster.thrift (93%)
 rename {thrift => service-rpc}/src/main/thrift/rpc.thrift (91%)
 rename {thrift => service-rpc}/src/main/thrift/sync.thrift (97%)
 rename {thrift => service-rpc}/src/pypi/README.md (97%)
 rename {thrift => service-rpc}/src/pypi/setup.py (100%)
 delete mode 100644 site/iotdb-doap.rdf
 delete mode 100644 thrift/pom.xml
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/TimeseriesSchema.java