You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2024/07/05 15:12:57 UTC
(flink) branch master updated: [hotfix] Fix merge conflicts in ParquetColumnarRowSplitReaderTest
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 64f745a5b1f [hotfix] Fix merge conflicts in ParquetColumnarRowSplitReaderTest
64f745a5b1f is described below
commit 64f745a5b1fc14a2cba1ddd977ab8e8db9cf45a4
Author: Jingsong <ji...@gmail.com>
AuthorDate: Fri Jul 5 23:12:40 2024 +0800
[hotfix] Fix merge conflicts in ParquetColumnarRowSplitReaderTest
---
.../formats/parquet/vector/ParquetColumnarRowSplitReaderTest.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/vector/ParquetColumnarRowSplitReaderTest.java b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/vector/ParquetColumnarRowSplitReaderTest.java
index ce5abe823d6..e4c5dc89c03 100644
--- a/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/vector/ParquetColumnarRowSplitReaderTest.java
+++ b/flink-formats/flink-parquet/src/test/java/org/apache/flink/formats/parquet/vector/ParquetColumnarRowSplitReaderTest.java
@@ -816,7 +816,7 @@ class ParquetColumnarRowSplitReaderTest {
for (int i = 0; i < rowNum; i++) {
Integer v = i;
Map<String, String> mp1 = new HashMap<>();
- mp1.put(null, "val_" + i);
+ mp1.put("key_" + i, "val_" + i);
Map<String, String> mp2 = new HashMap<>();
mp2.put("key_" + i, null);
mp2.put("key@" + i, "val@" + i);
@@ -874,7 +874,7 @@ class ParquetColumnarRowSplitReaderTest {
f3.addGroup(0);
Group mapList = f3.addGroup(0);
Group map1 = mapList.addGroup(0);
- createParquetMapGroup(map1, null, "val_" + i);
+ createParquetMapGroup(map1, "key_" + i, "val_" + i);
Group map2 = mapList.addGroup(0);
createParquetMapGroup(map2, "key_" + i, null);
createParquetMapGroup(map2, "key@" + i, "val@" + i);
@@ -927,9 +927,7 @@ class ParquetColumnarRowSplitReaderTest {
private void createParquetMapGroup(Group map, String key, String value) {
Group entry = map.addGroup(0);
- if (key != null) {
- entry.append("key", key);
- }
+ entry.append("key", key);
if (value != null) {
entry.append("value", value);
}