This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_TTL
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from f8c37f2 fix tests
add bee5b61 [IOTDB-240] Fix bug (#423)
add 70e28cb [IOTDB-242] fix mvn integration-test failed because the files
in the target folder changes (#428)
add 72660c3 Reduce project version declaration (#432)
add 4f254fd [IOTDB-209]Improvement on the Hadoop module (#386)
add 6908460 [IOTDB-221]Add a python client example (#427)
add 3f7e826 [246-IoTDB] Docs for Hadoop-Connector in IoTDB websites.
(#437)
add d6e902f [IoTDB-246] Add Chinese version for hadoop-connector doc
(#438)
add c7cbfab [ IOTDB-160]External sort (#336)
add 6d2f98b [IOTDB-241] Add query and non query interface in session
(#424)
add bee3539 enable lowercase of datatype,encoding,compressor in
create_timeseries sqls (#442)
add fc34254 change hive's copyright from 2019 to 2018 for being
consistent with github.com/apache/hive NOTICE file
add 4dc837a add apache-rat for .checkstyle file
add 69d6026 change scm in pom from https to git protocol
add 53dbf84 [IOTDB-203]add "group by device" function for narrow table
display (#433)
add a8d283e [IOTDB-165][TsFile] Delete a current version and add a number
version and an exception. (#409)
add 42c62e7 change hadoop package name (#452)
add 9f3ff8f Revert "change hadoop package name (#452)" (#454)
add ad2c25a Merge branch 'master' into dev_TTL
No new revisions were added by this update.
Summary of changes:
.checkstyle | 20 +
.travis.yml | 25 +
NOTICE | 6 +-
.../stop-sync-client.bat => client-py/compile.bat | 9 +-
.../sbin/stop-server.sh => client-py/compile.sh | 18 +-
client-py/readme.md | 42 ++
client-py/src/client_example.py | 151 +++++
client/pom.xml | 2 +-
.../org/apache/iotdb/client/AbstractClient.java | 44 +-
.../org/apache/iotdb/client/AbstractScript.java | 15 +-
distribution/pom.xml | 4 +-
docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md | 196 +++++-
.../1-IoTDB Query Statement.md | 83 ++-
docs/Documentation/UserGuide/9-Tools-Hadoop.md | 185 +++++-
example/{tsfile => hadoop}/pom.xml | 8 +-
.../iotdb/tsfile/hadoop}/TSFMRReadExample.java | 61 +-
.../iotdb/tsfile/hadoop/TSMRWriteExample.java | 178 +++++
.../apache/iotdb/tsfile/hadoop/TsFileHelper.java} | 71 +-
example/jdbc/pom.xml | 2 +-
example/kafka/pom.xml | 2 +-
example/pom.xml | 1 +
example/rocketmq/pom.xml | 2 +-
example/session/pom.xml | 2 +-
.../main/java/org/apache/iotdb/SessionExample.java | 23 +-
example/tsfile/pom.xml | 3 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 5 +-
grafana/pom.xml | 2 +-
hadoop/pom.xml | 5 +-
.../apache/iotdb/tsfile/hadoop/TSFInputFormat.java | 171 +++--
.../apache/iotdb/tsfile/hadoop/TSFInputSplit.java | 290 +++++---
.../iotdb/tsfile/hadoop/TSFOutputFormat.java | 51 +-
.../iotdb/tsfile/hadoop/TSFRecordReader.java | 230 ++++---
.../iotdb/tsfile/hadoop/TSFRecordWriter.java | 48 +-
.../java/org/apache/iotdb/tsfile/hadoop/TSRow.java | 51 --
.../iotdb/tsfile/hadoop/example/TsFileHelper.java | 128 ----
.../iotdb/tsfile/hadoop/io/HDFSInputStream.java | 109 ---
.../iotdb/tsfile/hadoop/io/HDFSOutputStream.java | 90 ---
.../iotdb/tsfile/hadoop/record/HDFSTSRecord.java | 207 ++++++
.../thu/tsfile/hadoop/InputOutputStreamTest.java | 93 ---
.../cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java | 145 ----
.../apache/iotdb}/tsfile/hadoop/TSFHadoopTest.java | 98 ++-
.../iotdb}/tsfile/hadoop/TSFInputSplitTest.java | 56 +-
.../iotdb/tsfile/hadoop/TsFileTestHelper.java | 56 +-
jdbc/pom.xml | 4 +-
pom.xml | 26 +-
server/pom.xml | 6 +-
.../resources/conf/iotdb-engine.properties | 13 +
.../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g | 1 +
.../org/apache/iotdb/db/sql/parse/TSParser.g | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 47 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 8 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 1 +
.../qp/executor/AbstractQueryProcessExecutor.java | 83 ++-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 18 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 51 ++
.../iotdb/db/qp/strategy/LogicalGenerator.java | 12 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 152 ++++-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 102 +--
.../db/query/control/QueryResourceManager.java | 64 +-
.../db/query/dataset/DeviceIterateDataSet.java | 220 +++++++
.../db/query/externalsort/ExternalSortJob.java | 51 ++
.../query/externalsort/ExternalSortJobEngine.java | 57 ++
.../db/query/externalsort/ExternalSortJobPart.java | 44 ++
.../externalsort/ExternalSortJobScheduler.java | 44 ++
.../iotdb/db/query/externalsort/LineMerger.java | 56 ++
.../MultiSourceExternalSortJobPart.java | 61 ++
.../externalsort/SimpleExternalSortEngine.java | 180 +++++
.../SingleSourceExternalSortJobPart.java | 40 ++
.../adapter/ByTimestampReaderAdapter.java | 78 +++
.../serialize/IExternalSortFileDeserializer.java | 32 +
.../serialize/IExternalSortFileSerializer.java} | 26 +-
.../FixLengthIExternalSortFileDeserializer.java | 209 ++++++
.../impl/FixLengthTimeValuePairSerializer.java | 169 +++++
.../query/reader/chunkRelated/ChunkReaderWrap.java | 106 +++
.../resourceRelated/UnseqResourceMergeReader.java | 37 +-
.../UnseqResourceReaderByTimestamp.java | 39 +-
.../reader/universal/PriorityMergeReader.java | 16 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 161 +++--
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 730 +++++++++++++++++++++
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 10 +
.../query/externalsort/ExternalSortEngineTest.java | 189 ++++++
.../query/externalsort/FakeChunkReaderWrap.java} | 31 +-
...ExternalSortFileSerializerDeserializerTest.java | 129 ++++
.../query/reader/universal/FakedSeriesReader.java | 88 +++
.../reader/universal/PriorityMergeReaderTest.java | 32 -
.../reader/universal/PriorityMergeReaderTest2.java | 50 +-
.../org/apache/iotdb/db/script/EnvScriptIT.java | 21 +-
.../org/apache/iotdb/db/sql/SQLParserTest.java | 143 +++-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 12 +-
session/pom.xml | 8 +-
.../java/org/apache/iotdb/session/Session.java | 118 +++-
.../org/apache/iotdb/session/SessionDataSet.java | 120 ++++
.../org/apache/iotdb/session/SessionUtils.java | 70 ++
.../org/apache/iotdb/session/IoTDBSessionIT.java | 85 ++-
spark-iotdb-connector/pom.xml | 5 +-
spark-tsfile/pom.xml | 2 +-
tsfile/format-changelist.md | 3 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 8 +-
.../tsfile/exception/NotCompatibleException.java | 12 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 7 +-
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 30 +-
.../iotdb/tsfile/read/TsFileRestorableReader.java | 6 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 77 ++-
.../org/apache/iotdb/tsfile/read/common/Path.java | 3 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 5 +
.../apache/iotdb/tsfile/write/record/TSRecord.java | 5 +-
.../tsfile/write/record/datapoint/DataPoint.java | 5 +-
.../write/writer/RestorableTsFileIOWriter.java | 2 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 6 +-
.../file/metadata/ChunkGroupMetaDataTest.java | 4 +-
.../tsfile/file/metadata/utils/TestHelper.java | 3 +-
.../iotdb/tsfile/file/metadata/utils/Utils.java | 1 -
.../tsfile/read/TsFileRestorableReaderTest.java | 6 +-
.../tsfile/read/TsFileSequenceReaderTest.java | 20 +-
.../iotdb/tsfile/read/filter/DigestFilterTest.java | 72 +-
.../read/filter/IExpressionOptimizerTest.java | 22 +-
.../read/filter/MinTimeMaxTimeFilterTest.java | 150 ++---
.../iotdb/tsfile/read/filter/OperatorTest.java | 102 +--
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 5 +-
120 files changed, 5751 insertions(+), 1871 deletions(-)
copy server/src/assembly/resources/tools/stop-sync-client.bat =>
client-py/compile.bat (77%)
mode change 100755 => 100644
copy server/src/assembly/resources/sbin/stop-server.sh => client-py/compile.sh
(74%)
mode change 100755 => 100644
create mode 100644 client-py/readme.md
create mode 100644 client-py/src/client_example.py
copy example/{tsfile => hadoop}/pom.xml (92%)
rename {hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example =>
example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop}/TSFMRReadExample.java
(68%)
create mode 100644
example/hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSMRWriteExample.java
copy
example/{tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithRowBatch.java
=> hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TsFileHelper.java} (61%)
delete mode 100644
hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/TSRow.java
delete mode 100644
hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/example/TsFileHelper.java
delete mode 100644
hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSInputStream.java
delete mode 100644
hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/io/HDFSOutputStream.java
create mode 100644
hadoop/src/main/java/org/apache/iotdb/tsfile/hadoop/record/HDFSTSRecord.java
delete mode 100644
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/InputOutputStreamTest.java
delete mode 100644
hadoop/src/test/java/cn/edu/thu/tsfile/hadoop/TsFileTestHelper.java
rename hadoop/src/test/java/{cn/edu/thu =>
org/apache/iotdb}/tsfile/hadoop/TSFHadoopTest.java (60%)
rename hadoop/src/test/java/{cn/edu/thu =>
org/apache/iotdb}/tsfile/hadoop/TSFInputSplitTest.java (59%)
copy
example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithRowBatch.java
=> hadoop/src/test/java/org/apache/iotdb/tsfile/hadoop/TsFileTestHelper.java
(71%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/dataset/DeviceIterateDataSet.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJob.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobEngine.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobPart.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/ExternalSortJobScheduler.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/LineMerger.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/MultiSourceExternalSortJobPart.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/SimpleExternalSortEngine.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/SingleSourceExternalSortJobPart.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/adapter/ByTimestampReaderAdapter.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/IExternalSortFileDeserializer.java
copy server/src/main/java/org/apache/iotdb/db/query/{reader/IPointReader.java
=> externalsort/serialize/IExternalSortFileSerializer.java} (50%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthIExternalSortFileDeserializer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/FixLengthTimeValuePairSerializer.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/ChunkReaderWrap.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/integration/IoTDBGroupbyDeviceIT.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/query/externalsort/ExternalSortEngineTest.java
copy
server/src/{main/java/org/apache/iotdb/db/qp/physical/sys/DataAuthPlan.java =>
test/java/org/apache/iotdb/db/query/externalsort/FakeChunkReaderWrap.java} (60%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/query/externalsort/IExternalSortFileSerializerDeserializerTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/query/reader/universal/FakedSeriesReader.java
create mode 100644
session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java
=>
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/NotCompatibleException.java
(77%)
