fix

rui-mo · rui-mo · commit d19e3dc7874c · 2023-06-27T03:41:00.000Z
diff --git a/velox/dwio/parquet/reader/ParquetReader.cpp b/velox/dwio/parquet/reader/ParquetReader.cpp
@@ -283,7 +283,7 @@ std::shared_ptr<const ParquetTypeWithId> ReaderBase::getParquetColumnInfo(
           schemaElement.name,
           std::nullopt,
           maxRepeat,
-          maxDefine);
+          maxDefine - 1);
     }
     return leafTypePtr;
   }
diff --git a/velox/dwio/parquet/reader/ParquetTypeWithId.cpp b/velox/dwio/parquet/reader/ParquetTypeWithId.cpp
@@ -76,7 +76,7 @@ LevelMode ParquetTypeWithId::makeLevelInfo(LevelInfo& info) const {
   }
   if (isList) {
     // the definition level is the level of a present element.
-    new (&info) LevelInfo(1, maxDefine_, maxRepeat_, repeatedAncestor);
+    new (&info) LevelInfo(1, maxDefine_ + 1, maxRepeat_, repeatedAncestor);
     return LevelMode::kList;
   }
 
diff --git a/velox/dwio/parquet/tests/reader/ParquetTableScanTest.cpp b/velox/dwio/parquet/tests/reader/ParquetTableScanTest.cpp
@@ -237,7 +237,8 @@ TEST_F(ParquetTableScanTest, array) {
               vector,
           }));
 
-  assertSelectWithFilter({"repeatedInt"}, {}, "", "SELECT repeatedInt FROM tmp");
+  assertSelectWithFilter(
+      {"repeatedInt"}, {}, "", "SELECT repeatedInt FROM tmp");
 }
 
 // Failed unit test on Velox map reader.

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ std::shared_ptr<const ParquetTypeWithId> ReaderBase::getParquetColumnInfo(`
`283`	`283`	`schemaElement.name,`
`284`	`284`	`std::nullopt,`
`285`	`285`	`maxRepeat,`
`286`		`- maxDefine);`
	`286`	`+ maxDefine - 1);`
`287`	`287`	`}`
`288`	`288`	`return leafTypePtr;`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ LevelMode ParquetTypeWithId::makeLevelInfo(LevelInfo& info) const {`
`76`	`76`	`}`
`77`	`77`	`if (isList) {`
`78`	`78`	`// the definition level is the level of a present element.`
`79`		`- new (&info) LevelInfo(1, maxDefine_, maxRepeat_, repeatedAncestor);`
	`79`	`+ new (&info) LevelInfo(1, maxDefine_ + 1, maxRepeat_, repeatedAncestor);`
`80`	`80`	`return LevelMode::kList;`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,8 @@ TEST_F(ParquetTableScanTest, array) {`
`237`	`237`	`vector,`
`238`	`238`	`}));`
`239`	`239`
`240`		`- assertSelectWithFilter({"repeatedInt"}, {}, "", "SELECT repeatedInt FROM tmp");`
	`240`	`+ assertSelectWithFilter(`
	`241`	`+ {"repeatedInt"}, {}, "", "SELECT repeatedInt FROM tmp");`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`// Failed unit test on Velox map reader.`