You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/12/03 12:24:35 UTC
[iotdb] branch master updated: fix insert partial tablet with
binary NullPointer bug (#2180)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new bf0fb06 fix insert partial tablet with binary NullPointer bug (#2180)
bf0fb06 is described below
commit bf0fb06acf8b5fa052004685a252613ab6f6a621
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Thu Dec 3 20:24:20 2020 +0800
fix insert partial tablet with binary NullPointer bug (#2180)
---
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 47 ++++++++++++++++++++++
.../apache/iotdb/tsfile/write/record/Tablet.java | 5 ++-
2 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
index 63ea32f..09849c8 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
@@ -43,6 +43,10 @@ import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+import org.apache.iotdb.tsfile.read.common.RowRecord;
+import org.apache.iotdb.tsfile.utils.Binary;
+import org.apache.iotdb.tsfile.write.record.Tablet;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -97,6 +101,49 @@ public class IoTDBSessionSimpleIT {
}
@Test
+ public void testInsertPartialTablet()
+ throws IoTDBConnectionException, StatementExecutionException {
+ session = new Session("127.0.0.1", 6667, "root", "root");
+ session.open();
+
+ List<MeasurementSchema> schemaList = new ArrayList<>();
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
+
+ Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
+
+ long timestamp = System.currentTimeMillis();
+
+ for (long row = 0; row < 15; row++) {
+ int rowIndex = tablet.rowSize++;
+ tablet.addTimestamp(rowIndex, timestamp);
+ tablet.addValue("s1", rowIndex, 1L);
+ tablet.addValue("s2", rowIndex, 1D);
+ tablet.addValue("s3", rowIndex, new Binary("1"));
+ if (tablet.rowSize == tablet.getMaxRowNumber()) {
+ session.insertTablet(tablet, true);
+ tablet.reset();
+ }
+ timestamp++;
+ }
+
+ if (tablet.rowSize != 0) {
+ session.insertTablet(tablet);
+ tablet.reset();
+ }
+
+ SessionDataSet dataSet = session.executeQueryStatement("select count(*) from root");
+ while (dataSet.hasNext()) {
+ RowRecord rowRecord = dataSet.next();
+ Assert.assertEquals(15L, rowRecord.getFields().get(0).getLongV());
+ Assert.assertEquals(15L, rowRecord.getFields().get(1).getLongV());
+ Assert.assertEquals(15L, rowRecord.getFields().get(2).getLongV());
+ }
+ session.close();
+ }
+
+ @Test
public void testInsertByStrAndInferType()
throws IoTDBConnectionException, StatementExecutionException {
session = new Session("127.0.0.1", 6667, "root", "root");
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java
index 3ccd884..a8b58a1 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/record/Tablet.java
@@ -235,8 +235,9 @@ public class Tablet {
break;
case TEXT:
valueOccupation += rowSize * 4;
- for (Binary value : (Binary[]) values[i]) {
- valueOccupation += value.getLength();
+ Binary[] binaries = (Binary[]) values[i];
+ for (int rowIndex = 0; rowIndex < rowSize; rowIndex++) {
+ valueOccupation += binaries[rowIndex].getLength();
}
break;
default: