Browse Source

Revert "Updating Hive jars from 0.5 to 0.6."

This reverts commit 6ca694383d965f3a4dd7ffd85a42f14c823a3106.
vinithra 15 years ago
parent
commit
c33dd81a4e
47 changed files with 16 additions and 20 deletions
  1. 1 1
      apps/beeswax/beeswax_server.sh
  2. BIN
      apps/beeswax/hive/lib/commons-cli-2.0-SNAPSHOT.jar
  3. BIN
      apps/beeswax/hive/lib/commons-codec-1.4.jar
  4. BIN
      apps/beeswax/hive/lib/commons-dbcp-1.4.jar
  5. BIN
      apps/beeswax/hive/lib/commons-pool-1.5.4.jar
  6. BIN
      apps/beeswax/hive/lib/datanucleus-connectionpool-2.0.1.jar
  7. BIN
      apps/beeswax/hive/lib/datanucleus-core-1.1.2-patched.jar
  8. BIN
      apps/beeswax/hive/lib/datanucleus-core-2.0.3.jar
  9. BIN
      apps/beeswax/hive/lib/datanucleus-enhancer-1.1.2.jar
  10. BIN
      apps/beeswax/hive/lib/datanucleus-enhancer-2.0.3.jar
  11. BIN
      apps/beeswax/hive/lib/datanucleus-rdbms-1.1.2.jar
  12. BIN
      apps/beeswax/hive/lib/datanucleus-rdbms-2.0.3.jar
  13. BIN
      apps/beeswax/hive/lib/hbase-0.20.3-test.jar
  14. BIN
      apps/beeswax/hive/lib/hbase-0.20.3.jar
  15. BIN
      apps/beeswax/hive/lib/hive-anttasks-0.6.0-CDH3-dev.jar
  16. BIN
      apps/beeswax/hive/lib/hive-cli-0.5.0.jar
  17. BIN
      apps/beeswax/hive/lib/hive-cli-0.6.0-CDH3-dev.jar
  18. BIN
      apps/beeswax/hive/lib/hive-common-0.5.0.jar
  19. BIN
      apps/beeswax/hive/lib/hive-common-0.6.0-CDH3-dev.jar
  20. BIN
      apps/beeswax/hive/lib/hive-default-xml-0.5.0.jar
  21. BIN
      apps/beeswax/hive/lib/hive-default-xml-0.6.0.jar
  22. BIN
      apps/beeswax/hive/lib/hive-exec-0.5.0.jar
  23. BIN
      apps/beeswax/hive/lib/hive-exec-0.6.0-CDH3-dev.jar
  24. BIN
      apps/beeswax/hive/lib/hive-hwi-0.5.0.jar
  25. BIN
      apps/beeswax/hive/lib/hive-hwi-0.6.0-CDH3-dev.jar
  26. BIN
      apps/beeswax/hive/lib/hive-hwi-0.6.0-CDH3-dev.war
  27. BIN
      apps/beeswax/hive/lib/hive-jdbc-0.5.0.jar
  28. BIN
      apps/beeswax/hive/lib/hive-jdbc-0.6.0-CDH3-dev.jar
  29. BIN
      apps/beeswax/hive/lib/hive-metastore-0.5.0.jar
  30. BIN
      apps/beeswax/hive/lib/hive-metastore-0.6.0-CDH3-dev.jar
  31. BIN
      apps/beeswax/hive/lib/hive-serde-0.5.0.jar
  32. BIN
      apps/beeswax/hive/lib/hive-serde-0.6.0-CDH3-dev.jar
  33. BIN
      apps/beeswax/hive/lib/hive-service-0.5.0.jar
  34. BIN
      apps/beeswax/hive/lib/hive-shims-0.5.0.jar
  35. BIN
      apps/beeswax/hive/lib/hive-shims-0.6.0-CDH3-dev.jar
  36. BIN
      apps/beeswax/hive/lib/hive_contrib.jar
  37. BIN
      apps/beeswax/hive/lib/hive_hbase-handler.jar
  38. BIN
      apps/beeswax/hive/lib/jdo2-api-2.3-SNAPSHOT.jar
  39. BIN
      apps/beeswax/hive/lib/junit-4.5.jar
  40. BIN
      apps/beeswax/hive/lib/libfb303.jar
  41. BIN
      apps/beeswax/hive/lib/libthrift.jar
  42. BIN
      apps/beeswax/hive/lib/log4j-1.2.16.jar
  43. BIN
      apps/beeswax/hive/lib/slf4j-api-1.6.1.jar
  44. BIN
      apps/beeswax/hive/lib/slf4j-log4j12-1.6.1.jar
  45. BIN
      apps/beeswax/hive/lib/zookeeper-3.2.2.jar
  46. 2 2
      apps/beeswax/src/beeswax/test_base.py
  47. 13 17
      apps/beeswax/src/beeswax/tests.py

