Fix parquet complex type handling #9187

jaystarshot · 2024-03-20T20:58:47Z

Parquet has notion of optional and repeated layers which is needed in arrow calls like DefLevelsToBitmap.

This info is passed using arrow:LevelInfo. We were incorrectly computing repeatedAncestor by ignoring optional fields which is fixed in this PR.

Parquet has 3 level structure for nested types
https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#lists

// List<String> (list non-null, elements nullable)
1. required group my_list (LIST) {
2.   repeated group list {
3.    optional binary element (UTF8);
  }
}

However when we read this and convert to ParquetTypeWithId in current velox parquet reader, we ignore the intermediated layer 2. repeated group list (grandfather logic) in https://github.com/facebookincubator/velox/pull/9187/files#diff-64787e76c1b0ad12b5764770a94acd62054896a762ccead8f083a71a060f2f44R325.

facebook-github-bot · 2024-03-20T20:58:53Z

Hi @jaystarshot!

Thank you for your pull request.

We require contributors to sign our Contributor License Agreement, and yours needs attention.

You currently have a record in our system, but the CLA is no longer valid, and will need to be resubmitted.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at [email protected]. Thanks!

netlify · 2024-03-20T20:59:04Z

✅ Deploy Preview for meta-velox canceled.

Name	Link
🔨 Latest commit	`231caed`
🔍 Latest deploy log	https://app.netlify.com/sites/meta-velox/deploys/662c0be7c27b070008f773dc

velox/dwio/parquet/reader/ParquetReader.cpp

velox/dwio/parquet/reader/ParquetTypeWithId.cpp

velox/dwio/parquet/reader/PageReader.cpp

velox/dwio/parquet/reader/ParquetReader.cpp

facebook-github-bot · 2024-03-26T20:31:24Z

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

jaystarshot · 2024-03-26T20:35:29Z

velox/dwio/parquet/reader/ParquetTypeWithId.cpp

