You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@arrow.apache.org by "mapleFU (via GitHub)" <gi...@apache.org> on 2024/03/24 16:16:26 UTC
[PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
mapleFU opened a new pull request, #40768:
URL: https://github.com/apache/arrow/pull/40768
<!--
Thanks for opening a pull request!
If this is your first pull request you can find detailed information on how
to contribute here:
* [New Contributor's Guide](https://arrow.apache.org/docs/dev/developers/guide/step_by_step/pr_lifecycle.html#reviews-and-merge-of-the-pull-request)
* [Contributing Overview](https://arrow.apache.org/docs/dev/developers/overview.html)
If this is not a [minor PR](https://github.com/apache/arrow/blob/main/CONTRIBUTING.md#Minor-Fixes). Could you open an issue for this pull request on GitHub? https://github.com/apache/arrow/issues/new/choose
Opening GitHub issues ahead of time contributes to the [Openness](http://theapacheway.com/open/#:~:text=Openness%20allows%20new%20users%20the,must%20happen%20in%20the%20open.) of the Apache Arrow project.
Then could you also rename the pull request title in the following format?
GH-${GITHUB_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}
or
MINOR: [${COMPONENT}] ${SUMMARY}
In the case of PARQUET issues on JIRA the title also supports:
PARQUET-${JIRA_ISSUE_ID}: [${COMPONENT}] ${SUMMARY}
-->
### Rationale for this change
<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->
Enhance style for creating page writer.
### What changes are included in this PR?
<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->
* create PageWriter with one calling
* extract `column_properties`
### Are these changes tested?
no need
<!--
We typically require tests for all PRs in order to:
1. Prevent the code from being accidentally broken by subsequent changes
2. Serve as another way to document the expected behavior of the code
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->
### Are there any user-facing changes?
no
<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->
<!--
If there are any breaking changes to public APIs, please uncomment the line below and explain which changes are breaking.
-->
<!-- **This PR includes breaking changes to public APIs.** -->
<!--
Please uncomment the line below (and provide explanation) if the changes fix either (a) a security vulnerability, (b) a bug that caused incorrect or invalid data to be produced, or (c) a bug that causes a crash (even when the API contract is upheld). We use this to highlight fixes to issues that may affect users without their knowledge. For this reason, fixing bugs that cause errors don't count, since those are usually obvious.
-->
<!-- **This PR contains a "Critical Fix".** -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #40768:
URL: https://github.com/apache/arrow/pull/40768#issuecomment-2016858312
:warning: GitHub issue #40767 **has been automatically assigned in GitHub** to PR creator.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Consolidate CodecOptions to simplify PageWriter creation [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1538922777
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -288,45 +256,48 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
}
void InitColumns() {
- for (int i = 0; i < num_columns(); i++) {
+ for (int i = 0; i < RowGroupSerializer::num_columns(); i++) {
auto col_meta = metadata_->NextColumnChunk();
- const auto& path = col_meta->descr()->path();
const int32_t column_ordinal = next_column_index_++;
- auto meta_encryptor =
- file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
+ column_writers_.push_back(CreateColumnWriterForColumn(col_meta, column_ordinal));
+ }
+ }
+
+ std::shared_ptr<ColumnWriter> CreateColumnWriterForColumn(
+ ColumnChunkMetaDataBuilder* col_meta, int32_t column_ordinal) const {
+ const auto& path = col_meta->descr()->path();
+ const ColumnProperties& column_properties = properties_->column_properties(path);
+ auto meta_encryptor =
+ file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
+ : nullptr;
+ auto data_encryptor =
+ file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
+ : nullptr;
+ auto ci_builder = page_index_builder_ && column_properties.page_index_enabled()
+ ? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
: nullptr;
- auto data_encryptor =
- file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
+ auto oi_builder = page_index_builder_ && column_properties.page_index_enabled()
+ ? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
: nullptr;
- auto ci_builder = page_index_builder_ && properties_->page_index_enabled(path)
- ? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
- : nullptr;
- auto oi_builder = page_index_builder_ && properties_->page_index_enabled(path)
- ? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
- : nullptr;
- auto codec_options = properties_->codec_options(path)
- ? (properties_->codec_options(path)).get()
- : nullptr;
-
- std::unique_ptr<PageWriter> pager;
- if (!codec_options) {
- pager = PageWriter::Open(
- sink_, properties_->compression(path), col_meta, row_group_ordinal_,
- static_cast<int16_t>(column_ordinal), properties_->memory_pool(),
- buffered_row_group_, meta_encryptor, data_encryptor,
- properties_->page_checksum_enabled(), ci_builder, oi_builder, CodecOptions());
- } else {
- pager = PageWriter::Open(
- sink_, properties_->compression(path), col_meta, row_group_ordinal_,
- static_cast<int16_t>(column_ordinal), properties_->memory_pool(),
- buffered_row_group_, meta_encryptor, data_encryptor,
- properties_->page_checksum_enabled(), ci_builder, oi_builder, *codec_options);
- }
- column_writers_.push_back(
- ColumnWriter::Make(col_meta, std::move(pager), properties_));
+
+ const CodecOptions* codec_options = column_properties.codec_options()
+ ? column_properties.codec_options().get()
+ : nullptr;
+ CodecOptions default_codec_options;
+ if (!codec_options) {
+ codec_options = &default_codec_options;
}
+ DCHECK_NE(nullptr, codec_options);
+ std::unique_ptr<PageWriter> pager = PageWriter::Open(
+ sink_, column_properties.compression(), col_meta, row_group_ordinal_,
+ static_cast<int16_t>(column_ordinal), properties_->memory_pool(),
+ buffered_row_group_, meta_encryptor, data_encryptor,
Review Comment:
Previously, `NextColumn()` hardcode `buffered_row_group_` as false. But it already check `!buffered_row_group_`, so, we can just unify this here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1536993089
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -140,37 +140,35 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
const int32_t column_ordinal = next_column_index_++;
const auto& path = col_meta->descr()->path();
+ const ColumnProperties& column_properties = properties_->column_properties(path);
auto meta_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
: nullptr;
auto data_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
: nullptr;
- auto ci_builder = page_index_builder_ && properties_->page_index_enabled(path) &&
- properties_->statistics_enabled(path)
+ auto ci_builder = page_index_builder_ && column_properties.page_index_enabled() &&
+ column_properties.statistics_enabled()
? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
: nullptr;
- auto oi_builder = page_index_builder_ && properties_->page_index_enabled(path)
+ auto oi_builder = page_index_builder_ && column_properties.page_index_enabled()
? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
: nullptr;
- auto codec_options = properties_->codec_options(path)
- ? properties_->codec_options(path).get()
- : nullptr;
+ const CodecOptions* codec_options = column_properties.codec_options()
Review Comment:
I prefer explicit type since we know the type here and it's unlikely to be changed. But we can wait for others comment here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Simplify PageWriter and ColumnWriter creation [arrow]
Posted by "pitrou (via GitHub)" <gi...@apache.org>.
pitrou merged PR #40768:
URL: https://github.com/apache/arrow/pull/40768
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Simplify PageWriter and ColumnWriter creation [arrow]
Posted by "pitrou (via GitHub)" <gi...@apache.org>.
pitrou commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1539108108
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -288,45 +256,48 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
}
void InitColumns() {
- for (int i = 0; i < num_columns(); i++) {
+ for (int i = 0; i < RowGroupSerializer::num_columns(); i++) {
Review Comment:
Is there a particular reason for this change?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Consolidate CodecOptions to simplify PageWriter creation [arrow]
Posted by "wgtmac (via GitHub)" <gi...@apache.org>.
wgtmac commented on PR #40768:
URL: https://github.com/apache/arrow/pull/40768#issuecomment-2019269914
All failures are unrelated. I'll merge this if there is no objection.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on PR #40768:
URL: https://github.com/apache/arrow/pull/40768#issuecomment-2016858836
cc @wgtmac @pitrou
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
Posted by "kou (via GitHub)" <gi...@apache.org>.
kou commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1536997008
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -140,37 +140,35 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
const int32_t column_ordinal = next_column_index_++;
const auto& path = col_meta->descr()->path();
+ const ColumnProperties& column_properties = properties_->column_properties(path);
auto meta_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
: nullptr;
auto data_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
: nullptr;
- auto ci_builder = page_index_builder_ && properties_->page_index_enabled(path) &&
- properties_->statistics_enabled(path)
+ auto ci_builder = page_index_builder_ && column_properties.page_index_enabled() &&
+ column_properties.statistics_enabled()
? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
: nullptr;
- auto oi_builder = page_index_builder_ && properties_->page_index_enabled(path)
+ auto oi_builder = page_index_builder_ && column_properties.page_index_enabled()
? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
: nullptr;
- auto codec_options = properties_->codec_options(path)
- ? properties_->codec_options(path).get()
- : nullptr;
+ const CodecOptions* codec_options = column_properties.codec_options()
Review Comment:
(It's not a strong opinion.)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Consolidate CodecOptions to simplify PageWriter creation [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1538921103
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -292,36 +290,34 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
auto col_meta = metadata_->NextColumnChunk();
Review Comment:
Aha, nice catch, this can be easily done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Minor enhance style for creating page writer [arrow]
Posted by "kou (via GitHub)" <gi...@apache.org>.
kou commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1536950188
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -292,36 +290,34 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
auto col_meta = metadata_->NextColumnChunk();
const auto& path = col_meta->descr()->path();
const int32_t column_ordinal = next_column_index_++;
+ const ColumnProperties& column_properties = properties_->column_properties(path);
auto meta_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
: nullptr;
auto data_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
: nullptr;
- auto ci_builder = page_index_builder_ && properties_->page_index_enabled(path)
+ auto ci_builder = page_index_builder_ && column_properties.page_index_enabled()
? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
: nullptr;
- auto oi_builder = page_index_builder_ && properties_->page_index_enabled(path)
+ auto oi_builder = page_index_builder_ && column_properties.page_index_enabled()
? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
: nullptr;
- auto codec_options = properties_->codec_options(path)
- ? (properties_->codec_options(path)).get()
- : nullptr;
- std::unique_ptr<PageWriter> pager;
+ const CodecOptions* codec_options = column_properties.codec_options()
+ ? column_properties.codec_options().get()
+ : nullptr;
+ CodecOptions default_codec_options;
if (!codec_options) {
- pager = PageWriter::Open(
- sink_, properties_->compression(path), col_meta, row_group_ordinal_,
- static_cast<int16_t>(column_ordinal), properties_->memory_pool(),
- buffered_row_group_, meta_encryptor, data_encryptor,
- properties_->page_checksum_enabled(), ci_builder, oi_builder, CodecOptions());
- } else {
- pager = PageWriter::Open(
- sink_, properties_->compression(path), col_meta, row_group_ordinal_,
- static_cast<int16_t>(column_ordinal), properties_->memory_pool(),
- buffered_row_group_, meta_encryptor, data_encryptor,
- properties_->page_checksum_enabled(), ci_builder, oi_builder, *codec_options);
+ codec_options = &default_codec_options;
}
+ DCHECK_NE(nullptr, codec_options);
+ std::unique_ptr<PageWriter> pager = PageWriter::Open(
Review Comment:
`auto`?
```suggestion
auto pager = PageWriter::Open(
```
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -140,37 +140,35 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
const int32_t column_ordinal = next_column_index_++;
const auto& path = col_meta->descr()->path();
+ const ColumnProperties& column_properties = properties_->column_properties(path);
Review Comment:
`auto`?
```suggestion
const auto& column_properties = properties_->column_properties(path);
```
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -140,37 +140,35 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
const int32_t column_ordinal = next_column_index_++;
const auto& path = col_meta->descr()->path();
+ const ColumnProperties& column_properties = properties_->column_properties(path);
auto meta_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnMetaEncryptor(path->ToDotString())
: nullptr;
auto data_encryptor =
file_encryptor_ ? file_encryptor_->GetColumnDataEncryptor(path->ToDotString())
: nullptr;
- auto ci_builder = page_index_builder_ && properties_->page_index_enabled(path) &&
- properties_->statistics_enabled(path)
+ auto ci_builder = page_index_builder_ && column_properties.page_index_enabled() &&
+ column_properties.statistics_enabled()
? page_index_builder_->GetColumnIndexBuilder(column_ordinal)
: nullptr;
- auto oi_builder = page_index_builder_ && properties_->page_index_enabled(path)
+ auto oi_builder = page_index_builder_ && column_properties.page_index_enabled()
? page_index_builder_->GetOffsetIndexBuilder(column_ordinal)
: nullptr;
- auto codec_options = properties_->codec_options(path)
- ? properties_->codec_options(path).get()
- : nullptr;
+ const CodecOptions* codec_options = column_properties.codec_options()
Review Comment:
Should we use explicit type here? Can we use `auto` here?
```suggestion
const auto* codec_options = column_properties.codec_options()
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Consolidate CodecOptions to simplify PageWriter creation [arrow]
Posted by "pitrou (via GitHub)" <gi...@apache.org>.
pitrou commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1538877672
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -292,36 +290,34 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
auto col_meta = metadata_->NextColumnChunk();
Review Comment:
Most of this initialization code seems the same as in `NextColumn`, can we refactor this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Simplify PageWriter and ColumnWriter creation [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1539110498
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -288,45 +256,48 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
}
void InitColumns() {
- for (int i = 0; i < num_columns(); i++) {
+ for (int i = 0; i < RowGroupSerializer::num_columns(); i++) {
Review Comment:
`num_columns()` is a virtual function ( I don't know the reason ). And `InitColumns` is called in ctor. So I think we'd better write it explicitly
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Consolidate CodecOptions to simplify PageWriter creation [arrow]
Posted by "mapleFU (via GitHub)" <gi...@apache.org>.
mapleFU commented on code in PR #40768:
URL: https://github.com/apache/arrow/pull/40768#discussion_r1538880395
##########
cpp/src/parquet/file_writer.cc:
##########
@@ -292,36 +290,34 @@ class RowGroupSerializer : public RowGroupWriter::Contents {
auto col_meta = metadata_->NextColumnChunk();
Review Comment:
Hmm sure, currently they're used in different way (For buffered / un-buffered write ), I'll take a look tonight
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] GH-40767: [C++][Parquet] Simplify PageWriter and ColumnWriter creation [arrow]
Posted by "conbench-apache-arrow[bot] (via GitHub)" <gi...@apache.org>.
conbench-apache-arrow[bot] commented on PR #40768:
URL: https://github.com/apache/arrow/pull/40768#issuecomment-2021732218
After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit 5e1a4fd8a4ed3630c9549c611222d2d6c32357ca.
There were no benchmark performance regressions. 🎉
The [full Conbench report](https://github.com/apache/arrow/runs/23131497412) has more details. It also includes information about 4 possible false positives for unstable benchmarks that are known to sometimes produce them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org