Skip to content

GH-32381: [C++] Improve error handling for hash table merges#49512

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
zanmato1984 merged 5 commits into from
May 14, 2026
Merged

GH-32381: [C++] Improve error handling for hash table merges #49512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad1aed5
Implement error handling
kris-gaudel Mar 14, 2026
0170ae3
Add test for error propagation
kris-gaudel Mar 14, 2026
bb079fb
`BinaryMemoTable` test
kris-gaudel Apr 20, 2026
a2cd26f
Make `VisitEntries` propagate callback failures
kris-gaudel Apr 20, 2026
856b9f0
Use `VisitEntries` to simplify return logic
kris-gaudel May 13, 2026
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: 21 additions & 13 deletions cpp/src/arrow/util/hashing.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
uint64_t size() const { return size_; }

// Visit all non-empty entries in the table
// The visit_func should have signature void(const Entry*)
// The visit_func should have signature Status(const Entry*)
template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
for (uint64_t i = 0; i < capacity_; i++) {
const auto& entry = entries_[i];
if (entry) {
visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
}
}
return Status::OK();
}

protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
// So that both uint16_t and Float16 are allowed
static_assert(sizeof(Value) == sizeof(Scalar));
Scalar* out = reinterpret_cast<Scalar*>(out_data);
hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
int32_t index = entry->payload.memo_index - start;
if (index >= 0) {
out[index] = entry->payload.value;
}
});
return Status::OK();
}));
// Zero-initialize the null entry
if (null_index_ != kKeyNotFound) {
int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
// Merge entries from `other_table` into `this->hash_table_`.
Status MergeTable(const ScalarMemoTable& other_table) {
const HashTableType& other_hashtable = other_table.hash_table_;

other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
});
// TODO: ARROW-17074 - implement proper error handling
return Status::OK();
}
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
}
}

// Like VisitValues, but allows the visitor to fail. The visitor should have
// signature `Status(std::string_view)` or `Status(const std::string_view&)`.
template <typename VisitFunc>
Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
for (int32_t i = start; i < size(); ++i) {
RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
}
return Status::OK();
}

// Visit the stored value at a specific index in insertion order.
// The visitor function should have the signature `void(std::string_view)`
// or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

public:
Status MergeTable(const BinaryMemoTable& other_table) {
other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
});
return Status::OK();
}
};

Expand Down
56 changes: 56 additions & 0 deletions cpp/src/arrow/util/hashing_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.
int64_t bytes_allocated_limit = 0;
{
ProxyMemoryPool probe(default_memory_pool());
ScalarMemoTable<int64_t> target(&probe, 0);
for (int64_t value = 0; value < 15; ++value) {
AssertGetOrInsert(target, value, static_cast<int32_t>(value));
}
bytes_allocated_limit = probe.bytes_allocated();
}
ASSERT_GT(bytes_allocated_limit, 0);

ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
AssertGetOrInsert(source, 15, 0);

ProxyMemoryPool proxy(default_memory_pool());
CappedMemoryPool pool(&proxy, bytes_allocated_limit);
ScalarMemoTable<int64_t> target(&pool, 0);
for (int64_t value = 0; value < 15; ++value) {
AssertGetOrInsert(target, value, static_cast<int32_t>(value));
}
ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
std::string A = "", B = "a", C = "foo", D = "bar", E, F;
E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
const std::string extra_value(4096, 'x');

int64_t bytes_allocated_limit = 0;
{
ProxyMemoryPool probe(default_memory_pool());
BinaryMemoTable<BinaryBuilder> target(&probe, 0);
for (size_t i = 0; i < initial_values.size(); ++i) {
AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
}
bytes_allocated_limit = probe.bytes_allocated();
}
ASSERT_GT(bytes_allocated_limit, 0);

BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
AssertGetOrInsert(source, extra_value, 0);

