Skip to content

GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

Closed
mapleFU wants to merge 4 commits into from
+19 −11
Closed

GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY #34336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb83b38
Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
mapleFU Feb 24, 2023
620828a
zero-copy read
mapleFU Feb 24, 2023
dc33d36
fix ub
mapleFU Feb 24, 2023
8f624f8
Merge branch 'main' into parquet/optimize-delta-length-decoding
mapleFU Feb 28, 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
6 changes: 5 additions & 1 deletion cpp/src/arrow/util/bit_stream_utils.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

/// Returns the number of bytes left in the stream, not including the current
/// byte (i.e., there may be an additional fraction of a byte).
int bytes_left() {
int bytes_left() const {
return max_bytes_ -
(byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
}

const uint8_t* begins() const { return buffer_; }

int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

/// Maximum byte length of a vlq encoded int
static constexpr int kMaxVlqByteLength = 5;

Expand Down
24 changes: 14 additions & 10 deletions cpp/src/parquet/encoding.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
MemoryPool* pool = ::arrow::default_memory_pool())
: DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
len_decoder_(nullptr, pool),
buffered_length_(AllocateBuffer(pool, 0)),
buffered_data_(AllocateBuffer(pool, 0)) {}
buffered_length_(AllocateBuffer(pool, 0)) {}

void SetData(int num_values, const uint8_t* data, int len) override {
num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
DecodeLengths();
}

// SetDecoder will be used by DeltaByteArrayDecoder.
void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
num_values_ = num_values;
decoder_ = decoder;
decoder_ = std::move(decoder);
DecodeLengths();
}

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
throw ParquetException("negative string delta length");
}
buffer[i].len = len;
if (AddWithOverflow(data_size, len, &data_size)) {
if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
}
}
length_idx_ += max_values;

PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
const uint8_t* begin = decoder_->begins();
int64_t current_bits_offset = decoder_->sum_bit_offsets();
if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
}
int64_t current_bytes_offset = current_bits_offset / 8;
// Check overflow
if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
ParquetException::EofException();
}
const uint8_t* data_ptr = buffered_data_->data();

for (int i = 0; i < max_values; ++i) {
buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
}
this->num_values_ -= max_values;
num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
int num_valid_values_;
uint32_t length_idx_;
std::shared_ptr<ResizableBuffer> buffered_length_;
std::shared_ptr<ResizableBuffer> buffered_data_;
};

// ----------------------------------------------------------------------
Expand Down
, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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

, '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-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY by mapleFU · Pull Request #34336 · apache/arrow · GitHub
Skip to content
GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY#34336

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

 Closed

mapleFU
wants to merge
4
commits into

from


+19

−11

 Closed


GH-34335: [C++][Parquet] Optimize Decoding DELTA_LENGTH_BYTE_ARRAY
#34336
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
fb83b38

Parquet: Optimize Decoding DELTA_LENGTH_BYTE_ARRAY


mapleFU Feb 24, 2023
620828a

zero-copy read


mapleFU Feb 24, 2023
dc33d36

fix ub


mapleFU Feb 24, 2023
8f624f8

Merge branch 'main' into parquet/optimize-delta-length-decoding


mapleFU Feb 28, 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


6 changes: 5 additions & 1 deletion
cpp/src/arrow/util/bit_stream_utils.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -178,11 +178,15 @@ class BitReader {

 /// Returns the number of bytes left in the stream, not including the current
 /// byte (i.e., there may be an additional fraction of a byte).
 int bytes_left() {
 int bytes_left() const {
 return max_bytes_ -
 (byte_offset_ + static_cast<int>(bit_util::BytesForBits(bit_offset_)));
 }

 const uint8_t* begins() const { return buffer_; }

 int64_t sum_bit_offsets() const { return byte_offset_ * 8 + bit_offset_; }

 /// Maximum byte length of a vlq encoded int
 static constexpr int kMaxVlqByteLength = 5;

Expand Down

24 changes: 14 additions & 10 deletions
cpp/src/parquet/encoding.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2703,8 +2703,7 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 MemoryPool* pool = ::arrow::default_memory_pool())
 : DecoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY),
 len_decoder_(nullptr, pool),
 buffered_length_(AllocateBuffer(pool, 0)),
 buffered_data_(AllocateBuffer(pool, 0)) {}
 buffered_length_(AllocateBuffer(pool, 0)) {}

 void SetData(int num_values, const uint8_t* data, int len) override {
 num_values_ = num_values;
Expand All@@ -2713,9 +2712,10 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 DecodeLengths();
 }

 // SetDecoder will be used by DeltaByteArrayDecoder.
 void SetDecoder(int num_values, std::shared_ptr<::arrow::bit_util::BitReader> decoder) {
 num_values_ = num_values;
 decoder_ = decoder;
 decoder_ = std::move(decoder);
 DecodeLengths();
 }

Expand All@@ -2736,21 +2736,26 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 throw ParquetException("negative string delta length");
 }
 buffer[i].len = len;
 if (AddWithOverflow(data_size, len, &data_size)) {
 if (ARROW_PREDICT_FALSE(AddWithOverflow(data_size, len, &data_size))) {
 throw ParquetException("excess expansion in DELTA_(LENGTH_)BYTE_ARRAY");
 }
 }
 length_idx_ += max_values;

 PARQUET_THROW_NOT_OK(buffered_data_->Resize(data_size));
 if (decoder_->GetBatch(8, buffered_data_->mutable_data(), data_size) != data_size) {
 const uint8_t* begin = decoder_->begins();
 int64_t current_bits_offset = decoder_->sum_bit_offsets();
 if (ARROW_PREDICT_FALSE(current_bits_offset % 8 != 0)) {
 throw ParquetException("Invalid DELTA_(LENGTH_)BYTE_ARRAY");
 }
 int64_t current_bytes_offset = current_bits_offset / 8;
 // Check overflow
 if (ARROW_PREDICT_FALSE(!decoder_->Advance(static_cast<int64_t>(data_size) * 8))) {
 ParquetException::EofException();
 }
 const uint8_t* data_ptr = buffered_data_->data();

 for (int i = 0; i < max_values; ++i) {
 buffer[i].ptr = data_ptr;
data_ptr += buffer[i].len;
 buffer[i].ptr = begin + current_bytes_offset;
current_bytes_offset += buffer[i].len;
 }
 this->num_values_ -= max_values;
 num_valid_values_ -= max_values;
Expand DownExpand Up@@ -2835,7 +2840,6 @@ class DeltaLengthByteArrayDecoder : public DecoderImpl,
 int num_valid_values_;
 uint32_t length_idx_;
 std::shared_ptr<ResizableBuffer> buffered_length_;
 std::shared_ptr<ResizableBuffer> buffered_data_;
};

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