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/10/17 11:10:58 UTC

[incubator-iotdb] branch log_tool updated (9dea356 -> 9057438)

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 9dea356  Merge branch 'master' into log_tool
     add 906dc90  fix bug in IOTDB-207 (#385)
     add 8a23a21  add more partition tests for spark-tsfile-connector;format code (#383)
     add 8d53b66  [IOTDB-57]rename (#384)
     add d3966e4  [IOTDB-180] Get rid of JSON format in "show timeseries" (#387)
     add 1578144  use jdbc to connect iotdb in spark (#381)
     add 17e9647  [IOTDB-200] Support creating TsFileWriter with config of storage file system (#388)
     add 6fefb72  use %IOTDB_HOME%\lib\* to refers to all .jar files in the directory (#390)
     add c4af91b  fix grammer (#391)
     add 7d07bae  [IOTDB-191] Enrich Session interfaces (#375)
     add a09f08b  add log for session (#394)
     add 0a4df04  [IOTDB-219] Add config of tsfile_storage_fs in iotdb-engine.properties (#395)
     add 18da903  fix a bug in DirectoryManager (#393)
     add 6849f79  fix ignoreTimeStamp IOTDB-214; simplify some jdbc interfaces (#392)
     add efe249b  using String.getBytes(utf-9).length to replace string.length() in ChunkGroupMetadata for supporting Chinese (#396)
     add 0c57d25  [IOTDB-222] Fix changing to read-only mode when flushing Tsfile on HDFS (#397)
     add 978338a  fix rpc error (#401)
     add c566bf5  [IOTDB-223]Add a TsFile sketch tool (#398)
     add 62f8f2f  [IOTDB-224] fix buffer size and remove cache (#400)
     add 2b5da1a  Rename some varaible names and struct names in RPC (#404)
     add 8ea1fc6  Remove static, add getter and setter. (#403)
     add 1769a7c  Update document affected by renaming RPC (#405)
     add 2a60c14  update servlet-api version (#407)
     add 767a4aa  exclusion servlet in iotdb-jdbc (#408)
     add 1776c30  add flush and close log in StorageGroupProcessor
     add 9358431  catch runtime exception when inserting memtable
     add 9a2507a  remove unthrowed exception
     add 5d4edb5  remove author
     add ab3e684  remove deprecated
     add 9de6e12  Merge pull request #410 from apache/improve_log
     add 8195a08  rename delete to deleteData in session
     add 3a281cf  add delete timeseries in session
     add ad3b924  Merge pull request #411 from apache/delete_timeseries_in_session
     add e200739  Avoid creating a new ChunkGroupFooter object. (#413)
     add 6c341db  Fix data cannot be found when restarting server in HDFS (#412)
     add fdc546a  update pom (#418)
     add 964f744  merge IncompleteFileTestUtil into TsFileGeneratorForTest (#414)
     add c0bec96  [IOTDB-239] Add interface for showing devices (#421)
     add 68264c3  fix IOTDB-235 (#419)
     add 6fe298d  Add JMX document (#422)
     add 59f66f6  [IOTDB-188] Delete storage group (#416)
     add 9bae1f3  Change javdoc to block comment. (#420)
     add 39ea67d  Fix initial value of minTimestamp to Long.MIN_VALUE in ChunkBuffer (#426)
     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 9057438  Merge branch 'master' into log_tool

No new revisions were added by this update.

Summary of changes:
 .checkstyle                                        |  20 +
 .gitignore                                         |   5 +-
 .travis.yml                                        |  25 ++
 Jenkinsfile                                        |   2 +-
 NOTICE                                             |   6 +-
 README.md                                          | 222 ++++++++---
 .../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    |  27 +-
 .../main/java/org/apache/iotdb/client/Client.java  |   2 +-
 .../java/org/apache/iotdb/client/WinClient.java    |   2 +-
 .../apache/iotdb/exception/ArgsErrorException.java |   2 +-
 .../org/apache/iotdb/tool/AbstractCsvTool.java     |   2 +-
 .../main/java/org/apache/iotdb/tool/ExportCsv.java |   3 +-
 .../main/java/org/apache/iotdb/tool/ImportCsv.java |   4 +-
 .../org/apache/iotdb/client/AbstractClientIT.java  |   7 +-
 .../org/apache/iotdb/client/AbstractScript.java    |  17 +-
 .../apache/iotdb/client/StartClientScriptIT.java   |   2 +-
 .../org/apache/iotdb/tool/ExportCsvTestIT.java     |   2 +-
 .../org/apache/iotdb/tool/ImportCsvTestIT.java     |   2 +-
 distribution/pom.xml                               |   4 +-
 docs/Documentation-CHN/QuickStart.md               | 259 +++++++------
 .../4-Deployment and Management/2-Configuration.md |  27 ++
 .../UserGuide/6-JDBC API/2-Status Code.md          |   2 +-
 .../UserGuide/7-Session API/1-Session API.md       | 139 +++----
 .../UserGuide/9-System Tools/3-JMX Tool.md}        |  16 +-
 docs/Documentation-CHN/UserGuide/9-Tools-Hadoop.md | 196 +++++++++-
 .../{9-Tools-spark.md => 9-Tools-spark-iotdb.md}   |   0
 .../{9-Tools-spark.md => 9-Tools-spark-tsfile.md}  |   0
 docs/Documentation/QuickStart.md                   | 189 +++++++--
 docs/Documentation/UserGuide/0-Content.md          |   1 +
 .../4-Deployment and Management/2-Configuration.md |  27 ++
 .../UserGuide/6-JDBC API/1-JDBC API.md             |  11 +-
 .../UserGuide/6-JDBC API/2-Status Code.md          |   2 +-
 .../UserGuide/7-Session API/1-Session API.md       | 139 +++----
 docs/Documentation/UserGuide/8-TsFile/2-Usage.md   |  13 +
 .../UserGuide/8-TsFile/3-Hierarchy.md              |  86 ++++-
 .../3-JMX Tool.md}                                 |  16 +-
 docs/Documentation/UserGuide/9-Tools-Hadoop.md     | 185 ++++++++-
 .../Documentation/UserGuide/9-Tools-spark-iotdb.md | 171 +++++++++
 .../{9-Tools-spark.md => 9-Tools-spark-tsfile.md}  |   0
 example/{tsfile => hadoop}/pom.xml                 |   8 +-
 .../iotdb/tsfile/hadoop}/TSFMRReadExample.java     |  63 +--
 .../iotdb/tsfile/hadoop/TSMRWriteExample.java      | 178 +++++++++
 .../apache/iotdb/tsfile/hadoop/TsFileHelper.java}  |  69 +++-
 example/jdbc/pom.xml                               |   2 +-
 .../main/java/org/apache/iotdb/JDBCExample.java    |   2 +-
 .../org/apache/iotdb/PrepareStatementDemo.java     |   2 +-
 example/kafka/pom.xml                              |   2 +-
 .../main/java/org/apache/iotdb/kafka/Constant.java |   5 +-
 .../java/org/apache/iotdb/kafka/KafkaConsumer.java |   4 +-
 .../apache/iotdb/kafka/KafkaConsumerThread.java    |   5 +-
 .../java/org/apache/iotdb/kafka/KafkaProducer.java |   4 +-
 example/pom.xml                                    |   1 +
 example/rocketmq/pom.xml                           |   2 +-
 .../java/org/apache/iotdb/rocketmq/Constant.java   |   5 +-
 .../apache/iotdb/rocketmq/RocketMQConsumer.java    |   5 +-
 .../apache/iotdb/rocketmq/RocketMQProducer.java    |   5 +-
 .../main/java/org/apache/iotdb/rocketmq/Utils.java |   5 +-
 example/session/pom.xml                            |   2 +-
 .../main/java/org/apache/iotdb/SessionExample.java |  48 ++-
 example/tsfile/pom.xml                             |   3 +-
 .../java/org/apache/iotdb/tsfile/TsFileRead.java   |   7 +-
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |   7 +-
 .../org/apache/iotdb/tsfile/TsFileSketchTool.java  | 220 +++++++++++
 .../iotdb/tsfile/TsFileWriteWithRowBatch.java      |   6 +-
 .../iotdb/tsfile/TsFileWriteWithTSRecord.java      |   7 +-
 grafana/pom.xml                                    |   8 +-
 .../web/grafana/TsfileWebDemoApplication.java      |   2 +-
 .../apache/iotdb/web/grafana/bean/TimeValues.java  |   2 +-
 .../iotdb/web/grafana/conf/MyConfiguration.java    |   2 +-
 .../controller/DatabaseConnectController.java      |   2 +-
 .../org/apache/iotdb/web/grafana/dao/BasicDao.java |   2 +-
 .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java   |   2 +-
 .../grafana/service/DatabaseConnectService.java    |   2 +-
 .../service/impl/DatabaseConnectServiceImpl.java   |   2 +-
 hadoop/pom.xml                                     |   5 +-
 .../iotdb/tsfile/hadoop/TSFHadoopException.java    |   5 +-
 .../apache/iotdb/tsfile/hadoop/TSFInputFormat.java | 172 ++++-----
 .../apache/iotdb/tsfile/hadoop/TSFInputSplit.java  | 294 +++++++++-----
 .../iotdb/tsfile/hadoop/TSFOutputFormat.java       |  53 +--
 .../iotdb/tsfile/hadoop/TSFRecordReader.java       | 231 +++++------
 .../iotdb/tsfile/hadoop/TSFRecordWriter.java       |  50 +--
 .../java/org/apache/iotdb/tsfile/hadoop/TSRow.java |  51 ---
 .../iotdb/tsfile/hadoop/example/TsFileHelper.java  | 128 -------
 .../iotdb/tsfile/hadoop/io/HDFSInputStream.java    | 111 ------
 .../iotdb/tsfile/hadoop/io/HDFSOutputStream.java   |  92 -----
 .../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 | 100 ++---
 .../iotdb}/tsfile/hadoop/TSFInputSplitTest.java    |  58 ++-
 .../iotdb/tsfile/hadoop/TsFileTestHelper.java      |  54 ++-
 jdbc/pom.xml                                       |   4 +-
 .../main/java/org/apache/iotdb/jdbc/Config.java    |   2 +-
 .../main/java/org/apache/iotdb/jdbc/Constant.java  |   8 +-
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |   6 +-
 .../apache/iotdb/jdbc/IoTDBConnectionParams.java   |   2 +-
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   |  27 +-
 .../java/org/apache/iotdb/jdbc/IoTDBDriver.java    |   2 +-
 .../iotdb/jdbc/IoTDBMetadataResultMetadata.java    |   2 +-
 .../apache/iotdb/jdbc/IoTDBMetadataResultSet.java  |  21 +-
 .../jdbc/IoTDBPreparedInsertionStatement.java      |   4 +-
 .../apache/iotdb/jdbc/IoTDBPreparedStatement.java  |   2 +-
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 359 ++++++++---------
 .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java |  64 +---
 .../org/apache/iotdb/jdbc/IoTDBSQLException.java   |   2 +-
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |  70 ++--
 .../org/apache/iotdb/jdbc/IoTDBURLException.java   |   2 +-
 .../src/main/java/org/apache/iotdb/jdbc/Utils.java |   2 +-
 .../test/java/org/apache/iotdb/jdbc/BatchTest.java |  12 +-
 .../org/apache/iotdb/jdbc/IoTDBConnectionTest.java |  10 +-
 .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java      |  66 +++-
 .../jdbc/IoTDBMetadataResultMetadataTest.java      |   2 +-
 .../iotdb/jdbc/IoTDBPreparedStatementTest.java     |  11 +-
 .../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java |  13 +-
 .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java |  26 +-
 .../org/apache/iotdb/jdbc/IoTDBStatementTest.java  |  73 +++-
 .../test/java/org/apache/iotdb/jdbc/UtilsTest.java |  17 +-
 pom.xml                                            |  56 +--
 server/pom.xml                                     |  26 +-
 .../resources/conf/iotdb-engine.properties         |  23 +-
 .../src/assembly/resources/sbin/start-server.bat   |   6 +-
 .../org/apache/iotdb/db/auth/AuthException.java    |   4 +-
 .../org/apache/iotdb/db/auth/AuthorityChecker.java |   2 +-
 .../iotdb/db/auth/authorizer/BasicAuthorizer.java  |   2 +-
 .../iotdb/db/auth/authorizer/IAuthorizer.java      |   2 +-
 .../db/auth/authorizer/LocalFileAuthorizer.java    |   2 +-
 .../apache/iotdb/db/auth/entity/PathPrivilege.java |   2 +-
 .../apache/iotdb/db/auth/entity/PrivilegeType.java |   2 +-
 .../java/org/apache/iotdb/db/auth/entity/Role.java |   2 +-
 .../java/org/apache/iotdb/db/auth/entity/User.java |   2 +-
 .../iotdb/db/auth/role/BasicRoleManager.java       |   2 +-
 .../apache/iotdb/db/auth/role/IRoleAccessor.java   |   2 +-
 .../apache/iotdb/db/auth/role/IRoleManager.java    |   2 +-
 .../iotdb/db/auth/role/LocalFileRoleAccessor.java  |  21 +-
 .../iotdb/db/auth/role/LocalFileRoleManager.java   |   2 +-
 .../iotdb/db/auth/user/BasicUserManager.java       |   2 +-
 .../apache/iotdb/db/auth/user/IUserAccessor.java   |   2 +-
 .../apache/iotdb/db/auth/user/IUserManager.java    |   2 +-
 .../iotdb/db/auth/user/LocalFileUserAccessor.java  |  40 +-
 .../iotdb/db/auth/user/LocalFileUserManager.java   |   2 +-
 .../org/apache/iotdb/db/concurrent/HashLock.java   |   2 +-
 .../IoTDBDefaultThreadExceptionHandler.java        |   2 +-
 .../db/concurrent/IoTDBThreadPoolFactory.java      |   4 +-
 .../iotdb/db/concurrent/IoTThreadFactory.java      |   2 +-
 .../org/apache/iotdb/db/concurrent/ThreadName.java |   2 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 140 ++++++-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |  12 +-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   2 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  20 +-
 .../iotdb/db/conf/adapter/CompressionRatio.java    |   9 +-
 .../iotdb/db/conf/adapter/IDynamicAdapter.java     |   2 +-
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |   5 +-
 .../db/conf/adapter/ManageDynamicParameters.java   |   2 +-
 .../conf/adapter/ManageDynamicParametersMBean.java |   2 +-
 .../db/conf/directories/DirectoryManager.java      |  15 +-
 .../directories/strategy/DirectoryStrategy.java    |   4 +-
 .../strategy/MaxDiskUsableSpaceFirstStrategy.java  |   2 +-
 .../MinFolderOccupiedSpaceFirstStrategy.java       |   2 +-
 .../directories/strategy/SequenceStrategy.java     |   2 +-
 .../db/cost/statistic/ConcurrentCircularArray.java |   2 +-
 .../iotdb/db/cost/statistic/Measurement.java       |   2 +-
 .../iotdb/db/cost/statistic/MeasurementMBean.java  |   2 +-
 .../apache/iotdb/db/cost/statistic/Operation.java  |   2 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  25 +-
 .../iotdb/db/engine/cache/DeviceMetaDataCache.java |   2 +-
 .../iotdb/db/engine/cache/LRULinkedHashMap.java    |   2 +-
 .../iotdb/db/engine/cache/RamUsageEstimator.java   |   2 +-
 .../iotdb/db/engine/cache/TsFileMetaDataCache.java |   2 +-
 .../iotdb/db/engine/cache/TsFileMetadataUtils.java |   2 +-
 .../iotdb/db/engine/fileSystem/HdfsFile.java       | 156 --------
 .../{FileFactory.java => SystemFileFactory.java}   |  26 +-
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |   3 +-
 .../iotdb/db/engine/flush/NotifyFlushMemTable.java |   2 +-
 .../db/engine/flush/pool/AbstractPoolManager.java  |   2 +-
 .../engine/flush/pool/FlushSubTaskPoolManager.java |   2 +-
 .../db/engine/flush/pool/FlushTaskPoolManager.java |   2 +-
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  31 +-
 .../iotdb/db/engine/memtable/ChunkBufferPool.java  |   2 -
 .../apache/iotdb/db/engine/memtable/IMemTable.java |   7 +-
 .../db/engine/memtable/IWritableMemChunk.java      |   2 +-
 .../db/engine/memtable/PrimitiveMemTable.java      |   2 +-
 .../iotdb/db/engine/merge/manage/MergeContext.java |   2 +-
 .../iotdb/db/engine/merge/manage/MergeManager.java |   2 +-
 .../db/engine/merge/manage/MergeResource.java      |  10 +-
 .../apache/iotdb/db/engine/merge/package-info.java |   2 +-
 .../iotdb/db/engine/merge/recover/LogAnalyzer.java |  10 +-
 .../iotdb/db/engine/merge/recover/MergeLogger.java |   2 +-
 .../merge/selector/IFileQueryMemMeasurement.java   |   2 +-
 .../engine/merge/selector/IMergeFileSelector.java  |   2 +-
 .../engine/merge/selector/IMergePathSelector.java  |   2 +-
 .../merge/selector/MaxFileMergeFileSelector.java   |   2 +-
 .../merge/selector/MaxSeriesMergeFileSelector.java |   2 +-
 .../engine/merge/selector/MergeFileStrategy.java   |   2 +-
 .../engine/merge/selector/NaivePathSelector.java   |   2 +-
 .../iotdb/db/engine/merge/task/MergeCallback.java  |   2 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  |   2 +-
 .../db/engine/merge/task/MergeMultiChunkTask.java  |   2 +-
 .../iotdb/db/engine/merge/task/MergeTask.java      |   2 +-
 .../db/engine/merge/task/RecoverMergeTask.java     |   2 +-
 .../iotdb/db/engine/modification/Deletion.java     |   2 +-
 .../iotdb/db/engine/modification/Modification.java |   2 +-
 .../db/engine/modification/ModificationFile.java   |   7 +-
 .../io/LocalTextModificationAccessor.java          |  27 +-
 .../engine/modification/io/ModificationReader.java |   2 +-
 .../engine/modification/io/ModificationWriter.java |   2 +-
 .../iotdb/db/engine/modification/package-info.java |   2 +-
 .../db/engine/querycontext/QueryDataSource.java    |   2 +-
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |   5 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  67 ++--
 .../db/engine/storagegroup/TsFileProcessor.java    |  13 +-
 .../db/engine/storagegroup/TsFileResource.java     |  23 +-
 .../version/SimpleFileVersionController.java       |  11 +-
 .../engine/version/SysTimeVersionController.java   |   2 +-
 .../iotdb/db/engine/version/VersionController.java |   2 +-
 .../iotdb/db/exception/ArgsErrorException.java     |   2 +-
 .../db/exception/ConfigAdjusterException.java      |   2 +-
 .../db/exception/DeltaEngineRunningException.java  |   4 +-
 .../exception/DiskSpaceInsufficientException.java  |   2 +-
 .../iotdb/db/exception/FlushRunTimeException.java  |   2 +-
 .../apache/iotdb/db/exception/MergeException.java  |   2 +-
 .../iotdb/db/exception/MetadataErrorException.java |   4 +-
 .../iotdb/db/exception/PathErrorException.java     |   2 +-
 .../iotdb/db/exception/ProcessorException.java     |   2 +-
 .../db/exception/QueryInBatchStmtException.java    |   2 +-
 .../iotdb/db/exception/StartupException.java       |   2 +-
 .../iotdb/db/exception/StorageEngineException.java |   2 +-
 .../exception/StorageEngineFailureException.java   |   2 +-
 .../exception/StorageGroupProcessorException.java  |   2 +-
 .../db/exception/SyncConnectionException.java      |   2 +-
 .../iotdb/db/exception/SysCheckException.java      |   2 +-
 .../db/exception/TsFileProcessorException.java     |   2 +-
 .../db/exception/UnSupportedFillTypeException.java |   2 +-
 .../db/exception/qp/IllegalASTFormatException.java |   2 +-
 .../db/exception/qp/LogicalOperatorException.java  |   2 +-
 .../db/exception/qp/LogicalOptimizeException.java  |   2 +-
 .../db/exception/qp/QueryProcessorException.java   |   2 +-
 .../java/org/apache/iotdb/db/metadata/MGraph.java  |  35 +-
 .../org/apache/iotdb/db/metadata/MManager.java     | 112 ++++--
 .../java/org/apache/iotdb/db/metadata/MNode.java   |  18 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  78 ++--
 .../org/apache/iotdb/db/metadata/Metadata.java     |   2 +-
 .../apache/iotdb/db/metadata/MetadataConstant.java |   2 +-
 .../iotdb/db/metadata/MetadataOperationType.java   |   5 +-
 .../java/org/apache/iotdb/db/metadata/PNode.java   |   2 +-
 .../java/org/apache/iotdb/db/metadata/PTree.java   |   2 +-
 .../apache/iotdb/db/monitor/MonitorConstants.java  |   2 +-
 .../org/apache/iotdb/db/monitor/StatMonitor.java   |  12 +-
 .../iotdb/db/monitor/collector/FileSize.java       |   8 +-
 .../monitor/collector/MemTableWriteTimeCost.java   |   2 +-
 .../org/apache/iotdb/db/qp/QueryProcessor.java     |   3 +-
 .../apache/iotdb/db/qp/constant/DatetimeUtils.java |   2 +-
 .../apache/iotdb/db/qp/constant/SQLConstant.java   |   2 +-
 .../iotdb/db/qp/constant/TSParserConstant.java     |   2 +-
 .../db/qp/exception/DateTimeFormatException.java   |   2 +-
 .../qp/executor/AbstractQueryProcessExecutor.java  |   2 +-
 .../db/qp/executor/IQueryProcessExecutor.java      |   2 +-
 .../iotdb/db/qp/executor/QueryProcessExecutor.java |  15 +-
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   4 +-
 .../apache/iotdb/db/qp/logical/RootOperator.java   |   2 +-
 .../db/qp/logical/crud/BasicFunctionOperator.java  |   2 +-
 .../db/qp/logical/crud/BasicOperatorType.java      |   2 +-
 .../iotdb/db/qp/logical/crud/DeleteOperator.java   |   2 +-
 .../iotdb/db/qp/logical/crud/FilterOperator.java   |   2 +-
 .../iotdb/db/qp/logical/crud/FromOperator.java     |   2 +-
 .../iotdb/db/qp/logical/crud/FunctionOperator.java |   2 +-
 .../iotdb/db/qp/logical/crud/InsertOperator.java   |   2 +-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |   2 +-
 .../iotdb/db/qp/logical/crud/SFWOperator.java      |   2 +-
 .../iotdb/db/qp/logical/crud/SelectOperator.java   |   2 +-
 .../iotdb/db/qp/logical/crud/UpdateOperator.java   |   2 +-
 .../iotdb/db/qp/logical/sys/AuthorOperator.java    |   2 +-
 .../iotdb/db/qp/logical/sys/DataAuthOperator.java  |   2 +-
 .../iotdb/db/qp/logical/sys/LoadDataOperator.java  |   2 +-
 .../iotdb/db/qp/logical/sys/MetadataOperator.java  |  11 +-
 .../iotdb/db/qp/logical/sys/PropertyOperator.java  |   2 +-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |   2 +-
 .../iotdb/db/qp/physical/crud/AggregationPlan.java |   2 +-
 .../iotdb/db/qp/physical/crud/BatchInsertPlan.java |  68 ++--
 .../iotdb/db/qp/physical/crud/DeletePlan.java      |  10 +-
 .../iotdb/db/qp/physical/crud/FillQueryPlan.java   |   2 +-
 .../iotdb/db/qp/physical/crud/GroupByPlan.java     |   2 +-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |   2 +-
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |   2 +-
 .../iotdb/db/qp/physical/crud/UpdatePlan.java      |   2 +-
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |   2 +-
 .../iotdb/db/qp/physical/sys/DataAuthPlan.java     |   2 +-
 .../iotdb/db/qp/physical/sys/LoadDataPlan.java     |   2 +-
 .../iotdb/db/qp/physical/sys/MetadataPlan.java     |  16 +-
 .../iotdb/db/qp/physical/sys/PropertyPlan.java     |   2 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  12 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   2 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |   8 +-
 .../qp/strategy/optimizer/DnfFilterOptimizer.java  |   2 +-
 .../db/qp/strategy/optimizer/IFilterOptimizer.java |   2 +-
 .../qp/strategy/optimizer/ILogicalOptimizer.java   |   2 +-
 .../optimizer/MergeSingleFilterOptimizer.java      |   2 +-
 .../qp/strategy/optimizer/RemoveNotOptimizer.java  |   2 +-
 .../db/query/aggregation/AggreResultData.java      |   2 +-
 .../db/query/aggregation/AggregateFunction.java    |   2 +-
 .../impl/{MeanAggrFunc.java => AvgAggrFunc.java}   |  10 +-
 .../db/query/aggregation/impl/CountAggrFunc.java   |   2 +-
 .../db/query/aggregation/impl/FirstAggrFunc.java   |   2 +-
 .../db/query/aggregation/impl/LastAggrFunc.java    |   2 +-
 .../db/query/aggregation/impl/MaxTimeAggrFunc.java |   2 +-
 .../query/aggregation/impl/MaxValueAggrFunc.java   |   2 +-
 .../db/query/aggregation/impl/MinTimeAggrFunc.java |   2 +-
 .../query/aggregation/impl/MinValueAggrFunc.java   |   2 +-
 .../db/query/aggregation/impl/SumAggrFunc.java     |   4 +-
 .../iotdb/db/query/context/QueryContext.java       |   2 +-
 .../iotdb/db/query/control/FileReaderManager.java  |   2 +-
 .../iotdb/db/query/control/JobFileManager.java     |   2 +-
 .../db/query/control/QueryResourceManager.java     |  66 ++--
 .../apache/iotdb/db/query/dataset/AuthDataSet.java |   2 +-
 .../dataset/EngineDataSetWithValueFilter.java      |   2 +-
 .../dataset/EngineDataSetWithoutValueFilter.java   |   2 +-
 .../dataset/groupby/GroupByEngineDataSet.java      |   2 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |   2 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |   2 +-
 .../db/query/executor/AggregateEngineExecutor.java |   2 +-
 .../iotdb/db/query/executor/EngineExecutor.java    |   2 +-
 .../iotdb/db/query/executor/EngineQueryRouter.java |   2 +-
 .../db/query/executor/FillEngineExecutor.java      |   2 +-
 .../db/query/executor/IEngineQueryRouter.java      |   2 +-
 .../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}    |  24 +-
 .../FixLengthIExternalSortFileDeserializer.java    | 209 ++++++++++
 .../impl/FixLengthTimeValuePairSerializer.java     | 169 ++++++++
 .../iotdb/db/query/factory/AggreFuncFactory.java   |   8 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   2 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |   2 +-
 .../apache/iotdb/db/query/fill/PreviousFill.java   |   2 +-
 .../iotdb/db/query/reader/IAggregateReader.java    |   2 +-
 .../apache/iotdb/db/query/reader/IBatchReader.java |   2 +-
 .../apache/iotdb/db/query/reader/IPointReader.java |   2 +-
 .../iotdb/db/query/reader/IReaderByTimestamp.java  |   2 +-
 .../reader/chunkRelated/CachedDiskChunkReader.java |   2 +-
 .../query/reader/chunkRelated/ChunkReaderWrap.java | 106 ++++++
 .../query/reader/chunkRelated/DiskChunkReader.java |   2 +-
 .../chunkRelated/DiskChunkReaderByTimestamp.java   |   2 +-
 .../query/reader/chunkRelated/MemChunkReader.java  |   2 +-
 .../chunkRelated/MemChunkReaderByTimestamp.java    |   2 +-
 .../fileRelated/FileSeriesReaderAdapter.java       |   2 +-
 .../FileSeriesReaderByTimestampAdapter.java        |   2 +-
 .../fileRelated/UnSealedTsFileIterateReader.java   |   2 +-
 .../UnSealedTsFileReaderByTimestamp.java           |   2 +-
 .../CachedUnseqResourceMergeReader.java            |   2 +-
 .../resourceRelated/SeqResourceIterateReader.java  |   2 +-
 .../SeqResourceReaderByTimestamp.java              |   2 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |  39 +-
 .../UnseqResourceReaderByTimestamp.java            |  41 +-
 .../seriesRelated/SeriesReaderByTimestamp.java     |   2 +-
 .../seriesRelated/SeriesReaderWithValueFilter.java |   2 +-
 .../SeriesReaderWithoutValueFilter.java            |   2 +-
 .../universal/CachedPriorityMergeReader.java       |   2 +-
 .../db/query/reader/universal/IterateReader.java   |   2 +-
 .../reader/universal/PriorityMergeReader.java      |  18 +-
 .../universal/PriorityMergeReaderByTimestamp.java  |   2 +-
 .../timegenerator/AbstractNodeConstructor.java     |   2 +-
 .../db/query/timegenerator/EngineLeafNode.java     |   2 +-
 .../query/timegenerator/EngineNodeConstructor.java |   2 +-
 .../query/timegenerator/EngineTimeGenerator.java   |   2 +-
 .../apache/iotdb/db/rescon/PrimitiveArrayPool.java |   2 +-
 .../apache/iotdb/db/rescon/TVListAllocator.java    |   2 +-
 .../iotdb/db/rescon/TVListAllocatorMBean.java      |   2 +-
 .../org/apache/iotdb/db/rescon/package-info.java   |   2 +-
 .../java/org/apache/iotdb/db/service/IService.java |   2 +-
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   2 +-
 .../org/apache/iotdb/db/service/IoTDBMBean.java    |   2 +-
 .../apache/iotdb/db/service/IoTDBShutdownHook.java |   2 +-
 .../org/apache/iotdb/db/service/JDBCService.java   |   2 +-
 .../iotdb/db/service/JDBCServiceEventHandler.java  |   2 +-
 .../apache/iotdb/db/service/JDBCServiceMBean.java  |   2 +-
 .../org/apache/iotdb/db/service/JMXService.java    |   2 +-
 .../java/org/apache/iotdb/db/service/Monitor.java  |   7 +-
 .../org/apache/iotdb/db/service/MonitorMBean.java  |   2 +-
 .../apache/iotdb/db/service/RegisterManager.java   |   2 +-
 .../org/apache/iotdb/db/service/ServiceType.java   |   2 +-
 .../org/apache/iotdb/db/service/StartupCheck.java  |   2 +-
 .../org/apache/iotdb/db/service/StartupChecks.java |   2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 370 +++++++++++-------
 .../org/apache/iotdb/db/sql/ParseGenerator.java    |   2 +-
 .../apache/iotdb/db/sql/parse/AstErrorNode.java    |   2 +-
 .../org/apache/iotdb/db/sql/parse/AstNode.java     |   2 +-
 .../apache/iotdb/db/sql/parse/AstNodeOrigin.java   |   2 +-
 .../java/org/apache/iotdb/db/sql/parse/Node.java   |   2 +-
 .../org/apache/iotdb/db/sql/parse/ParseDriver.java |   2 +-
 .../org/apache/iotdb/db/sql/parse/ParseError.java  |   2 +-
 .../apache/iotdb/db/sql/parse/ParseException.java  |   2 +-
 .../org/apache/iotdb/db/sql/parse/ParseUtils.java  |   2 +-
 .../org/apache/iotdb/db/sync/conf/Constans.java    |   2 +-
 .../iotdb/db/sync/conf/SyncSenderConfig.java       |   2 +-
 .../iotdb/db/sync/conf/SyncSenderDescriptor.java   |   2 +-
 .../iotdb/db/sync/receiver/SyncServerManager.java  |   2 +-
 .../iotdb/db/sync/receiver/SyncServiceImpl.java    |  33 +-
 .../iotdb/db/sync/sender/SyncFileManager.java      |   2 +-
 .../apache/iotdb/db/sync/sender/SyncSender.java    |   2 +-
 .../apache/iotdb/db/tools/MemEst/MemEstTool.java   |   7 +-
 .../iotdb/db/tools/MemEst/MemEstToolCmd.java       |   2 +-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |  11 +-
 .../java/org/apache/iotdb/db/tools/WalChecker.java |   8 +-
 .../watermark/GroupedLSBWatermarkEncoder.java      |   2 +-
 .../db/tools/watermark/WatermarkDetector.java      |   2 +-
 .../iotdb/db/tools/watermark/WatermarkEncoder.java |   2 +-
 .../java/org/apache/iotdb/db/utils/AuthUtils.java  |   2 +-
 .../org/apache/iotdb/db/utils/CommonUtils.java     |  12 +-
 .../iotdb/db/utils/CopyOnReadLinkedList.java       |   2 +-
 .../org/apache/iotdb/db/utils/FilePathUtils.java   |   2 +-
 .../java/org/apache/iotdb/db/utils/IOUtils.java    |   2 +-
 .../java/org/apache/iotdb/db/utils/MathUtils.java  |  15 +-
 .../java/org/apache/iotdb/db/utils/MemUtils.java   |   2 +-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java |   2 +-
 .../org/apache/iotdb/db/utils/OpenFileNumUtil.java |   2 +-
 .../apache/iotdb/db/utils/QueryDataSetUtils.java   |   2 +-
 .../java/org/apache/iotdb/db/utils/QueryUtils.java |   2 +-
 .../apache/iotdb/db/utils/RandomDeleteCache.java   |   2 +-
 .../org/apache/iotdb/db/utils/SchemaUtils.java     |   2 +-
 .../java/org/apache/iotdb/db/utils/SyncUtils.java  |   2 +-
 .../org/apache/iotdb/db/utils/TimeValuePair.java   |   2 +-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  |   2 +-
 .../org/apache/iotdb/db/utils/TsPrimitiveType.java |   2 +-
 .../iotdb/db/utils/datastructure/BinaryTVList.java |   2 +-
 .../db/utils/datastructure/BooleanTVList.java      |   2 +-
 .../iotdb/db/utils/datastructure/DoubleTVList.java |   2 +-
 .../iotdb/db/utils/datastructure/FloatTVList.java  |   2 +-
 .../iotdb/db/utils/datastructure/IntTVList.java    |   2 +-
 .../iotdb/db/utils/datastructure/LongTVList.java   |   2 +-
 .../iotdb/db/utils/datastructure/TVList.java       |   2 +-
 .../iotdb/db/writelog/io/BatchLogReader.java       |   2 +-
 .../apache/iotdb/db/writelog/io/ILogReader.java    |   2 +-
 .../apache/iotdb/db/writelog/io/ILogWriter.java    |   2 +-
 .../org/apache/iotdb/db/writelog/io/LogWriter.java |   5 +-
 .../iotdb/db/writelog/io/MultiFileLogReader.java   |   2 +-
 .../iotdb/db/writelog/io/SingleFileLogReader.java  |   2 +-
 .../writelog/manager/MultiFileLogNodeManager.java  |   2 +-
 .../db/writelog/manager/WriteLogNodeManager.java   |   2 +-
 .../db/writelog/node/ExclusiveWriteLogNode.java    |  12 +-
 .../iotdb/db/writelog/node/WriteLogNode.java       |   2 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  47 ++-
 .../writelog/recover/TsFileRecoverPerformer.java   |   9 +-
 .../iotdb/db/auth/LocalFIleRoleAccessorTest.java   |   2 +-
 .../iotdb/db/auth/LocalFileAuthorizerTest.java     |   2 +-
 .../iotdb/db/auth/LocalFileRoleManagerTest.java    |   2 +-
 .../iotdb/db/auth/LocalFileUserAccessorTest.java   |   2 +-
 .../iotdb/db/auth/LocalFileUserManagerTest.java    |   2 +-
 .../IoTDBDefaultThreadExceptionHandlerTest.java    |   2 +-
 .../db/concurrent/IoTDBThreadPoolFactoryTest.java  |   2 +-
 .../db/conf/adapter/CompressionRatioTest.java      |   2 +-
 .../strategy/DirectoryStrategyTest.java            |   2 +-
 .../db/cost/statistic/PerformanceStatTest.java     |   2 +-
 .../iotdb/db/engine/MetadataManagerHelper.java     |  21 +-
 .../db/engine/cache/DeviceMetaDataCacheTest.java   |   9 +-
 .../db/engine/memtable/ChunkBufferPoolTest.java    |   2 +-
 .../db/engine/memtable/MemTableFlushTaskTest.java  |   4 +-
 .../iotdb/db/engine/memtable/MemTablePoolTest.java |   2 +-
 .../db/engine/memtable/MemTableTestUtils.java      |   2 +-
 .../db/engine/memtable/MemtableBenchmark.java      |   2 +-
 .../db/engine/memtable/PrimitiveMemTableTest.java  |   5 +-
 .../engine/merge/MaxFileMergeFileSelectorTest.java |   2 +-
 .../merge/MaxSeriesMergeFileSelectorTest.java      |   2 +-
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |   2 +-
 .../iotdb/db/engine/merge/MergePerfTest.java       |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |   2 +-
 .../apache/iotdb/db/engine/merge/MergeTest.java    |  12 +-
 .../engine/modification/DeletionFileNodeTest.java  |   9 +-
 .../db/engine/modification/DeletionQueryTest.java  |  10 +-
 .../engine/modification/ModificationFileTest.java  |   2 +-
 .../io/LocalTextModificationAccessorTest.java      |   2 +-
 .../storagegroup/FileNodeManagerBenchmark.java     |   4 +-
 .../storagegroup/StorageGroupProcessorTest.java    |  11 +-
 .../engine/storagegroup/TsFileProcessorTest.java   |  27 +-
 .../version/SimpleFileVersionControllerTest.java   |   2 +-
 .../version/SysTimeVersionControllerTest.java      |   2 +-
 .../org/apache/iotdb/db/integration/Constant.java  |   6 +-
 .../apache/iotdb/db/integration/IOTDBFillIT.java   |   2 +-
 .../iotdb/db/integration/IOTDBGroupByIT.java       |  14 +-
 .../iotdb/db/integration/IoTDBAggregationIT.java   |  25 +-
 .../integration/IoTDBAggregationLargeDataIT.java   |  30 +-
 .../integration/IoTDBAggregationSmallDataIT.java   |  14 +-
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |   2 +-
 .../iotdb/db/integration/IoTDBCompleteIT.java      |   2 +-
 .../apache/iotdb/db/integration/IoTDBDaemonIT.java |   4 +-
 .../iotdb/db/integration/IoTDBDeletionIT.java      |   2 +-
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  20 +-
 .../db/integration/IoTDBFloatPrecisionIT.java      |   2 +-
 .../db/integration/IoTDBFlushQueryMergeTest.java   |   2 +-
 .../iotdb/db/integration/IoTDBLargeDataIT.java     |  20 +-
 .../iotdb/db/integration/IoTDBLimitSlimitIT.java   |   2 +-
 .../iotdb/db/integration/IoTDBMergeTest.java       |   2 +-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  22 +-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |  20 +-
 .../iotdb/db/integration/IoTDBNumberPathIT.java    |   2 +-
 .../iotdb/db/integration/IoTDBPreparedStmtIT.java  |   2 +-
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  20 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  20 +-
 .../iotdb/db/integration/IoTDBTimeZoneIT.java      |   2 +-
 .../iotdb/db/integration/IoTDBVersionIT.java       |   2 +-
 .../org/apache/iotdb/db/metadata/MGraphTest.java   |  14 +-
 .../iotdb/db/metadata/MManagerAdvancedTest.java    |  16 +-
 .../iotdb/db/metadata/MManagerBasicTest.java       |  54 +--
 .../iotdb/db/metadata/MManagerImproveTest.java     |   4 +-
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |   2 +-
 .../org/apache/iotdb/db/metadata/MetadataTest.java |  18 +-
 .../org/apache/iotdb/db/qp/QueryProcessorTest.java |  11 +-
 .../iotdb/db/qp/bench/QueryParseBenchmark.java     |   2 +-
 .../iotdb/db/qp/other/TSPlanContextAuthorTest.java |   2 +-
 .../db/qp/other/TSPlanContextPropertyTest.java     |   5 +-
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     |   2 +-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |  12 +-
 .../org/apache/iotdb/db/qp/plan/QPUpdateTest.java  |   2 +-
 .../iotdb/db/qp/plan/TestConcatOptimizer.java      |   2 +-
 .../iotdb/db/qp/strategy/LogicalGeneratorTest.java |   2 +-
 .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java |   2 +-
 .../iotdb/db/query/component/SimpleFileWriter.java |   2 +-
 .../db/query/control/FileReaderManagerTest.java    |  10 +-
 .../db/query/control/QueryResourceManagerTest.java |   2 +-
 .../dataset/EngineDataSetWithValueFilterTest.java  |   2 +-
 .../query/executor/GroupByEngineDataSetTest.java   |   2 +-
 .../query/externalsort/ExternalSortEngineTest.java | 189 +++++++++
 .../query/externalsort/FakeChunkReaderWrap.java}   |  29 +-
 ...ExternalSortFileSerializerDeserializerTest.java | 129 +++++++
 .../iotdb/db/query/reader/ReaderTestHelper.java    |   7 +-
 .../fileRelated/UnSealedTsFileReaderTest.java      |   5 +-
 .../resourceRelated/SeqResourceReaderTest.java     |   5 +-
 .../resourceRelated/UnseqResourceReaderTest.java   |   5 +-
 .../reader/seriesRelated/FakedIBatchPoint.java     |   2 +-
 .../reader/seriesRelated/FakedIPointReader.java    |   2 +-
 .../SeriesReaderWithValueFilterTest.java           |   2 +-
 .../SeriesReaderWithoutValueFilterTest.java        |   2 +-
 .../query/reader/universal/FakedSeriesReader.java  |  88 +++++
 .../universal/FakedSeriesReaderByTimestamp.java    |   2 +-
 .../PriorityMergeReaderByTimestampTest.java        |   2 +-
 .../reader/universal/PriorityMergeReaderTest.java  |  34 +-
 .../reader/universal/PriorityMergeReaderTest2.java |  52 +--
 .../org/apache/iotdb/db/script/EnvScriptIT.java    |  23 +-
 .../db/sql/DatetimeQueryDataSetUtilsTest.java      |   2 +-
 .../org/apache/iotdb/db/sql/SQLParserTest.java     |   2 +-
 .../db/sync/sender/MultipleClientSyncTest.java     |   2 +-
 .../iotdb/db/sync/sender/SingleClientSyncTest.java |   2 +-
 .../iotdb/db/sync/sender/SyncFileManagerTest.java  |   2 +-
 .../org/apache/iotdb/db/sync/test/RandomNum.java   |   2 +-
 .../apache/iotdb/db/sync/test/SyncTestClient1.java |   2 +-
 .../apache/iotdb/db/sync/test/SyncTestClient2.java |   2 +-
 .../apache/iotdb/db/sync/test/SyncTestClient3.java |   2 +-
 .../java/org/apache/iotdb/db/sync/test/Utils.java  |   2 +-
 .../apache/iotdb/db/tools/IoTDBWatermarkTest.java  |   2 +-
 .../org/apache/iotdb/db/tools/WalCheckerTest.java  |   2 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |  17 +-
 .../iotdb/db/utils/MathQueryDataSetUtilsTest.java  |   2 +-
 .../apache/iotdb/db/utils/OpenFileNumUtilTest.java |   2 +-
 .../db/utils/datastructure/LongTVListTest.java     |   2 +-
 .../iotdb/db/writelog/IoTDBLogFileSizeTest.java    |   9 +-
 .../apache/iotdb/db/writelog/PerformanceTest.java  |   4 +-
 .../iotdb/db/writelog/WriteLogNodeManagerTest.java |   2 +-
 .../apache/iotdb/db/writelog/WriteLogNodeTest.java |   2 +-
 .../iotdb/db/writelog/io/LogWriterReaderTest.java  |   2 +-
 .../db/writelog/io/MultiFileLogReaderTest.java     |   2 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |   8 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |   6 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   6 +-
 service-rpc/rpc-changelist.md                      |  14 +-
 .../main/java/org/apache/iotdb/rpc/RpcUtils.java   |   6 +-
 .../rpc/{TSStatusType.java => TSStatusCode.java}   |   6 +-
 service-rpc/src/main/thrift/rpc.thrift             |  64 ++--
 session/pom.xml                                    |  16 +-
 .../main/java/org/apache/iotdb/session/Config.java |   2 +-
 .../java/org/apache/iotdb/session/Session.java     | 209 ++++++++--
 .../org/apache/iotdb/session/SessionDataSet.java   | 120 ++++++
 .../org/apache/iotdb/session/SessionUtils.java     |  70 ++++
 .../org/apache/iotdb/session/IoTDBSessionIT.java   | 283 ++++++++++++++
 .../iotdb/session}/utils/EnvironmentUtils.java     |  22 +-
 spark-iotdb-connector/Readme.md                    | 171 +++++++++
 {spark-tsfile => spark-iotdb-connector}/pom.xml    |  28 +-
 .../java/org/apache/iotdb/sparkdb/SQLConstant.java |  23 +-
 .../scala/org/apache/iotdb/sparkdb/Converter.scala |  84 ++++
 .../org/apache/iotdb/sparkdb/DefaultSource.scala   |  42 ++
 .../org/apache/iotdb/sparkdb/IoTDBOptions.scala    |  42 ++
 .../scala/org/apache/iotdb/sparkdb/IoTDBRDD.scala  | 134 +++++++
 .../org/apache/iotdb/sparkdb/IoTDBRelation.scala   | 116 ++++++
 .../org/apache/iotdb/sparkdb}/Transformer.scala    |  33 +-
 .../scala/org/apache/iotdb/sparkdb/package.scala   |  35 ++
 .../apache/iotdb/sparkdb}/EnvironmentUtils.java    |  95 ++++-
 .../scala/org/apache/iotdb/sparkdb/IoTDBTest.scala | 150 ++++++++
 spark-tsfile/pom.xml                               |  16 +-
 .../apache/iotdb/tsfile/io/TsFileOutputFormat.java |   2 +-
 .../apache/iotdb/tsfile/io/TsFileRecordWriter.java |   3 +-
 .../java/org/apache/iotdb/tsfile/qp/Executor.java  |  39 +-
 .../org/apache/iotdb/tsfile/qp/QueryProcessor.java | 273 ++++++-------
 .../iotdb/tsfile/qp/common/BasicOperator.java      |  81 ++--
 .../iotdb/tsfile/qp/common/FilterOperator.java     | 246 ++++++------
 .../apache/iotdb/tsfile/qp/common/Operator.java    |  43 ++-
 .../apache/iotdb/tsfile/qp/common/SQLConstant.java | 251 ++++++------
 .../apache/iotdb/tsfile/qp/common/SingleQuery.java |  55 +--
 .../apache/iotdb/tsfile/qp/common/TSQueryPlan.java |  73 ++--
 .../qp/exception/BasicOperatorException.java       |  16 +-
 .../tsfile/qp/exception/DNFOptimizeException.java  |  16 +-
 .../qp/exception/LogicalOptimizeException.java     |  16 +-
 .../tsfile/qp/exception/MergeFilterException.java  |  16 +-
 .../qp/exception/QueryOperatorException.java       |  16 +-
 .../qp/exception/QueryProcessorException.java      |  32 +-
 .../tsfile/qp/exception/RemoveNotException.java    |  17 +-
 .../tsfile/qp/optimizer/DNFFilterOptimizer.java    | 243 ++++++------
 .../tsfile/qp/optimizer/IFilterOptimizer.java      |  12 +-
 .../qp/optimizer/MergeSingleFilterOptimizer.java   | 215 +++++------
 .../tsfile/qp/optimizer/PhysicalOptimizer.java     | 389 ++++++++++---------
 .../tsfile/qp/optimizer/RemoveNotOptimizer.java    | 146 +++----
 .../scala/org/apache/iotdb/tsfile/Converter.scala  |  14 +-
 .../org/apache/iotdb/tsfile/DefaultSource.scala    |  47 ++-
 .../org/apache/iotdb/tsfile/NarrowConverter.scala  | 138 ++++---
 .../iotdb/tsfile/NarrowTsFileOutputWriter.scala    |   2 +-
 .../org/apache/iotdb/tsfile/Transformer.scala      |   2 +-
 .../org/apache/iotdb/tsfile/WideConverter.scala    |  31 +-
 .../iotdb/tsfile/WideTsFileOutputWriter.scala      |  12 +-
 .../scala/org/apache/iotdb/tsfile/package.scala    |   9 +-
 .../scala/org/apache/iotdb/tool/TsFileExample.java |   5 +-
 .../org/apache/iotdb/tool/TsFileWriteTool.java     |  57 ++-
 .../org/apache/iotdb/tsfile/ConverterTest.scala    |   4 +-
 .../org/apache/iotdb/tsfile/HDFSInputTest.java     |   4 +-
 .../scala/org/apache/iotdb/tsfile/TSFileSuit.scala | 423 ++++++++++++++++++++-
 tsfile/pom.xml                                     |  18 +
 .../apache/iotdb/tsfile/common/cache/Cache.java    |   2 +-
 .../apache/iotdb/tsfile/common/cache/LRUCache.java |   2 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     | 220 +++++++++--
 .../iotdb/tsfile/common/conf/TSFileDescriptor.java |  50 ++-
 .../tsfile/common/constant/JsonFormatConstant.java |   2 +-
 .../tsfile/common/constant/QueryConstant.java      |   2 +-
 .../tsfile/common/constant/StatisticConstant.java  |   4 +-
 .../tsfile/common/constant/TsFileConstant.java     |   2 +-
 .../apache/iotdb/tsfile/compress/ICompressor.java  |   2 +-
 .../iotdb/tsfile/compress/IUnCompressor.java       |   2 +-
 .../tsfile/encoding/bitpacking/IntPacker.java      |   3 +-
 .../tsfile/encoding/bitpacking/LongPacker.java     |   3 +-
 .../tsfile/encoding/common/EncodingConfig.java     |   4 +-
 .../iotdb/tsfile/encoding/common/EndianType.java   |   4 +-
 .../tsfile/encoding/decoder/BitmapDecoder.java     |   2 +-
 .../iotdb/tsfile/encoding/decoder/Decoder.java     |   2 +-
 .../encoding/decoder/DeltaBinaryDecoder.java       |   3 +-
 .../encoding/decoder/DoublePrecisionDecoder.java   |   2 +-
 .../tsfile/encoding/decoder/FloatDecoder.java      |   2 +-
 .../tsfile/encoding/decoder/GorillaDecoder.java    |   2 +-
 .../tsfile/encoding/decoder/IntRleDecoder.java     |   2 +-
 .../tsfile/encoding/decoder/LongRleDecoder.java    |   2 +-
 .../tsfile/encoding/decoder/PlainDecoder.java      |   5 +-
 .../encoding/decoder/RegularDataDecoder.java       |   3 +-
 .../iotdb/tsfile/encoding/decoder/RleDecoder.java  |   2 +-
 .../encoding/decoder/SinglePrecisionDecoder.java   |   2 +-
 .../tsfile/encoding/encoder/BitmapEncoder.java     |   5 +-
 .../encoding/encoder/DeltaBinaryEncoder.java       |   4 +-
 .../encoding/encoder/DoublePrecisionEncoder.java   |   2 +-
 .../iotdb/tsfile/encoding/encoder/Encoder.java     |   4 +-
 .../tsfile/encoding/encoder/FloatEncoder.java      |   2 +-
 .../tsfile/encoding/encoder/GorillaEncoder.java    |   2 +-
 .../tsfile/encoding/encoder/IntRleEncoder.java     |   2 +-
 .../tsfile/encoding/encoder/LongRleEncoder.java    |   2 +-
 .../tsfile/encoding/encoder/PlainEncoder.java      |   2 +-
 .../encoding/encoder/RegularDataEncoder.java       |   4 +-
 .../iotdb/tsfile/encoding/encoder/RleEncoder.java  |   2 +-
 .../encoding/encoder/SinglePrecisionEncoder.java   |   2 +-
 .../tsfile/encoding/encoder/TSEncodingBuilder.java |  18 +-
 .../tsfile/exception/NotImplementedException.java  |   2 +-
 .../tsfile/exception/TsFileRuntimeException.java   |   4 +-
 .../tsfile/exception/cache/CacheException.java     |   2 +-
 .../CompressionTypeNotSupportedException.java      |   2 +-
 .../encoding/TsFileDecodingException.java          |   4 +-
 .../encoding/TsFileEncodingException.java          |   4 +-
 .../exception/filter/FilterDataTypeException.java  |  43 ---
 .../exception/filter/FilterInvokeException.java    |  42 --
 .../filter/QueryFilterOptimizationException.java   |   2 +-
 .../filter/UnSupportFilterDataTypeException.java   |   2 +-
 .../metadata/MetadataArgsErrorException.java       |  35 --
 .../write/InvalidJsonSchemaException.java          |  34 --
 .../exception/write/NoMeasurementException.java    |   2 +-
 .../tsfile/exception/write/PageException.java      |   2 +-
 .../write/TsFileNotCompleteException.java          |   2 +-
 .../write/UnSupportedDataTypeException.java        |   2 +-
 .../write/UnknownColumnTypeException.java          |   4 +-
 .../exception/write/WriteProcessException.java     |   4 +-
 .../org/apache/iotdb/tsfile/file/MetaMarker.java   |   2 +-
 .../iotdb/tsfile/file/footer/ChunkGroupFooter.java |   4 +-
 .../iotdb/tsfile/file/header/ChunkHeader.java      |   9 +-
 .../iotdb/tsfile/file/header/PageHeader.java       |   2 +-
 .../iotdb/tsfile/file/header/package-info.java     |   2 +-
 .../tsfile/file/metadata/ChunkGroupMetaData.java   |  15 +-
 .../iotdb/tsfile/file/metadata/ChunkMetaData.java  |  10 +-
 .../tsfile/file/metadata/TsDeviceMetadata.java     |   2 +-
 .../file/metadata/TsDeviceMetadataIndex.java       |   2 +-
 .../iotdb/tsfile/file/metadata/TsDigest.java       |   2 +-
 .../file/metadata/enums/CompressionType.java       |   2 +-
 .../tsfile/file/metadata/enums/TSDataType.java     |   2 +-
 .../tsfile/file/metadata/enums/TSEncoding.java     |   2 +-
 .../tsfile/file/metadata/enums/TSFreqType.java     |   2 +-
 .../file/metadata/statistics/BinaryStatistics.java |   4 +-
 .../metadata/statistics/BooleanStatistics.java     |   4 +-
 .../file/metadata/statistics/DoubleStatistics.java |   4 +-
 .../file/metadata/statistics/FloatStatistics.java  |   4 +-
 .../metadata/statistics/IntegerStatistics.java     |   4 +-
 .../file/metadata/statistics/LongStatistics.java   |   4 +-
 .../file/metadata/statistics/NoStatistics.java     |   4 +-
 .../file/metadata/statistics/Statistics.java       |   4 +-
 .../statistics/StatisticsClassException.java       |   2 +-
 .../apache/iotdb/tsfile}/fileSystem/FSType.java    |   2 +-
 .../iotdb/tsfile/fileSystem/FileInputFactory.java  |  51 +++
 .../iotdb/tsfile/fileSystem/FileOutputFactory.java |  50 +++
 .../apache/iotdb/tsfile/fileSystem/HDFSFile.java   | 372 ++++++++++++++++++
 .../apache/iotdb/tsfile/fileSystem}/HDFSInput.java |  15 +-
 .../iotdb/tsfile/fileSystem}/HDFSOutput.java       |  47 ++-
 .../iotdb/tsfile/fileSystem/TSFileFactory.java     | 201 ++++++++++
 .../org/apache/iotdb/tsfile/read/IDataReader.java  |   2 +-
 .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java   |   2 +-
 .../iotdb/tsfile/read/TsFileCheckStatus.java       |   2 +-
 .../iotdb/tsfile/read/TsFileRestorableReader.java  |   7 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  56 +--
 .../iotdb/tsfile/read/UnClosedTsFileReader.java    |   2 +-
 .../apache/iotdb/tsfile/read/common/BatchData.java |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Field.java |   2 +-
 .../org/apache/iotdb/tsfile/read/common/Path.java  |   7 +-
 .../apache/iotdb/tsfile/read/common/RowRecord.java |   2 +-
 .../apache/iotdb/tsfile/read/common/TimeRange.java |   4 +-
 .../tsfile/read/controller/ChunkLoaderImpl.java    |   2 +-
 .../iotdb/tsfile/read/controller/IChunkLoader.java |   2 +-
 .../tsfile/read/controller/IMetadataQuerier.java   |   2 +-
 .../read/controller/MetadataQuerierByFileImpl.java |   2 +-
 .../tsfile/read/expression/ExpressionType.java     |   2 +-
 .../tsfile/read/expression/IBinaryExpression.java  |   5 +-
 .../iotdb/tsfile/read/expression/IExpression.java  |   2 +-
 .../tsfile/read/expression/IUnaryExpression.java   |   2 +-
 .../tsfile/read/expression/QueryExpression.java    |   2 +-
 .../read/expression/impl/BinaryExpression.java     |   2 +-
 .../read/expression/impl/GlobalTimeExpression.java |   2 +-
 .../expression/impl/SingleSeriesExpression.java    |   2 +-
 .../read/expression/util/ExpressionOptimizer.java  |   2 +-
 .../read/expression/util/ExpressionPrinter.java    |   2 +-
 .../iotdb/tsfile/read/filter/DigestForFilter.java  |   2 +-
 .../iotdb/tsfile/read/filter/TimeFilter.java       |   2 +-
 .../iotdb/tsfile/read/filter/ValueFilter.java      |   2 +-
 .../tsfile/read/filter/basic/BinaryFilter.java     |   2 +-
 .../iotdb/tsfile/read/filter/basic/Filter.java     |   2 +-
 .../tsfile/read/filter/basic/UnaryFilter.java      |   3 +-
 .../tsfile/read/filter/factory/FilterFactory.java  |   2 +-
 .../tsfile/read/filter/factory/FilterType.java     |   2 +-
 .../tsfile/read/filter/operator/AndFilter.java     |   2 +-
 .../iotdb/tsfile/read/filter/operator/Eq.java      |   2 +-
 .../iotdb/tsfile/read/filter/operator/Gt.java      |   2 +-
 .../iotdb/tsfile/read/filter/operator/GtEq.java    |   2 +-
 .../iotdb/tsfile/read/filter/operator/Lt.java      |   2 +-
 .../iotdb/tsfile/read/filter/operator/LtEq.java    |   2 +-
 .../iotdb/tsfile/read/filter/operator/NotEq.java   |   2 +-
 .../tsfile/read/filter/operator/NotFilter.java     |   2 +-
 .../tsfile/read/filter/operator/OrFilter.java      |   2 +-
 .../query/dataset/DataSetWithTimeGenerator.java    |   2 +-
 .../query/dataset/DataSetWithoutTimeGenerator.java |   2 +-
 .../tsfile/read/query/dataset/QueryDataSet.java    |   2 +-
 .../query/executor/ExecutorWithTimeGenerator.java  |   2 +-
 .../tsfile/read/query/executor/QueryExecutor.java  |   2 +-
 .../tsfile/read/query/executor/TsFileExecutor.java |   2 +-
 .../read/query/timegenerator/TimeGenerator.java    |   2 +-
 .../query/timegenerator/TimeGeneratorImpl.java     |   2 +-
 .../read/query/timegenerator/node/AndNode.java     |   2 +-
 .../read/query/timegenerator/node/LeafNode.java    |   2 +-
 .../tsfile/read/query/timegenerator/node/Node.java |   2 +-
 .../read/query/timegenerator/node/NodeType.java    |   4 +-
 .../read/query/timegenerator/node/OrNode.java      |   2 +-
 .../tsfile/read/reader/DefaultTsFileInput.java     |   2 +-
 .../iotdb/tsfile/read/reader/TsFileInput.java      |   2 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |   5 +-
 .../read/reader/chunk/ChunkReaderByTimestamp.java  |   2 +-
 .../read/reader/chunk/ChunkReaderWithFilter.java   |   2 +-
 .../reader/chunk/ChunkReaderWithoutFilter.java     |   2 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   2 +-
 .../read/reader/series/EmptyFileSeriesReader.java  |   2 +-
 .../read/reader/series/FileSeriesReader.java       |   2 +-
 .../reader/series/FileSeriesReaderByTimestamp.java |   2 +-
 .../reader/series/FileSeriesReaderWithFilter.java  |   2 +-
 .../series/FileSeriesReaderWithoutFilter.java      |   2 +-
 .../java/org/apache/iotdb/tsfile/utils/Binary.java |  14 +-
 .../org/apache/iotdb/tsfile/utils/BytesUtils.java  |  16 +-
 .../java/org/apache/iotdb/tsfile/utils/Loader.java |   2 +-
 .../java/org/apache/iotdb/tsfile/utils/Pair.java   |   3 +-
 .../org/apache/iotdb/tsfile/utils/PublicBAOS.java  |   2 +-
 .../tsfile/utils/ReadWriteForEncodingUtils.java    |   2 +-
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |   4 +-
 .../apache/iotdb/tsfile/utils/StringContainer.java |   4 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |  24 +-
 .../iotdb/tsfile/write/chunk/ChunkBuffer.java      |  21 +-
 .../tsfile/write/chunk/ChunkGroupWriterImpl.java   |   9 +-
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |  34 +-
 .../tsfile/write/chunk/IChunkGroupWriter.java      |   7 +-
 .../iotdb/tsfile/write/chunk/IChunkWriter.java     |   4 +-
 .../apache/iotdb/tsfile/write/page/PageWriter.java |   4 +-
 .../apache/iotdb/tsfile/write/record/RowBatch.java |   8 +-
 .../apache/iotdb/tsfile/write/record/TSRecord.java |   7 +-
 .../write/record/datapoint/BooleanDataPoint.java   |   3 +-
 .../tsfile/write/record/datapoint/DataPoint.java   |   9 +-
 .../write/record/datapoint/DoubleDataPoint.java    |   3 +-
 .../write/record/datapoint/FloatDataPoint.java     |   3 +-
 .../write/record/datapoint/IntDataPoint.java       |   3 +-
 .../write/record/datapoint/LongDataPoint.java      |   3 +-
 .../write/record/datapoint/StringDataPoint.java    |   3 +-
 .../tsfile/write/schema/MeasurementSchema.java     |  11 +-
 .../apache/iotdb/tsfile/write/schema/Schema.java   |   2 +-
 .../iotdb/tsfile/write/schema/SchemaBuilder.java   |   2 +-
 .../tsfile/write/writer/DefaultTsFileOutput.java   |   2 +-
 .../write/writer/ForceAppendTsFileWriter.java      |   2 +-
 .../iotdb/tsfile/write/writer/IDataWriter.java     |   2 +-
 .../write/writer/RestorableTsFileIOWriter.java     |   5 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  |  29 +-
 .../iotdb/tsfile/write/writer/TsFileOutput.java    |   2 +-
 .../apache/iotdb/tsfile/common/LRUCacheTest.java   |   2 +-
 .../apache/iotdb/tsfile/compress/CompressTest.java |   7 +-
 .../apache/iotdb/tsfile/compress/SnappyTest.java   |   5 +-
 .../tsfile/constant/TimeseriesTestConstant.java    |   5 +-
 .../tsfile/encoding/bitpacking/IntPackerTest.java  |   2 +-
 .../tsfile/encoding/bitpacking/LongPackerTest.java |   2 +-
 .../tsfile/encoding/decoder/BitmapDecoderTest.java |   2 +-
 .../tsfile/encoding/decoder/FloatDecoderTest.java  |   2 +-
 .../encoding/decoder/GorillaDecoderTest.java       |   2 +-
 .../tsfile/encoding/decoder/IntRleDecoderTest.java |   2 +-
 .../encoding/decoder/LongRleDecoderTest.java       |   2 +-
 .../delta/DeltaBinaryEncoderIntegerTest.java       |   2 +-
 .../decoder/delta/DeltaBinaryEncoderLongTest.java  |   2 +-
 .../regular/RegularDataEncoderIntegerTest.java     |   2 +-
 .../regular/RegularDataEncoderLongTest.java        |   2 +-
 .../file/metadata/ChunkGroupMetaDataTest.java      |   2 +-
 .../tsfile/file/metadata/ChunkMetaDataTest.java    |   2 +-
 .../file/metadata/TimeSeriesMetadataTest.java      |   2 +-
 .../file/metadata/TsDeviceMetadataIndexTest.java   |   2 +-
 .../tsfile/file/metadata/TsDeviceMetadataTest.java |   2 +-
 .../tsfile/file/metadata/TsFileMetaDataTest.java   |   2 +-
 .../metadata/statistics/BooleanStatisticsTest.java |   5 +-
 .../metadata/statistics/DoubleStatisticsTest.java  |   2 +-
 .../metadata/statistics/FloatStatisticsTest.java   |   2 +-
 .../metadata/statistics/IntegerStatisticsTest.java |   2 +-
 .../metadata/statistics/LongStatisticsTest.java    |   2 +-
 .../metadata/statistics/StringStatisticsTest.java  |   2 +-
 .../tsfile/file/metadata/utils/TestHelper.java     |   2 +-
 .../iotdb/tsfile/file/metadata/utils/Utils.java    |   2 +-
 .../iotdb/tsfile/read/ReadInPartitionTest.java     |   2 +-
 .../iotdb/tsfile/read/ReadOnlyTsFileTest.java      |   6 +-
 .../org/apache/iotdb/tsfile/read/ReadTest.java     |   2 +-
 .../iotdb/tsfile/read/TimePlainEncodeReadTest.java |   4 +-
 .../tsfile/read/TsFileRestorableReaderTest.java    |  10 +-
 .../apache/iotdb/tsfile/read/common/PathTest.java  |   2 +-
 .../iotdb/tsfile/read/common/TimeRangeTest.java    |   2 +-
 .../tsfile/read/controller/ChunkLoaderTest.java    |   2 +-
 .../controller/IMetadataQuerierByFileImplTest.java |   2 +-
 .../iotdb/tsfile/read/filter/DigestFilterTest.java |   2 +-
 .../read/filter/IExpressionOptimizerTest.java      |   2 +-
 .../read/filter/MinTimeMaxTimeFilterTest.java      |   2 +-
 .../iotdb/tsfile/read/filter/OperatorTest.java     |   2 +-
 .../read/query/executor/QueryExecutorTest.java     |   4 +-
 .../tsfile/read/query/timegenerator/NodeTest.java  |   2 +-
 .../query/timegenerator/ReaderByTimestampTest.java |   4 +-
 .../query/timegenerator/TimeGeneratorTest.java     |   4 +-
 .../TsFileGeneratorForSeriesReaderByTimestamp.java |  20 +-
 .../iotdb/tsfile/read/reader/PageReaderTest.java   |   2 +-
 .../iotdb/tsfile/read/reader/ReaderTest.java       |   4 +-
 .../apache/iotdb/tsfile/utils/BytesUtilsTest.java  |   2 +-
 .../iotdb/tsfile/utils/CommonTestConstant.java     |   5 +-
 .../apache/iotdb/tsfile/utils/FileGenerator.java   |  17 +-
 .../org/apache/iotdb/tsfile/utils/FileUtils.java   |   7 +-
 .../apache/iotdb/tsfile/utils/FileUtilsTest.java   |   5 +-
 .../iotdb/tsfile/utils/IncompleteFileTestUtil.java |  61 ---
 .../org/apache/iotdb/tsfile/utils/PairTest.java    |   2 +-
 .../tsfile/utils/ReadWriteStreamUtilsTest.java     |   2 +-
 .../tsfile/utils/ReadWriteToBytesUtilsTest.java    |   2 +-
 .../org/apache/iotdb/tsfile/utils/RecordUtils.java |   2 +-
 .../apache/iotdb/tsfile/utils/RecordUtilsTest.java |  19 +-
 .../iotdb/tsfile/utils/StringContainerTest.java    |   7 +-
 .../iotdb/tsfile/utils/TsFileGeneratorForTest.java |  48 ++-
 .../org/apache/iotdb/tsfile/write/PerfTest.java    |  13 +-
 .../iotdb/tsfile/write/ReadPageInMemTest.java      |  38 +-
 .../iotdb/tsfile/write/TsFileIOWriterTest.java     |   2 +-
 .../iotdb/tsfile/write/TsFileReadWriteTest.java    |   7 +-
 .../org/apache/iotdb/tsfile/write/WriteTest.java   |  20 +-
 .../write/schema/converter/SchemaBuilderTest.java  |   5 +-
 .../iotdb/tsfile/write/series/PageWriterTest.java  |   2 +-
 .../write/writer/RestorableTsFileIOWriterTest.java |  39 +-
 891 files changed, 11514 insertions(+), 5793 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 docs/{Documentation/UserGuide/9-Tools-Hadoop.md => Documentation-CHN/UserGuide/9-System Tools/3-JMX Tool.md} (60%)
 copy docs/Documentation-CHN/UserGuide/{9-Tools-spark.md => 9-Tools-spark-iotdb.md} (100%)
 rename docs/Documentation-CHN/UserGuide/{9-Tools-spark.md => 9-Tools-spark-tsfile.md} (100%)
 copy docs/Documentation/UserGuide/{9-Tools-Hadoop.md => 9-System Tools/3-JMX Tool.md} (56%)
 create mode 100644 docs/Documentation/UserGuide/9-Tools-spark-iotdb.md
 rename docs/Documentation/UserGuide/{9-Tools-spark.md => 9-Tools-spark-tsfile.md} (100%)
 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%)
 create mode 100644 example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSketchTool.java
 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%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/fileSystem/HdfsFile.java
 rename server/src/main/java/org/apache/iotdb/db/engine/fileSystem/{FileFactory.java => SystemFileFactory.java} (59%)
 rename server/src/main/java/org/apache/iotdb/db/query/aggregation/impl/{MeanAggrFunc.java => AvgAggrFunc.java} (96%)
 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} (51%)
 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/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
 rename service-rpc/src/main/java/org/apache/iotdb/rpc/{TSStatusType.java => TSStatusCode.java} (95%)
 create mode 100644 session/src/main/java/org/apache/iotdb/session/SessionDataSet.java
 create mode 100644 session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java
 copy {server/src/test/java/org/apache/iotdb/db => session/src/test/java/org/apache/iotdb/session}/utils/EnvironmentUtils.java (96%)
 create mode 100644 spark-iotdb-connector/Readme.md
 copy {spark-tsfile => spark-iotdb-connector}/pom.xml (82%)
 copy spark-tsfile/src/main/java/org/apache/iotdb/tsfile/qp/exception/RemoveNotException.java => spark-iotdb-connector/src/main/java/org/apache/iotdb/sparkdb/SQLConstant.java (71%)
 mode change 100755 => 100644
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/Converter.scala
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/DefaultSource.scala
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBOptions.scala
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRDD.scala
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/IoTDBRelation.scala
 copy {spark-tsfile/src/main/scala/org/apache/iotdb/tsfile => spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb}/Transformer.scala (86%)
 create mode 100644 spark-iotdb-connector/src/main/scala/org/apache/iotdb/sparkdb/package.scala
 copy {server/src/test/java/org/apache/iotdb/db/utils => spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb}/EnvironmentUtils.java (64%)
 create mode 100644 spark-iotdb-connector/src/test/scala/org/apache/iotdb/sparkdb/IoTDBTest.scala
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java
 rename {server/src/main/java/org/apache/iotdb/db/engine => tsfile/src/main/java/org/apache/iotdb/tsfile}/fileSystem/FSType.java (94%)
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FileInputFactory.java
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/FileOutputFactory.java
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/HDFSFile.java
 rename {spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io => tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem}/HDFSInput.java (93%)
 rename {spark-tsfile/src/main/java/org/apache/iotdb/tsfile/io => tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem}/HDFSOutput.java (62%)
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/TSFileFactory.java
 delete mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/utils/IncompleteFileTestUtil.java