This is an automated email from the ASF dual-hosted git repository.

suyue pushed a change to branch external_sort
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from d8939e1  ReDesign External Sort
     add fc44f1a  modify pr reviews
     add 263eb29  add merge framework
     add da82e76  fill merge framework until file merge stage refactor 
FileReaderManager to support merge query lock add mergeQueryLock in 
TsFileResource add ForceAppendTsFileWriter to support appending closed TsFile 
add MergeFileSelector add MergeException
     add ad82c80  add merge recovery
     add dae5889  add merge in StorageGroupProcessor and StorageEngine
     add 23b6ad8  add merge recovery in system reboot
     add f309df8  sort chunks by startTime when doing a query
     add 992ec37  fix fields' accesses
     add 71baff1  add timed merge
     add d47cfa5  add merge configs
     add fe92a6e  refactor merging memory estimation: consider metadata in 
FileWriter
     add ca9e047  add more logs
     add 4eca66e  Merge branch 'master' into dev_merge
     add ca82fbe  refactor memory cost computation : tightening read memory 
consumption in seqFiles add some tests use file metadata to collect series in a 
file
     add 1aefa0c  refactor memory cost computation : tightening read memory 
consumption in seqFiles add some tests use file metadata to collect series in a 
file
     add be0c809  sort paths in merge add MergeLogTest
     add d1a5949  fix an incomplete log
     add 83fce5c  do not start TImedMergeThread until StorageEngine is recovered
     add 7d3f076  add more test
     add 9f5fa74  add full merge
     add 0e2b10d  add mergeChunkNumberThreshold
     add dc87568  optimize MergeFileSelector fix improper test inheritance
     add 855675f  fix unclosed file in test
     add 354d637  add merge statistics
     add 80ba624  fix statistic time unit
     add 83a9501  refactor package structure
     add b5b7400  refactor RecoverMergeTask
     add 06eef43  Merge branch 'master' into dev_merge
     add 651f189  remove unused begin query
     add a301d7b  add documentation and code refinements
     add 03483d7  Merge branch 'master' into dev_merge
     add b80fa8c  fix an unclosed reader when moving merged data to seqFiles
     add cc88f7d  close old file reader before replace it
     add 30b0f6e  Merge branch 'master' into dev_merge
     add 8fccbee  fix a call to FileReaderManager.get()
     add e35525c  fix merge statistic unit
     add 7e05549  add whole chunk write interface
     add 33c6056  use lower log frequency
     add bec56b7  fix a NPE in merge recovery
     add 49132a6  clean some imports
     add 9e6b1d6  flip string equals to avoid NPE
     add 7262303  add logs in merge recovery
     add b9d9231  add more logs in merge recovery
     add ca54d43  fix that TsFileResource is not properly deserialized during 
start-up
     add 497c81b  refactor file recovery order
     add 67f5f0f  fix TsFileResource deserialize condition
     add 8a78113  fix name of RecoverMergeTask
     add c6362f1  change default value of continue merge to false
     add e24236d  fix an NPE in SGP during recovery
     add dc5c336  add encoding in test config
     add df3c17a  remove random in perftest
     add 03558d6  optimize PlainEncoder
     add 763d0a2  unify endian type to big
     add d4dd3e8  add documents reduce unneeded parameters
     add 8cd144f  Merge branch 'master' into dev_merge
     add 4baa36e  fix an NPE when closing mergeLogger
     add 7062470  code refinement remove usage of MetadataQuerier in merge
     add c4ed1fa  add MergeContext to reduce the parameter number
     add aee1484  add MergeMultiChunkTask
     add 9106a36  remove MergeChunkTask
     add 3048785  add Path comparator
     add 6a59eca  add MaxMergeFileStrategy allow merging multiple series at the 
same time
     add 8781806  add MaxSeriesMergeFileSelectorTest
     add 5933e04  clean MergePerfTest
     add 4853bbb  fix chunks may not be deleted during merge
     add a426228  Merge branch 'master' into dev_merge
     add d88cd83  fix unupdated device min time
     add 26578c8  fix an NPE in updating device min time
     add b170a0b  fix an unchecked batchData length
     add d4b5057  clean unused imports
     add 633d6ed  Merge branch 'master' into dev_merge
     add 0a7bcbb  use reader cache in MergeResource to construct MergeReader
     add 6dd1815  change the order of reading unseq chunks
     add aade076  fix according to review
     add e5e6cbb  clean an import
     add 43af5fe  Merge branch 'master' into dev_merge
     add a604b33  change the order of reading seq chunks
     add d1795ef  add MergePathSelector
     add 0e7977d  Merge branch 'master' into dev_merge
     add 0237a67  optimize PrioritiMergeReader
     add 7cd4fbb  use comparator instead of comparable
     add 2a10126  optimize PriorityMergeReader
     add 026c296  remove unnecessary condition
     add 5138aa5  enhance encapsulation of PriorityMergeReader
     add 967e4e9  fix unupdated minTime
     add 6d0ed15  fix PriorityMergeReader
     add 65f9426  improve resource control in tests
     add 81c4b30  add CachedPriorityMergeReader
     add 5855477  Merge branch 'master' into dev_merge
     add 155cec3  fix incompatible interfaces
     add 74fda42  fix improper hasNext() next() usages fix unregistered 
measurementSchema
     add a8153b0  use buffered stream in DefaultTsFileOutput
     add 5b33de9  fix test and improper hashcode in measurementSchema
     add 762f47d  fix maxTotalCost is not correctly set in 
