You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/05/12 00:18:07 UTC
[incubator-iotdb] branch refactor_overflow updated (8dbf279 ->
b4a2728)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 8dbf279 tmp commit
new 0622b3a Merge remote-tracking branch 'origin/refactor_bufferwrite_new' into refactor_overflow
new 5ca3fd3 Merge branch 'refactor_overflow' of github.com:apache/incubator-iotdb into refactor_overflow
add 3568b32 [IOTDB-64] TsFile-Spark-Connector update (#108)
add b1b35f6 fix bug about BOOLEAN
add bf62685 Update QueryConstant.java
add ec72e4e Merge pull request #173 from LeiRui/master
new b4a2728 Merge remote-tracking branch 'origin/master' into refactor_overflow
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 27 +-
.../Documentation/UserGuideV0.7.0/7-Tools-spark.md | 286 ++++----
pom.xml | 6 +-
spark/README.md | 407 +++++++----
spark/pom.xml | 7 +-
.../org/apache/iotdb/tsfile/io/CreateTSFile.java | 150 ----
.../java/org/apache/iotdb/tsfile/io/HDFSInput.java | 147 ++++
.../apache/iotdb/tsfile/io/HDFSInputStream.java | 111 ---
.../io/{HDFSOutputStream.java => HDFSOutput.java} | 52 +-
.../apache/iotdb/tsfile/io/TsFileOutputFormat.java | 10 +-
.../apache/iotdb/tsfile/io/TsFileRecordWriter.java | 19 +-
.../java/org/apache/iotdb/tsfile/qp/Executor.java | 51 --
.../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 153 -----
.../iotdb/tsfile/qp/common/BasicOperator.java | 75 --
.../iotdb/tsfile/qp/common/FilterOperator.java | 157 -----
.../apache/iotdb/tsfile/qp/common/Operator.java | 47 --
.../apache/iotdb/tsfile/qp/common/SQLConstant.java | 150 ----
.../apache/iotdb/tsfile/qp/common/SingleQuery.java | 63 --
.../apache/iotdb/tsfile/qp/common/TSQueryPlan.java | 63 --
.../qp/exception/BasicOperatorException.java | 34 -
.../tsfile/qp/exception/DNFOptimizeException.java | 34 -
.../qp/exception/LogicalOptimizeException.java | 33 -
.../tsfile/qp/exception/MergeFilterException.java | 30 -
.../qp/exception/QueryOperatorException.java | 29 -
.../qp/exception/QueryProcessorException.java | 41 --
.../tsfile/qp/exception/RemoveNotException.java | 34 -
.../tsfile/qp/optimizer/DNFFilterOptimizer.java | 157 -----
.../tsfile/qp/optimizer/IFilterOptimizer.java | 34 -
.../qp/optimizer/MergeSingleFilterOptimizer.java | 141 ----
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 228 ------
.../tsfile/qp/optimizer/RemoveNotOptimizer.java | 108 ---
.../scala/org/apache/iotdb/tsfile/Converter.scala | 764 ++++++++++++---------
.../org/apache/iotdb/tsfile/DefaultSource.scala | 178 ++---
.../apache/iotdb/tsfile/TsFileOutputWriter.scala | 52 +-
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 42 +-
.../scala/org/apache/iotdb/tsfile/package.scala | 36 +-
spark/src/test/resources/test.tsfile | Bin 1406 -> 0 bytes
.../cn/edu/tsinghua/tsfile/ConverterTest.scala | 130 ----
.../scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala | 194 ------
.../scala/org/apache/iotdb/tool/TsFileExample.java | 106 +++
.../scala/org/apache/iotdb/tool/TsFileWrite.java | 215 ++++++
.../org/apache/iotdb/tsfile/ConverterTest.scala | 266 +++++++
.../org/apache/iotdb/tsfile/HDFSInputTest.java | 79 +++
.../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 217 ++++++
.../tsfile/common/constant/QueryConstant.java | 9 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 289 ++++++++
.../tsfile/read/controller/MetadataQuerier.java | 40 ++
.../read/controller/MetadataQuerierByFileImpl.java | 132 +++-
.../query/executor/ExecutorWithTimeGenerator.java | 33 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 64 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 12 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 11 +
.../iotdb/tsfile/read/ReadInPartitionTest.java | 158 +++++
.../org/apache/iotdb/tsfile/read/ReadTest.java | 2 +-
.../iotdb/tsfile/read/common/TimeRangeTest.java | 225 ++++++
.../controller/MetadataQuerierByFileImplTest.java | 57 +-
57 files changed, 3075 insertions(+), 3122 deletions(-)
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/io/CreateTSFile.java
create mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInput.java
delete mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/io/HDFSInputStream.java
rename spark/src/main/java/org/apache/iotdb/tsfile/io/{HDFSOutputStream.java => HDFSOutput.java} (67%)
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java
delete mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java
delete mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java
delete mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryProcessorException.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/IFilterOptimizer.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java
delete mode 100644 spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java
delete mode 100755 spark/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java
delete mode 100644 spark/src/test/resources/test.tsfile
delete mode 100644 spark/src/test/scala/cn/edu/tsinghua/tsfile/ConverterTest.scala
delete mode 100644 spark/src/test/scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala
create mode 100644 spark/src/test/scala/org/apache/iotdb/tool/TsFileExample.java
create mode 100644 spark/src/test/scala/org/apache/iotdb/tool/TsFileWrite.java
create mode 100644 spark/src/test/scala/org/apache/iotdb/tsfile/ConverterTest.scala
create mode 100644 spark/src/test/scala/org/apache/iotdb/tsfile/HDFSInputTest.java
create mode 100644 spark/src/test/scala/org/apache/iotdb/tsfile/TSFileSuit.scala
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeRange.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/ReadInPartitionTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/TimeRangeTest.java
[incubator-iotdb] 03/03: Merge remote-tracking branch
'origin/master' into refactor_overflow
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit b4a2728a008396cc16d1df598559c6ce063f4f93
Merge: 5ca3fd3 ec72e4e
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun May 12 08:17:48 2019 +0800
Merge remote-tracking branch 'origin/master' into refactor_overflow
.travis.yml | 27 +-
.../Documentation/UserGuideV0.7.0/7-Tools-spark.md | 286 ++++----
pom.xml | 6 +-
spark/README.md | 407 +++++++----
spark/pom.xml | 7 +-
.../org/apache/iotdb/tsfile/io/CreateTSFile.java | 150 ----
.../java/org/apache/iotdb/tsfile/io/HDFSInput.java | 147 ++++
.../apache/iotdb/tsfile/io/HDFSInputStream.java | 111 ---
.../io/{HDFSOutputStream.java => HDFSOutput.java} | 52 +-
.../apache/iotdb/tsfile/io/TsFileOutputFormat.java | 10 +-
.../apache/iotdb/tsfile/io/TsFileRecordWriter.java | 19 +-
.../java/org/apache/iotdb/tsfile/qp/Executor.java | 51 --
.../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 153 -----
.../iotdb/tsfile/qp/common/BasicOperator.java | 75 --
.../iotdb/tsfile/qp/common/FilterOperator.java | 157 -----
.../apache/iotdb/tsfile/qp/common/Operator.java | 47 --
.../apache/iotdb/tsfile/qp/common/SQLConstant.java | 150 ----
.../apache/iotdb/tsfile/qp/common/SingleQuery.java | 63 --
.../apache/iotdb/tsfile/qp/common/TSQueryPlan.java | 63 --
.../qp/exception/BasicOperatorException.java | 34 -
.../tsfile/qp/exception/DNFOptimizeException.java | 34 -
.../qp/exception/LogicalOptimizeException.java | 33 -
.../tsfile/qp/exception/MergeFilterException.java | 30 -
.../qp/exception/QueryOperatorException.java | 29 -
.../qp/exception/QueryProcessorException.java | 41 --
.../tsfile/qp/exception/RemoveNotException.java | 34 -
.../tsfile/qp/optimizer/DNFFilterOptimizer.java | 157 -----
.../tsfile/qp/optimizer/IFilterOptimizer.java | 34 -
.../qp/optimizer/MergeSingleFilterOptimizer.java | 141 ----
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 228 ------
.../tsfile/qp/optimizer/RemoveNotOptimizer.java | 108 ---
.../scala/org/apache/iotdb/tsfile/Converter.scala | 764 ++++++++++++---------
.../org/apache/iotdb/tsfile/DefaultSource.scala | 178 ++---
.../apache/iotdb/tsfile/TsFileOutputWriter.scala | 52 +-
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 42 +-
.../scala/org/apache/iotdb/tsfile/package.scala | 36 +-
spark/src/test/resources/test.tsfile | Bin 1406 -> 0 bytes
.../cn/edu/tsinghua/tsfile/ConverterTest.scala | 130 ----
.../scala/cn/edu/tsinghua/tsfile/TSFileSuit.scala | 194 ------
.../scala/org/apache/iotdb/tool/TsFileExample.java | 106 +++
.../scala/org/apache/iotdb/tool/TsFileWrite.java | 215 ++++++
.../org/apache/iotdb/tsfile/ConverterTest.scala | 266 +++++++
.../org/apache/iotdb/tsfile/HDFSInputTest.java | 79 +++
.../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 217 ++++++
.../tsfile/common/constant/QueryConstant.java | 9 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 289 ++++++++
.../tsfile/read/controller/MetadataQuerier.java | 40 ++
.../read/controller/MetadataQuerierByFileImpl.java | 132 +++-
.../query/executor/ExecutorWithTimeGenerator.java | 33 +-
.../tsfile/read/query/executor/TsFileExecutor.java | 64 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 12 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 11 +
.../iotdb/tsfile/read/ReadInPartitionTest.java | 158 +++++
.../org/apache/iotdb/tsfile/read/ReadTest.java | 2 +-
.../iotdb/tsfile/read/common/TimeRangeTest.java | 225 ++++++
.../controller/MetadataQuerierByFileImplTest.java | 57 +-
57 files changed, 3075 insertions(+), 3122 deletions(-)
[incubator-iotdb] 01/03: Merge remote-tracking branch
'origin/refactor_bufferwrite_new' into refactor_overflow
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 0622b3a76bf304c1f6fb717345c394fc2d36bb9b
Merge: f5f0159 6d56f0c
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Thu Apr 25 23:51:03 2019 +0800
Merge remote-tracking branch 'origin/refactor_bufferwrite_new' into refactor_overflow
.../db/engine/filenode/FileNodeProcessor.java | 29 +---------------------
.../iotdb/db/engine/filenode/TsFileResource.java | 7 ------
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 2 --
3 files changed, 1 insertion(+), 37 deletions(-)
[incubator-iotdb] 02/03: Merge branch 'refactor_overflow' of
github.com:apache/incubator-iotdb into refactor_overflow
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_overflow
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5ca3fd350788b8fea3f75d3801bd7f3bac1acea7
Merge: 0622b3a 8dbf279
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun May 12 00:10:41 2019 +0800
Merge branch 'refactor_overflow' of github.com:apache/incubator-iotdb into refactor_overflow
iotdb/iotdb/conf/iotdb-engine.properties | 5 +
iotdb/iotdb/conf/iotdb-env.sh | 2 +-
iotdb/pom.xml | 26 ++++
.../org/apache/cassandra/utils/ObjectSizes.java | 167 +++++++++++++++++++++
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 15 ++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 3 +
.../engine/bufferwrite/BufferWriteProcessor.java | 23 +--
.../iotdb/db/engine/filenode/FileNodeManager.java | 18 ++-
.../db/engine/filenode/FileNodeProcessor.java | 156 +++++++++++--------
.../db/engine/overflow/io/OverflowProcessor.java | 33 +---
.../db/engine/overflowdata/OverflowProcessor.java | 7 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 2 +
.../db/engine/sgmanager/StorageGroupProcessor.java | 51 +------
.../db/engine/tsfiledata/TsFileProcessor.java | 52 +++----
.../db/exception/FileNodeManagerException.java | 4 +
.../iotdb/db/exception/TooManyChunksException.java | 26 ++++
.../EngineExecutorWithoutTimeGenerator.java | 1 -
.../reader/overflow/ConciseChunkMetadata.java | 64 ++++++++
.../overflow/ConciseChunkMetadataWithFileName.java | 23 +++
.../overflow/OverflowSeriesMultiFileReader.java} | 20 +--
.../overflow/OverflowSeriesSingleFileReader.java | 77 ++++++++++
.../engine/overflowdata/OverflowProcessorTest.java | 2 +
.../db/engine/tsfiledata/TsFileProcessorTest.java | 2 +-
.../read/reader/series/FileSeriesReader.java | 5 +-
24 files changed, 566 insertions(+), 218 deletions(-)