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

hui pushed a commit to branch lmh/fillCheckDebug
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 757297509a3151dfab3f15a1c07e071224bb3a17
Merge: b2a37046c3 0b7cdfba2c
Author: Minghui Liu <[email protected]>
AuthorDate: Fri Jul 1 17:43:34 2022 +0800

    Merge remote-tracking branch 'origin/master' into lmh/fillCheckDebug

 .../iotdb/consensus/config/MultiLeaderConfig.java  |   46 +-
 .../multileader/MultiLeaderConsensus.java          |    2 +-
 .../multileader/service/MultiLeaderRPCService.java |   17 +-
 .../service/MultiLeaderRPCServiceProcessor.java    |   59 +-
 grafana-plugin/backend-compile.sh                  |    1 -
 integration-test/checkstyle.xml                    |    2 +-
 integration-test/import-control.xml                |    2 +
 .../java/org/apache/iotdb/it/env/MppConfig.java    |    7 +
 .../apache/iotdb/itbase/constant/TestConstant.java |    2 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |   16 +
 .../db/it/aligned/IoTDBAlignedSeriesQueryIT.java   | 2594 ++++++++++++++++++++
 .../db/it/aligned/IoTDBGroupByLevelQueryIT.java    |  168 +-
 ...GroupByQueryWithValueFilterWithDeletion2IT.java |   43 +-
 ...BGroupByQueryWithValueFilterWithDeletionIT.java |  268 +-
 .../iotdb/db/it/env/StandaloneEnvConfig.java       |   12 +
 .../apache/iotdb/db/it/groupby/IOTDBGroupByIT.java |  531 ++++
 .../db/it/groupby/IoTDBGroupByNaturalMonthIT.java  |  246 ++
 .../iotdb/db/it}/groupby/IoTDBGroupByUnseqIT.java  |  109 +-
 .../org/apache/iotdb/db/it/query/IoTDBAliasIT.java |  384 +++
 .../iotdb/db/it/query/IoTDBPaginationIT.java       |  152 ++
 .../query}/IoTDBQueryWithComplexValueFilterIT.java |   59 +-
 .../apache/iotdb/db/it/query/IoTDBResultSetIT.java |  131 +
 .../org/apache/iotdb/db/it/utils/TestUtils.java    |  251 ++
 .../apache/iotdb/db/integration/IoTDBAliasIT.java  |  396 ---
 .../org/apache/iotdb/db/integration/IoTDBAsIT.java |  564 -----
 .../iotdb/db/integration/IoTDBLimitSlimitIT.java   |  204 --
 .../db/integration/IoTDBPathNumOverLimitIT.java    |   74 -
 .../db/integration/IoTDBResultMetadataIT.java      |   89 -
 .../iotdb/db/integration/IoTDBResultSetIT.java     |  134 -
 .../IoTDBGroupByQueryWithValueFilter2IT.java       |   65 -
 .../IoTDBGroupByQueryWithValueFilterIT.java        | 1094 ---------
 ...GroupBySlidingWindowQueryWithValueFilterIT.java |  951 -------
 ...upBySlidingWindowQueryWithoutValueFilterIT.java |  947 -------
 .../db/integration/groupby/IOTDBGroupByIT.java     |  996 --------
 .../groupby/IOTDBGroupByInnerIntervalIT.java       |  342 ---
 .../integration/groupby/IoTDBGroupByMonthIT.java   |  366 ---
 ...IT.java => IoTDBGroupByNaturalMonthFillIT.java} |    7 +-
 .../service/AbstractThriftServiceThread.java       |   34 +-
 .../iotdb/commons/service/ThriftServiceThread.java |    4 +
 server/file-changelists/conf-changelist.md         |    3 +
 .../resources/conf/iotdb-datanode.properties       |    6 +
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |   22 +
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |   22 +
 .../db/consensus/DataRegionConsensusImpl.java      |    4 +
 .../exception/query/PathNumOverLimitException.java |    3 +-
 .../{query => sql}/PathNumOverLimitException.java  |    7 +-
 .../apache/iotdb/db/mpp/plan/analyze/Analyzer.java |   10 +-
 .../plan/analyze/ColumnPaginationController.java   |   12 +-
 .../org/apache/iotdb/rpc/IoTDBJDBCDataSet.java     |   15 +-
 .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java |    6 +-
 50 files changed, 4770 insertions(+), 6709 deletions(-)


Reply via email to