MaxSeriesMergeFileSelector
     add c5f486d  improve var naming
     add 53e7890  fix parameter
     add 59e473b  fix missing license
     add e15edca  fix CachedDiskChunkReader
     add 17b36c6  fix registering order and pool termination
     add 4d24f9c  reverse register order
     add a17a737  clean imports
     add a6603c6  [IOTDB-152]return data type in TSExecuteStatementResp (#294)
     add 4ac6d7e  [IOTDB-153]further limit fetchSize to speed up LIMIT&OFFSET 
query (#302)
     add 8129f8c  remove unuseful package.sh and fix a url in pom.xml.
     add e2e0251  Add maven package
     add e2e5a84  Merge pull request #304 from Genius-pig/master
     add c56fc48  Split the LICENSE and NOTICE as source-release version and 
binary-release version (#300)
     add 7557d3e  update version to 0.9.0-SNAPSHOT
     add 1ef5bfe  Merge pull request #309 from apache/cherry_pick_rel0.8
     add f9e18ca  Merge branch 'master' into dev_merge
     add e1ac2a0  fix recovery when a TsFile contains head magic string only
     add 54025c8  reduce a log level
     add 20eb6a8  add excludes in rat plugin of pom
     add 0403bfa  modify pom and git ignore
     add f179e07  Merge branch 'master' into dev_merge
     add 4f09b76  add a test
     add 604b1e3  clean import
     add d72ce6a  recover TsFileResource from TsFileSequenceReader when it is 
broken
     add 1eb3823  add a log of concurrent merge num
     add 403fbd1  clear resource caches after merge files are selected.
     add 693bb80  add merge ptRate
     add 85785cc  fix semicolon
     add e4b8f0b  Changed artefactId and incubating in release artefact.
     add 82706a3  Changed parent pom name. Delted build module and moved 
"binary" build to parent pom.
     add 4a489cc  Fixed assembly plugin. Added sha512 code for binary package. 
Changed version to 0.8.0-SNAPSHOT.
     add e3f6b2c  [maven-release-plugin] prepare release release/0.8.0
     add 5b03d26  [maven-release-plugin] prepare for next development iteration
     add 8872de2  fix readme bug
     add 6b2bf22  change version to 0.9.0-SNAPSHOT
     add af66931  Merge pull request #315 from apache/cherry_pick_rel0.8
     add 6a68a5b  Added a note on spark-tsfile documentation to indicate the 
potential incompatiblity between openjdk and scala
     add 50f935a  Update dockerfile to only compile server and client
     add d6f0ffc  Merge pull request #316 from apache/cherry_pick_rel0.8
     add 1e3dd4b  modify antlr3 to support timeseries path in number format
     add a4e1a7f  add support for special float format, eg 2., .3 and .3e2
     add 4660802  add show dynamic parameters
     add 829f517  support manage dynamic parameters via jmx
     add ea92189  Merge pull request #317 from apache/add_show_dyna_para
     add 8e7f521  add log to show dynamic parameters after updating compression 
ratio
     add 35ab2d9  Only fix documents, not to fix readme.md
     add d3f8983  update copyright of MIT, BSD licenses
     add 215d725  modify print function in AbstractClient
     add 8032fc2  Merge pull request #322 from LeiRui/betterDisplay
     add 41dd716  Fixed the year in the notice
     add e840f47  Fixed patent number
     add c18492c  Deleted 'SNAPSHOTS' in markdown docs
     add 26f19b1  use latest binary file to build the docker image (#312)
     add a3db254  change dockerfile to build from the master branch
     add 4ecb6c7  fix copyright about the year, remove code declaration about 
hive and mavenWrapper
     add 8ccf006  Merge pull request #329 from 
apache/feature/fix-binary-distribution
     add 5af8132  Fixed build due to bad cherry-pick
     add 0bb054a  fixed documents again
     add eef4f0a  fix link problem
     add 9b35595  -     Nothing is built outside the target directory anymore o 
I moved the static parts of the client and server distributions to 
“src/assembly/resources” and added an assembly that builds the client and 
server inside the target directory (You need to update the documentation on 
this) o        The sever is now available at 
server/target/iotdb-server-0.9.0-SNAPSHOT o       The client is now available 
at client/target/iotdb-client-0.9.0-SNAPSHOT o      I updated the integration 
tests to work wit [...]
     add bbb8b4b  Merge pull request #332 from 
apache/feature/clean-up-maven-build
     add 2e305ad  add private executeQueryStatement
     add a0e51c9  Update documents according to #332 (#333)
     add 09a1bf5  Merge branch 'master' into dev_merge
     add 187a9ff  fix config: MergeThreadNum
     add 4909de9  remove unused merge_concurrent_threads
     add 59dff51  fix and simplify MergeLogger
     add d2703b8  fix LogAnalyzer array index
     add 0afca42  add timings of LogAnalyzer
     add 0bfb4d0  log timeseries to be merged before merge refactor LogAnalyzer
     add 666bba9  use concuurent MergeMultiChunkTask
     add d41d4ab  do not cache metadata until the file selection is done
     add 524b908  add file selection time budget
     add 9806289  fix negative array index
     add d66d387  fix File memory measurement
     add d0c2b8e  fix LogAnalyzer
     add 040ed6a  set default merge chunk sub thread num to 4
     add 2170da2  fix perfTest
     add 3f8d716  get paths to be merged from MManager to avoid non-existing 
paths.
     add d9f9c76  fix a typo
     add d3758b0  change merge chunk logic and add some comments
     add bb4961f  remove unnecessary usage of hash measurement
     add 7a23ef2  fix by review comment
     add 0f2e52d  Merge branch 'dev_merge' of github.com:apache/incubator-iotdb 
into dev_merge
     add 8014e8c  fix by review comment
     add d075465  fix readme (#335)
     add 2d4cfba  Merge branch 'master' into dev_merge
     add ade0eb7  add filename to replace args[0]
     add 61609e4  code formatting.
     add 123ceb4  Merge pull request #340 from yx-zhang/fix_example
     add 920a362  [IOTDB-13]Support batched ingestion
     add 521be40  Add documentation for RowBatch
     add 10d1f54  Merge pull request #331 from 
jack870131/support_batched_ingestion
     add d5280c5  merge master
     add f94d421  increase configuration parameters of cache
     add 5e865b8  modify pr reviews
     add 2028c1b  Merge pull request #341 from apache/add_cache_configuration
     add ac465f4  fix start-walchecker scripts for leting user define the wal 
folder
     add 21bd10c  add jmx interface for getting the active and pending tasks in 
FlushManager
     add f40c076  add Apache header on FlushManagerMBean.java
     add 3311fa0  deregister FlushManager MBean when stop
     add f5c0dce  merge two homogeneous interfaces (getNumberOfWorkingTasks() 
of FlushTask Pool)
     add bdd129a  delete duplicated function
     add f718837  Merge pull request #319 from 
apache/feature_add_flush_queue_jmx_interface
     add a83f7f3  add -e option for iotdb client
     add 0c5243f  fix apache license
     add b573ba0  fix UT for unix
     add 1a92040  fix apache license
     add 1e09a2a  Merge branch 'master' of 
https://github.com/apache/incubator-iotdb
     add 94bca89  Merge branch 'master' of 
https://github.com/apache/incubator-iotdb
     add 9767bd2  Merge branch 'master' of 
https://github.com/apache/incubator-iotdb
     add 4f1a928  Merge branch 'master' of 
https://github.com/apache/incubator-iotdb
     add 4d8991a  complete the doc for client -e parameter
     add 2cc202e  complete doc for Cli/Shell -e parameter
     add 94eac46  fix apache license
     add 1c83237  Merge pull request #301 from EJTTianYu/master
     add 0e94676  Merge branch 'master' of github.com:apache/incubator-iotdb 
into dev_merge
     add fdc8d28  implement rpc compression (#323)
     add fc03f2d  Fix bugs in RowBatch
     add 1077647  Merge pull request #344 from 
jack870131/support_batched_ingestion
     add 26ffc58  code optimization.
     add 821a3b2  fix IOTDB-168 and 169
     add 64376f1  Merge pull request #1 from apache/master
     add 9c59ec4  move "tsfile/examle" to "example/tsfile" and fix 
'example/tsfile/TsFileRead.java'
     add 6101b8a  update 2-Usage.md and pox.xml of module example/tsfile
     add 2e03a2a  add license to pom.xml of example/tsfile
     add ec4f051  Merge pull request #346 from yx-zhang/fix-example
     add 8bb9b31  Merge branch 'master' into dev_merge
     add 0d39fcd  fix bug about TsFileResource updateTime
     add a2d6f42  also fix replayInsert in LogReplayer; modify unit tests
     add 1a09243  Update TsFileResource.java
     add 53bda62  Remove unnecessary dependencies.
     add f4df6e3  add max concurrent client number
     add e6ba4da  formatting code
     add 719e87e  Merge pull request #353 from yx-zhang/configMaxCon
     add ceaa9b1  add batch rpc interface
     add e31d4f5  fix write too many times bug
     add f0fb8c2  merge master to resolve conflict
     add 4281082  fix columns to rows
     add f9a1ab8  add license and change private to public
     add a098310  fix reviews
     add 22bab90  add license in BatchInsertPlan
     add eb0935f  change data value list in rpc to bytes
     add 32902bf  add array-parametered interfaces
     add 9a872e7  Merge remote-tracking branch 'origin/rpc_client' into 
rpc_client
     add 965e72d  change time-value in rpc to bytes
     add 69f211f  fix test bug
     add e7ea34d  rename Client to Cli and Session to Client
     add 895c9ba  fix when batch is not full, time serialize overflow buffer 
size bug
     add c9d040c  remove IoTDBDataType in rpc, use int32 instead
     add 5b1a318  add session module and rename cli to client
     add 0777569  fix windows echo cli to client
     add ca45800  make session module depend on service-rpc instead of jdbc
     add 553055d  fix putsInts in IntTVList
     add 6320a45  add license
     add dd879eb  fix IT test, IoTDBRPCException -> IoTDBSQLException, default 
user/password
     add 7714ec4  fix session example caught exception
     add 6ce1f41  Merge pull request #351 from apache/rpc_client
     add 064523e  rename FileSchema to Schema
     add de927f4  bring modules in pom.xml under root folder forward
     add f022d10  Merge pull request #354 from apache/fix_schema_name
     add 84451ac  Remove unnecessary code and simplify assertEquals to 
assertFalse or assertTrue.
     add 35ae1c3  Merge pull request #355 from Genius-pig/master
     add d9e821e  add jdbc dependency in session example
     add 4a074cd  add a tool to print tsfileResources (each device's start and 
end time)
     add d8ad79d  remove wal check in  print-tsfile-resource-files scripts
     add fcddd51  Merge pull request #342 from apache/tool_print_tsfileSource
     add d1428ba  Merge branch 'master' into dev_merge
     add f9a1d1e  change exception message
     add b92e5df  Merge pull request #356 from apache/f_change_exception_message
     add 8827bdf  [IOTDB-161] Add ErrorCode of different response errors (#350)
     add 177f5b2  change String key of statistics map in TsDigest to enum type 
to decrease IO num
     add f87ac42  Merge branch 'master' into TsDigestEnumKey
     add 1337fda  change TsDigest.statistics from map to array, also improve 
boundary logic and modify docs
     add 1c0cfcd  Merge remote-tracking branch 'origin2/master' into 
TsDigestEnumKey
     add a9ac318  polish codes and docs about TsDigest
     add d346073  Merge pull request #326 from LeiRui/TsDigestEnumKey
     add ea6daf1  Merge branch 'master' into dev_merge
     add bfbccbe  [IOTDB-179] Add create matadata interfaces to Session (#357)
     add 349cdfe  Merge branch 'master' into dev_merge
     add f8d0902  Merge pull request #258 from apache/dev_merge
     add af9786c  fix travis
     add e07870d  fix travis (#358)
     add 9423961  Merge branch 'master' of github.com:apache/incubator-iotdb
     add 9ff28b1  Fix readme/docs and add changelist (#359)
     add cbcd31e  Merge branch 'master' of github.com:apache/incubator-iotdb
     add 18ae6c7  F fix create tsrpc lack compressor (#361)
     add ce20881  Merge branch 'master' of github.com:apache/incubator-iotdb
     add 32137ff  max open file num
     add f0e8b6b  remove unused parameter merge_concurrent_thread
     add e636c51  Merge pull request #363 from apache/add_max_open_file
     add 89b8cbe  add assembly plugin in session module
     add dfb76af  Change maven to 3.1
     add a9e0166  Merge pull request #364 from Genius-pig/master
     add 2e36f61  [IOTDB-183] Split Development pages and update rpc changelist
     add 08bb5a7  update rpc changelist
     add b5b2873  Add mvn clean compile step
     add 6c4e432  Merge pull request #360 from samperson1997/split_development
     add b3b7417  add insertRow interface
     add 8656e1f  format insertRow in rpc.thrift
     add aa029b3  Merge pull request #367 from apache/session_insert
     add 9065c5d  add set max open files to preliminaries
     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 db3bb2c  change maven version in travis from 3.6.1 to 3.6.2 (#369)
     add 33aedd1  avoid reopen session (#373)
     add 7749841  merge master

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |  27 +-
 .mvn/wrapper/MavenWrapperDownloader.java           |  18 -
 .mvn/wrapper/maven-wrapper.properties              |  19 -
 .travis.yml                                        |  49 +-
 DISCLAIMER                                         |   6 +
 License => LICENSE                                 |  84 +---
 License => LICENSE-binary                          |  24 -
 NOTICE                                             | 539 +-------------------
 NOTICE-binary                                      |  26 +
 README.md                                          | 257 +++-------
 RELEASE_NOTES.md                                   |   4 +-
 client/pom.xml                                     |  66 +--
 .../src/assembly/client.xml                        |  20 +-
 .../assembly/resources}/sbin/start-client.bat      |   2 +-
 .../assembly/resources}/sbin/start-client.sh       |   6 +-
 .../assembly/resources}/tools/export-csv.bat       |   2 +-
 .../assembly/resources}/tools/export-csv.sh        |   2 +-
 .../assembly/resources}/tools/import-csv.bat       |   2 +-
 .../assembly/resources}/tools/import-csv.sh        |   2 +-
 .../iotdb/{cli => }/client/AbstractClient.java     | 239 +++++----
 .../org/apache/iotdb/{cli => }/client/Client.java  |  29 +-
 .../apache/iotdb/{cli => }/client/WinClient.java   |   6 +-
 .../{cli => }/exception/ArgsErrorException.java    |   2 +-
 .../iotdb/{cli => }/tool/AbstractCsvTool.java      |   4 +-
 .../org/apache/iotdb/{cli => }/tool/ExportCsv.java |  48 +-
 .../org/apache/iotdb/{cli => }/tool/ImportCsv.java |   6 +-
 .../iotdb/{cli => }/client/AbstractClientIT.java   |  62 ++-
 .../iotdb/{cli => }/client/AbstractScript.java     |  31 +-
 .../{cli => }/client/StartClientScriptIT.java      |  13 +-
 .../iotdb/{cli => }/tool/ExportCsvTestIT.java      |  12 +-
 .../iotdb/{cli => }/tool/ImportCsvTestIT.java      |  12 +-
 codecov.yml                                        |   1 +
 distribution/pom.xml                               | 100 ++++
 .../src/assembly}/distribution.xml                 |  51 +-
 docker/{ => src/main}/Dockerfile                   |   9 +-
 ...{Development.md => Development-Contributing.md} |  39 --
 docs/Development-IDE.md                            |  65 +++
 docs/Documentation-CHN/QuickStart.md               |  21 +-
 .../UserGuide/1-Overview/3-Scenario.md             |   4 +-
 .../2-Data Type.md                                 |   2 +-
 .../4-Deployment and Management/1-Deployment.md    |  34 +-
 .../UserGuide/6-JDBC API/2-Status Code.md          |  64 +++
 .../UserGuide/7-Session API/1-Session API.md       | 129 +++++
 .../{7-TsFile => 8-TsFile}/1-Installation.md       |   2 +-
 .../UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md    |   2 +-
 .../{7-TsFile => 8-TsFile}/3-Hierarchy.md          |   2 +-
 .../{8-System Tools => 9-System Tools}/1-Sync.md   |   2 +-
 .../2-Memory Estimation Tool.md                    |   2 +-
 .../UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md}   |  61 ++-
 .../{8-Tools-Grafana.md => 9-Tools-Grafana.md}     |   2 +-
 .../{8-Tools-Hadoop.md => 9-Tools-Hadoop.md}       |   0
 .../{8-Tools-spark.md => 9-Tools-spark.md}         |   0
 docs/Documentation/Frequently asked questions.md   |  23 +-
 docs/Documentation/QuickStart.md                   | 319 +++---------
 docs/Documentation/UserGuide/0-Content.md          |   7 +-
 .../UserGuide/1-Overview/3-Scenario.md             |   4 +-
 .../2-Data Type.md                                 |   2 +-
 .../UserGuide/3-Operation Manual/3-Data Import.md  |   2 +-
 .../4-Deployment and Management/1-Deployment.md    |  47 +-
 .../6-Data Management.md                           |  42 +-
 .../7-Build and use IoTDB by Dockerfile.md         |   6 +-
 .../UserGuide/6-JDBC API/1-JDBC API.md             |  18 +-
 .../UserGuide/6-JDBC API/2-Status Code.md          |  64 +++
 .../UserGuide/7-Session API/1-Session API.md       | 138 ++++++
 .../{7-TsFile => 8-TsFile}/1-Installation.md       |   6 +-
 .../UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md    | 106 +++-
 .../{7-TsFile => 8-TsFile}/3-Hierarchy.md          | 146 ++++--
 .../{8-System Tools => 9-System Tools}/1-Sync.md   |   2 +-
 .../2-Memory Estimation Tool.md                    |   2 +-
 .../UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md}   |  47 +-
 .../{8-Tools-Grafana.md => 9-Tools-Grafana.md}     |   6 +-
 .../{8-Tools-Hadoop.md => 9-Tools-Hadoop.md}       |   0
 .../{8-Tools-spark.md => 9-Tools-spark.md}         |   0
 {build => example/jdbc}/pom.xml                    |  35 +-
 .../main/java/org/apache/iotdb/JDBCExample.java    |  76 +++
 .../org/apache/iotdb}/PrepareStatementDemo.java    |  40 +-
 example/kafka/pom.xml                              |  26 +-
 example/kafka/readme.md                            |   4 +-
 example/pom.xml                                    |  56 ++-
 example/rocketmq/pom.xml                           |  14 +-
 .../iotdb/{example => rocketmq}/Constant.java      |   2 +-
 .../{example => rocketmq}/RocketMQConsumer.java    |   2 +-
 .../{example => rocketmq}/RocketMQProducer.java    |   2 +-
 .../apache/iotdb/{example => rocketmq}/Utils.java  |   2 +-
 example/{ => session}/pom.xml                      |  35 +-
 .../main/java/org/apache/iotdb/SessionExample.java |  95 ++++
 {hadoop => example/tsfile}/pom.xml                 |  22 +-
 {tsfile/example => example/tsfile}/readme.md       |   4 +-
 .../java/org/apache/iotdb/tsfile/TsFileRead.java   |  10 +-
 .../apache/iotdb/tsfile/TsFileSequenceRead.java    |   8 +-
 .../iotdb/tsfile/TsFileWriteWithRowBatch.java      |  94 ++++
 .../iotdb/tsfile/TsFileWriteWithTSRecord.java      |   4 +-
 grafana/pom.xml                                    |   2 +-
 grafana/readme.md                                  |   6 +-
 grafana/readme_zh.md                               |   2 +-
 hadoop/pom.xml                                     |  10 +-
 .../iotdb/tsfile/hadoop/TSFRecordWriter.java       |   6 +-
 jdbc/README.md                                     |   2 +-
 jdbc/package.sh                                    |  43 --
 jdbc/pom.xml                                       |  13 +-
 .../main/java/org/apache/iotdb/jdbc/Config.java    |   2 +
 .../main/java/org/apache/iotdb/jdbc/Constant.java  |   9 +
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     | 111 ++---
 .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java   | 123 ++++-
 .../apache/iotdb/jdbc/IoTDBMetadataResultSet.java  | 135 +++--
 .../jdbc/IoTDBPreparedInsertionStatement.java      |   7 +-
 .../apache/iotdb/jdbc/IoTDBPreparedStatement.java  |   1 +
 .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java |  36 +-
 .../org/apache/iotdb/jdbc/IoTDBSQLException.java   |   4 +
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 112 +++--
 .../src/main/java/org/apache/iotdb/jdbc/Utils.java |  25 +-
 .../test/java/org/apache/iotdb/jdbc/BatchTest.java |  15 +-
 .../org/apache/iotdb/jdbc/IoTDBConnectionTest.java |  15 +-
 .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java      | 152 +++++-
 .../iotdb/jdbc/IoTDBPreparedStatementTest.java     |  15 +-
 .../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 120 ++---
 .../org/apache/iotdb/jdbc/IoTDBStatementTest.java  |  22 +-
 .../test/java/org/apache/iotdb/jdbc/UtilsTest.java |  19 +-
 .../org/apache/iotdb/jdbc/demo/MetadataDemo.java   |  36 --
 .../org/apache/iotdb/jdbc/demo/StatementDemo.java  |  68 ---
 licenses/The 2-Clause BSD License                  |   2 +-
 licenses/The 3-Clause BSD License                  |   2 +-
 licenses/The MIT License                           |   3 +-
 pom.xml                                            | 481 ++++++++++++++++--
 server/pom.xml                                     |  87 +---
 .../resources}/conf/iotdb-engine.properties        |  72 ++-
 .../assembly/resources}/conf/iotdb-env.bat         |   0
 .../assembly/resources}/conf/iotdb-env.sh          |   0
 .../resources}/conf/iotdb-sync-client.properties   |   0
 .../assembly/resources}/conf/logback-tool.xml      |   0
 .../assembly/resources}/conf/logback.xml           |   0
 .../resources}/conf/tsfile-format.properties       |   0
 .../assembly/resources}/sbin/start-server.bat      |   0
 .../assembly/resources}/sbin/start-server.sh       |   0
 .../assembly/resources}/sbin/stop-server.bat       |   0
 .../assembly/resources}/sbin/stop-server.sh        |   0
 .../assembly/resources}/tools/memory-tool.bat      |   0
 .../assembly/resources}/tools/memory-tool.sh       |   0
 .../tools/print-tsfile-resource-files.bat}         |  14 +-
 .../tools/print-tsfile-resource-files.sh}          |  10 +-
 .../assembly/resources}/tools/start-WalChecker.bat |   8 +-
 .../assembly/resources}/tools/start-WalChecker.sh  |  11 +-
 .../resources}/tools/start-sync-client.bat         |   0
 .../assembly/resources}/tools/start-sync-client.sh |   0
 .../assembly/resources}/tools/stop-sync-client.bat |   0
 .../assembly/resources}/tools/stop-sync-client.sh  |   0
 .../logback-tool.xml => src/assembly/server.xml}   |  20 +-
 .../antlr3/org/apache/iotdb/db/sql/parse/TSLexer.g |  58 ++-
 .../org/apache/iotdb/db/sql/parse/TSParser.g       |  53 +-
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 203 +++++++-
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   4 +-
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  69 ++-
 .../iotdb/db/conf/adapter/CompressionRatio.java    |  20 +-
 .../db/conf/adapter/IoTDBConfigDynamicAdapter.java |  24 +-
 .../db/conf/adapter/ManageDynamicParameters.java   | 135 +++++
 .../adapter/ManageDynamicParametersMBean.java}     |  48 +-
 .../iotdb/db/cost/statistic/Measurement.java       |   2 +-
 .../apache/iotdb/db/cost/statistic/Operation.java  |   3 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  58 ++-
 .../iotdb/db/engine/cache/DeviceMetaDataCache.java |  38 +-
 .../iotdb/db/engine/cache/TsFileMetaDataCache.java |  41 +-
 .../iotdb/db/engine/cache/TsFileMetadataUtils.java |  35 +-
 .../apache/iotdb/db/engine/flush/FlushManager.java |  35 +-
 .../iotdb/db/engine/flush/FlushManagerMBean.java   |  16 +-
 .../iotdb/db/engine/flush/MemTableFlushTask.java   |  13 +-
 .../db/engine/flush/pool/AbstractPoolManager.java  |   5 +-
 .../engine/flush/pool/FlushSubTaskPoolManager.java |   1 -
 .../db/engine/flush/pool/FlushTaskPoolManager.java |   1 +
 .../iotdb/db/engine/memtable/AbstractMemTable.java |  21 +-
 .../apache/iotdb/db/engine/memtable/IMemTable.java |   7 +-
 .../db/engine/memtable/IWritableMemChunk.java      |  15 +-
 .../iotdb/db/engine/memtable/WritableMemChunk.java |  86 +++-
 .../iotdb/db/engine/merge/manage/MergeContext.java |  90 ++++
 .../iotdb/db/engine/merge/manage/MergeManager.java | 127 +++++
 .../db/engine/merge/manage/MergeResource.java      | 262 ++++++++++
 .../db/{rescon => engine/merge}/package-info.java  |   7 +-
 .../iotdb/db/engine/merge/recover/LogAnalyzer.java | 300 +++++++++++
 .../iotdb/db/engine/merge/recover/MergeLogger.java | 132 +++++
 .../merge/selector/IFileQueryMemMeasurement.java}  |  20 +-
 .../engine/merge/selector/IMergeFileSelector.java  |  17 +-
 .../engine/merge/selector/IMergePathSelector.java  |  20 +-
 .../merge/selector/MaxFileMergeFileSelector.java   | 303 ++++++++++++
 .../merge/selector/MaxSeriesMergeFileSelector.java | 108 ++++
 .../engine/merge/selector/MergeFileStrategy.java   |  11 +-
 .../merge/selector/NaivePathSelector.java}         |  39 +-
 .../merge/task/MergeCallback.java}                 |  32 +-
 .../iotdb/db/engine/merge/task/MergeFileTask.java  | 238 +++++++++
 .../db/engine/merge/task/MergeMultiChunkTask.java  | 440 +++++++++++++++++
 .../iotdb/db/engine/merge/task/MergeTask.java      | 172 +++++++
 .../db/engine/merge/task/RecoverMergeTask.java     | 268 ++++++++++
 .../db/engine/modification/ModificationFile.java   |   7 +
 .../engine/storagegroup/StorageGroupProcessor.java | 410 ++++++++++++---
 .../db/engine/storagegroup/TsFileProcessor.java    |  51 +-
 .../db/engine/storagegroup/TsFileResource.java     |  63 ++-
 ...{SysCheckException.java => MergeException.java} |  10 +-
 .../java/org/apache/iotdb/db/metadata/MGraph.java  |   6 +-
 .../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 +-
 .../db/qp/executor/IQueryProcessExecutor.java      |   7 +
 .../iotdb/db/qp/executor/QueryProcessExecutor.java |  37 +-
 .../org/apache/iotdb/db/qp/logical/Operator.java   |   2 +-
 .../iotdb/db/qp/logical/sys/MetadataOperator.java  |   8 +-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |   7 +-
 .../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 276 +++++++++++
 .../iotdb/db/qp/physical/sys/MetadataPlan.java     |  48 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  28 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   6 -
 .../iotdb/db/query/control/FileReaderManager.java  |  77 +--
 .../iotdb/db/query/control/JobFileManager.java     |  35 +-
 .../db/query/control/QueryResourceManager.java     | 149 +-----
 .../groupby/GroupByWithValueFilterDataSet.java     |   3 -
 .../groupby/GroupByWithoutValueFilterDataSet.java  |   1 -
 .../db/query/executor/AggregateEngineExecutor.java |  21 +-
 .../iotdb/db/query/executor/EngineExecutor.java    |   7 -
 .../iotdb/db/query/executor/EngineQueryRouter.java |   8 +-
 .../db/query/executor/FillEngineExecutor.java      |   1 -
 .../iotdb/db/query/externalsort/LineMerger.java    |  10 +-
 .../externalsort/SimpleExternalSortEngine.java     |  13 +-
 .../adapter/ByTimestampReaderAdapter.java          |   2 +-
 ...zer.java => IExternalSortFileDeserializer.java} |   5 +-
 ...lizer.java => IExternalSortFileSerializer.java} |   2 +-
 ...=> FixLengthIExternalSortFileDeserializer.java} |  40 +-
 .../impl/FixLengthTimeValuePairSerializer.java     |  18 +-
 ...va => SimpleIExternalSortFileDeserializer.java} |  13 +-
 .../impl/SimpleTimeValuePairSerializer.java        |   4 +-
 .../apache/iotdb/db/query/reader/IPointReader.java |   1 +
 ...ChunkReader.java => CachedDiskChunkReader.java} |  42 +-
 .../query/reader/chunkRelated/ChunkReaderWrap.java |   6 +-
 .../query/reader/chunkRelated/DiskChunkReader.java |   1 +
 .../fileRelated/UnSealedTsFileIterateReader.java   |   6 +-
 .../UnSealedTsFileReaderByTimestamp.java           |   6 +-
 .../CachedUnseqResourceMergeReader.java            |  37 +-
 .../resourceRelated/SeqResourceIterateReader.java  |   9 +-
 .../SeqResourceReaderByTimestamp.java              |   8 +-
 .../resourceRelated/UnseqResourceMergeReader.java  |  22 +-
 .../UnseqResourceReaderByTimestamp.java            |   4 +-
 .../universal/CachedPriorityMergeReader.java       |  95 ++++
 .../reader/universal/PriorityMergeReader.java      | 118 ++---
 .../org/apache/iotdb/db/rescon/MemTablePool.java   |   1 +
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   8 +-
 .../org/apache/iotdb/db/service/JDBCService.java   |  15 +-
 .../org/apache/iotdb/db/service/ServiceType.java   |  13 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 536 +++++++++++++-------
 .../iotdb/db/sync/receiver/SyncServerManager.java  |  11 +-
 .../iotdb/db/sync/sender/SyncSenderImpl.java       |  10 +-
 .../iotdb/db/tools/TsFileResourcePrinter.java      |  64 +++
 .../java/org/apache/iotdb/db/utils/MemUtils.java   |  30 +-
 .../java/org/apache/iotdb/db/utils/MergeUtils.java | 306 ++++++++++++
 .../apache/iotdb/db/utils/QueryDataSetUtils.java   |  86 ++++
 .../{FileSchemaUtils.java => SchemaUtils.java}     |  20 +-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  | 100 +++-
 .../org/apache/iotdb/db/utils/TsPrimitiveType.java |  54 ++
 .../iotdb/db/utils/datastructure/BinaryTVList.java |  31 ++
 .../db/utils/datastructure/BooleanTVList.java      |  31 ++
 .../iotdb/db/utils/datastructure/DoubleTVList.java |  31 ++
 .../iotdb/db/utils/datastructure/FloatTVList.java  |  31 ++
 .../iotdb/db/utils/datastructure/IntTVList.java    |  31 ++
 .../iotdb/db/utils/datastructure/LongTVList.java   |  31 ++
 .../iotdb/db/utils/datastructure/TVList.java       |  38 ++
 .../writelog/manager/MultiFileLogNodeManager.java  |   2 +-
 .../iotdb/db/writelog/recover/LogReplayer.java     |  23 +-
 .../writelog/recover/TsFileRecoverPerformer.java   | 118 +++--
 .../db/cost/statistic/PerformanceStatTest.java     |   2 +-
 .../db/engine/memtable/MemTableFlushTaskTest.java  |   2 +-
 .../db/engine/memtable/MemTableTestUtils.java      |  10 +-
 .../engine/merge/MaxFileMergeFileSelectorTest.java |  85 ++++
 .../merge/MaxSeriesMergeFileSelectorTest.java      | 103 ++++
 .../apache/iotdb/db/engine/merge/MergeLogTest.java |  82 +++
 .../iotdb/db/engine/merge/MergePerfTest.java       | 105 ++++
 .../iotdb/db/engine/merge/MergeTaskTest.java       | 233 +++++++++
 .../apache/iotdb/db/engine/merge/MergeTest.java    | 169 +++++++
 .../engine/modification/DeletionFileNodeTest.java  |   2 -
 .../db/engine/modification/DeletionQueryTest.java  |   4 +-
 .../storagegroup/StorageGroupProcessorTest.java    | 134 ++++-
 .../engine/storagegroup/TsFileProcessorTest.java   |  10 +-
 .../apache/iotdb/db/integration/IOTDBFillIT.java   | 202 ++++----
 .../iotdb/db/integration/IOTDBGroupByIT.java       | 309 +++++-------
 .../iotdb/db/integration/IoTDBAggregationIT.java   | 478 ++++++++----------
 .../integration/IoTDBAggregationLargeDataIT.java   | 435 ++++++----------
 .../integration/IoTDBAggregationSmallDataIT.java   | 549 +++++++++------------
 .../iotdb/db/integration/IoTDBCompleteIT.java      |  15 +-
 .../apache/iotdb/db/integration/IoTDBDaemonIT.java | 216 ++++----
 .../iotdb/db/integration/IoTDBDeletionIT.java      | 198 ++++----
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  14 +-
 .../db/integration/IoTDBFloatPrecisionIT.java      | 110 ++---
 .../db/integration/IoTDBFlushQueryMergeTest.java   |  44 +-
 .../iotdb/db/integration/IoTDBLargeDataIT.java     | 167 +++----
 .../iotdb/db/integration/IoTDBLimitSlimitIT.java   |  73 ++-
 .../iotdb/db/integration/IoTDBMergeTest.java       |  97 ++++
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 216 ++++----
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   | 167 +++----
 .../iotdb/db/integration/IoTDBNumberPathIT.java    | 434 ++++++++++++++++
 .../iotdb/db/integration/IoTDBPreparedStmtIT.java  |  58 +--
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  13 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  19 +-
 .../iotdb/db/integration/IoTDBTimeZoneIT.java      |  30 +-
 .../iotdb/db/integration/IoTDBVersionIT.java       |  13 +-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  | 205 +++++++-
 .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java |  11 +-
 .../db/query/control/FileReaderManagerTest.java    |  33 +-
 .../SimpleIExternalSortFileSerializerTest.java     | 147 ++++++
 .../SimpleTimeValuePairSerializerTest.java         | 146 ------
 .../fileRelated/UnSealedTsFileReaderTest.java      |   6 +-
 .../resourceRelated/SeqResourceReaderTest.java     |   6 +-
 .../resourceRelated/UnseqResourceReaderTest.java   |   8 +-
 .../org/apache/iotdb/db/script/EnvScriptIT.java    |  34 +-
 .../org/apache/iotdb/db/sql/SQLParserTest.java     | 531 +++++++++++++++++---
 .../iotdb/db/sync/sender/SingleClientSyncTest.java |  96 ++--
 .../apache/iotdb/db/sync/test/SyncTestClient1.java |  11 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   2 +-
 .../iotdb/db/writelog/IoTDBLogFileSizeTest.java    |  59 +--
 .../iotdb/db/writelog/recover/LogReplayerTest.java |  25 +-
 .../db/writelog/recover/SeqTsFileRecoverTest.java  |  38 +-
 .../writelog/recover/UnseqTsFileRecoverTest.java   |  40 +-
 service-rpc/pom.xml                                |   2 +-
 service-rpc/rpc-changelist.md                      |  34 ++
 .../org/apache/iotdb/rpc/IoTDBRPCException.java    |  58 +--
 .../main/java/org/apache/iotdb/rpc/RpcUtils.java   |  34 +-
 .../org/apache/iotdb/rpc/SynchronizedHandler.java  |  54 ++
 .../java/org/apache/iotdb/rpc/TSStatusType.java    |  55 +++
 service-rpc/src/main/thrift/rpc.thrift             | 106 ++--
 {build => session}/pom.xml                         |  52 +-
 .../main/java/org/apache/iotdb/session/Config.java |  10 +-
 .../iotdb/session/IoTDBSessionException.java       |  18 +-
 .../java/org/apache/iotdb/session/Session.java     | 220 +++++++++
 .../org/apache/iotdb/session/SessionUtils.java     |  90 ++++
 spark-tsfile/README.md                             |   2 +
 spark-tsfile/pom.xml                               |  34 +-
 .../apache/iotdb/tsfile/io/TsFileOutputFormat.java |  10 +-
 .../apache/iotdb/tsfile/io/TsFileRecordWriter.java |   6 +-
 .../scala/org/apache/iotdb/tsfile/Converter.scala  |   4 +-
 .../org/apache/iotdb/tool/TsFileWriteTool.java     |   2 +-
 .../org/apache/iotdb/tsfile/HDFSInputTest.java     |   6 +-
 .../format-changelist.md                           |   4 +-
 tsfile/package.sh                                  |  43 --
 tsfile/pom.xml                                     |   5 +-
 .../iotdb/tsfile/common/conf/TSFileConfig.java     |   4 +-
 .../iotdb/tsfile/encoding/common/EndianType.java   |   2 +-
 .../iotdb/tsfile/encoding/decoder/Decoder.java     |   6 +-
 .../encoding/decoder/DeltaBinaryDecoder.java       |   1 +
 .../tsfile/encoding/decoder/FloatDecoder.java      |   4 +-
 .../tsfile/encoding/decoder/PlainDecoder.java      |  41 +-
 .../encoding/encoder/DeltaBinaryEncoder.java       |  15 +-
 .../tsfile/encoding/encoder/FloatEncoder.java      |   4 +-
 .../tsfile/encoding/encoder/PlainEncoder.java      |  39 +-
 .../encoding/encoder/RegularDataEncoder.java       |   1 -
 .../tsfile/encoding/encoder/TSEncodingBuilder.java |   6 +-
 ...eption.java => TsFileNotCompleteException.java} |  19 +-
 .../tsfile/file/metadata/ChunkGroupMetaData.java   |   2 +-
 .../iotdb/tsfile/file/metadata/ChunkMetaData.java  |   2 +-
 .../iotdb/tsfile/file/metadata/TsDigest.java       | 171 +++----
 .../iotdb/tsfile/file/metadata/TsFileMetaData.java |  31 ++
 .../file/metadata/statistics/BinaryStatistics.java |  79 +--
 .../metadata/statistics/BooleanStatistics.java     |  88 ++--
 .../file/metadata/statistics/DoubleStatistics.java |  82 +--
 .../file/metadata/statistics/FloatStatistics.java  |  80 +--
 .../metadata/statistics/IntegerStatistics.java     |  85 ++--
 .../file/metadata/statistics/LongStatistics.java   |  73 +--
 .../file/metadata/statistics/NoStatistics.java     |  20 +
 .../file/metadata/statistics/Statistics.java       |  48 +-
 .../apache/iotdb/tsfile/read/ReadOnlyTsFile.java   |   8 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 101 +++-
 .../apache/iotdb/tsfile/read/common/BatchData.java |   1 +
 .../org/apache/iotdb/tsfile/read/common/Chunk.java |   8 +-
 .../org/apache/iotdb/tsfile/read/common/Path.java  |   2 +-
 .../tsfile/read/controller/ChunkLoaderImpl.java    |  10 +-
 .../{ChunkLoader.java => IChunkLoader.java}        |   6 +-
 ...{MetadataQuerier.java => IMetadataQuerier.java} |   7 +-
 .../read/controller/MetadataQuerierByFileImpl.java |  34 +-
 .../iotdb/tsfile/read/filter/DigestForFilter.java  |  14 +
 .../iotdb/tsfile/read/filter/operator/Eq.java      |   3 +
 .../iotdb/tsfile/read/filter/operator/Gt.java      |   3 +
 .../iotdb/tsfile/read/filter/operator/GtEq.java    |   3 +
 .../iotdb/tsfile/read/filter/operator/Lt.java      |   3 +
 .../iotdb/tsfile/read/filter/operator/LtEq.java    |   3 +
 .../iotdb/tsfile/read/filter/operator/NotEq.java   |   3 +
 .../query/executor/ExecutorWithTimeGenerator.java  |  10 +-
 .../tsfile/read/query/executor/TsFileExecutor.java |  10 +-
 .../query/timegenerator/TimeGeneratorImpl.java     |  12 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |   3 +
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   3 +-
 .../read/reader/series/FileSeriesReader.java       |   6 +-
 .../reader/series/FileSeriesReaderByTimestamp.java |   6 +-
 .../reader/series/FileSeriesReaderWithFilter.java  |  20 +-
 .../series/FileSeriesReaderWithoutFilter.java      |   4 +-
 .../org/apache/iotdb/tsfile/utils/BytesUtils.java  |  14 +-
 .../apache/iotdb/tsfile/write/TsFileWriter.java    |  73 ++-
 .../iotdb/tsfile/write/chunk/ChunkBuffer.java      |  15 +-
 .../tsfile/write/chunk/ChunkGroupWriterImpl.java   |  50 +-
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  | 113 ++++-
 .../tsfile/write/chunk/IChunkGroupWriter.java      |  16 +-
 .../iotdb/tsfile/write/chunk/IChunkWriter.java     |  38 ++
 .../apache/iotdb/tsfile/write/page/PageWriter.java |  70 +++
 .../apache/iotdb/tsfile/write/record/RowBatch.java | 184 +++++++
 .../apache/iotdb/tsfile/write/record/TSRecord.java |   2 -
 .../iotdb/tsfile/write/schema/FileSchema.java      | 102 ----
 .../tsfile/write/schema/MeasurementSchema.java     |  10 +-
 .../apache/iotdb/tsfile/write/schema/Schema.java   | 165 +++++++
 .../iotdb/tsfile/write/schema/SchemaBuilder.java   |  18 +-
 .../tsfile/write/writer/DefaultTsFileOutput.java   |  21 +-
 .../write/writer/ForceAppendTsFileWriter.java      |  86 ++++
 .../write/writer/RestorableTsFileIOWriter.java     |  13 +-
 .../iotdb/tsfile/write/writer/TsFileIOWriter.java  | 121 ++++-
 .../tsfile/encoding/decoder/IntRleDecoderTest.java |  10 +-
 .../encoding/decoder/LongRleDecoderTest.java       |   6 +-
 .../file/metadata/ChunkGroupMetaDataTest.java      |   8 +-
 .../tsfile/file/metadata/ChunkMetaDataTest.java    |  11 +-
 .../metadata/statistics/BooleanStatisticsTest.java |  38 +-
 .../metadata/statistics/DoubleStatisticsTest.java  |  37 +-
 .../metadata/statistics/FloatStatisticsTest.java   |  23 +-
 .../metadata/statistics/IntegerStatisticsTest.java |   7 +-
 .../metadata/statistics/LongStatisticsTest.java    |  24 +-
 .../metadata/statistics/StringStatisticsTest.java  |  13 +-
 .../tsfile/file/metadata/utils/TestHelper.java     |  53 +-
 .../iotdb/tsfile/file/metadata/utils/Utils.java    |  54 +-
 .../iotdb/tsfile/read/ReadInPartitionTest.java     |   2 +-
 ...st.java => IMetadataQuerierByFileImplTest.java} |   2 +-
 .../iotdb/tsfile/read/filter/DigestFilterTest.java |  17 +-
 .../read/query/executor/QueryExecutorTest.java     |   4 +-
 .../query/timegenerator/TimeGeneratorTest.java     |   4 +-
 .../TsFileGeneratorForSeriesReaderByTimestamp.java |  11 +-
 .../iotdb/tsfile/read/reader/PageReaderTest.java   |   4 +-
 .../apache/iotdb/tsfile/utils/FileGenerator.java   |  11 +-
 .../org/apache/iotdb/tsfile/utils/RecordUtils.java |   4 +-
 .../apache/iotdb/tsfile/utils/RecordUtilsTest.java |  27 +-
 .../iotdb/tsfile/utils/TsFileGeneratorForTest.java |   6 +-
 .../org/apache/iotdb/tsfile/write/PerfTest.java    |  23 +-
 .../iotdb/tsfile/write/ReadPageInMemTest.java      |  23 +-
 .../iotdb/tsfile/write/TsFileIOWriterTest.java     |   8 +-
 .../iotdb/tsfile/write/TsFileReadWriteTest.java    |  62 ++-
 .../org/apache/iotdb/tsfile/write/WriteTest.java   |   6 +-
 .../write/schema/converter/SchemaBuilderTest.java  |   8 +-
 .../iotdb/tsfile/write/series/PageWriterTest.java  |   6 +-
 434 files changed, 15422 insertions(+), 6993 deletions(-)
 create mode 100644 DISCLAIMER
 copy License => LICENSE (83%)
 rename License => LICENSE-binary (93%)
 create mode 100644 NOTICE-binary
 copy server/iotdb/conf/logback-tool.xml => client/src/assembly/client.xml (63%)
 rename client/{cli => src/assembly/resources}/sbin/start-client.bat (95%)
 rename client/{cli => src/assembly/resources}/sbin/start-client.sh (91%)
 rename client/{cli => src/assembly/resources}/tools/export-csv.bat (96%)
 rename client/{cli => src/assembly/resources}/tools/export-csv.sh (96%)
 rename client/{cli => src/assembly/resources}/tools/import-csv.bat (96%)
 rename client/{cli => src/assembly/resources}/tools/import-csv.sh (96%)
 rename client/src/main/java/org/apache/iotdb/{cli => 
}/client/AbstractClient.java (78%)
 rename client/src/main/java/org/apache/iotdb/{cli => }/client/Client.java (86%)
 rename client/src/main/java/org/apache/iotdb/{cli => }/client/WinClient.java 
