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/11/16 08:35:21 UTC
[iotdb] 06/06: Fix tests
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch new_vector_writablechunkgroup
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8ee2c55eb37552ff9256b86d7dc3c8d9994ec357
Merge: 96bac68 0464838
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Nov 16 16:31:35 2021 +0800
Fix tests
.../iotdb/db/engine/memtable/AbstractMemTable.java | 6 +++
.../org/apache/iotdb/db/metadata/MManager.java | 2 +-
.../java/org/apache/iotdb/session/Session.java | 34 +++++-----------
.../test/java/org/apache/iotdb/db/sql/Cases.java | 46 +++++++++-------------
4 files changed, 34 insertions(+), 54 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 8a4e9d4,72c9b72..c5e8ae2
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@@ -159,14 -167,25 +159,17 @@@ public abstract class AbstractMemTable
continue;
}
IMeasurementSchema schema = insertRowPlan.getMeasurementMNodes()[i].getSchema();
- measurements.add(schema.getMeasurementId());
- types.add(schema.getType());
- encodings.add(schema.getEncodingType());
- compressionType = schema.getCompressor();
+ schemaList.add(schema);
+ dataTypes.add(schema.getType());
}
- if (measurements.isEmpty()) {
++ if (schemaList.isEmpty()) {
+ return;
+ }
- VectorMeasurementSchema vectorSchema =
- new VectorMeasurementSchema(
- AlignedPath.VECTOR_PLACEHOLDER,
- measurements.toArray(new String[measurements.size()]),
- types.toArray(new TSDataType[measurements.size()]),
- encodings.toArray(new TSEncoding[measurements.size()]),
- compressionType);
- memSize += MemUtils.getAlignedRecordSize(types, insertRowPlan.getValues(), disableMemControl);
+ memSize +=
+ MemUtils.getAlignedRecordsSize(dataTypes, insertRowPlan.getValues(), disableMemControl);
writeAlignedRow(
insertRowPlan.getDeviceId().getFullPath(),
- vectorSchema,
+ schemaList,
insertRowPlan.getTime(),
insertRowPlan.getValues());
totalPointsNum +=
@@@ -250,12 -269,25 +253,15 @@@
continue;
}
IMeasurementSchema schema = insertTabletPlan.getMeasurementMNodes()[i].getSchema();
- measurements.add(schema.getMeasurementId());
- types.add(schema.getType());
- encodings.add(schema.getEncodingType());
- compressionType = schema.getCompressor();
+ schemaList.add(schema);
}
- if (measurements.isEmpty()) {
++ if (schemaList.isEmpty()) {
+ return;
+ }
- VectorMeasurementSchema vectorSchema =
- new VectorMeasurementSchema(
- AlignedPath.VECTOR_PLACEHOLDER,
- measurements.toArray(new String[measurements.size()]),
- types.toArray(new TSDataType[measurements.size()]),
- encodings.toArray(new TSEncoding[measurements.size()]),
- compressionType);
- IWritableMemChunk memSeries =
- createAlignedMemChunkIfNotExistAndGet(
- insertTabletPlan.getDeviceId().getFullPath(), vectorSchema);
- memSeries.writeAlignedValues(
+ IWritableMemChunkGroup memChunkGroup =
+ createAlignedMemChunkGroupIfNotExistAndGet(
+ insertTabletPlan.getDeviceId().getFullPath(), schemaList);
+ memChunkGroup.writeValues(
insertTabletPlan.getTimes(),
insertTabletPlan.getColumns(),
insertTabletPlan.getBitMaps(),