Skip to content

Commit

Permalink
Revert D51867634: Multisect successfully blamed "D51867634: [velox][P…
Browse files Browse the repository at this point in the history
…R] Scatter struct nulls when deserializing Presto wire format" for otest failure (apache#8105)

Summary:
Pull Request resolved: facebookincubator/velox#8105

This diff is reverting D51867634
D51867634: [velox][PR] Scatter struct nulls when deserializing Presto wire format by oerling has been identified to be causing the following test failure:

Tests affected:
- [xldb/alpha_jni/alpha-spark:alphajni_lib_test-java11 - testRleEncodingTopLevelNulls(com.facebook.xldb.presto.shaded.com.facebook.presto.common.type.Type)[16 : Type(row(field_0 integer,field_1 integer))] (com.facebook.xldb.alpha.EndToEndTest)](https://www.internalfb.com/intern/test/281475090996697/)

Here's the Multisect link:
https://www.internalfb.com/multisect/3818385
Here are the tasks that are relevant to this breakage:

We're generating a revert to back out the changes in this diff, please note the backout may land if someone accepts it.

If you believe this diff has been generated in error you may Commandeer and Abandon it.

Differential Revision: D52278809

fbshipit-source-id: 5d626b9e26645b11e9b57f11e49f836627f4fed5
  • Loading branch information
generatedunixname89002005232357 authored and facebook-github-bot committed Dec 19, 2023
1 parent eb71c70 commit ef47305
Show file tree
Hide file tree
Showing 4 changed files with 509 additions and 612 deletions.
4 changes: 2 additions & 2 deletions velox/exec/SpillFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ uint64_t SpillWriter::write(
MicrosecondTimer timer(&timeUs);
if (batch_ == nullptr) {
serializer::presto::PrestoVectorSerde::PrestoOptions options = {
kDefaultUseLosslessTimestamp, compressionKind_, true};
kDefaultUseLosslessTimestamp, compressionKind_};
batch_ = std::make_unique<VectorStreamGroup>(pool_);
batch_->createStreamTree(
std::static_pointer_cast<const RowType>(rows->type()),
Expand Down Expand Up @@ -294,7 +294,7 @@ SpillReadFile::SpillReadFile(
numSortKeys_(numSortKeys),
sortCompareFlags_(sortCompareFlags),
compressionKind_(compressionKind),
readOptions_{kDefaultUseLosslessTimestamp, compressionKind_, true},
readOptions_{kDefaultUseLosslessTimestamp, compressionKind_},
pool_(pool) {
constexpr uint64_t kMaxReadBufferSize =
(1 << 20) - AlignedBuffer::kPaddedSize; // 1MB - padding.
Expand Down
Loading

0 comments on commit ef47305

Please sign in to comment.