(97%)
 rename client/src/main/java/org/apache/iotdb/{cli => 
}/exception/ArgsErrorException.java (96%)
 rename client/src/main/java/org/apache/iotdb/{cli => 
}/tool/AbstractCsvTool.java (98%)
 rename client/src/main/java/org/apache/iotdb/{cli => }/tool/ExportCsv.java 
(89%)
 rename client/src/main/java/org/apache/iotdb/{cli => }/tool/ImportCsv.java 
(99%)
 rename client/src/test/java/org/apache/iotdb/{cli => 
}/client/AbstractClientIT.java (74%)
 rename client/src/test/java/org/apache/iotdb/{cli => 
}/client/AbstractScript.java (67%)
 rename client/src/test/java/org/apache/iotdb/{cli => 
}/client/StartClientScriptIT.java (83%)
 rename client/src/test/java/org/apache/iotdb/{cli => 
}/tool/ExportCsvTestIT.java (86%)
 rename client/src/test/java/org/apache/iotdb/{cli => 
}/tool/ImportCsvTestIT.java (86%)
 create mode 100644 distribution/pom.xml
 rename {build/src/main/resources => 
distribution/src/assembly}/distribution.xml (53%)
 rename docker/{ => src/main}/Dockerfile (82%)
 rename docs/{Development.md => Development-Contributing.md} (91%)
 create mode 100644 docs/Development-IDE.md
 create mode 100644 docs/Documentation-CHN/UserGuide/6-JDBC API/2-Status Code.md
 create mode 100644 docs/Documentation-CHN/UserGuide/7-Session API/1-Session 
