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

haonan pushed a change to branch mem_control
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 0d63651  Merge branch 'master' of 
https://github.com/apache/incubator-iotdb into mem_control
     add 6955753  time out
     add 0de9fff  [IOTDB-904] fix update last cache NullPointerException (#1752)
     add 479bfad  Update maven download url for TravisCI (WinOS) (#1754)
     add 0bdc1e1  Change TreeSet to List in getAllDevices (#1756)
     add 38bf656  Improve the readUnLock way while inserting (#1757)
     add ee8c17f  update the website because of graduation (#1755)
     add 3df2da3  fix ImportCsvToolIT bug
     add a1260a0  Fixed getFloat(int ColumnIndex) Method.
     add f2820e4  [bug] modify disableIS08601 to disableISO8601
     add 3db6cb0  - Removed the incubation resources from the produced jars - 
Made the source plugin create source-jars even for SNAPSHOT builds
     add adb5926  [IOTDB-870] change tags and attributes output format to two 
columns with json values(#1731)
     add 5fa23d0  [IOTDB-892] Replace fastjson with Gson (#1728)
     add c2ca774  Avoid type conversion when encoding MeasureSchema (#1749)
     add ece4928  Update DML Data Manipulation Language.md (#1769)
     add 2e7d902  [IOTDB-863]: add a switch to drop ouf-of-order data that is 
recognized by IoTDB (#1693)
     add 410815d  [IOTDB-907] Change TreeSet to HashSet in getAllDevices (#1772)
     add 1e3d945  [IOTDB-919] Update License binary as fastjson has been 
removed (#1773)
     add 79fe721  remove some redundant code (#1778)
     add 52b087f  [IOTDB-929] Update show timeseries information in readme 
(#1786)
     add c916da9  [IOTDB-934] Update TsFile structure graph (#1797)
     add 1eb3cbe  remove incubating or incubator word
     add a12c90e  revert travis.xml as sonarcloud does not rename iotdb repo
     add 665df9b  revert travis.xml as sonarcloud does not rename iotdb repo
     add af08781  Update docs/zh/UserGuide/Get Started/Frequently asked 
questions.md
     add efbf93a  Update docs/zh/SystemDesign/TsFile/Format.md
     add 1cb82ba  Update docs/UserGuide/Server/Download.md
     add 45b803f  Update README.md
     add 9f44105  remove incubating or incubator word (#1790)
     add e2a349d  merge master
     add 7f0cb09  fix test

No new revisions were added by this update.

Summary of changes:
 .travis.yml                                        |   4 +-
 DISCLAIMER                                         |   6 -
 LICENSE-binary                                     |   2 +-
 README.md                                          |  50 ++--
 README_ZH.md                                       |  24 +-
 .../tests/tools/importCsv/AbstractScript.java      |   5 +
 .../tests/tools/importCsv/ImportCsvTestIT.java     |   4 +-
 distribution/pom.xml                               |   4 +-
 distribution/src/assembly/distribution.xml         |   3 -
 docker/src/main/Dockerfile                         |   4 +-
 docs/Community/Community-Powered By.md             |   2 +-
 docs/Development/VoteRelease.md                    |  12 +-
 docs/SystemDesign/TsFile/Format.md                 |  12 +-
 docs/UserGuide/Client/Command Line Interface.md    |   6 +-
 docs/UserGuide/Client/Programming - TsFile API.md  |   4 +-
 docs/UserGuide/Ecosystem Integration/Grafana.md    |   8 +-
 .../UserGuide/Ecosystem Integration/Hive TsFile.md |   8 +-
 .../Ecosystem Integration/MapReduce TsFile.md      |   6 +-
 .../Ecosystem Integration/Spark TsFile.md          |   6 +-
 .../Get Started/Frequently asked questions.md      |  12 +-
 docs/UserGuide/Get Started/QuickStart.md           |   4 +-
 .../DML Data Manipulation Language.md              |   1 +
 docs/UserGuide/Server/Docker Image.md              |   8 +-
 docs/UserGuide/Server/Download.md                  |  14 +-
 docs/zh/Development/VoteRelease.md                 |  12 +-
 docs/zh/SystemDesign/TsFile/Format.md              |   8 +-
 docs/zh/UserGuide/Client/Command Line Interface.md |   8 +-
 .../UserGuide/Client/Programming - TsFile API.md   |   4 +-
 docs/zh/UserGuide/Ecosystem Integration/Grafana.md |   8 +-
 .../UserGuide/Ecosystem Integration/Hive TsFile.md |  12 +-
 .../Ecosystem Integration/MapReduce TsFile.md      |   6 +-
 .../Ecosystem Integration/Spark TsFile.md          |   6 +-
 .../Get Started/Frequently asked questions.md      |  14 +-
 docs/zh/UserGuide/Get Started/QuickStart.md        |   4 +-
 docs/zh/UserGuide/Server/Docker Image.md           |  10 +-
 docs/zh/UserGuide/Server/Download.md               |   2 +-
 .../controller/DatabaseConnectController.java      | 120 ++++----
 .../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java     |   2 +-
 pom.xml                                            |  41 ++-
 server/pom.xml                                     |   4 +
 .../resources/conf/iotdb-engine.properties         |   4 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  10 +
 .../org/apache/iotdb/db/conf/IoTDBConstant.java    |   2 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   4 +
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   6 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  88 +++---
 .../db/engine/storagegroup/TsFileProcessor.java    |  14 +
 .../org/apache/iotdb/db/metadata/MManager.java     | 181 ++++++------
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  61 ++--
 .../apache/iotdb/db/mqtt/JSONPayloadFormatter.java |  27 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  35 ++-
 .../iotdb/db/qp/physical/crud/InsertPlan.java      |  26 +-
 .../iotdb/db/qp/physical/crud/InsertRowPlan.java   |  59 ++--
 .../db/query/dataset/ShowTimeSeriesResult.java     |  81 ++++--
 .../db/query/dataset/ShowTimeseriesDataSet.java    |  81 +++++-
 .../org/apache/iotdb/db/rescon/SystemInfo.java     |  70 +++--
 .../java/org/apache/iotdb/db/utils/QueryUtils.java | 107 -------
 .../iotdb/db/writelog/recover/LogReplayer.java     |  31 +--
 .../db/engine/cache/ChunkMetadataCacheTest.java    |   7 -
 .../engine/modification/DeletionFileNodeTest.java  |   4 -
 .../db/engine/modification/DeletionQueryTest.java  |   5 +-
 .../storagegroup/StorageGroupProcessorTest.java    | 306 ++++++++++++++++++++-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |  15 +-
 .../iotdb/db/integration/IoTDBAddSubDeviceIT.java  |   9 +-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  35 ++-
 .../integration/IoTDBSortedShowTimeseriesIT.java   | 127 +++++----
 .../iotdb/db/integration/IoTDBTagAlterIT.java      | 132 ++++-----
 .../apache/iotdb/db/integration/IoTDBTagIT.java    | 259 +++++++++--------
 .../iotdb/db/writelog/recover/LogReplayerTest.java |  11 +-
 site/iotdb-doap.rdf                                |  14 +-
 site/src/main/.vuepress/theme/components/Page.vue  |   3 +-
 .../.vuepress/theme/global-components/IoTDB.vue    |  13 +-
 .../.vuepress/theme/global-components/IoTDBZH.vue  |  14 +-
 site/src/main/package.json                         |   4 +-
 thrift/src/pypi/setup.py                           |   2 +-
 tools/download_staged_release.sh                   |   4 +-
 tsfile/pom.xml                                     |   8 +-
 .../file/metadata/enums/CompressionType.java       |  67 ++++-
 .../tsfile/file/metadata/enums/TSDataType.java     |  60 +++-
 .../tsfile/file/metadata/enums/TSEncoding.java     |  67 ++++-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |   4 +-
 .../tsfile/write/schema/MeasurementSchema.java     |  37 ++-
 .../tsfile/encoding/decoder/BitmapDecoderTest.java |   1 -
 .../iotdb/tsfile/utils/TsFileGeneratorForTest.java |   8 -
 .../org/apache/iotdb/tsfile/write/PerfTest.java    |  13 +-
 .../writer/MeasurementSchemaSerializeTest.java     |  55 ++++
 86 files changed, 1567 insertions(+), 1074 deletions(-)
 delete mode 100644 DISCLAIMER
 create mode 100644 
tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java

Reply via email to