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

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

commit df80578883401b83867cb7bc3ed5e03167977046
Merge: dbf0d4a e77d26a
Author: HTHou <[email protected]>
AuthorDate: Fri Oct 16 14:54:26 2020 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into 
fix_homepage_link

 LICENSE-binary                                     |    2 +-
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |   89 +-
 docs/SystemDesign/TsFile/Format.md                 |    2 +-
 .../DDL Data Definition Language.md                |   19 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |   10 +
 docs/zh/SystemDesign/TsFile/Format.md              |    2 +-
 .../DDL Data Definition Language.md                |    5 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |   10 +
 docs/zh/UserGuide/Server/Config Manual.md          |    4 +-
 .../iotdb/hadoop/tsfile/TSFMRReadExample.java      |    1 -
 .../iotdb/hadoop/tsfile/TSMRWriteExample.java      |    6 +-
 .../java/org/apache/iotdb/rocketmq/Constant.java   |   17 +-
 .../main/java/org/apache/iotdb/SessionExample.java |   58 +-
 .../apache/iotdb/tsfile/TsFileWriteWithTablet.java |    6 +-
 flink-iotdb-connector/pom.xml                      |    1 +
 .../apache/iotdb/hadoop/fileSystem/HDFSFile.java   |   59 +-
 .../org/apache/iotdb/hive/TsFileDeserializer.java  |   17 +-
 .../main/java/org/apache/iotdb/jdbc/Activator.java |   21 +-
 .../org/apache/iotdb/jdbc/IoTDBConnection.java     |   18 +-
 .../org/apache/iotdb/jdbc/IoTDBDataSource.java     |  230 ++--
 .../apache/iotdb/jdbc/IoTDBDataSourceFactory.java  |   79 ++
 .../java/org/apache/iotdb/jdbc/IoTDBStatement.java |   14 +-
 .../apache/iotdb/jdbc/IoTDbDataSourceFactory.java  |   79 --
 .../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java  |   28 +-
 .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java |    4 +-
 pom.xml                                            |    4 +-
 server/src/assembly/resources/conf/logback.xml     |    4 +-
 .../iotdb/db/auth/user/BasicUserManager.java       |    4 +-
 .../iotdb/db/cost/statistic/Measurement.java       |   29 +-
 .../db/engine/fileSystem/SystemFileFactory.java    |   10 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  130 +--
 .../level/LevelTsFileManagement.java               |    2 -
 .../org/apache/iotdb/db/metadata/MLogWriter.java   |   13 +-
 .../org/apache/iotdb/db/metadata/MManager.java     | 1218 ++++++++------------
 .../java/org/apache/iotdb/db/metadata/MTree.java   |  353 +++---
 .../org/apache/iotdb/db/metadata/mnode/MNode.java  |  123 +-
 .../apache/iotdb/db/metrics/source/JvmSource.java  |   12 +-
 .../iotdb/db/metrics/source/MetricsSource.java     |   24 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  113 +-
 .../org/apache/iotdb/db/qp/logical/Operator.java   |    3 +-
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |    7 +-
 .../qp/physical/sys/CreateMultiTimeSeriesPlan.java |  304 +++++
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |   26 +-
 .../db/query/control/QueryResourceManager.java     |   15 +-
 .../iotdb/db/query/control/TracingManager.java     |   32 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  124 +-
 .../iotdb/db/engine/merge/MergeManagerTest.java    |    2 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   28 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java |  435 +++----
 .../db/integration/IoTDBCreateSnapshotIT.java      |   39 +-
 .../iotdb/db/integration/IoTDBDisableAlignIT.java  |  178 ++-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |   38 +-
 .../db/integration/IoTDBLoadExternalTsfileIT.java  |   41 +-
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  111 +-
 .../iotdb/db/integration/IoTDBQueryDemoIT.java     |  191 ++-
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   |   26 +-
 .../integration/IoTDBSortedShowTimeseriesIT.java   |   12 +-
 .../apache/iotdb/db/integration/IoTDBTagIT.java    |  104 +-
 .../iotdb/db/integration/IoTDBTracingTest.java     |    6 +-
 .../apache/iotdb/db/integration/IoTDBTtlIT.java    |   18 +-
 .../iotdb/db/metadata/MManagerImproveTest.java     |   18 +-
 .../org/apache/iotdb/db/metadata/MTreeTest.java    |   51 +-
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     |    2 +-
 .../apache/iotdb/db/qp/plan/PhysicalPlanTest.java  |    4 +-
 .../iotdb/db/writelog/recover/LogReplayerTest.java |    2 +-
 .../java/org/apache/iotdb/session/Session.java     |   35 +-
 .../org/apache/iotdb/session/SessionDataSet.java   |    6 +-
 .../iotdb/session/IoTDBSessionComplexIT.java       |   54 +-
 .../apache/iotdb/session/IoTDBSessionSimpleIT.java |   47 +-
 .../java/org/apache/iotdb/session/SessionUT.java   |   26 +-
 .../scala/org/apache/iotdb/spark/db/IoTDBRDD.scala |    4 +-
 thrift/src/main/thrift/rpc.thrift                  |    1 +
 .../iotdb/tsfile/compress/IUnCompressor.java       |    9 +-
 .../iotdb/tsfile/encoding/decoder/Decoder.java     |   13 +-
 .../file/metadata/statistics/BinaryStatistics.java |   22 +-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  104 +-
 .../apache/iotdb/tsfile/read/common/BatchData.java |   14 +-
 .../iotdb/tsfile/utils/ReadWriteIOUtils.java       |   34 +-
 .../apache/iotdb/tsfile/write/record/Tablet.java   |    7 +-
 .../iotdb/tsfile/read/GetAllDevicesTest.java       |   90 ++
 .../tsfile/read/TsFileSequenceReaderTest.java      |    1 -
 .../iotdb/tsfile/read/reader/ReaderTest.java       |    6 +-
 .../apache/iotdb/tsfile/utils/FileGenerator.java   |   79 +-
 .../apache/iotdb/tsfile/utils/RecordUtilsTest.java |  100 +-
 84 files changed, 2822 insertions(+), 2467 deletions(-)

Reply via email to