You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/03/14 03:19:30 UTC
[iotdb] branch HTVector updated (1daf2a2 -> da699d0)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch HTVector
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 1daf2a2 fix conflicts
add 19e1aba device template
add b2ee6ca [To Vector] flush vector series (#2826)
add 0198f5c Add generated-sources as source folder
add bfa529b (Fix Github Action)Update apt source before installing libboost
add 19ad435 [IOTDB-1204] set parameter in iotdb-cluster.properties (#2797)
add 1f54e62 Update cpp client build doc (#2796)
add 7d5329f [IOTDB-1192] Fix sql end with semicolon (#2798)
add a857820 Update UDF User Defined Function.md
add aad1bcd [IOTDB-1193] Remove redundant sync meta leader in CManager for cluster module (#2787)
add 02a4ecf [IOTDB-1208] revise the cluster setup docs (#2807)
add ff3a0f9 Fix compaction with cluster snapshot deletion (#2811)
add 1f98174 [IOTDB-1221] Compaction module: chunk metadata lists returned by the getMeasurementChunkMetadataListMapIterator method are not lexicographically ordered by the measurement names (#2817)
add bccb441 check and persist the system properties of the cluster version (#2816)
add 251c979 Rename timeout parameter (#2824)
add 653841b download calcite-core's dependency penhato from public.nexus.pentaho.org rather than spring.io
add 1b9d1f2 Merge branch 'master' into Vector
add 6767feb Merge branch 'Vector' of https://github.com/apache/iotdb into Vector
add 6fed4ed update template
add fb51b68 [To Vector] [IOTDB-1225] Support CreateAlignedTimeseriesPlan in MManager (#2831)
new da699d0 fix conflicts
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:
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
...eption.java => AlignedTimeseriesException.java} | 9 +-
.../org/apache/iotdb/db/metadata/MManager.java | 88 ++++++++++-
.../java/org/apache/iotdb/db/metadata/MTree.java | 172 ++++++++++++++++++---
.../org/apache/iotdb/db/metadata/MetaUtils.java | 15 ++
.../iotdb/db/metadata/MManagerBasicTest.java | 106 ++++++++++++-
.../db/qp/physical/PhysicalPlanSerializeTest.java | 20 +--
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
8 files changed, 358 insertions(+), 55 deletions(-)
copy server/src/main/java/org/apache/iotdb/db/exception/metadata/{IllegalParameterOfPathException.java => AlignedTimeseriesException.java} (76%)
[iotdb] 01/01: fix conflicts
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch HTVector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit da699d0d913cbd278cd8126241ba0b935ad18e27
Merge: 1daf2a2 fb51b68
Author: HTHou <hh...@outlook.com>
AuthorDate: Sun Mar 14 11:19:01 2021 +0800
fix conflicts
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../metadata/AlignedTimeseriesException.java | 31 ++++
.../org/apache/iotdb/db/metadata/MManager.java | 88 ++++++++++-
.../java/org/apache/iotdb/db/metadata/MTree.java | 172 ++++++++++++++++++---
.../org/apache/iotdb/db/metadata/MetaUtils.java | 15 ++
.../iotdb/db/metadata/MManagerBasicTest.java | 106 ++++++++++++-
.../db/qp/physical/PhysicalPlanSerializeTest.java | 20 +--
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
8 files changed, 384 insertions(+), 51 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 3413082,7f9c91f..41144ca
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@@ -44,6 -45,8 +44,7 @@@ import java.util.concurrent.ExecutionEx
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingQueue;
-import static org.apache.iotdb.db.rescon.PrimitiveArrayManager.ARRAY_SIZE;
+
public class MemTableFlushTask {
private static final Logger LOGGER = LoggerFactory.getLogger(MemTableFlushTask.class);
@@@ -160,7 -163,12 +161,6 @@@
new Runnable() {
private void writeOneSeries(
TVList tvPairs, IChunkWriter seriesWriterImpl, TSDataType dataType) {
-
- if (dataType == TSDataType.VECTOR) {
- writeOneVectorSeries(tvPairs, seriesWriterImpl);
- return;
- }
--
for (int i = 0; i < tvPairs.size(); i++) {
long time = tvPairs.getTime(i);