API.md
 rename docs/Documentation-CHN/UserGuide/{7-TsFile => 
8-TsFile}/1-Installation.md (96%)
 rename docs/Documentation-CHN/UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md (96%)
 rename docs/Documentation-CHN/UserGuide/{7-TsFile => 8-TsFile}/3-Hierarchy.md 
(96%)
 rename docs/Documentation-CHN/UserGuide/{8-System Tools => 9-System 
Tools}/1-Sync.md (99%)
 rename docs/Documentation-CHN/UserGuide/{8-System Tools => 9-System 
Tools}/2-Memory Estimation Tool.md (99%)
 rename docs/Documentation-CHN/UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md} 
(56%)
 rename docs/Documentation-CHN/UserGuide/{8-Tools-Grafana.md => 
9-Tools-Grafana.md} (99%)
 rename docs/Documentation-CHN/UserGuide/{8-Tools-Hadoop.md => 
9-Tools-Hadoop.md} (100%)
 rename docs/Documentation-CHN/UserGuide/{8-Tools-spark.md => 9-Tools-spark.md} 
(100%)
 create mode 100644 docs/Documentation/UserGuide/6-JDBC API/2-Status Code.md
 create mode 100644 docs/Documentation/UserGuide/7-Session API/1-Session API.md
 rename docs/Documentation/UserGuide/{7-TsFile => 8-TsFile}/1-Installation.md 
