This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch log_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 8ce4381 update docs and examples
add c4b39b7 [IoTDB-174]Add interfaces for querying device or timeseries
number
add 8ead902 Merge pull request #352 from
jack870131/query_device_and_node_num
add 80ad447 fix maxConcurrentClientNum to rpcMaxConcurrentClientNum
add 8fd6248 Merge pull request #368 from apache/fix_parameter
add 59c164c avoid reopen session
add db3bb2c change maven version in travis from 3.6.1 to 3.6.2 (#369)
add 33aedd1 avoid reopen session (#373)
add d1e305f Merge remote-tracking branch 'origin/master'
add 63c992a make session thread safe
add c9a11a9 Merge pull request #374 from apache/session_synchronized
add f1ee7c5 fix some small problems discovered when reading code
add 95768e8 add unit test for DeviceMetadataCache
add bdb2cae Merge pull request #371 from LeiRui/quickFix
add 3ae733b add watermark interfaces in Authorization
add 0704e47 serialize field useWaterMark
add 1c5ff01 save user when useWaterMarkUpdated
add 6cec0e5 watermark encoder
add 12893af add grant/revoke data auth sql support
add e9cd1cd change user's default watermark configuration
add 3b6de22 add data authorize in qp
add 55bdaf5 update utils
add 5c24a0e watermark parameters
add 53a56b2 watermark config
add f195d4a fix watermark bug
add 283f1b4 add license
add 3025bb0 fix PhysicalPlanTest
add 3cfea15 Merge remote-tracking branch 'origin2/master' into pick-wm
add b6e7af6 get through watermark encoding process
add 2bac929 merge master
add 5176ff7 remove useless exception
add d514236 fix a bug in encoder about hashMod key
add 12a94fb Merge remote-tracking branch 'origin2/master' into pick-wm
add 07ef906 update
add 3a72031 rename data_auth; add watermark_detect grammar
add 55b49f3 update watermarkIT
add dd3ee0f remove watermark_detect grammar
add 8a2eefa add decode test
add b4543d0 Merge remote-tracking branch 'origin2/master' into pick-wm
add 8e118f4 remove an invalid test
add a1308a3 update with master
add 0ef7cc0 finish turning watermark demo into minumum usable feature
add 498fd13 fix pr review
add 5b70069 Merge branch 'master' into pick-wm
add 3a85427 Update iotdb-engine.properties
add bb88cbe remodify the names of two parameters of GroupBasedLSBMethod
add abb8bd6 improve watermark docs
add 551f48e Merge branch 'master' into pick-wm
add 624bc81 Merge remote-tracking branch 'origin2/master' into pick-wm
add bbcc2be modify watermark docs
add 146d0db fix data type problem in watermark detection
add 650d953 Merge branch 'master' into pick-wm
add dac0e93 Merge branch 'master' into pick-wm
add 3d5d56d update with master
add e3d48fd Merge pull request #299 from LeiRui/pick-wm
add a2d9c63 transform old form to new form and use a parameter to control
add 39d124c Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
add 210f10e rename temp table and add some tests
add e402f37 Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
add 7ebfbcb Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
add 4158e5a build new default source to implement new form of spark
dataframe
add 62214e8 change docs
add bedaae9 fix test
add bf830f1 transform filter to iexpression
add 5ce8102 Merge branch 'master' of
https://github.com/apache/incubator-iotdb into xuekaifeng-spark-connector
add ca5fe35 add license
add 91def7b update doc
add efabf33 remove duplicate cause by or and fix bugs
add 1ba2493 merge wide and narrow convertor together and update doc
add 19d92e6 remove NewConverter
add 8dabe60 change code format to confirm google style
add e519157 for travis
add 225d167 add write narrow form to tsfile
add dd58af0 remove original file
add 6d64e3a add test
add 190f20f add license
add 0f41773 add log for partition position and add test code for test
partitioned file
add 7b606ac for travis
add 75ef7cf change log level to error
add 89fdf9e Merge pull request #303 from
SilverNarcissus/xuekaifeng-spark-connector
add 734154b remove the redundant field measurementSchemaList in
Schema.java
add d75a223 Change all the str.length() to str.getBytes().length while
calculating the serialized byte size
add 69dc6e4 Set log level to error
add e6199e4 Merge pull request #377 from JackieTien97/ty
add 606c67d fix tsfile example data type
add e052e55 fix log size
add f0077d9 Merge pull request #378 from apache/fix_tsfile_example
add 6c009d8 [IOTDB-189] Support compatibility of HDFS File and Java File
(#365)
add ce17ef9 Move a util class to test dir.
add 0facdf2 Merge pull request #380 from Genius-pig/master
add a371acb fix a bug in TimeRange's intersect function (#382)
add 9dea356 Merge branch 'master' into log_tool
No new revisions were added by this update.
Summary of changes:
.travis.yml | 49 +-
.../src/assembly/resources/sbin/start-client.bat | 9 +-
client/src/assembly/resources/tools/export-csv.bat | 12 +-
client/src/assembly/resources/tools/import-csv.bat | 12 +-
.../org/apache/iotdb/client/AbstractScript.java | 7 +-
.../UserGuide/8-Tools-watermark.md | 212 ++++++++
.../UserGuide/6-JDBC API/1-JDBC API.md | 12 +
docs/Documentation/UserGuide/8-Tools-watermark.md | 211 ++++++++
docs/Documentation/UserGuide/8-TsFile/2-Usage.md | 20 +-
docs/Documentation/UserGuide/9-Tools-spark.md | 70 ++-
.../iotdb/tsfile/TsFileWriteWithRowBatch.java | 3 +-
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 66 +--
.../main/java/org/apache/iotdb/jdbc/Constant.java | 9 +
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 91 +++-
.../apache/iotdb/jdbc/IoTDBMetadataResultSet.java | 135 +++--
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 31 ++
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 134 ++++-
server/pom.xml | 19 +
.../resources/conf/iotdb-engine.properties | 14 +
.../{memory-tool.bat => detect-watermark.bat} | 2 +-
.../tools/{memory-tool.sh => detect-watermark.sh} | 17 +-
.../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g | 2 +-
.../org/apache/iotdb/db/sql/parse/TSParser.g | 23 +
.../iotdb/db/auth/authorizer/BasicAuthorizer.java | 10 +
.../iotdb/db/auth/authorizer/IAuthorizer.java | 16 +
.../java/org/apache/iotdb/db/auth/entity/User.java | 10 +
.../iotdb/db/auth/user/BasicUserManager.java | 28 +
.../apache/iotdb/db/auth/user/IUserManager.java | 16 +
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 2 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 111 +++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 28 +-
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 4 +
.../apache/iotdb/db/engine/fileSystem/FSType.java | 7 +-
.../iotdb/db/engine/fileSystem/FileFactory.java | 65 +++
.../iotdb/db/engine/fileSystem/HdfsFile.java | 156 ++++++
.../db/engine/merge/manage/MergeResource.java | 25 +-
.../engine/storagegroup/StorageGroupProcessor.java | 7 +-
.../db/engine/storagegroup/TsFileResource.java | 20 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 4 +
.../org/apache/iotdb/db/metadata/MManager.java | 32 +-
.../java/org/apache/iotdb/db/metadata/MNode.java | 10 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 41 +-
.../org/apache/iotdb/db/qp/QueryProcessor.java | 2 +
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 25 +-
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
...LoadDataOperator.java => DataAuthOperator.java} | 31 +-
.../physical/sys/DataAuthPlan.java} | 27 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 18 +
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 +
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 16 +-
.../fileRelated/UnSealedTsFileIterateReader.java | 39 +-
.../org/apache/iotdb/db/service/JDBCService.java | 3 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 58 ++-
.../iotdb/db/sync/receiver/SyncServiceImpl.java | 28 +-
.../iotdb/db/tools/TsFileResourcePrinter.java | 12 +-
.../watermark/GroupedLSBWatermarkEncoder.java | 142 +++++
.../db/tools/watermark/WatermarkDetector.java | 209 ++++++++
.../watermark/WatermarkEncoder.java} | 8 +-
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 32 +-
.../writelog/recover/TsFileRecoverPerformer.java | 5 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 160 ++++++
.../db/engine/memtable/MemTableFlushTaskTest.java | 4 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 7 +-
.../engine/storagegroup/TsFileProcessorTest.java | 12 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 4 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 23 +
.../db/query/control/FileReaderManagerTest.java | 11 +-
.../org/apache/iotdb/db/sql/SQLParserTest.java | 31 ++
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 221 ++++++++
.../apache/iotdb/db/utils/EnvironmentUtils.java | 10 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 5 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 3 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 3 +-
server/src/test/resources/logback.xml | 4 +-
service-rpc/src/main/thrift/rpc.thrift | 3 +
.../java/org/apache/iotdb/session/Session.java | 25 +-
.../java/org/apache/iotdb/tsfile/qp/Executor.java | 32 +-
.../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 190 +++++++
.../iotdb/tsfile/qp/common/BasicOperator.java | 75 +++
.../iotdb/tsfile/qp/common/FilterOperator.java | 157 ++++++
.../apache/iotdb/tsfile/qp/common/Operator.java | 42 +-
.../apache/iotdb/tsfile/qp/common/SQLConstant.java | 150 ++++++
.../apache/iotdb/tsfile/qp/common/SingleQuery.java | 62 +++
.../apache/iotdb/tsfile/qp/common/TSQueryPlan.java | 68 +++
.../qp/exception/BasicOperatorException.java | 24 +-
.../tsfile/qp/exception/DNFOptimizeException.java | 24 +-
.../qp/exception/LogicalOptimizeException.java | 23 +-
.../tsfile/qp/exception/MergeFilterException.java | 20 +-
.../qp/exception/QueryOperatorException.java | 18 +-
.../qp/exception}/QueryProcessorException.java | 35 +-
.../tsfile/qp/exception/RemoveNotException.java | 25 +-
.../tsfile/qp/optimizer/DNFFilterOptimizer.java | 159 ++++++
.../tsfile/qp}/optimizer/IFilterOptimizer.java | 19 +-
.../qp/optimizer/MergeSingleFilterOptimizer.java | 138 +++++
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 225 ++++++++
.../tsfile/qp/optimizer/RemoveNotOptimizer.java | 104 ++++
.../scala/org/apache/iotdb/tsfile/Converter.scala | 472 +----------------
.../org/apache/iotdb/tsfile/DefaultSource.scala | 166 ++++--
.../org/apache/iotdb/tsfile/NarrowConverter.scala | 576 +++++++++++++++++++++
...Writer.scala => NarrowTsFileOutputWriter.scala} | 19 +-
.../org/apache/iotdb/tsfile/Transformer.scala | 174 +++++++
.../apache/iotdb/tsfile/TsFileWriterFactory.scala | 8 +-
.../{Converter.scala => WideConverter.scala} | 314 ++++-------
...utWriter.scala => WideTsFileOutputWriter.scala} | 6 +-
.../scala/org/apache/iotdb/tsfile/package.scala | 25 +-
.../org/apache/iotdb/tsfile/ConverterTest.scala | 26 +-
.../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 47 +-
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 13 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 24 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 16 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 31 +-
.../tsfile/file/metadata/TsDeviceMetadata.java | 5 +-
.../iotdb/tsfile/file/metadata/TsFileMetaData.java | 19 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 86 ++-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 12 +-
.../read/controller/MetadataQuerierByFileImpl.java | 18 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 +-
.../apache/iotdb/tsfile/write/schema/Schema.java | 27 +-
.../write/writer/ForceAppendTsFileWriter.java | 2 -
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 14 +-
.../tsfile/read/TsFileRestorableReaderTest.java | 2 +-
.../iotdb/tsfile/read/common/TimeRangeTest.java | 215 ++++++--
.../tsfile/utils}/IncompleteFileTestUtil.java | 4 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 1 +
tsfile/src/test/resources/logback.xml | 2 +-
126 files changed, 5445 insertions(+), 1418 deletions(-)
create mode 100644 docs/Documentation-CHN/UserGuide/8-Tools-watermark.md
create mode 100644 docs/Documentation/UserGuide/8-Tools-watermark.md
copy server/src/assembly/resources/tools/{memory-tool.bat =>
detect-watermark.bat} (98%)
mode change 100755 => 100644
copy server/src/assembly/resources/tools/{memory-tool.sh =>
detect-watermark.sh} (86%)
mode change 100755 => 100644
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/IDataWriter.java =>
server/src/main/java/org/apache/iotdb/db/engine/fileSystem/FSType.java (85%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/fileSystem/FileFactory.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/fileSystem/HdfsFile.java
copy
server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{LoadDataOperator.java
=> DataAuthOperator.java} (60%)
copy
server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IMergePathSelector.java
=> qp/physical/sys/DataAuthPlan.java} (64%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/tools/watermark/WatermarkDetector.java
copy
server/src/main/java/org/apache/iotdb/db/{rescon/TVListAllocatorMBean.java =>
tools/watermark/WatermarkEncoder.java} (81%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/engine/cache/DeviceMetaDataCacheTest.java
create mode 100644
server/src/test/java/org/apache/iotdb/db/tools/IoTDBWatermarkTest.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/executor/QueryExecutor.java
=> spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/Executor.java (53%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/QueryProcessor.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/BasicOperator.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/FilterOperator.java
copy example/rocketmq/src/main/java/org/apache/iotdb/rocketmq/Utils.java =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/Operator.java (56%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/SQLConstant.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/SingleQuery.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/common/TSQueryPlan.java
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/BasicOperatorException.java
(66%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/DNFOptimizeException.java
(67%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/LogicalOptimizeException.java
(65%)
mode change 100644 => 100755
copy
server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManagerMBean.java =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/MergeFilterException.java
(70%)
mode change 100644 => 100755
copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/QueryOperatorException.java
(70%)
mode change 100644 => 100755
copy {server/src/main/java/org/apache/iotdb/db/exception/qp =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception}/QueryProcessorException.java
(61%)
mode change 100644 => 100755
copy
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
=>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java
(67%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/DNFFilterOptimizer.java
copy {server/src/main/java/org/apache/iotdb/db/qp/strategy =>
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp}/optimizer/IFilterOptimizer.java
(63%)
mode change 100644 => 100755
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/MergeSingleFilterOptimizer.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/PhysicalOptimizer.java
create mode 100755
spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/optimizer/RemoveNotOptimizer.java
mode change 100755 => 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Converter.scala
create mode 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/NarrowConverter.scala
copy
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{TsFileOutputWriter.scala
=> NarrowTsFileOutputWriter.scala} (71%)
create mode 100644
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/Transformer.scala
copy spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{Converter.scala =>
WideConverter.scala} (85%)
rename
spark-tsfile/src/main/scala/org/apache/iotdb/tsfile/{TsFileOutputWriter.scala
=> WideTsFileOutputWriter.scala} (91%)
rename tsfile/src/{main/java/org/apache/iotdb/tsfile/write/writer =>
test/java/org/apache/iotdb/tsfile/utils}/IncompleteFileTestUtil.java (95%)