+  int16_t repeatedAncestor = maxDefine_;
+  auto node = this;
+  do {
+    if (node->isOptional_) {


Roughly based on https://github.com/apache/arrow/blob/main/cpp/src/parquet/level_conversion.h#L125.
the do() is to make sure that for nested types we are going inside and checking optional since the child layers optional (which we ignored) is needed by arrow

jaystarshot · 2024-03-26T21:05:26Z

cc: @Yuhta @yingsu00 @pranjalssh @rui-mo

qqibrow · 2024-03-26T22:15:05Z

velox/dwio/parquet/reader/ParquetReader.cpp

@@ -309,6 +318,9 @@ std::shared_ptr<const ParquetTypeWithId> ReaderBase::getParquetColumnInfo(
          VELOX_CHECK_EQ(children.size(), 1);
          const auto& child = children[0];
          auto grandChildren = child->getChildren();
+          // This level will not be repeated since parquet will have a child layer with the repeated info which we are ignoring here


could you elaborate more? it's a bit confusing that quote "This level will not be repeated" and next line isRepeated = true

hitarth · 2024-03-27T17:57:13Z

velox/dwio/parquet/tests/reader/ParquetTableScanTest.cpp

@@ -342,7 +341,7 @@ TEST_F(ParquetTableScanTest, DISABLED_optArrayReqEle) {

 // Required array with required elements.
 // Core dump is fixed, but the result is incorrect.


Remove the comment about result being incorrect now that it is fixed.

qqibrow

Please ensure all related DISABLED_ testes are reenabled. Also, in case we want a UT in ParquetReaderTest.cpp as well is a unit test here https://github.com/facebookincubator/velox/pull/8425/files

Yuhta · 2024-04-22T18:34:37Z

@jaystarshot Try debug build, it seems the OSS one is only running parquet tests with only release build

jaystarshot · 2024-04-22T21:12:38Z

Couldn't repro locally with the debug build as well
ctest -j ${NUM_THREADS} -VV --output-on-failure -R "parquet_table_scan" command used to run

Yuhta · 2024-04-22T21:25:05Z

Maybe add a VELOX_CHECK_LT(type.column(), fileMetaData_->row_groups[rowGroupIndex].columns.size()) before the crash point:

int64_t ReaderBase::rowGroupUncompressedSize(
    int32_t rowGroupIndex,
    const dwio::common::TypeWithId& type) const {
  if (type.column() != ParquetTypeWithId::kNonLeaf) {
    VELOX_CHECK_LT(type.column(), fileMetaData_->row_groups[rowGroupIndex].columns.size());
    return fileMetaData_->row_groups[rowGroupIndex]
        .columns[type.column()]
        .meta_data.total_uncompressed_size;
  }
  int64_t sum = 0;
  for (auto child : type.getChildren()) {
    sum += rowGroupUncompressedSize(rowGroupIndex, *child);
  }
  return sum;
}

Apparently the type has more columns than the metadata has

jaystarshot · 2024-04-22T21:59:06Z

Was the array test the only failure? If so it could be that there could be some issue in the test file and I can remove this test.

Yuhta · 2024-04-22T22:12:32Z

@jaystarshot It's both array and reqArrayLegacy

jaystarshot · 2024-04-22T22:17:59Z

I am wondering if this could be related to the crash #9223 is fixing.

jaystarshot · 2024-04-22T22:19:40Z

We can either keep those tests disabled in this PR or cherry pick that commit in this same PR and try to merge both

jaystarshot · 2024-04-24T16:36:19Z

@Yuhta Can you please try with this?

qqibrow · 2024-04-24T21:23:17Z

@jaystarshot I was about to add unit test for #9223 . Let me know whether I should proceed.

jaystarshot · 2024-04-24T21:41:36Z

Lets check if this fixes the crashes observed in meta's environment, if they do then we may not need tests

Yuhta · 2024-04-25T19:27:19Z

Can you rebase to latest to fix the build?

facebook-github-bot · 2024-04-25T19:27:45Z

@Yuhta has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

velox/dwio/parquet/reader/ParquetTypeWithId.cpp

Co-authored-by: hitarth <[email protected]>

facebook-github-bot · 2024-04-26T20:44:55Z

@Yuhta has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

facebook-github-bot · 2024-04-29T16:18:16Z

@Yuhta merged this pull request in 37f4700.

conbench-facebook · 2024-04-29T16:41:07Z

Conbench analyzed the 1 benchmark run on commit 37f4700b.

There were no benchmark performance regressions. 🎉

The full Conbench report has more details.

Summary: Fixes facebookincubator#7776 Parquet has notion of optional and repeated layers which is needed in arrow calls like [DefLevelsToBitmap](https://github.com/facebookincubator/velox/blob/7fc09667d5e22c684fdeff81da529b79cc974fee/velox/dwio/parquet/reader/PageReader.cpp#L573). This info is passed using arrow:LevelInfo. We were incorrectly computing **repeatedAncestor** by ignoring optional fields which is fixed in this PR. Parquet has 3 level structure for nested types https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#lists ``` // List<String> (list non-null, elements nullable) 1. required group my_list (LIST) { 2. repeated group list { 3. optional binary element (UTF8); } } ``` However when we read this and convert to **ParquetTypeWithId** in current velox parquet reader, we ignore the intermediated layer 2. **repeated group list** (grandfather logic) in https://github.com/facebookincubator/velox/pull/9187/files#diff-64787e76c1b0ad12b5764770a94acd62054896a762ccead8f083a71a060f2f44R325. Pull Request resolved: facebookincubator#9187 Reviewed By: mbasmanova Differential Revision: D55975472 Pulled By: Yuhta fbshipit-source-id: d0972b3134cc710645a9f50cd74a23efac830751

jaystarshot marked this pull request as draft March 20, 2024 20:59

jaystarshot mentioned this pull request Mar 20, 2024

Empty collection in array or map lead to incorrect results in parquet reader #7776

Closed

qqibrow reviewed Mar 20, 2024

View reviewed changes

velox/dwio/parquet/reader/ParquetReader.cpp Outdated Show resolved Hide resolved

velox/dwio/parquet/reader/ParquetTypeWithId.cpp Outdated Show resolved Hide resolved

hitarth reviewed Mar 20, 2024

View reviewed changes

velox/dwio/parquet/reader/PageReader.cpp Outdated Show resolved Hide resolved

jaystarshot force-pushed the test branch 2 times, most recently from df0987a to 2f420cc Compare March 22, 2024 02:28

jaystarshot changed the title ~~[Do not review] test arrow1~~ [WIP] Fix parquet complex types Mar 22, 2024

chliang71 reviewed Mar 26, 2024

View reviewed changes

velox/dwio/parquet/reader/ParquetReader.cpp Outdated Show resolved Hide resolved

facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Mar 26, 2024

jaystarshot commented Mar 26, 2024

View reviewed changes

jaystarshot force-pushed the test branch from 2f420cc to 121b376 Compare March 26, 2024 21:02

jaystarshot changed the title ~~[WIP] Fix parquet complex types~~ [WIP] Fix parquet complex type handling Mar 26, 2024

jaystarshot changed the title ~~[WIP] Fix parquet complex type handling~~ Fix parquet complex type handling Mar 26, 2024

jaystarshot marked this pull request as ready for review March 26, 2024 21:04

jaystarshot requested review from qqibrow, hitarth and chliang71 March 26, 2024 21:05

jaystarshot force-pushed the test branch from 121b376 to 89b2551 Compare March 26, 2024 21:21

qqibrow reviewed Mar 26, 2024

View reviewed changes

jaystarshot force-pushed the test branch 3 times, most recently from 3dc0bf9 to 0d6b1b8 Compare March 27, 2024 00:26

hitarth reviewed Mar 27, 2024

View reviewed changes

qqibrow approved these changes Mar 27, 2024

View reviewed changes

jaystarshot force-pushed the test branch 2 times, most recently from 90a4d38 to 7d4acb3 Compare March 27, 2024 23:37

jaystarshot force-pushed the test branch 2 times, most recently from eeecedf to 9e2670f Compare April 24, 2024 16:24

jaystarshot force-pushed the test branch from 9e2670f to 1b66b82 Compare April 25, 2024 22:58

Yuhta reviewed Apr 26, 2024

View reviewed changes

velox/dwio/parquet/reader/ParquetTypeWithId.cpp Outdated Show resolved Hide resolved

jaystarshot and others added 2 commits April 26, 2024 20:17

Fix Parquet Complex type handling

ab65c4e

Co-authored-by: hitarth <[email protected]>

Avoid crashes in rowGroupUncompressedSize

231caed

jaystarshot force-pushed the test branch from 1b66b82 to 231caed Compare April 26, 2024 20:17

jaystarshot mentioned this pull request Apr 27, 2024

Several failed cases on Parquet scan of complex type #5454

Closed

Yuhta approved these changes Apr 29, 2024

View reviewed changes

facebook-github-bot closed this in 37f4700 Apr 29, 2024

facebook-github-bot added the Merged label Apr 29, 2024

yingsu00 mentioned this pull request May 10, 2024

Avoid crashes in rowGroupUncompressedSize due to column index being o… #9223

Closed

ulysses-you mentioned this pull request May 30, 2024

Result mismatch when data contains empty map apache/incubator-gluten#4587

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix parquet complex type handling #9187

Fix parquet complex type handling #9187

jaystarshot commented Mar 20, 2024 •

edited

Loading

facebook-github-bot commented Mar 20, 2024

netlify bot commented Mar 20, 2024 •

edited

Loading

facebook-github-bot commented Mar 26, 2024

jaystarshot Mar 26, 2024

jaystarshot commented Mar 26, 2024 •

edited

Loading

qqibrow Mar 26, 2024

hitarth Mar 27, 2024 •

edited

Loading

qqibrow left a comment

Yuhta commented Apr 22, 2024 •

edited

Loading

jaystarshot commented Apr 22, 2024

Yuhta commented Apr 22, 2024 •

edited

Loading

jaystarshot commented Apr 22, 2024

Yuhta commented Apr 22, 2024

jaystarshot commented Apr 22, 2024

jaystarshot commented Apr 22, 2024 •

edited

Loading

jaystarshot commented Apr 24, 2024

qqibrow commented Apr 24, 2024

jaystarshot commented Apr 24, 2024

Yuhta commented Apr 25, 2024 •

edited

Loading

facebook-github-bot commented Apr 25, 2024

facebook-github-bot commented Apr 26, 2024

facebook-github-bot commented Apr 29, 2024

conbench-facebook bot commented Apr 29, 2024

		@@ -342,7 +341,7 @@ TEST_F(ParquetTableScanTest, DISABLED_optArrayReqEle) {

		// Required array with required elements.
		// Core dump is fixed, but the result is incorrect.

Fix parquet complex type handling #9187

Fix parquet complex type handling #9187

Conversation

jaystarshot commented Mar 20, 2024 • edited Loading

facebook-github-bot commented Mar 20, 2024

Process

netlify bot commented Mar 20, 2024 • edited Loading

✅ Deploy Preview for meta-velox canceled.

facebook-github-bot commented Mar 26, 2024

jaystarshot Mar 26, 2024

Choose a reason for hiding this comment

jaystarshot commented Mar 26, 2024 • edited Loading

qqibrow Mar 26, 2024

Choose a reason for hiding this comment

hitarth Mar 27, 2024 • edited Loading

Choose a reason for hiding this comment

qqibrow left a comment

Choose a reason for hiding this comment

Yuhta commented Apr 22, 2024 • edited Loading

jaystarshot commented Apr 22, 2024

Yuhta commented Apr 22, 2024 • edited Loading

jaystarshot commented Apr 22, 2024

Yuhta commented Apr 22, 2024

jaystarshot commented Apr 22, 2024

jaystarshot commented Apr 22, 2024 • edited Loading

jaystarshot commented Apr 24, 2024

qqibrow commented Apr 24, 2024

jaystarshot commented Apr 24, 2024

Yuhta commented Apr 25, 2024 • edited Loading

facebook-github-bot commented Apr 25, 2024

facebook-github-bot commented Apr 26, 2024

facebook-github-bot commented Apr 29, 2024

conbench-facebook bot commented Apr 29, 2024

jaystarshot commented Mar 20, 2024 •

edited

Loading

netlify bot commented Mar 20, 2024 •

edited

Loading

jaystarshot commented Mar 26, 2024 •

edited

Loading

hitarth Mar 27, 2024 •

edited

Loading

Yuhta commented Apr 22, 2024 •

edited

Loading

Yuhta commented Apr 22, 2024 •

edited

Loading

jaystarshot commented Apr 22, 2024 •

edited

Loading

Yuhta commented Apr 25, 2024 •

edited

Loading