GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjones127 merged 2 commits into from
Feb 21, 2023
Merged

GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary #34107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f6eea
GH-34106: Fix updating page stats for WriteArrowDictionary
wgtmac Feb 9, 2023
af1318e
avoid null page stats
wgtmac Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions cpp/src/parquet/arrow/arrow_reader_writer_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
ASSERT_EQ(stats1->EncodeMin(), "b");
ASSERT_EQ(stats0->EncodeMax(), "b");
ASSERT_EQ(stats1->EncodeMax(), "c");

// Check page statistics
const auto expected_page_type =
GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
: PageType::DATA_PAGE_V2;
auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
for (int i = 0; i < 3; ++i) {
auto page = rg0_page_reader->NextPage();
ASSERT_EQ(expected_page_type, page->type());
auto data_page = std::static_pointer_cast<DataPage>(page);
ASSERT_EQ(3, data_page->num_values());
const auto& stats = data_page->statistics();
EXPECT_EQ(1, stats.null_count);
EXPECT_EQ(rg0_min_values[i], stats.min());
EXPECT_EQ(rg0_max_values[i], stats.max());
}
ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
{
auto page = rg1_page_reader->NextPage();
ASSERT_EQ(expected_page_type, page->type());
auto data_page = std::static_pointer_cast<DataPage>(page);
ASSERT_EQ(3, data_page->num_values());
const auto& stats = data_page->statistics();
EXPECT_EQ(1, stats.null_count);
EXPECT_EQ("b", stats.min());
EXPECT_EQ("c", stats.max());
}
ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down
81 changes: 36 additions & 45 deletions cpp/src/parquet/column_writer.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
std::shared_ptr<::arrow::Array> indices = data.indices();

auto update_stats = [&](int64_t num_chunk_levels,
const std::shared_ptr<Array>& chunk_indices) {
// TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
// indices array to a (hopefully smaller) referenced indices array. Second, a copy
// of the values array to a (probably not smaller) referenced values array.
//
// Once the MinMax kernel supports all data types we should use that kernel instead
// as it does not make any copies.
::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
exec_ctx.set_use_threads(false);

std::shared_ptr<::arrow::Array> referenced_dictionary;
PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
::arrow::compute::Unique(*chunk_indices, &exec_ctx));

// On first run, we might be able to re-use the existing dictionary
if (referenced_indices.length() == dictionary->length()) {
referenced_dictionary = dictionary;
} else {
PARQUET_ASSIGN_OR_THROW(
::arrow::Datum referenced_dictionary_datum,
::arrow::compute::Take(dictionary, referenced_indices,
::arrow::compute::TakeOptions(/*boundscheck=*/false),
&exec_ctx));
referenced_dictionary = referenced_dictionary_datum.make_array();
}

int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.
page_statistics_->IncrementNumValues(non_null_count);
page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
};

int64_t value_offset = 0;
auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
AddIfNotNull(rep_levels, offset));
std::shared_ptr<Array> writeable_indices =
indices->Slice(value_offset, batch_num_spaced_values);
if (page_statistics_) {
update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
}
PARQUET_ASSIGN_OR_THROW(
writeable_indices,
MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
value_offset += batch_num_spaced_values;
};

auto update_stats = [&]() {
// TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
// indices array to a (hopefully smaller) referenced indices array. Second, a copy
// of the values array to a (probably not smaller) referenced values array.
//
// Once the MinMax kernel supports all data types we should use that kernel instead
// as it does not make any copies.
::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
exec_ctx.set_use_threads(false);

std::shared_ptr<::arrow::Array> referenced_dictionary;
// If dictionary is the same dictionary we already have, just use that
if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
referenced_dictionary = preserved_dictionary_;
} else {
PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
::arrow::compute::Unique(*indices, &exec_ctx));

// On first run, we might be able to re-use the existing dictionary
if (referenced_indices.length() == dictionary->length()) {
referenced_dictionary = dictionary;
} else {
PARQUET_ASSIGN_OR_THROW(
::arrow::Datum referenced_dictionary_datum,
::arrow::compute::Take(dictionary, referenced_indices,
::arrow::compute::TakeOptions(/*boundscheck=*/false),
&exec_ctx));
referenced_dictionary = referenced_dictionary_datum.make_array();
}
}

int64_t non_null_count = indices->length() - indices->null_count();
page_statistics_->IncrementNullCount(num_levels - non_null_count);
page_statistics_->IncrementNumValues(non_null_count);
page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
};

// Handle seeing dictionary for the first time
if (!preserved_dictionary_) {
// It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
return WriteDense();
}

if (page_statistics_ != nullptr) {
update_stats();
}
preserved_dictionary_ = dictionary;
} else if (!dictionary->Equals(*preserved_dictionary_)) {
// Dictionary has changed
PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
return WriteDense();
} else {
// Dictionary is same, but we need to update stats
if (page_statistics_ != nullptr) {
update_stats();
}
}

