This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch OOMImprove
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from c03bfc6 resolve conflicts
add 1c1ccb6 rm update in md (#1835)
add 90ff56a IOTDB-932 Removed (wrong and redundant) Verification of Paths
in Session API.
add df48add IOTDB-932 Removed unnecessary Constant PATH_PATTERN and
related Test.
add 8ba9284 Trigger
add 6ba9889 Merge pull request #1793 from
apache/bugfix/932-wrong-verification
add 48f01b7 [IOTDB-926] Support reconnection of Session (#1821)
add c889776 [IOTDB-845]Enable to stop iotdb server by iotdb.IoTDB (#1633)
add 7755ffc [IOTDB-912] Implement wasNull method in
AbstractIoTDBJDBCResultSet (#1791)
add 6511a88 [IOTDB-908] Implement ResultSetMetadata interface for JDBC
(#1768)
add b67f669 Add readChunksInDevice method to TsFileSequenceReader (#1765)
add f352932 [IOTDB-942] Optimization of query with long time unsequence
page (#1824)
add e74f241 fix conflicts
No new revisions were added by this update.
Summary of changes:
docs/UserGuide/Operation Manual/Administration.md | 1 -
docs/UserGuide/Operation Manual/SQL Reference.md | 19 +-
.../UserGuide/Operation Manual/Administration.md | 1 -
.../zh/UserGuide/Operation Manual/SQL Reference.md | 17 +-
.../iotdb/jdbc/AbstractIoTDBJDBCResultSet.java | 19 +-
.../main/java/org/apache/iotdb/jdbc/Config.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 2 +-
.../iotdb/jdbc/IoTDBNonAlignJDBCResultSet.java | 8 +-
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 46 +-
.../resources/conf/iotdb-engine.properties | 4 +-
server/src/assembly/resources/conf/iotdb-env.bat | 70 ++-
.../src/assembly/resources/sbin/start-server.bat | 2 +-
server/src/assembly/resources/sbin/stop-server.bat | 17 +-
server/src/assembly/resources/sbin/stop-server.sh | 11 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 -
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 2 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 243 ++++++---
.../org/apache/iotdb/db/service/TSServiceImpl.java | 66 +--
.../apache/iotdb/db/sql/CheckPathValidityTest.java | 53 --
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 23 +-
.../main/java/org/apache/iotdb/session/Config.java | 3 +-
.../java/org/apache/iotdb/session/Session.java | 131 ++++-
.../iotdb/session/IoTDBSessionComplexIT.java | 45 --
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 554 +++++++++++----------
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 11 +
.../tsfile/file/metadata/TimeseriesMetadata.java | 11 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 28 ++
.../tsfile/read/TsFileSequenceReaderTest.java | 40 +-
28 files changed, 855 insertions(+), 576 deletions(-)
delete mode 100644
server/src/test/java/org/apache/iotdb/db/sql/CheckPathValidityTest.java
