You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2021/05/19 06:31:56 UTC
[iotdb] 01/01: Fix session UT
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch pr3211
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 40c9751af8a6b679c6c230502263692b5d642769
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Wed May 19 14:19:21 2021 +0800
Fix session UT
---
.../java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java | 4 +++-
session/src/test/java/org/apache/iotdb/session/SessionUT.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index 0d70cad..0db373e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -338,7 +338,9 @@ public class TsFileProcessor {
int columnIndex = 0;
for (int i = 0; i < insertTabletPlan.getMeasurementMNodes().length; i++) {
// for aligned timeseries
- if (insertTabletPlan.getMeasurementMNodes()[i].getSchema().getType() == TSDataType.VECTOR) {
+ if (insertTabletPlan.getMeasurementMNodes()[i] != null
+ && insertTabletPlan.getMeasurementMNodes()[i].getSchema().getType()
+ == TSDataType.VECTOR) {
VectorMeasurementSchema vectorSchema =
(VectorMeasurementSchema) insertTabletPlan.getMeasurementMNodes()[i].getSchema();
Object[] columns = new Object[vectorSchema.getValueMeasurementIdList().size()];
diff --git a/session/src/test/java/org/apache/iotdb/session/SessionUT.java b/session/src/test/java/org/apache/iotdb/session/SessionUT.java
index 59d9f5b..28f251c 100644
--- a/session/src/test/java/org/apache/iotdb/session/SessionUT.java
+++ b/session/src/test/java/org/apache/iotdb/session/SessionUT.java
@@ -174,7 +174,7 @@ public class SessionUT {
RowRecord record = dataSet.next();
int nullCount = 0;
for (int j = 0; j < 4; ++j) {
- if (record.getFields().get(j) == null) {
+ if (record.getFields().get(j) == null || record.getFields().get(j).getDataType() == null) {
++nullCount;
} else {
assertEquals(i, record.getFields().get(j).getLongV());