ProxyMemoryPool proxy(default_memory_pool());
CappedMemoryPool pool(&proxy, bytes_allocated_limit);
BinaryMemoTable<BinaryBuilder> target(&pool, 0);
for (size_t i = 0; i < initial_values.size(); ++i) {
AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
}
ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
ASSERT_EQ(table.size(), 0);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
GH-32381: [C++] Improve error handling for hash table merges by kris-gaudel · Pull Request #49512 · apache/arrow · GitHub
Skip to content
GH-32381: [C++] Improve error handling for hash table merges#49512

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
GH-32381: [C++] Improve error handling for hash table merges by kris-gaudel · Pull Request #49512 · apache/arrow · GitHub
Skip to content
GH-32381: [C++] Improve error handling for hash table merges#49512

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

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

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
GH-32381: [C++] Improve error handling for hash table merges by kris-gaudel · Pull Request #49512 · apache/arrow · GitHub
Skip to content
GH-32381: [C++] Improve error handling for hash table merges#49512

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
GH-32381: [C++] Improve error handling for hash table merges by kris-gaudel · Pull Request #49512 · apache/arrow · GitHub
Skip to content
GH-32381: [C++] Improve error handling for hash table merges#49512

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
GH-32381: [C++] Improve error handling for hash table merges by kris-gaudel · Pull Request #49512 · apache/arrow · GitHub
Skip to content
GH-32381: [C++] Improve error handling for hash table merges#49512

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading

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

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

zanmato1984
merged 5 commits into

from

May 14, 2026
 Merged


GH-32381: [C++] Improve error handling for hash table merges
#49512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ad1aed5

Implement error handling


kris-gaudel Mar 14, 2026
0170ae3

Add test for error propagation


kris-gaudel Mar 14, 2026
bb079fb

`BinaryMemoTable` test


kris-gaudel Apr 20, 2026
a2cd26f

Make `VisitEntries` propagate callback failures


kris-gaudel Apr 20, 2026
856b9f0

Use `VisitEntries` to simplify return logic


kris-gaudel May 13, 2026

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: 21 additions & 13 deletions
cpp/src/arrow/util/hashing.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -286,15 +286,16 @@ class HashTable {
 uint64_t size() const { return size_; }

 // Visit all non-empty entries in the table
 // The visit_func should have signature void(const Entry*)
 // The visit_func should have signature Status(const Entry*)
 template <typename VisitFunc>
void VisitEntries(VisitFunc&& visit_func) const {
Status VisitEntries(VisitFunc&& visit_func) const {
 for (uint64_t i = 0; i < capacity_; i++) {
 const auto& entry = entries_[i];
 if (entry) {
 visit_func(&entry);
RETURN_NOT_OK(visit_func(&entry));
 }
 }
 return Status::OK();
 }

 protected:
Expand DownExpand Up@@ -494,12 +495,13 @@ class ScalarMemoTable : public MemoTable {
 // So that both uint16_t and Float16 are allowed
 static_assert(sizeof(Value) == sizeof(Scalar));
 Scalar* out = reinterpret_cast<Scalar*>(out_data);
 hash_table_.VisitEntries([=](const HashTableEntry* entry) {
ARROW_DCHECK_OK(hash_table_.VisitEntries([=](const HashTableEntry* entry) {
 int32_t index = entry->payload.memo_index - start;
 if (index >= 0) {
 out[index] = entry->payload.value;
 }
 });
 return Status::OK();
 }));
 // Zero-initialize the null entry
 if (null_index_ != kKeyNotFound) {
 int32_t index = null_index_ - start;
Expand DownExpand Up@@ -534,13 +536,10 @@ class ScalarMemoTable : public MemoTable {
 // Merge entries from `other_table` into `this->hash_table_`.
 Status MergeTable(const ScalarMemoTable& other_table) {
 const HashTableType& other_hashtable = other_table.hash_table_;

 other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 return other_hashtable.VisitEntries([this](const HashTableEntry* other_entry) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_entry->payload.value, &unused));
return this->GetOrInsert(other_entry->payload.value, &unused);
 });
 // TODO: ARROW-17074 - implement proper error handling
 return Status::OK();
 }
};

Expand DownExpand Up@@ -867,6 +866,16 @@ class BinaryMemoTable : public MemoTable {
 }
 }

 // Like VisitValues, but allows the visitor to fail. The visitor should have
 // signature `Status(std::string_view)` or `Status(const std::string_view&)`.
 template <typename VisitFunc>
 Status VisitValuesStatus(int32_t start, VisitFunc&& visit) const {
 for (int32_t i = start; i < size(); ++i) {
 RETURN_NOT_OK(visit(binary_builder_.GetView(i)));
 }
 return Status::OK();
 }

 // Visit the stored value at a specific index in insertion order.
 // The visitor function should have the signature `void(std::string_view)`
 // or `void(const std::string_view&)`.
