You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/12/30 12:37:16 UTC
[incubator-iotdb] branch cluster_new updated (ed4359f -> 917ea9f)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ed4359f fix bug when there is invalid log locally and is conflict with new logs sent by new leader.
add df5dd1b [IOTDB-361]Refactor session management (#650)
add 5043dce [IOTDB-370] fix a multi-thread problem. (#659)
add 7da8e8f add IoTDBDataDirViewer Tool (#648)
add 7d7b7c8 fix nullpointer exception of tsfile recover
add c8b8939 fix asf header (#661)
add 3965328 fix export csv. (#663)
add d9801b4 update to maven 3.6.3
add 679c8fb Add metaquery in python example (#667)
add d688c1b divide queryId generation into data query and non-data query (#666)
add 639cf97 fix a bug of deleting sg
add e9b321f fix ut
add 038cbbf Merge pull request #669 from apache/fix_jira_375
add 2b47675 enable Sonarcloud (#645)
add 2b58cab remove useless debug log of Config Dynamic Adapter
add 96fd6d7 Enable coveralls on travis (#670)
add 754d664 fix docs (#672)
add 99acba6 disable sonar and coveralls for non-committers (#673)
add 545f128 add the issues link (#675)
add c1cb94b Fix doc (#674)
add e7adcbb Serialize filters (#657)
add f0f229d [IOTDB-386] Vectorize the raw data query process (#652)
add 777dd00 Fix document bugs and add development guide in Chinese (#681)
add ba76c4b refactor chunk reader (#680)
add 994dc32 [IOTDB-393] Fix unclear error message for no privilege users (#682)
add 2200115 [IOTDB-340] Remove unnecessary getting data types from MManager (#677)
add 917ea9f Merge branch 'master' into cluster_new
No new revisions were added by this update.
Summary of changes:
.travis.yml | 26 +-
Jenkinsfile | 18 +
README.md | 2 +-
client-py/src/client_example.py | 38 +-
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 18 +-
.../java/org/apache/iotdb/cluster/ClientMain.java | 10 +-
.../cluster/query/ClusterDataQueryExecutor.java | 16 +-
.../iotdb/cluster/query/ClusterQueryRouter.java | 18 +-
.../cluster/query/manage/ClusterQueryManager.java | 17 +-
.../query/reader/ClusterNodeConstructor.java | 72 ++-
.../query/reader/RemoteSimpleSeriesReader.java | 38 +-
.../iotdb/cluster/server/DataClusterServer.java | 4 +-
.../iotdb/cluster/server/MetaClusterServer.java | 7 +-
.../cluster/server/member/DataGroupMember.java | 44 +-
.../cluster/server/member/MetaGroupMember.java | 23 +-
.../apache/iotdb/cluster/utils/SerializeUtils.java | 105 +++-
docs/Community-Project Committers.md | 5 +
docs/Development-Chinese.md | 77 +++
docs/Development-Contributing.md | 6 +-
docs/Development-IDE.md | 2 +-
.../UserGuide/0-Get Started/1-QuickStart.md | 2 +-
.../0-Get Started/2-Frequently asked questions.md | 144 ++++-
.../UserGuide/3-Server/2-Single Node Setup.md | 11 +-
.../UserGuide/3-Server/5-Docker Image.md | 67 +-
.../UserGuide/4-Client/2-Programming - JDBC.md | 188 +++++-
.../4-Client/5-Programming - TsFile API.md | 679 ++++++++++++++++++++-
.../1-DDL (Data Definition Language).md | 4 +-
.../2-DML (Data Manipulation Language).md | 2 +-
.../3-Account Management Statements.md | 4 +-
.../8-System Design (Developer)/1-Hierarchy.md | 245 +++++---
.../UserGuide/0-Get Started/1-QuickStart.md | 4 +-
.../0-Get Started/2-Frequently asked questions.md | 24 +-
.../UserGuide/3-Server/5-Docker Image.md | 2 +-
.../1-DDL (Data Definition Language).md | 2 +-
.../2-DML (Data Manipulation Language).md | 2 +-
.../3-Account Management Statements.md | 56 +-
.../8-System Design (Developer)/1-Hierarchy.md | 237 ++++---
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 16 +-
hadoop/pom.xml | 28 +
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 22 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 3 -
.../jdbc/IoTDBPreparedInsertionStatement.java | 75 ---
.../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 5 -
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 110 ++--
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 28 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 28 +-
pom.xml | 284 ++++++---
.../resources/conf/iotdb-engine.properties | 4 +-
.../src/assembly/resources/tools/memory-tool.bat | 2 +-
server/src/assembly/resources/tools/memory-tool.sh | 2 +-
.../print-iotdb-data-dir.bat} | 6 +-
.../print-iotdb-data-dir.sh} | 6 +-
.../print-tsfile-resource-files.bat | 2 +-
.../print-tsfile-resource-files.sh | 2 +-
.../{ => tsfileToolSet}/print-tsfile-sketch.bat | 2 +-
.../{ => tsfileToolSet}/print-tsfile-sketch.sh | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 12 +-
.../engine/memtable/TimeValuePairInMemTable.java | 2 +-
.../iotdb/db/engine/memtable/WritableMemChunk.java | 12 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 7 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 5 +-
.../engine/storagegroup/StorageGroupProcessor.java | 15 +-
.../db/engine/storagegroup/TsFileResource.java | 3 +
.../db/exception/ConfigAdjusterException.java | 3 +-
.../org/apache/iotdb/db/metadata/MManager.java | 3 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 72 +--
.../db/qp/executor/IQueryProcessExecutor.java | 24 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 44 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 13 +
.../iotdb/db/qp/physical/crud/QueryPlan.java | 42 ++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 5 -
.../apache/iotdb/db/qp/strategy/ParseDriver.java | 9 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 67 +-
.../db/query/aggregation/impl/AvgAggrFunc.java | 7 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 7 +-
.../query/aggregation/impl/FirstValueAggrFunc.java | 8 +-
.../query/aggregation/impl/LastValueAggrFunc.java | 2 +-
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 2 +-
.../query/aggregation/impl/MaxValueAggrFunc.java | 8 +-
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 8 +-
.../query/aggregation/impl/MinValueAggrFunc.java | 8 +-
.../db/query/control/QueryResourceManager.java | 6 +-
.../db/query/dataset/DeviceIterateDataSet.java | 50 +-
.../NewEngineDataSetWithoutValueFilter.java | 306 ++++++++++
...ava => OldEngineDataSetWithoutValueFilter.java} | 16 +-
.../dataset/groupby/GroupByEngineDataSet.java | 34 +-
.../groupby/GroupByWithValueFilterDataSet.java | 40 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 47 +-
.../db/query/executor/AggregateEngineExecutor.java | 54 +-
.../query/executor/DataQueryExecutorFactory.java | 8 +-
.../iotdb/db/query/executor/EngineExecutor.java | 71 ++-
.../iotdb/db/query/executor/EngineQueryRouter.java | 142 ++---
.../db/query/executor/FillEngineExecutor.java | 25 +-
.../db/query/executor/IEngineQueryRouter.java | 38 +-
.../db/query/externalsort/ExternalSortJob.java | 10 +-
.../query/externalsort/ExternalSortJobEngine.java | 1 -
.../externalsort/ExternalSortJobScheduler.java | 2 +-
.../iotdb/db/query/externalsort/LineMerger.java | 63 +-
.../MultiSourceExternalSortJobPart.java | 62 +-
.../externalsort/SimpleExternalSortEngine.java | 322 +++++-----
.../FixLengthIExternalSortFileDeserializer.java | 2 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 2 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 2 +-
.../reader/chunkRelated/CachedDiskChunkReader.java | 16 +-
.../query/reader/chunkRelated/ChunkReaderWrap.java | 8 +-
.../query/reader/chunkRelated/DiskChunkReader.java | 22 +-
.../chunkRelated/DiskChunkReaderByTimestamp.java | 12 +-
.../query/reader/chunkRelated/MemChunkReader.java | 21 +-
.../fileRelated/FileSeriesReaderAdapter.java | 69 ---
.../fileRelated/UnSealedTsFileIterateReader.java | 29 +-
.../CachedUnseqResourceMergeReader.java | 3 +-
.../NewUnseqResourceMergeReader.java | 199 ++++++
...eader.java => OldUnseqResourceMergeReader.java} | 4 +-
.../resourceRelated/ResourceRelatedUtil.java | 48 ++
.../resourceRelated/SeqResourceIterateReader.java | 45 +-
.../seriesRelated/SeriesReaderWithValueFilter.java | 54 +-
.../SeriesReaderWithoutValueFilter.java | 213 ++++---
.../db/query/reader/universal/IterateReader.java | 22 +-
.../query/timegenerator/EngineNodeConstructor.java | 19 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 199 +++---
.../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 138 +++++
.../apache/iotdb/db/tools/TsFileSketchTool.java | 291 ++++-----
.../watermark/GroupedLSBWatermarkEncoder.java | 12 +-
.../iotdb/db/tools/watermark/WatermarkEncoder.java | 11 +
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 7 +-
.../org/apache/iotdb/db/utils/TimeValuePair.java | 2 +
.../apache/iotdb/db/utils/TimeValuePairUtils.java | 13 +-
.../adapter/IoTDBConfigDynamicAdapterTest.java | 22 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 2 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 90 +--
.../db/engine/modification/DeletionQueryTest.java | 57 +-
.../storagegroup/StorageGroupProcessorTest.java | 43 ++
.../iotdb/db/engine/storagegroup/TTLTest.java | 4 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 146 ++---
.../iotdb/db/integration/IoTDBAggregationIT.java | 78 +--
.../integration/IoTDBLoadExternalTsfileTest.java | 8 +-
.../iotdb/db/integration/IoTDBPreparedStmtIT.java | 201 ------
.../db/integration/IoTDBSequenceDataQueryIT.java | 104 ++--
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 135 ++--
...TDBVersionIT.java => IoTDBSimpleQueryTest.java} | 52 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 15 +-
.../query/executor/GroupByEngineDataSetTest.java | 50 +-
.../query/externalsort/ExternalSortEngineTest.java | 4 +-
.../db/query/externalsort/FakeChunkReaderWrap.java | 3 +
...ExternalSortFileSerializerDeserializerTest.java | 2 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 3 +-
.../fileRelated/UnSealedTsFileReaderTest.java | 18 +-
.../NewUnseqResourceMergeReaderTest.java | 102 ++++
.../resourceRelated/SeqResourceReaderTest.java | 18 +-
.../resourceRelated/UnseqResourceReaderTest.java | 8 +-
.../reader/seriesRelated/FakedIBatchPoint.java | 10 +-
.../reader/seriesRelated/FakedIPointReader.java | 2 +-
.../SeriesReaderWithValueFilterTest.java | 33 +-
.../SeriesReaderWithoutValueFilterTest.java | 51 +-
.../query/reader/universal/FakedSeriesReader.java | 2 +-
.../universal/FakedSeriesReaderByTimestamp.java | 2 +-
.../PriorityMergeReaderByTimestampTest.java | 2 +-
.../reader/universal/PriorityMergeReaderTest.java | 2 -
.../reader/universal/PriorityMergeReaderTest2.java | 3 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +-
.../db/utils/datastructure/LongTVListTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 2 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 12 +-
service-rpc/rpc-changelist.md | 1 +
service-rpc/src/main/thrift/cluster.thrift | 3 +-
service-rpc/src/main/thrift/rpc.thrift | 19 +-
session/pom.xml | 73 ++-
.../main/java/org/apache/iotdb/session/Config.java | 2 +
.../java/org/apache/iotdb/session/Session.java | 27 +-
.../org/apache/iotdb/session/SessionDataSet.java | 18 +-
.../iotdb/session/utils/EnvironmentUtils.java | 4 +-
session/src/test/resources/iotdb-engine.properties | 2 +-
.../apache/iotdb/spark/db/EnvironmentUtils.java | 4 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 38 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 171 ++----
.../tsfile/read/expression/QueryExpression.java | 17 +-
.../query/dataset/DataSetWithoutTimeGenerator.java | 18 +-
.../tsfile/read/query/dataset/QueryDataSet.java | 10 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 19 +-
.../query/timegenerator/TimeGeneratorImpl.java | 8 +-
.../read/query/timegenerator/node/LeafNode.java | 12 +-
.../tsfile/read}/reader/IAggregateReader.java | 2 +-
.../iotdb/tsfile/read}/reader/IBatchReader.java | 4 +-
.../tsfile/read/reader/chunk/ChunkReader.java | 63 +-
.../read/reader/chunk/ChunkReaderByTimestamp.java | 2 +-
.../read/reader/chunk/ChunkReaderWithFilter.java | 42 --
.../reader/chunk/ChunkReaderWithoutFilter.java | 35 --
.../iotdb/tsfile/read/reader/page/PageReader.java | 136 +----
...esReader.java => AbstractFileSeriesReader.java} | 23 +-
.../read/reader/series/EmptyFileSeriesReader.java | 4 +-
.../read/reader/series/FileSeriesReader.java | 89 +--
.../reader/series/FileSeriesReaderByTimestamp.java | 26 +-
.../reader/series/FileSeriesReaderWithFilter.java | 54 --
.../series/FileSeriesReaderWithoutFilter.java | 49 --
.../org/apache/iotdb/tsfile/utils/PublicBAOS.java | 8 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 5 +-
.../iotdb/tsfile}/utils/TsPrimitiveType.java | 3 +-
.../tsfile/read/filter/FilterSerializeTest.java | 2 +-
.../tsfile/read/query/timegenerator/NodeTest.java | 10 +-
.../query/timegenerator/ReaderByTimestampTest.java | 8 +-
.../iotdb/tsfile/read/reader/PageReaderTest.java | 11 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 23 +-
205 files changed, 5225 insertions(+), 3123 deletions(-)
create mode 100644 docs/Development-Chinese.md
delete mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBPreparedInsertionStatement.java
copy server/src/assembly/resources/tools/{print-tsfile-sketch.bat => tsfileToolSet/print-iotdb-data-dir.bat} (94%)
copy server/src/assembly/resources/tools/{print-tsfile-sketch.sh => tsfileToolSet/print-iotdb-data-dir.sh} (87%)
rename server/src/assembly/resources/tools/{ => tsfileToolSet}/print-tsfile-resource-files.bat (98%)
rename server/src/assembly/resources/tools/{ => tsfileToolSet}/print-tsfile-resource-files.sh (97%)
rename server/src/assembly/resources/tools/{ => tsfileToolSet}/print-tsfile-sketch.bat (98%)
rename server/src/assembly/resources/tools/{ => tsfileToolSet}/print-tsfile-sketch.sh (95%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/dataset/NewEngineDataSetWithoutValueFilter.java
rename server/src/main/java/org/apache/iotdb/db/query/dataset/{EngineDataSetWithoutValueFilter.java => OldEngineDataSetWithoutValueFilter.java} (94%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/FileSeriesReaderAdapter.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/NewUnseqResourceMergeReader.java
rename server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/{UnseqResourceMergeReader.java => OldUnseqResourceMergeReader.java} (97%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/ResourceRelatedUtil.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/tools/IoTDBDataDirViewer.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBPreparedStmtIT.java
copy server/src/test/java/org/apache/iotdb/db/integration/{IoTDBVersionIT.java => IoTDBSimpleQueryTest.java} (61%)
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/NewUnseqResourceMergeReaderTest.java
rename {server/src/main/java/org/apache/iotdb/db/query => tsfile/src/main/java/org/apache/iotdb/tsfile/read}/reader/IAggregateReader.java (96%)
rename {server/src/main/java/org/apache/iotdb/db/query => tsfile/src/main/java/org/apache/iotdb/tsfile/read}/reader/IBatchReader.java (91%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithFilter.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/ChunkReaderWithoutFilter.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/{FileSeriesReader.java => AbstractFileSeriesReader.java} (83%)
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithFilter.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java
rename {server/src/main/java/org/apache/iotdb/db => tsfile/src/main/java/org/apache/iotdb/tsfile}/utils/TsPrimitiveType.java (99%)