This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_premerge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 617960f Merge branch 'master' into cluster_premerge
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 8415385 Merge branch 'master' into cluster_premerge
No new revisions were added by this update.
Summary of changes:
.../controller/DatabaseConnectController.java | 120 +++++-----
pom.xml | 12 +-
server/pom.xml | 4 +
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +
.../org/apache/iotdb/db/metadata/MManager.java | 32 +--
.../java/org/apache/iotdb/db/metadata/MTree.java | 61 ++---
.../apache/iotdb/db/mqtt/JSONPayloadFormatter.java | 27 ++-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 10 +-
.../db/query/dataset/ShowTimeSeriesResult.java | 81 ++++---
.../db/query/dataset/ShowTimeseriesDataSet.java | 84 +++++--
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 107 ---------
.../iotdb/db/integration/IoTDBAddSubDeviceIT.java | 9 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 35 ++-
.../integration/IoTDBSortedShowTimeseriesIT.java | 128 +++++-----
.../iotdb/db/integration/IoTDBTagAlterIT.java | 132 +++++------
.../apache/iotdb/db/integration/IoTDBTagIT.java | 262 ++++++++++++---------
tsfile/pom.xml | 8 +-
.../file/metadata/enums/CompressionType.java | 67 +++++-
.../tsfile/file/metadata/enums/TSDataType.java | 60 ++++-
.../tsfile/file/metadata/enums/TSEncoding.java | 67 +++++-
.../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 +++++
25 files changed, 829 insertions(+), 593 deletions(-)
create mode 100644
tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java
