hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1665320 [7/7] - in /hive/branches/cbo: ./ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/predicate/ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/ ant/...
Date Mon, 09 Mar 2015 18:44:22 GMT
Modified: hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
(original)
+++ hive/branches/cbo/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
Mon Mar  9 18:44:19 2015
@@ -1793,7 +1793,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is
a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is
a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group
by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -1897,7 +1897,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join MERGEJOIN[24][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is
a cross product
+Warning: Shuffle Join MERGEJOIN[23][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is
a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart
group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -4108,7 +4108,7 @@ POSTHOOK: Input: default@srcpart@ds=2008
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 #### A masked pattern was here ####
 1000
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: -- parent is reduce tasks
 EXPLAIN select count(*) from srcpart join (select ds as ds, ds as date from srcpart group
by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
@@ -4209,7 +4209,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Map Join MAPJOIN[24][bigTable=?] in task 'Map 1' is a cross product
+Warning: Map Join MAPJOIN[23][bigTable=?] in task 'Map 1' is a cross product
 PREHOOK: query: select count(*) from srcpart join (select ds as ds, ds as date from srcpart
group by ds) s on (srcpart.ds = s.ds) where s.date = '2008-04-08'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart

Modified: hive/branches/cbo/ql/src/test/templates/TestCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/templates/TestCliDriver.vm?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/templates/TestCliDriver.vm (original)
+++ hive/branches/cbo/ql/src/test/templates/TestCliDriver.vm Mon Mar  9 18:44:19 2015
@@ -41,6 +41,9 @@ public class $className extends TestCase
     String cleanupScript = "$cleanupScript";
     try {
       String hadoopVer = "$hadoopVersion";
+      if (!hiveConfDir.isEmpty()) {
+        hiveConfDir = HIVE_ROOT + hiveConfDir;
+      }
       qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR,
       hiveConfDir, hadoopVer, initScript, cleanupScript);
 

Modified: hive/branches/cbo/ql/src/test/templates/TestCompareCliDriver.vm
URL: http://svn.apache.org/viewvc/hive/branches/cbo/ql/src/test/templates/TestCompareCliDriver.vm?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/ql/src/test/templates/TestCompareCliDriver.vm (original)
+++ hive/branches/cbo/ql/src/test/templates/TestCompareCliDriver.vm Mon Mar  9 18:44:19 2015
@@ -42,6 +42,9 @@ public class $className extends TestCase
     String cleanupScript = "$cleanupScript";
     try {
       String hadoopVer = "$hadoopVersion";
+      if (!hiveConfDir.isEmpty()) {
+        hiveConfDir = HIVE_ROOT + hiveConfDir;
+      }
       qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR,
       hiveConfDir, hadoopVer, initScript, cleanupScript);
 

Modified: hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java
(original)
+++ hive/branches/cbo/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerializer.java
Mon Mar  9 18:44:19 2015
@@ -28,6 +28,7 @@ import java.util.Set;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Field;
 import org.apache.avro.Schema.Type;
+import org.apache.avro.generic.GenericArray;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericData.Fixed;
 import org.apache.avro.generic.GenericEnumSymbol;
@@ -237,7 +238,7 @@ class AvroSerializer {
 
   private Object serializeList(ListTypeInfo typeInfo, ListObjectInspector fieldOI, Object
structFieldData, Schema schema) throws AvroSerdeException {
     List<?> list = fieldOI.getList(structFieldData);
-    List<Object> deserialized = new ArrayList<Object>(list.size());
+    List<Object> deserialized = new GenericData.Array<Object>(list.size(), schema);
 
     TypeInfo listElementTypeInfo = typeInfo.getListElementTypeInfo();
     ObjectInspector listElementObjectInspector = fieldOI.getListElementObjectInspector();

Modified: hive/branches/cbo/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java
(original)
+++ hive/branches/cbo/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerializer.java
Mon Mar  9 18:44:19 2015
@@ -17,6 +17,7 @@
  */
 package org.apache.hadoop.hive.serde2.avro;
 
+import org.apache.avro.generic.GenericArray;
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
@@ -27,6 +28,7 @@ import org.apache.hadoop.hive.serde2.Ser
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
 import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
 import org.apache.hadoop.io.Writable;
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -130,7 +132,10 @@ public class TestAvroSerializer {
     Collections.addAll(intList, 1,2, 3);
     String field = "{ \"name\":\"list1\", \"type\":{\"type\":\"array\", \"items\":\"int\"}
}";
     GenericRecord r = serializeAndDeserialize(field, "list1", intList);
-    assertEquals(intList, r.get("list1"));
+    final Object list1 = r.get("list1");
+    Assert.assertTrue(list1 instanceof GenericArray);
+    Assert.assertTrue(list1 instanceof List);
+    assertEquals(intList, list1);
   }
 
   @Test

Modified: hive/branches/cbo/service/src/java/org/apache/hive/service/server/ThreadFactoryWithGarbageCleanup.java
URL: http://svn.apache.org/viewvc/hive/branches/cbo/service/src/java/org/apache/hive/service/server/ThreadFactoryWithGarbageCleanup.java?rev=1665320&r1=1665319&r2=1665320&view=diff
==============================================================================
--- hive/branches/cbo/service/src/java/org/apache/hive/service/server/ThreadFactoryWithGarbageCleanup.java
(original)
+++ hive/branches/cbo/service/src/java/org/apache/hive/service/server/ThreadFactoryWithGarbageCleanup.java
Mon Mar  9 18:44:19 2015
@@ -19,8 +19,8 @@
 
 package org.apache.hive.service.server;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadFactory;
 
 import org.apache.hadoop.hive.metastore.RawStore;
@@ -43,7 +43,7 @@ import org.apache.hadoop.hive.metastore.
  */
 public class ThreadFactoryWithGarbageCleanup implements ThreadFactory {
 
-  private static Map<Long, RawStore> threadRawStoreMap = new HashMap<Long, RawStore>();
+  private static Map<Long, RawStore> threadRawStoreMap = new ConcurrentHashMap<Long,
RawStore>();
 
   private final String namePrefix;
 



Mime
View raw message