You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ab...@apache.org on 2019/12/13 09:19:47 UTC

[hive] branch master updated: HIVE-22617: Re-Enable PreCommit test org.apache.hadoop.hive.ql.TestMTQueries.testMTQueries1 (László Bodor reviewed by Zoltan Haindrich)

This is an automated email from the ASF dual-hosted git repository.

abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new ed0c768  HIVE-22617: Re-Enable PreCommit test org.apache.hadoop.hive.ql.TestMTQueries.testMTQueries1 (László Bodor reviewed by Zoltan Haindrich)
ed0c768 is described below

commit ed0c768c21b08b4abf11778168448f54b28c60b5
Author: László Bodor <bo...@gmail.com>
AuthorDate: Fri Dec 13 10:14:06 2019 +0100

    HIVE-22617: Re-Enable PreCommit test org.apache.hadoop.hive.ql.TestMTQueries.testMTQueries1 (László Bodor reviewed by Zoltan Haindrich)
    
    Signed-off-by: Laszlo Bodor <bo...@gmail.com>
---
 .../java/org/apache/hadoop/hive/ql/TestMTQueries.java  |  3 ---
 .../hadoop/hive/ql/dataset/QTestDatasetHandler.java    | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
index 4130a03..d72c14a 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/TestMTQueries.java
@@ -19,8 +19,6 @@
 package org.apache.hadoop.hive.ql;
 
 import java.io.File;
-
-import org.junit.Ignore;
 import org.junit.Test;
 import static org.junit.Assert.fail;
 
@@ -36,7 +34,6 @@ public class TestMTQueries extends BaseTestQueries {
     }
   }
 
-  @Ignore("Disabled due to intermittent failures (HIVE-22616)")
   @Test
   public void testMTQueries1() throws Exception {
     String[] testNames = new String[] {"join2.q", "groupby1.q", "input1.q", "input19.q"};
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java
index d658d9e..85ece49 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/dataset/QTestDatasetHandler.java
@@ -51,7 +51,7 @@ public class QTestDatasetHandler implements QTestOptionHandler {
 
   private File datasetDir;
   private static Set<String> srcTables;
-  private Set<String> missingTables = new HashSet<>();
+  private static Set<String> missingTables = new HashSet<>();
 
   public QTestDatasetHandler(HiveConf conf) {
     // Use path relative to dataDir directory if it is not specified
@@ -134,13 +134,15 @@ public class QTestDatasetHandler implements QTestOptionHandler {
   @Override
   public void processArguments(String arguments) {
     String[] tables = arguments.split(",");
-    for (String string : tables) {
-      string = string.trim();
-      if (string.length() == 0) {
-        continue;
-      }
-      if (srcTables == null || !srcTables.contains(string)) {
-        missingTables.add(string);
+    synchronized (QTestUtil.class) {
+      for (String string : tables) {
+        string = string.trim();
+        if (string.length() == 0) {
+          continue;
+        }
+        if (srcTables == null || !srcTables.contains(string)) {
+          missingTables.add(string);
+        }
       }
     }
   }