(92%)
 rename docs/Documentation/UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md (85%)
 rename docs/Documentation/UserGuide/{7-TsFile => 8-TsFile}/3-Hierarchy.md (68%)
 rename docs/Documentation/UserGuide/{8-System Tools => 9-System 
Tools}/1-Sync.md (99%)
 rename docs/Documentation/UserGuide/{8-System Tools => 9-System 
Tools}/2-Memory Estimation Tool.md (99%)
 rename docs/Documentation/UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md} (60%)
 rename docs/Documentation/UserGuide/{8-Tools-Grafana.md => 9-Tools-Grafana.md} 
(96%)
 rename docs/Documentation/UserGuide/{8-Tools-Hadoop.md => 9-Tools-Hadoop.md} 
(100%)
 rename docs/Documentation/UserGuide/{8-Tools-spark.md => 9-Tools-spark.md} 
(100%)
 copy {build => example/jdbc}/pom.xml (61%)
 create mode 100644 example/jdbc/src/main/java/org/apache/iotdb/JDBCExample.java
 rename {jdbc/src/test/java/org/apache/iotdb/jdbc/demo => 
example/jdbc/src/main/java/org/apache/iotdb}/PrepareStatementDemo.java (69%)
 rename example/rocketmq/src/main/java/org/apache/iotdb/{example => 
rocketmq}/Constant.java (99%)
 rename example/rocketmq/src/main/java/org/apache/iotdb/{example => 
rocketmq}/RocketMQConsumer.java (99%)
 rename example/rocketmq/src/main/java/org/apache/iotdb/{example => 
rocketmq}/RocketMQProducer.java (98%)
 rename example/rocketmq/src/main/java/org/apache/iotdb/{example => 
rocketmq}/Utils.java (97%)
 copy example/{ => session}/pom.xml (67%)
 create mode 100644 
