You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by bo...@apache.org on 2021/11/03 15:32:19 UTC
[impala] branch master updated: IMPALA-9873: (addendum) Fix test
case for scratch_tuple_batch
This is an automated email from the ASF dual-hosted git repository.
boroknagyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new ef2a8f6 IMPALA-9873: (addendum) Fix test case for scratch_tuple_batch
ef2a8f6 is described below
commit ef2a8f6f57c8feb11197d2e632e18e65e05cc4ab
Author: Amogh Margoor <am...@cloudera.com>
AuthorDate: Tue Nov 2 10:32:25 2021 -0700
IMPALA-9873: (addendum) Fix test case for scratch_tuple_batch
Patch contains minor fixes:
1. scratch_tuple_batch test which was causing failure in ASAN
build (IMPALA-10998).
2. Removing DCHECK which is not needed and gets triggered on
cancellation tests (IMPALA-11000).
Change-Id: I74ee41718745b8dca26f88082d3f2efe474e3bf9
Reviewed-on: http://gerrit.cloudera.org:8080/17992
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
be/src/exec/parquet/hdfs-parquet-scanner.cc | 1 -
be/src/exec/scratch-tuple-batch-test.cc | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/be/src/exec/parquet/hdfs-parquet-scanner.cc b/be/src/exec/parquet/hdfs-parquet-scanner.cc
index a47e1de..f5c3b6a 100644
--- a/be/src/exec/parquet/hdfs-parquet-scanner.cc
+++ b/be/src/exec/parquet/hdfs-parquet-scanner.cc
@@ -2391,7 +2391,6 @@ Status HdfsParquetScanner::FillScratchMicroBatches(
// Skipping this row group. Free up all the resources with this row group.
FlushRowGroupResources(row_batch);
*num_tuples = 0;
- DCHECK(scratch_batch_->AtEnd());
*skip_row_group = true;
if (num_tuples_mismatch && continue_execution) {
Status err(Substitute("Corrupt Parquet file '$0': column '$1' "
diff --git a/be/src/exec/scratch-tuple-batch-test.cc b/be/src/exec/scratch-tuple-batch-test.cc
index b80f8d0..fc730bc 100644
--- a/be/src/exec/scratch-tuple-batch-test.cc
+++ b/be/src/exec/scratch-tuple-batch-test.cc
@@ -155,7 +155,7 @@ TEST_F(ScratchTupleBatchTest, TestRandomGeneratedMicroBatches) {
// gaps to try
vector<int> gaps = {5, 16, 29, 37, 1025};
vector<float> selected_ratios = {0.5, 0.75, 0.1, 1.0, 0.44};
- for (int g = 0; g < sizeof(gaps); g++) {
+ for (int g = 0; g < gaps.size(); g++) {
int n = gaps[g];
// Set random locations as selected.
srand(time(NULL));