You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/07/14 03:33:42 UTC
[iotdb] branch calandarbug updated (de1d62a -> 6d90aa8)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch calandarbug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from de1d62a modify tests
add 80aa392 Replace timeLowerBound with ttlLowerBound (#3542)
add 7ff4cb5 Update docker doc (#3539)
add 0147ec4 [IOTDB-1482]Fix timeseries count and device count with Template (#3544)
add 6615778 [IOTDB-1416] Maintanance command support in cluster mode (#3480)
add 08c6787 [IOTDB-1490] Add built-in UDTFs: sinh, conh, tanh (#3546)
add bf22001 Using cached pool to reduce the String memory size in TsFileResourse (#3555)
add f3de46f make parameter definition clearer (#3559)
add 8a1dd9a Add more builder options (#3552)
add 140c9f0 Bug: Time interval value is disorder in group by month (#3548)
add 5e020b5 [IOTDB-1483]Temporarily adapt the template functionality and merge functionality (#3560)
new 6d90aa8 Fix conflict
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cluster/src/assembly/resources/sbin/stop-node.sh | 6 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 8 +-
.../cluster/log/applier/DataLogApplierTest.java | 18 +++
.../cluster/log/applier/MetaLogApplierTest.java | 10 ++
docs/UserGuide/API/Programming-Java-Native-API.md | 13 ++-
.../DML-Data-Manipulation-Language.md | 3 +
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 47 ++++----
.../UserGuide/API/Programming-Java-Native-API.md | 13 ++-
.../DML-Data-Manipulation-Language.md | 3 +
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 55 ++++-----
.../db/engine/compaction/TsFileManagement.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 2 +-
.../db/engine/merge/manage/MergeResource.java | 8 +-
.../engine/storagegroup/StorageGroupProcessor.java | 18 +--
.../db/engine/storagegroup/TsFileResource.java | 5 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 12 +-
.../storagegroup/timeindex/FileTimeIndex.java | 12 +-
.../engine/storagegroup/timeindex/ITimeIndex.java | 4 +-
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 17 ++-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 17 ++-
.../iotdb/db/qp/physical/sys/ClearCachePlan.java | 17 +++
.../db/qp/physical/sys/CreateSnapshotPlan.java | 17 +++
.../apache/iotdb/db/qp/physical/sys/MergePlan.java | 17 +++
.../db/query/udf/builtin/BuiltinFunction.java | 3 +
.../udf/builtin/{UDTFAsin.java => UDTFCosh.java} | 4 +-
.../udf/builtin/{UDTFAsin.java => UDTFSinh.java} | 4 +-
.../udf/builtin/{UDTFAsin.java => UDTFTanh.java} | 4 +-
.../engine/merge/MaxFileMergeFileSelectorTest.java | 5 +-
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 3 +
.../iotdb/db/metadata/MManagerBasicTest.java | 124 +++++++++++++++++++++
.../java/org/apache/iotdb/session/Session.java | 29 +++++
.../org/apache/iotdb/session/pool/SessionPool.java | 9 ++
.../java/org/apache/iotdb/session/SessionTest.java | 31 +++++-
.../apache/iotdb/session/pool/SessionPoolTest.java | 17 +--
.../test/java/org/apache/iotdb/db/sql/Cases.java | 30 +++++
37 files changed, 472 insertions(+), 124 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/query/udf/builtin/{UDTFAsin.java => UDTFCosh.java} (92%)
copy server/src/main/java/org/apache/iotdb/db/query/udf/builtin/{UDTFAsin.java => UDTFSinh.java} (92%)
copy server/src/main/java/org/apache/iotdb/db/query/udf/builtin/{UDTFAsin.java => UDTFTanh.java} (92%)
[iotdb] 01/01: Fix conflict
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch calandarbug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6d90aa88147cf7651ce88048b6be8735e83122e8
Merge: de1d62a 5e020b5
Author: Alima777 <wx...@gmail.com>
AuthorDate: Wed Jul 14 11:32:30 2021 +0800
Fix conflict
cluster/src/assembly/resources/sbin/stop-node.sh | 6 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 8 +-
.../cluster/log/applier/DataLogApplierTest.java | 18 +++
.../cluster/log/applier/MetaLogApplierTest.java | 10 ++
docs/UserGuide/API/Programming-Java-Native-API.md | 13 ++-
.../DML-Data-Manipulation-Language.md | 3 +
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 47 ++++----
.../UserGuide/API/Programming-Java-Native-API.md | 13 ++-
.../DML-Data-Manipulation-Language.md | 3 +
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 55 ++++-----
.../db/engine/compaction/TsFileManagement.java | 4 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 2 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 2 +-
.../db/engine/merge/manage/MergeResource.java | 8 +-
.../engine/storagegroup/StorageGroupProcessor.java | 18 +--
.../db/engine/storagegroup/TsFileResource.java | 5 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 12 +-
.../storagegroup/timeindex/FileTimeIndex.java | 12 +-
.../engine/storagegroup/timeindex/ITimeIndex.java | 4 +-
.../org/apache/iotdb/db/metadata/MManager.java | 5 +
.../java/org/apache/iotdb/db/metadata/MTree.java | 17 ++-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 17 ++-
.../iotdb/db/qp/physical/sys/ClearCachePlan.java | 17 +++
.../db/qp/physical/sys/CreateSnapshotPlan.java | 17 +++
.../apache/iotdb/db/qp/physical/sys/MergePlan.java | 17 +++
.../db/query/udf/builtin/BuiltinFunction.java | 3 +
.../udf/builtin/UDTFCosh.java} | 18 +--
.../udf/builtin/UDTFSinh.java} | 18 +--
.../udf/builtin/UDTFTanh.java} | 18 +--
.../engine/merge/MaxFileMergeFileSelectorTest.java | 5 +-
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 3 +
.../iotdb/db/metadata/MManagerBasicTest.java | 124 +++++++++++++++++++++
.../java/org/apache/iotdb/session/Session.java | 29 +++++
.../org/apache/iotdb/session/pool/SessionPool.java | 9 ++
.../java/org/apache/iotdb/session/SessionTest.java | 31 +++++-
.../apache/iotdb/session/pool/SessionPoolTest.java | 17 +--
.../test/java/org/apache/iotdb/db/sql/Cases.java | 30 +++++
37 files changed, 478 insertions(+), 160 deletions(-)