Expand DownExpand Up@@ -899,11 +908,10 @@ class BinaryMemoTable : public MemoTable {

 public:
 Status MergeTable(const BinaryMemoTable& other_table) {
 other_table.VisitValues(0, [this](std::string_view other_value) {
return other_table.VisitValuesStatus(0, [this](std::string_view other_value) {
 int32_t unused;
ARROW_DCHECK_OK(this->GetOrInsert(other_value, &unused));
return this->GetOrInsert(other_value, &unused);
 });
 return Status::OK();
 }
};

Expand Down

56 changes: 56 additions & 0 deletions
cpp/src/arrow/util/hashing_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,6 +30,7 @@

#include "arrow/array/builder_primitive.h"
#include "arrow/array/concatenate.h"
#include "arrow/memory_pool.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/hashing.h"
Expand DownExpand Up@@ -376,6 +377,32 @@ TEST(ScalarMemoTable, StressInt64) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(ScalarMemoTable, MergeTablePropagatesInsertError) {
Comment thread
kris-gaudel marked this conversation as resolved.

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 ScalarMemoTable<int64_t> target(&probe, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 ScalarMemoTable<int64_t> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, 15, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 ScalarMemoTable<int64_t> target(&pool, 0);
 for (int64_t value = 0; value < 15; ++value) {
 AssertGetOrInsert(target, value, static_cast<int32_t>(value));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Basics) {
 std::string A = "", B = "a", C = "foo", D = "bar", E, F;
 E += '\0';
Expand DownExpand Up@@ -480,6 +507,35 @@ TEST(BinaryMemoTable, Stress) {
 ASSERT_EQ(table.size(), map.size());
}

TEST(BinaryMemoTable, MergeTablePropagatesInsertError) {
 const std::vector<std::string> initial_values = {"a", "bb", "ccc", "dddd"};
 const std::string extra_value(4096, 'x');

 int64_t bytes_allocated_limit = 0;
 {
 ProxyMemoryPool probe(default_memory_pool());
 BinaryMemoTable<BinaryBuilder> target(&probe, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 bytes_allocated_limit = probe.bytes_allocated();
 }
 ASSERT_GT(bytes_allocated_limit, 0);

 BinaryMemoTable<BinaryBuilder> source(default_memory_pool(), 0);
 AssertGetOrInsert(source, extra_value, 0);

 ProxyMemoryPool proxy(default_memory_pool());
 CappedMemoryPool pool(&proxy, bytes_allocated_limit);
 BinaryMemoTable<BinaryBuilder> target(&pool, 0);
 for (size_t i = 0; i < initial_values.size(); ++i) {
 AssertGetOrInsert(target, initial_values[i], static_cast<int32_t>(i));
 }
 ASSERT_EQ(proxy.bytes_allocated(), bytes_allocated_limit);

 ASSERT_RAISES(OutOfMemory, target.MergeTable(source));
}

TEST(BinaryMemoTable, Empty) {
 BinaryMemoTable<BinaryBuilder> table(default_memory_pool());
 ASSERT_EQ(table.size(), 0);
Expand Down
Loading