+ 1 - 1
apps/beeswax/beeswax_server.sh

@@ -56,7 +56,7 @@ fi
 if [ -f $HADOOP_CONF_DIR/hadoop-env.sh ]; then
   . $HADOOP_CONF_DIR/hadoop-env.sh
 fi
-export HADOOP_CONF_DIR=$BEESWAX_ROOT/../../desktop/conf:${BEESWAX_HIVE_LIB}/hive-default-xml-0.6.0.jar:${HADOOP_CONF_DIR}:$(find $BEESWAX_HIVE_LIB -name "thrift-fb303-0.5.0.jar" | head -1)
+export HADOOP_CONF_DIR=$BEESWAX_ROOT/../../desktop/conf:${BEESWAX_HIVE_LIB}/hive-default-xml-0.5.0.jar:${HADOOP_CONF_DIR}:$(find $BEESWAX_HIVE_LIB -name "libfb303.jar" | head -1)
 echo \$HADOOP_CONF_DIR=$HADOOP_CONF_DIR
 
 # Note: I've had trouble running this with just "java -jar" with the classpath

BIN
apps/beeswax/hive/lib/commons-cli-2.0-SNAPSHOT.jar


BIN
apps/beeswax/hive/lib/commons-codec-1.4.jar


BIN
apps/beeswax/hive/lib/commons-dbcp-1.4.jar


BIN
apps/beeswax/hive/lib/commons-pool-1.5.4.jar


BIN
apps/beeswax/hive/lib/datanucleus-connectionpool-2.0.1.jar


BIN
apps/beeswax/hive/lib/datanucleus-core-1.1.2-patched.jar


BIN
apps/beeswax/hive/lib/datanucleus-core-2.0.3.jar


BIN
apps/beeswax/hive/lib/datanucleus-enhancer-1.1.2.jar


BIN
apps/beeswax/hive/lib/datanucleus-enhancer-2.0.3.jar


BIN
apps/beeswax/hive/lib/datanucleus-rdbms-1.1.2.jar


BIN
apps/beeswax/hive/lib/datanucleus-rdbms-2.0.3.jar


BIN
apps/beeswax/hive/lib/hbase-0.20.3-test.jar


BIN
apps/beeswax/hive/lib/hbase-0.20.3.jar


BIN
apps/beeswax/hive/lib/hive-anttasks-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-cli-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-cli-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-common-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-common-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-default-xml-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-default-xml-0.6.0.jar


BIN
apps/beeswax/hive/lib/hive-exec-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-exec-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-hwi-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-hwi-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-hwi-0.6.0-CDH3-dev.war


BIN
apps/beeswax/hive/lib/hive-jdbc-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-jdbc-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-metastore-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-metastore-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-serde-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-serde-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive-service-0.6.0-CDH3-dev.jar → apps/beeswax/hive/lib/hive-service-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-shims-0.5.0.jar


BIN
apps/beeswax/hive/lib/hive-shims-0.6.0-CDH3-dev.jar


BIN
apps/beeswax/hive/lib/hive_contrib.jar


BIN
apps/beeswax/hive/lib/hive_hbase-handler.jar


BIN
apps/beeswax/hive/lib/jdo2-api-2.3-ec.jar → apps/beeswax/hive/lib/jdo2-api-2.3-SNAPSHOT.jar


BIN
apps/beeswax/hive/lib/junit-4.5.jar


BIN
apps/beeswax/hive/lib/thrift-fb303-0.5.0.jar → apps/beeswax/hive/lib/libfb303.jar


BIN
apps/beeswax/hive/lib/thrift-0.5.0.jar → apps/beeswax/hive/lib/libthrift.jar


BIN
apps/beeswax/hive/lib/log4j-1.2.16.jar


BIN
apps/beeswax/hive/lib/slf4j-api-1.6.1.jar


BIN
apps/beeswax/hive/lib/slf4j-log4j12-1.6.1.jar


BIN
apps/beeswax/hive/lib/zookeeper-3.2.2.jar


+ 2 - 2
apps/beeswax/src/beeswax/test_base.py

