You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by st...@apache.org on 2021/04/18 11:44:28 UTC
[impala] branch master updated (6b16df9 -> fdb6a4e)
This is an automated email from the ASF dual-hosted git repository.
stigahuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git.
from 6b16df9 IMPALA-9732: Improve exceptions of unsupported HdfsTableSink formats
new a1a1f99 IMPALA-10657: Remove accidental usage of shaded imports
new fdb6a4e IMPALA-10532: TestOverlapMinMaxFilters.test_overlap_min_max_filters seems flaky
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java | 2 +-
fe/src/main/java/org/apache/impala/catalog/Transaction.java | 3 ++-
fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java | 2 +-
fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java | 3 ++-
tests/common/skip.py | 2 ++
tests/query_test/test_runtime_filters.py | 2 ++
6 files changed, 10 insertions(+), 4 deletions(-)
[impala] 01/02: IMPALA-10657: Remove accidental usage of shaded
imports
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stigahuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit a1a1f9922565f866692b17c82106a1a8f6ac64a5
Author: John Sherman <jf...@cloudera.com>
AuthorDate: Tue Apr 13 21:18:28 2021 +0000
IMPALA-10657: Remove accidental usage of shaded imports
- This changes seemingly accidental usages of shaded imports
with the direct dependency
- This is helpful to reduce confusion and possibly reduce the
required jars for certain usages of the frontend jars
Change-Id: Ifa67aec96539db7861416f3e71cca83607e3d8c9
Reviewed-on: http://gerrit.cloudera.org:8080/17314
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java | 2 +-
fe/src/main/java/org/apache/impala/catalog/Transaction.java | 3 ++-
fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java | 2 +-
fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java b/fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java
index d5e4f29..48cb37f 100644
--- a/fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java
+++ b/fe/src/main/java/org/apache/impala/analysis/MultiAggregateInfo.java
@@ -29,11 +29,11 @@ import org.apache.impala.catalog.AggregateFunction;
import org.apache.impala.catalog.Type;
import org.apache.impala.common.AnalysisException;
import org.apache.impala.common.InternalException;
-import org.apache.kudu.shaded.com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
/**
* Encapsulates all the information needed to compute the aggregate functions of a single
diff --git a/fe/src/main/java/org/apache/impala/catalog/Transaction.java b/fe/src/main/java/org/apache/impala/catalog/Transaction.java
index f4af599..f9eeaf9 100644
--- a/fe/src/main/java/org/apache/impala/catalog/Transaction.java
+++ b/fe/src/main/java/org/apache/impala/catalog/Transaction.java
@@ -17,7 +17,6 @@
package org.apache.impala.catalog;
-import org.apache.curator.shaded.com.google.common.base.Preconditions;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
import org.apache.impala.common.TransactionException;
import org.apache.impala.common.TransactionKeepalive;
@@ -25,6 +24,8 @@ import org.apache.impala.common.TransactionKeepalive.HeartbeatContext;
import org.apache.impala.compat.MetastoreShim;
import org.apache.log4j.Logger;
+import com.google.common.base.Preconditions;
+
/**
* Transaction class that implements the AutoCloseable interface and hence the callers
* should use the try-with-resources statement while creating an instance. In its
diff --git a/fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java b/fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java
index b15888a..c070ea6 100644
--- a/fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java
+++ b/fe/src/main/java/org/apache/impala/planner/AnalyticPlanner.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.curator.shaded.com.google.common.collect.Iterables;
import org.apache.impala.analysis.AggregateInfoBase;
import org.apache.impala.analysis.AnalyticExpr;
import org.apache.impala.analysis.AnalyticInfo;
@@ -48,6 +47,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
diff --git a/fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java b/fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java
index 0e517a5..061e4a9 100644
--- a/fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java
+++ b/fe/src/test/java/org/apache/impala/analysis/ExprCardinalityTest.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull;
import java.util.Set;
-import org.apache.curator.shaded.com.google.common.collect.Sets;
import org.apache.impala.catalog.Catalog;
import org.apache.impala.catalog.Column;
import org.apache.impala.catalog.ColumnStats;
@@ -39,6 +38,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import com.google.common.collect.Sets;
+
/**
* Tests expression cardinality and selectivity, both of which are
* important inputs to scan and join cardinality estimates.
[impala] 02/02: IMPALA-10532:
TestOverlapMinMaxFilters.test_overlap_min_max_filters seems flaky
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stigahuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit fdb6a4e264ad3f156a76c4fc01d4c1b8f9b39189
Author: Qifan Chen <qc...@cloudera.com>
AuthorDate: Thu Apr 8 13:08:22 2021 -0400
IMPALA-10532: TestOverlapMinMaxFilters.test_overlap_min_max_filters seems flaky
This change disables the overlap min/max filter test for hdfs in
erasure coding, due to the query plan change (from 3-node scan to
2-node scan) which splits the row groups among scan nodes differently.
The SkipIfEC class in test harness skip.py is enhanced with a new
skip reason 'different_scan_split' to facilitate this action.
Testing:
1. Ran unit tests;
2. Ran core tests.
Change-Id: I527de530f7db1ce959e7ef2ae3ced18677221c9f
Reviewed-on: http://gerrit.cloudera.org:8080/17289
Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
tests/common/skip.py | 2 ++
tests/query_test/test_runtime_filters.py | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tests/common/skip.py b/tests/common/skip.py
index 6acef78..bde0f22 100644
--- a/tests/common/skip.py
+++ b/tests/common/skip.py
@@ -215,6 +215,8 @@ class SkipIfEC:
contain_full_explain = pytest.mark.skipif(IS_EC, reason="Contain full explain output "
"for hdfs tables.")
different_schedule = pytest.mark.skipif(IS_EC, reason="Query is scheduled differently.")
+ different_scan_split = pytest.mark.skipif(IS_EC, reason="Scan split of row "
+ "groups for Parquet tables created in EC mode is different.")
class SkipIfDockerizedCluster:
diff --git a/tests/query_test/test_runtime_filters.py b/tests/query_test/test_runtime_filters.py
index 2f9b6b6..61f63ce 100644
--- a/tests/query_test/test_runtime_filters.py
+++ b/tests/query_test/test_runtime_filters.py
@@ -26,6 +26,7 @@ from tests.common.environ import build_flavor_timeout
from tests.common.environ import ImpalaTestClusterProperties
from tests.common.impala_cluster import ImpalaCluster
from tests.common.impala_test_suite import ImpalaTestSuite
+from tests.common.skip import SkipIfEC
from tests.common.skip import SkipIfLocal, SkipIfIsilon
from tests.common.test_dimensions import add_exec_option_dimension
from tests.common.test_vector import ImpalaTestDimension
@@ -266,6 +267,7 @@ class TestMinMaxFilters(ImpalaTestSuite):
assert cursor.fetchall() == [(len(matching_vals) + 2,)]
+@SkipIfEC.different_scan_split
@SkipIfLocal.multiple_impalad
class TestOverlapMinMaxFilters(ImpalaTestSuite):
@classmethod