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 277e18a  Merge branch 'mem_control' of github.com:apache/iotdb into 
mem_control
     add 45eb518  add config
     add 913f0b7  Stop iotdb instance when RPC ip address or port is 
unavailable (#1868)
     add 539b8f1  add debug SQL log (#1912)
     add 597d7ce  update vue to 1.7.1 and fix shell render name in markdowns 
(#1911)
     add 0cf358c  Add restrictions for LAST query filter (#1917)
     add 36b332d  Remove mqtt log and add InsertRowPlan check (#1916)
     add 5851ac9  [IOTDB-973] fix bug when start-cli with -e parameter (#1908)
     add b7b293f  Add more query log (#1918)
     add b5fcd7f  [IOTDB-971] More precise error messages of slimit and soffset 
(#1913)
     add 9f09a93  [IOTDB-975] Fix reading file error in getChunkMetadataList 
(#1920)
     add 6e67357  add solution for network broken when downloading thrift files 
from github (#1921)
     add cc6c459  merge master
     add 94284c6  Merge branch 'mem_control' of https://github.com/apache/iotdb 
into mem_control

No new revisions were added by this update.

Summary of changes:
 README.md                                          |   5 +
 README_ZH.md                                       |   4 +
 cli/src/assembly/resources/sbin/start-cli.bat      |  16 ++-
 cli/src/assembly/resources/sbin/start-cli.sh       |  44 ++-------
 .../java/org/apache/iotdb/cli/AbstractCli.java     |   6 +-
 docs/Development/ContributeGuide.md                |  15 +++
 docs/SystemDesign/TsFile/Format.md                 |  11 +--
 docs/UserGuide/Get Started/Publication.md          |   2 +
 .../DML Data Manipulation Language.md              |   6 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |   7 +-
 docs/zh/Development/ContributeGuide.md             |  15 +++
 docs/zh/SystemDesign/TsFile/Format.md              |   8 +-
 .../UserGuide/Ecosystem Integration/Hive TsFile.md |   2 +-
 .../DML Data Manipulation Language.md              |   6 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |   7 +-
 docs/zh/UserGuide/Server/Docker Image.md           |   2 +-
 .../resources/conf/iotdb-engine.properties         |  14 +++
 server/src/assembly/resources/conf/logback.xml     |  67 +++++++++++++
 .../java/org/apache/iotdb/db/conf/IoTDBConfig.java |  53 ++++++++--
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  34 ++++++-
 .../apache/iotdb/db/engine/cache/ChunkCache.java   |   9 +-
 .../iotdb/db/engine/cache/ChunkMetadataCache.java  |   6 ++
 .../db/engine/cache/TimeSeriesMetadataCache.java   |  13 +++
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   2 +-
 .../org/apache/iotdb/db/mqtt/PublishHandler.java   |   2 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  26 ++---
 .../iotdb/db/qp/physical/crud/LastQueryPlan.java   |  21 +++-
 .../db/qp/physical/crud/RawDataQueryPlan.java      |   3 +-
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |   4 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  13 ++-
 .../query/dataset/groupby/GroupByFillDataSet.java  |   2 +-
 .../iotdb/db/query/executor/LastQueryExecutor.java |  10 +-
 .../org/apache/iotdb/db/service/RPCService.java    |  20 ++--
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  43 +++++++-
 .../iotdb/db/service/thrift/ThriftService.java     |   3 +-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   |  67 +------------
 .../db/integration/IoTDBQueryMemoryControlIT.java  | 108 +++++++++++++++++----
 .../iotdb/db/qp/plan/LogicalPlanSmallTest.java     |   3 +-
 site/src/main/package.json                         |   5 +-
 .../tsfile/file/metadata/MetadataIndexNode.java    |  20 +++-
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  42 ++++++--
 .../file/metadata/MetadataIndexNodeTest.java       |  10 +-
 42 files changed, 531 insertions(+), 225 deletions(-)

Reply via email to