Home | About | Sematext search-lucene.com search-hadoop.com
 Search Hadoop and all its subprojects:

Switch to Threaded View
Drill, mail # dev - [12/24] git commit: merge fixes


Copy link to this message
-
[12/24] git commit: merge fixes
jacques@... 2014-05-22, 01:14
merge fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/e6121d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/e6121d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/e6121d05

Branch: refs/heads/diagnostics2
Commit: e6121d05ed3e5afe776486383a90e66e5af99351
Parents: 8621b68
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Mon May 19 08:58:59 2014 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Mon May 19 09:12:34 2014 -0700

 .../drill/exec/store/hbase/HBaseSubScan.java    |  5 +++
 exec/java-exec/pom.xml                          |  5 +++
 .../src/main/codegen/templates/TypeHelper.java  |  1 -
 .../drill/exec/cache/JacksonSerializable.java   | 20 ++++++++--
 .../cache/VectorAccessibleSerializable.java     |  5 +--
 .../drill/exec/cache/hazel/HazelCache.java      |  2 +
 .../drill/exec/cache/infinispan/ICache.java     | 17 ++++++++-
 .../drill/exec/cache/local/LocalCache.java      |  2 +
 .../apache/drill/exec/ops/OperatorStats.java    |  4 +-
 .../exec/physical/impl/join/HashJoinBatch.java  |  4 +-
 .../drill/exec/record/AbstractRecordBatch.java  | 27 ++++++++------
 .../exec/record/AbstractSingleRecordBatch.java  |  4 +-
 .../org/apache/drill/exec/server/Drillbit.java  | 39 ++++++++++++--------
 .../drill/exec/server/rest/DrillRestServer.java | 28 ++++++++++++++
 .../drill/exec/server/rest/DrillRoot.java       | 15 ++++++++
 .../apache/drill/exec/work/foreman/Foreman.java |  2 +-
 .../drill/exec/work/foreman/QueryManager.java   |  4 +-
 .../drill/exec/work/foreman/QueryStatus.java    |  2 +-
 .../java/org/apache/drill/BaseTestQuery.java    |  2 +-
 .../java/org/apache/drill/PlanTestBase.java     |  2 +-
 .../drill/exec/cache/TestVectorCache.java       | 32 ++++++++--------
 .../exec/client/DrillClientSystemTest.java      |  2 +-
 .../exec/fn/impl/TestAggregateFunction.java     |  5 +--
 .../drill/exec/fn/impl/TestDateFunctions.java   |  2 +-
 .../drill/exec/fn/impl/TestMultiInputAdd.java   |  2 +-
 .../exec/physical/impl/TestCastFunctions.java   |  2 +-
 .../physical/impl/TestCastVarCharToBigInt.java  |  2 +-
 .../drill/exec/physical/impl/TestDecimal.java   | 14 +++----
 .../impl/TestDistributedFragmentRun.java        |  8 +---
 .../physical/impl/TestExtractFunctions.java     |  2 +-
 .../physical/impl/TestHashToRandomExchange.java |  2 +-
 .../exec/physical/impl/TestOptiqPlans.java      | 10 ++---
 .../physical/impl/TestReverseImplicitCast.java  |  2 +-
 .../physical/impl/TestSimpleFragmentRun.java    |  2 +-
 .../exec/physical/impl/TestUnionExchange.java   |  2 +-
 .../exec/physical/impl/TopN/TestSimpleTopN.java |  2 +-
 .../exec/physical/impl/join/TestHashJoin.java   |  8 ++--
 .../exec/physical/impl/join/TestMergeJoin.java  |  6 +--
 .../impl/join/TestMergeJoinMulCondition.java    |  2 +-
 .../impl/mergereceiver/TestMergingReceiver.java |  6 +--
 .../TestOrderedPartitionExchange.java           |  2 +-
 .../impl/xsort/TestSimpleExternalSort.java      |  6 +--
 .../drill/exec/record/vector/TestDateTypes.java | 12 +++---
 .../store/parquet/ParquetRecordReaderTest.java  |  8 +---
 .../store/parquet/TestParquetPhysicalPlan.java  |  4 +-
 .../exec/store/text/TextRecordReaderTest.java   |  2 +-
 .../exec/work/batch/TestSpoolingBuffer.java     |  2 +-
 exec/java-exec/src/test/resources/logback.xml   |  2 +-
 48 files changed, 215 insertions(+), 126 deletions(-)
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e6121d05/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java
diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java
index 3f20087..d9f2b7c 100644
+++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseSubScan.java
@@ -209,4 +209,9 @@ public class HBaseSubScan extends AbstractBase implements SubScan {
 
   }
 
+  @Override
+  public int getOperatorType() {
+    return 1001;
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e6121d05/exec/java-exec/pom.xml
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 6d11614..83220ab 100644
+++ b/exec/java-exec/pom.xml
@@ -92,6 +92,11 @@
       <version>2.8</version>
     </dependency>
     <dependency>
+        <groupId>org.glassfish.jersey.ext</groupId>
+        <artifactId>jersey-mvc-freemarker</artifactId>
+        <version>2.8</version>
+    </dependency>    
+    <dependency>
       <groupId>net.hydromatic</groupId>
       <artifactId>optiq-core</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e6121d05/exec/java-exec/src/main/codegen/templates/TypeHelper.java
diff --git a/exec/java-exec/src/main/codegen/templates/TypeHelper.java b/exec/java-exec/src/main/codegen/templates/TypeHelper.java
index f2d66d2..5f24a30 100644
+++ b/exec/java-exec/src/main/codegen/templates/TypeHelper.java
@@ -67,7 +67,6 @@ public class TypeHelper {
     </#list>
     </#list>
     case MAP:
-    case REPEATMAP:
     case LIST:
       return new GenericAccessor(vector);
     }

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e6121d05/exec/java-exec/src/main/java/org/apache/drill/exec/cache/JacksonSerializable.java
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/JacksonSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/JacksonSerializable.java
index 831db84..247c79e 100644
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/JacksonSerializable.java
@@ -17,8 +17,12 @@
  */
 package org.apache.drill.exec.cache;
 
+import java.io.DataInput;
+import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 import java.io.OutputStream;
 
 import com.hazelcast.nio.ObjectDataInput;
@@ -33,