PARQUET_CATCH_NOT_OK(
Expand Down
, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down

, '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
GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary#34107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wjones127
merged 2 commits into

from

Feb 21, 2023
 Merged


GH-34106: [C++][Parquet] Fix updating page stats for WriteArrowDictionary
#34107
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
84f6eea

GH-34106: Fix updating page stats for WriteArrowDictionary


wgtmac Feb 9, 2023
af1318e

avoid null page stats


wgtmac Feb 13, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 34 additions & 0 deletions
cpp/src/parquet/arrow/arrow_reader_writer_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4243,6 +4243,40 @@ TEST_P(TestArrowWriteDictionary, StatisticsUnifiedDictionary) {
 ASSERT_EQ(stats1->EncodeMin(), "b");
 ASSERT_EQ(stats0->EncodeMax(), "b");
 ASSERT_EQ(stats1->EncodeMax(), "c");

 // Check page statistics
 const auto expected_page_type =
 GetParquetDataPageVersion() == ParquetDataPageVersion::V1 ? PageType::DATA_PAGE
 : PageType::DATA_PAGE_V2;
 auto rg0_page_reader = parquet_reader->RowGroup(0)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg0_page_reader->NextPage()->type());
 const std::vector<std::string> rg0_min_values = {"a", "a", "a"};
 const std::vector<std::string> rg0_max_values = {"a", "a", "b"};
 for (int i = 0; i < 3; ++i) {
 auto page = rg0_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ(rg0_min_values[i], stats.min());
 EXPECT_EQ(rg0_max_values[i], stats.max());
 }
 ASSERT_EQ(rg0_page_reader->NextPage(), nullptr);

 auto rg1_page_reader = parquet_reader->RowGroup(1)->GetColumnPageReader(0);
 ASSERT_EQ(PageType::DICTIONARY_PAGE, rg1_page_reader->NextPage()->type());
 {
 auto page = rg1_page_reader->NextPage();
 ASSERT_EQ(expected_page_type, page->type());
 auto data_page = std::static_pointer_cast<DataPage>(page);
 ASSERT_EQ(3, data_page->num_values());
 const auto& stats = data_page->statistics();
 EXPECT_EQ(1, stats.null_count);
 EXPECT_EQ("b", stats.min());
 EXPECT_EQ("c", stats.max());
 }
 ASSERT_EQ(rg1_page_reader->NextPage(), nullptr);
}

// ----------------------------------------------------------------------
Expand Down

81 changes: 36 additions & 45 deletions
cpp/src/parquet/column_writer.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1484,6 +1484,39 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 std::shared_ptr<::arrow::Array> dictionary = data.dictionary();
 std::shared_ptr<::arrow::Array> indices = data.indices();

 auto update_stats = [&](int64_t num_chunk_levels,
 const std::shared_ptr<Array>& chunk_indices) {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*chunk_indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }

 int64_t non_null_count = chunk_indices->length() - chunk_indices->null_count();
 page_statistics_->IncrementNullCount(num_chunk_levels - non_null_count);
Comment thread
wgtmac marked this conversation as resolved.

 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 int64_t value_offset = 0;
 auto WriteIndicesChunk = [&](int64_t offset, int64_t batch_size) {
 int64_t batch_num_values = 0;
Expand All@@ -1498,6 +1531,9 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 AddIfNotNull(rep_levels, offset));
 std::shared_ptr<Array> writeable_indices =
 indices->Slice(value_offset, batch_num_spaced_values);
 if (page_statistics_) {
 update_stats(/*num_chunk_levels=*/batch_size, writeable_indices);
 }
 PARQUET_ASSIGN_OR_THROW(
 writeable_indices,
 MaybeReplaceValidity(writeable_indices, null_count, ctx->memory_pool));
Expand All@@ -1506,43 +1542,6 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 value_offset += batch_num_spaced_values;
 };

 auto update_stats = [&]() {
 // TODO(PARQUET-2068) This approach may make two copies. First, a copy of the
 // indices array to a (hopefully smaller) referenced indices array. Second, a copy
 // of the values array to a (probably not smaller) referenced values array.
 //
 // Once the MinMax kernel supports all data types we should use that kernel instead
 // as it does not make any copies.
 ::arrow::compute::ExecContext exec_ctx(ctx->memory_pool);
 exec_ctx.set_use_threads(false);

 std::shared_ptr<::arrow::Array> referenced_dictionary;
 // If dictionary is the same dictionary we already have, just use that
 if (preserved_dictionary_ && preserved_dictionary_ == dictionary) {
 referenced_dictionary = preserved_dictionary_;
 } else {
 PARQUET_ASSIGN_OR_THROW(::arrow::Datum referenced_indices,
 ::arrow::compute::Unique(*indices, &exec_ctx));

 // On first run, we might be able to re-use the existing dictionary
 if (referenced_indices.length() == dictionary->length()) {
 referenced_dictionary = dictionary;
 } else {
 PARQUET_ASSIGN_OR_THROW(
 ::arrow::Datum referenced_dictionary_datum,
 ::arrow::compute::Take(dictionary, referenced_indices,
 ::arrow::compute::TakeOptions(/*boundscheck=*/false),
 &exec_ctx));
 referenced_dictionary = referenced_dictionary_datum.make_array();
 }
 }

 int64_t non_null_count = indices->length() - indices->null_count();
 page_statistics_->IncrementNullCount(num_levels - non_null_count);
 page_statistics_->IncrementNumValues(non_null_count);
 page_statistics_->Update(*referenced_dictionary, /*update_counts=*/false);
 };

 // Handle seeing dictionary for the first time
 if (!preserved_dictionary_) {
 // It's a new dictionary. Call PutDictionary and keep track of it
Expand All@@ -1556,19 +1555,11 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
 return WriteDense();
 }

 if (page_statistics_ != nullptr) {
 update_stats();
 }
 preserved_dictionary_ = dictionary;
 } else if (!dictionary->Equals(*preserved_dictionary_)) {
 // Dictionary has changed
 PARQUET_CATCH_NOT_OK(FallbackToPlainEncoding());
 return WriteDense();
 } else {
 // Dictionary is same, but we need to update stats
 if (page_statistics_ != nullptr) {
 update_stats();
 }
 }

 PARQUET_CATCH_NOT_OK(
Expand Down