example/session/src/main/java/org/apache/iotdb/SessionExample.java
 copy {hadoop => example/tsfile}/pom.xml (71%)
 rename {tsfile/example => example/tsfile}/readme.md (94%)
 rename {tsfile/example => 
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileRead.java (93%)
 rename {tsfile/example => 
example/tsfile}/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java 
(96%)
 create mode 100644 
example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithRowBatch.java
 rename tsfile/example/src/main/java/org/apache/iotdb/tsfile/TsFileWrite.java 
=> 
example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
 (97%)
 delete mode 100755 jdbc/package.sh
 delete mode 100644 
jdbc/src/test/java/org/apache/iotdb/jdbc/demo/MetadataDemo.java
 delete mode 100644 
jdbc/src/test/java/org/apache/iotdb/jdbc/demo/StatementDemo.java
 rename server/{iotdb => src/assembly/resources}/conf/iotdb-engine.properties 
(76%)
 rename server/{iotdb => src/assembly/resources}/conf/iotdb-env.bat (100%)
 rename server/{iotdb => src/assembly/resources}/conf/iotdb-env.sh (100%)
 rename server/{iotdb => 
src/assembly/resources}/conf/iotdb-sync-client.properties (100%)
 copy server/{iotdb => src/assembly/resources}/conf/logback-tool.xml (100%)
 rename server/{iotdb => src/assembly/resources}/conf/logback.xml (100%)
 rename server/{iotdb => src/assembly/resources}/conf/tsfile-format.properties 
(100%)
 rename server/{iotdb => src/assembly/resources}/sbin/start-server.bat (100%)
 rename server/{iotdb => src/assembly/resources}/sbin/start-server.sh (100%)
 rename server/{iotdb => src/assembly/resources}/sbin/stop-server.bat (100%)
 rename server/{iotdb => src/assembly/resources}/sbin/stop-server.sh (100%)
 rename server/{iotdb => src/assembly/resources}/tools/memory-tool.bat (100%)
 rename server/{iotdb => src/assembly/resources}/tools/memory-tool.sh (100%)
 copy server/{iotdb/tools/start-WalChecker.bat => 
src/assembly/resources/tools/print-tsfile-resource-files.bat} (90%)
 copy server/{iotdb/tools/start-WalChecker.sh => 
src/assembly/resources/tools/print-tsfile-resource-files.sh} (89%)
 rename server/{iotdb => src/assembly/resources}/tools/start-WalChecker.bat 
(96%)
 rename server/{iotdb => src/assembly/resources}/tools/start-WalChecker.sh (93%)
 mode change 100644 => 100755
 rename server/{iotdb => src/assembly/resources}/tools/start-sync-client.bat 
(100%)
 rename server/{iotdb => src/assembly/resources}/tools/start-sync-client.sh 
(100%)
 rename server/{iotdb => src/assembly/resources}/tools/stop-sync-client.bat 
(100%)
 rename server/{iotdb => src/assembly/resources}/tools/stop-sync-client.sh 
(100%)
 rename server/{iotdb/conf/logback-tool.xml => src/assembly/server.xml} (63%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/conf/adapter/ManageDynamicParameters.java
 copy 
server/src/main/java/org/apache/iotdb/db/{qp/logical/sys/LoadDataOperator.java 
=> conf/adapter/ManageDynamicParametersMBean.java} (55%)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/timegenerator/node/Node.java
 => 
server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManagerMBean.java 
(72%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeContext.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
 copy server/src/main/java/org/apache/iotdb/db/{rescon => 
engine/merge}/package-info.java (76%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/recover/LogAnalyzer.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/recover/MergeLogger.java
 copy 
server/src/main/java/org/apache/iotdb/db/{qp/strategy/optimizer/IFilterOptimizer.java
 => engine/merge/selector/IFileQueryMemMeasurement.java} (69%)
 copy grafana/src/main/java/org/apache/iotdb/web/grafana/dao/BasicDao.java => 
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/IMergeFileSelector.java
 (70%)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IBinaryExpression.java
 => 
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/IMergePathSelector.java
 (70%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxFileMergeFileSelector.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MaxSeriesMergeFileSelector.java
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java 
=> 
server/src/main/java/org/apache/iotdb/db/engine/merge/selector/MergeFileStrategy.java
 (84%)
 copy server/src/main/java/org/apache/iotdb/db/{query/dataset/AuthDataSet.java 
=> engine/merge/selector/NaivePathSelector.java} (55%)
 copy server/src/main/java/org/apache/iotdb/db/{sql/parse/Node.java => 
engine/merge/task/MergeCallback.java} (56%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeFileTask.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/engine/merge/task/RecoverMergeTask.java
 copy 
server/src/main/java/org/apache/iotdb/db/exception/{SysCheckException.java => 
MergeException.java} (79%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/qp/physical/crud/BatchInsertPlan.java
 rename 
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/{TimeValuePairDeserializer.java
 => IExternalSortFileDeserializer.java} (82%)
 rename 
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/{TimeValuePairSerializer.java
 => IExternalSortFileSerializer.java} (95%)
 rename 
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/{FixLengthTimeValuePairDeserializer.java
 => FixLengthIExternalSortFileDeserializer.java} (82%)
 rename 
server/src/main/java/org/apache/iotdb/db/query/externalsort/serialize/impl/{SimpleTimeValuePairDeserializer.java
 => SimpleIExternalSortFileDeserializer.java} (85%)
 copy 
server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/{DiskChunkReader.java
 => CachedDiskChunkReader.java} (63%)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/FileSeriesReaderWithoutFilter.java
 => 
server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/CachedUnseqResourceMergeReader.java
 (55%)
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/query/reader/universal/CachedPriorityMergeReader.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/tools/TsFileResourcePrinter.java
 create mode 100644 
server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java
 rename server/src/main/java/org/apache/iotdb/db/utils/{FileSchemaUtils.java => 
SchemaUtils.java} (72%)
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MaxFileMergeFileSelectorTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MaxSeriesMergeFileSelectorTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeLogTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MergePerfTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTaskTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/integration/IoTDBNumberPathIT.java
 create mode 100644 
server/src/test/java/org/apache/iotdb/db/query/externalsort/SimpleIExternalSortFileSerializerTest.java
 delete mode 100644 
server/src/test/java/org/apache/iotdb/db/query/externalsort/SimpleTimeValuePairSerializerTest.java
 create mode 100644 service-rpc/rpc-changelist.md
 copy 
server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java
 => service-rpc/src/main/java/org/apache/iotdb/rpc/IoTDBRPCException.java (74%)
 copy 
server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
 => service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java (52%)
 create mode 100644 
service-rpc/src/main/java/org/apache/iotdb/rpc/SynchronizedHandler.java
 create mode 100644 
service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusType.java
 rename {build => session}/pom.xml (60%)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java 
=> session/src/main/java/org/apache/iotdb/session/Config.java (77%)
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java
 => session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java 
(69%)
 create mode 100644 session/src/main/java/org/apache/iotdb/session/Session.java
 create mode 100644 
session/src/main/java/org/apache/iotdb/session/SessionUtils.java
 copy docs/Community-History&Vision.md => tsfile/format-changelist.md (95%)
 delete mode 100755 tsfile/package.sh
 copy 
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/{PageException.java
 => TsFileNotCompleteException.java} (73%)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{ChunkLoader.java 
=> IChunkLoader.java} (92%)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{MetadataQuerier.java
 => IMetadataQuerier.java} (95%)
 create mode 100644 
tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/RowBatch.java
 delete mode 100644 
tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/FileSchema.java
 create mode 100644 
tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java
 create mode 100644 
tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
 rename 
tsfile/src/test/java/org/apache/iotdb/tsfile/read/controller/{MetadataQuerierByFileImplTest.java
 => IMetadataQuerierByFileImplTest.java} (99%)

Reply via email to