ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation - #4971

Closed
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree
Closed

ARROW-6077: [C++][Parquet] Build Arrow "schema tree" from Parquet schema to help with nested data implementation#4971
wesm wants to merge 2 commits into
apache:masterfrom
wesm:parquet-arrow-schema-tree

Conversation

@wesm

@wesmwesm commented Jul 31, 2019

Copy link
Copy Markdown
Member

Introduces auxiliary internal SchemaManifest and SchemaField data structures.

This also permits dictionary-encoded subfields in a slightly more principled way (the dictionary type creation is resolved one time, so this removes the FixSchema hacks that were there before). I rewrote the nested schema conversion logic to hopefully be slightly easier to follow though it could still use some work. I added comments within to explain the 3 different styles of list encoding

There are a couple of API changes:

  • The FileReader::GetSchema(indices, &schema) method has been removed. The way that "projected" schemas were being constructed was pretty hacky, and this function is non-essential to the operation of the class. I had to remove bindings in the GLib and R libraries for this function, but as far as I can tell these bindings were non-essential to operation, and were added only because the function was there to wrap.
  • Added FileWriter::Make factory method, making constructor private

This patch was pretty unpleasant to do -- it removes some hacky functions used to create Arrow fields with leaf nodes trimmed. There is little functional change; it is an attempt to bring a cleaner structure for full-fledged nested data reading

I'm going to get on with seeing through user-facing dictionary-encoding functionality in Python

@codecov-io

codecov-io commented Jul 31, 2019

Copy link
Copy Markdown

Codecov Report

Merging #4971 into master will increase coverage by 1.6%.
The diff coverage is 91.34%.

Impacted file tree graph

@@ Coverage Diff @@## master #4971 +/- ##
==========================================
+ Coverage 87.55% 89.15% +1.6% 
==========================================
Files 1000 723 -277 Lines 142303 101705 -40598 Branches 1418 0 -1418 ==========================================
- Hits 124589 90678 -33911 + Misses 17352 11027 -6325 + Partials 362 0 -362
Impacted FilesCoverage Δ
cpp/src/parquet/arrow/writer.h100% <ø> (ø)⬆️
cpp/src/parquet/arrow/schema.cc93.21% <ø> (+2.24%)⬆️
cpp/src/parquet/arrow/reader.h91.66% <ø> (ø)⬆️
cpp/src/parquet/schema.h100% <ø> (ø)⬆️
cpp/src/parquet/schema-internal.h100% <ø> (+3.44%)⬆️
r/R/arrowExports.R71.12% <100%> (+0.29%)⬆️
cpp/src/parquet/file_writer.cc81.21% <100%> (-1.02%)⬇️
r/src/arrowExports.cpp70.91% <100%> (+0.33%)⬆️
r/src/parquet.cpp70.58% <100%> (+7.43%)⬆️
r/R/parquet.R72% <50%> (+5.33%)⬆️
... and 305 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 803dd89...a5187c2. Read the comment docs.

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Looks like I have to rebase. Any thoughts about this? I need to stack my patches on top

@fsaintjacques

Copy link
Copy Markdown
Contributor

@wesm I have a pending review I started yesterday night, let me complete this morning (lot to review!)

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Okay. Quite a bit code has been moved around relatively unmodified so please refrain from commenting on old code. Thanks =)

@fsaintjacques

Copy link
Copy Markdown
Contributor

I'll try to, github review interface does not make this easy to do :)

@hatemhelal

Copy link
Copy Markdown
Contributor

I had a read through and looked good to me. I think this or your previous refactoring PR might have fixed ARROW-6005. I'll plan to use that issue to add some unittests for that particular workflow.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found this change from passing by const ref to value threw me a bit. Could warrant a comment? Or does it make sense to keep the signature as accepting a const ref and move this:

::arrow::dictionary(::arrow::int32(), logical_value_type)

into TransferDictionary?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm reverting this change, it was a leftover from mid-way through the patch

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this code was moved from elsewhere but you could replace this with boost::algorithm::ends_with

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, doing that then =)

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::vector<int> Arange(int length) {
staticstd::vector<int> Arange(int length) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to anonymous namespace

Comment threadcpp/src/parquet/arrow/reader.cc Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
explicitRowGroupRecordBatchReader(
RowGroupRecordBatchReader(

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a misleading error message since non-leaf schema fields don't have indices

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tricky thing to have any kind of error here, since users should not see this. I am changing to say that the schema manifest may be malformed

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate? Is this in reference to #4956 ?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem that I'm referencing here is fixed by this patch, I will remove the comment

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}else {
}

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (((empty_def_level[j] - 1) == def_levels[i]) && (nullable[j])) {
if (nullable[j] && empty_def_level[j] - 1 == def_levels[i]) {

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be easier than offset_builders and valid_bits_builders:

MakeBuilder(pool, list(list(list(/*...*/null()/*...*/))), &root_builder);

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Old code

wesm added 2 commits August 1, 2019 15:45
Initial ugly refactoring
More ugly refactoring. Not quite there yet
More non-working refactoring
Schema tests pass again
Fix node filtering logic
C++ unit tests passing again, create dictionary subfields
Move symbols to reader.h
Remove bindings for removed GetSchema API
Remove API
Fix R bindings
@wesm
wesmforce-pushed the parquet-arrow-schema-tree branch from a5187c2 to e1f19c0CompareAugust 1, 2019 21:14
@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Thank you for the feedback. I'll merge this once the build passes

@wesm

wesm commented Aug 1, 2019

Copy link
Copy Markdown
MemberAuthor

Travis CI: https://travis-ci.org/wesm/arrow/builds/566680039
Appveyor: https://ci.appveyor.com/project/wesm/arrow/builds/26412833

The Appveyor build isn't done yet so I'll wait a little bit to make sure MinGW is ok

@wesm

wesm commented Aug 2, 2019

Copy link
Copy Markdown
MemberAuthor

One of the Windows builds is hanging, it doesn't appear related to this patch because I found it in a build in master. I opened

https://issues.apache.org/jira/browse/ARROW-6108

Merging this in the meantime

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@wesm@codecov-io@fsaintjacques@hatemhelal@bkietz