You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mj...@apache.org on 2016/09/16 21:44:07 UTC

[1/2] incubator-impala git commit: IMPALA-4116: Remove 'cdh' from version string again

Repository: incubator-impala
Updated Branches:
  refs/heads/master e3abf84cc -> 0f188636d


IMPALA-4116: Remove 'cdh' from version string again

The rebase of another change went wrong and undid the change of
I7754538a23e73dcdebc6e3df509f357cbe03198c so we need to do this one
again. Previous review was at http://gerrit.cloudera.org:8080/4421 .

Change-Id: Ie386d25f2006e2dcebcbfd3d6ae88f70d65efb0f
Reviewed-on: http://gerrit.cloudera.org:8080/4439
Reviewed-by: Sailesh Mukil <sa...@cloudera.com>
Reviewed-by: Lars Volker <lv...@cloudera.com>
Reviewed-by: Jim Apple <jb...@cloudera.com>
Tested-by: Sailesh Mukil <sa...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/1e33d04e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/1e33d04e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/1e33d04e

Branch: refs/heads/master
Commit: 1e33d04e52d71fc7de3417fad629abfd94e43b31
Parents: e3abf84
Author: Lars Volker <lv...@cloudera.com>
Authored: Fri Sep 16 09:32:38 2016 -0700
Committer: Jim Apple <jb...@cloudera.com>
Committed: Fri Sep 16 16:44:46 2016 +0000

----------------------------------------------------------------------
 bin/save-version.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/1e33d04e/bin/save-version.sh
----------------------------------------------------------------------
diff --git a/bin/save-version.sh b/bin/save-version.sh
index 978222e..bc0de75 100755
--- a/bin/save-version.sh
+++ b/bin/save-version.sh
@@ -21,7 +21,7 @@
 # Note: for internal (aka pre-release) versions, the version should have
 # "-INTERNAL" appended. Parts of the code will look for this to distinguish
 # between released and internal versions.
-VERSION=2.8.0-cdh5-INTERNAL
+VERSION=2.7.0
 GIT_HASH=$(git rev-parse HEAD 2> /dev/null)
 if [ -z $GIT_HASH ]
 then


[2/2] incubator-impala git commit: IMPALA-4136: testKudu planner test hangs if Kudu is not supported

Posted by mj...@apache.org.
IMPALA-4136: testKudu planner test hangs if Kudu is not supported

The Kudu planner tests were recently moved into PlannerTest
but they need to be explicitly skipped when
KUDU_IS_SUPPORTED is false.

Change-Id: Iaf713107cdf49fa73efae5a731f26bbce96d8364
Reviewed-on: http://gerrit.cloudera.org:8080/4426
Reviewed-by: Alex Behm <al...@cloudera.com>
Tested-by: Internal Jenkins


Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/0f188636
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/0f188636
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/0f188636

Branch: refs/heads/master
Commit: 0f188636d029c19b06a23f60ba63b47f4cd2d866
Parents: 1e33d04
Author: Matthew Jacobs <mj...@cloudera.com>
Authored: Thu Sep 15 09:32:56 2016 -0700
Committer: Internal Jenkins <cl...@gerrit.cloudera.org>
Committed: Fri Sep 16 20:37:55 2016 +0000

----------------------------------------------------------------------
 .../cloudera/impala/planner/PlannerTest.java    | 23 ++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/0f188636/fe/src/test/java/com/cloudera/impala/planner/PlannerTest.java
----------------------------------------------------------------------
diff --git a/fe/src/test/java/com/cloudera/impala/planner/PlannerTest.java b/fe/src/test/java/com/cloudera/impala/planner/PlannerTest.java
index a09f218..6c88170 100644
--- a/fe/src/test/java/com/cloudera/impala/planner/PlannerTest.java
+++ b/fe/src/test/java/com/cloudera/impala/planner/PlannerTest.java
@@ -17,9 +17,11 @@
 
 package com.cloudera.impala.planner;
 
+import org.junit.Assume;
 import org.junit.Test;
 
 import com.cloudera.impala.catalog.Db;
+import com.cloudera.impala.common.RuntimeEnv;
 import com.cloudera.impala.thrift.TExplainLevel;
 import com.cloudera.impala.thrift.TQueryOptions;
 import com.cloudera.impala.thrift.TRuntimeFilterMode;
@@ -247,21 +249,34 @@ public class PlannerTest extends PlannerTestBase {
   }
 
   @Test
-  public void testKudu() { runPlannerTestFile("kudu"); }
+  public void testKudu() {
+    Assume.assumeTrue(RuntimeEnv.INSTANCE.isKuduSupported());
+    runPlannerTestFile("kudu");
+  }
 
   @Test
-  public void testKuduUpdate() { runPlannerTestFile("kudu-update"); }
+  public void testKuduUpdate() {
+    Assume.assumeTrue(RuntimeEnv.INSTANCE.isKuduSupported());
+    runPlannerTestFile("kudu-update");
+  }
 
   @Test
-  public void testKuduDelete() { runPlannerTestFile("kudu-delete"); }
+  public void testKuduDelete() {
+    Assume.assumeTrue(RuntimeEnv.INSTANCE.isKuduSupported());
+    runPlannerTestFile("kudu-delete");
+  }
 
   @Test
   public void testKuduSelectivity() {
+    Assume.assumeTrue(RuntimeEnv.INSTANCE.isKuduSupported());
     TQueryOptions options = defaultQueryOptions();
     options.setExplain_level(TExplainLevel.VERBOSE);
     runPlannerTestFile("kudu-selectivity", options);
   }
 
   @Test
-  public void testKuduTpch() { runPlannerTestFile("tpch-kudu"); }
+  public void testKuduTpch() {
+    Assume.assumeTrue(RuntimeEnv.INSTANCE.isKuduSupported());
+    runPlannerTestFile("tpch-kudu");
+  }
 }