This is an automated email from the ASF dual-hosted git repository.
haonan 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 31108de [IOTDB-2755] Fix tests of flink-tsfile-connector not executed
in CI (#5268)
31108de is described below
commit 31108de8039e2563a8c83c5ab0549b0c0eb6d1fa
Author: Haonan <[email protected]>
AuthorDate: Thu Mar 17 17:15:27 2022 +0800
[IOTDB-2755] Fix tests of flink-tsfile-connector not executed in CI (#5268)
---
...=> RowTSRecordOutputFormatIntegrationTest.java} | 2 +-
...va => RowTsFileInputFormatIntegrationTest.java} | 58 +++++++++++-----------
.../iotdb/tsfile/utils/MeasurementGroup.java | 3 +-
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIT.java
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIntegrationTest.java
similarity index 95%
rename from
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIT.java
rename to
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIntegrationTest.java
index 399cecd..60b6c17 100644
---
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIT.java
+++
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTSRecordOutputFormatIntegrationTest.java
@@ -28,7 +28,7 @@ import java.io.File;
import static org.junit.Assert.assertArrayEquals;
/** ITCases for TSRecordOutputFormat. */
-public class RowTSRecordOutputFormatIT extends RowTsFileOutputFormatTestBase {
+public class RowTSRecordOutputFormatIntegrationTest extends
RowTsFileOutputFormatTestBase {
@Test
public void testOutputFormat() throws Exception {
diff --git
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIT.java
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIntegrationTest.java
similarity index 67%
rename from
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIT.java
rename to
flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIntegrationTest.java
index 2fbee54..e00f865 100644
---
a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIT.java
+++
b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileInputFormatIntegrationTest.java
@@ -37,7 +37,7 @@ import java.util.stream.StreamSupport;
import static org.junit.Assert.assertArrayEquals;
/** ITCases for RowTsFileInputFormat. */
-public class RowTsFileInputFormatIT extends RowTsFileInputFormatTestBase {
+public class RowTsFileInputFormatIntegrationTest extends
RowTsFileInputFormatTestBase {
private ExecutionEnvironment env;
private StreamExecutionEnvironment senv;
@@ -59,20 +59,20 @@ public class RowTsFileInputFormatIT extends
RowTsFileInputFormatTestBase {
List<String> result = source.map(Row::toString).collect();
Collections.sort(result);
String[] expected = {
- "1,1.2,20,null,2.3,11,19",
- "10,null,20,50,25.4,10,21",
- "11,1.4,21,null,null,null,null",
- "12,1.2,20,51,null,null,null",
- "14,7.2,10,11,null,null,null",
- "15,6.2,20,21,null,null,null",
- "16,9.2,30,31,null,null,null",
- "2,null,20,50,25.4,10,21",
- "3,1.4,21,null,null,null,null",
- "4,1.2,20,51,null,null,null",
- "6,7.2,10,11,null,null,null",
- "7,6.2,20,21,null,null,null",
- "8,9.2,30,31,null,null,null",
- "9,1.2,20,null,2.3,11,19"
+ "+I[1, 1.2, 20, null, 2.3, 11, 19]",
+ "+I[10, null, 20, 50, 25.4, 10, 21]",
+ "+I[11, 1.4, 21, null, null, null, null]",
+ "+I[12, 1.2, 20, 51, null, null, null]",
+ "+I[14, 7.2, 10, 11, null, null, null]",
+ "+I[15, 6.2, 20, 21, null, null, null]",
+ "+I[16, 9.2, 30, 31, null, null, null]",
+ "+I[2, null, 20, 50, 25.4, 10, 21]",
+ "+I[3, 1.4, 21, null, null, null, null]",
+ "+I[4, 1.2, 20, 51, null, null, null]",
+ "+I[6, 7.2, 10, 11, null, null, null]",
+ "+I[7, 6.2, 20, 21, null, null, null]",
+ "+I[8, 9.2, 30, 31, null, null, null]",
+ "+I[9, 1.2, 20, null, 2.3, 11, 19]"
};
assertArrayEquals(expected, result.toArray());
}
@@ -88,20 +88,20 @@ public class RowTsFileInputFormatIT extends
RowTsFileInputFormatTestBase {
.sorted()
.toArray(String[]::new);
String[] expected = {
- "1,1.2,20,null,2.3,11,19",
- "10,null,20,50,25.4,10,21",
- "11,1.4,21,null,null,null,null",
- "12,1.2,20,51,null,null,null",
- "14,7.2,10,11,null,null,null",
- "15,6.2,20,21,null,null,null",
- "16,9.2,30,31,null,null,null",
- "2,null,20,50,25.4,10,21",
- "3,1.4,21,null,null,null,null",
- "4,1.2,20,51,null,null,null",
- "6,7.2,10,11,null,null,null",
- "7,6.2,20,21,null,null,null",
- "8,9.2,30,31,null,null,null",
- "9,1.2,20,null,2.3,11,19"
+ "+I[1, 1.2, 20, null, 2.3, 11, 19]",
+ "+I[10, null, 20, 50, 25.4, 10, 21]",
+ "+I[11, 1.4, 21, null, null, null, null]",
+ "+I[12, 1.2, 20, 51, null, null, null]",
+ "+I[14, 7.2, 10, 11, null, null, null]",
+ "+I[15, 6.2, 20, 21, null, null, null]",
+ "+I[16, 9.2, 30, 31, null, null, null]",
+ "+I[2, null, 20, 50, 25.4, 10, 21]",
+ "+I[3, 1.4, 21, null, null, null, null]",
+ "+I[4, 1.2, 20, 51, null, null, null]",
+ "+I[6, 7.2, 10, 11, null, null, null]",
+ "+I[7, 6.2, 20, 21, null, null, null]",
+ "+I[8, 9.2, 30, 31, null, null, null]",
+ "+I[9, 1.2, 20, null, 2.3, 11, 19]"
};
assertArrayEquals(expected, result);
}
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
index e4306b7..21cf4c8 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
@@ -20,11 +20,12 @@ package org.apache.iotdb.tsfile.utils;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class MeasurementGroup {
+public class MeasurementGroup implements Serializable {
private boolean isAligned;
private Map<String, MeasurementSchema> measurementSchemaMap;