@@ -168,7 +168,7 @@ def wait_for_query_to_finish(client, response, max=30.0):
 def make_query(client, query, submission_type="Execute",
                udfs=None, settings=None, resources=None,
                wait=False, name=None, desc=None, local=True,
-               is_parameterized=True, max=30.0, **kwargs):
+               is_parameterized=True, **kwargs):
   """
   Prepares arguments for the execute view.
 
@@ -221,7 +221,7 @@ def make_query(client, query, submission_type="Execute",
   response = client.post("/beeswax/execute", parameters, **kwargs)
 
   if wait:
-    return wait_for_query_to_finish(client, response, max)
+    return wait_for_query_to_finish(client, response)
   return response
 
 

+ 13 - 17
apps/beeswax/src/beeswax/tests.py

@@ -52,11 +52,11 @@ CSV_LINK_PAT = re.compile('/beeswax/download/\d+/csv')
 def _make_query(client, query, submission_type="Execute",
                 udfs=None, settings=None, resources=[],
                 wait=False, name=None, desc=None, local=True,
-                is_parameterized=True, max=30.0, **kwargs):
+                is_parameterized=True, **kwargs):
   """Wrapper around the real make_query"""
   res = make_query(client, query, submission_type,
                    udfs, settings, resources,
-                   wait, name, desc, local, is_parameterized, max, **kwargs)
+                   wait, name, desc, local, is_parameterized, **kwargs)
   # Should be in the history if it's submitted.
   if submission_type == 'Execute':
     fragment = collapse_whitespace(smart_str(query[:20]))
@@ -136,7 +136,7 @@ for x in sys.stdin:
     response = wait_for_query_to_finish(self.client, response, max=180.0)
     # Check that we actually got a compressed output
     files = self.cluster.fs.listdir("/user/hive/warehouse/test2")
-    assert_true(len(files) >= 1)
+    assert_equal(1, len(files))
     assert_true(files[0].endswith(".deflate"))
     # And check that the name is right...
     assert_true("test_query_with_setting" in [ x.profile.name for x in self.cluster.jt.all_jobs().jobs ])
@@ -529,13 +529,10 @@ for x in sys.stdin:
       # Check that data is right
       if verify:
         target_ls = self.cluster.fs.listdir(target_dir)
-        assert_true(len(target_ls) >= 1)
-        data_buf = ""
-        for target in target_ls:
-          target_file = self.cluster.fs.open(target_dir + '/' + target)
-          data_buf += target_file.read()
-          target_file.close()
-
+        assert_equal(1, len(target_ls))
+        target_file = self.cluster.fs.open(target_dir + '/' + target_ls[0])
+        data_buf = target_file.read()
+        target_file.close()
         assert_equal(256, len(data_buf.strip().split('\n')))
         assert_true('255' in data_buf)
       return resp
@@ -544,13 +541,13 @@ for x in sys.stdin:
 
     # Not supported. SELECT *. (Result dir is same as table dir.)
     hql = "SELECT * FROM test"
-    resp = _make_query(self.client, hql, wait=True, local=False, max=180.0)
+    resp = _make_query(self.client, hql, wait=True)
     resp = save_and_verify(resp, TARGET_DIR_ROOT + '/1', verify=False)
     assert_true('not supported' in resp.content)
 
     # SELECT columns. (Result dir is in /tmp.)
     hql = "SELECT foo, bar FROM test"
-    resp = _make_query(self.client, hql, wait=True, local=False, max=180.0)
+    resp = _make_query(self.client, hql, wait=True)
     resp = save_and_verify(resp, TARGET_DIR_ROOT + '/2')
     # Results has a link to the FB
     assert_true('Query results stored in' in resp.content)
@@ -558,7 +555,7 @@ for x in sys.stdin:
 
     # Not supported. Partition tables
     hql = "SELECT * FROM test_partitions"
-    resp = _make_query(self.client, hql, wait=True, local=False, max=180.0)
+    resp = _make_query(self.client, hql, wait=True)
     resp = save_and_verify(resp, TARGET_DIR_ROOT + '/3', verify=False)
     assert_true('not supported' in resp.content)
 
@@ -578,8 +575,7 @@ for x in sys.stdin:
       wait_for_query_to_finish(self.client, resp, max=120)
 
       # Check that data is right. The SELECT may not give us the whole table.
-      resp = _make_query(self.client, 'SELECT * FROM %s' % (target_tbl,), wait=True,
-                        local=False)
+      resp = _make_query(self.client, 'SELECT * FROM %s' % (target_tbl,), wait=True)
       for i in xrange(90):
         assert_equal([str(i), '0x%x' % (i,)], resp.context['results'][i])
 
@@ -587,12 +583,12 @@ for x in sys.stdin:
 
     # SELECT *. (Result dir is same as table dir.)
     hql = "SELECT * FROM test"
-    resp = _make_query(self.client, hql, wait=True, local=False, max=180.0)
+    resp = _make_query(self.client, hql, wait=True)
     save_and_verify(resp, TARGET_TBL_ROOT + '_1')
 
     # SELECT columns. (Result dir is in /tmp.)
     hql = "SELECT foo, bar FROM test"
-    resp = _make_query(self.client, hql, wait=True, local=False, max=180.0)
+    resp = _make_query(self.client, hql, wait=True)
     save_and_verify(resp, TARGET_TBL_ROOT + '_2')