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

Switch to Plain View
Drill, mail # dev - [28/53] [abbrv] git commit: DRILL-75 and DRILL-76


Copy link to this message
-
[28/53] [abbrv] git commit: DRILL-75 and DRILL-76
jacques@... 2013-07-20, 01:57
DRILL-75 and DRILL-76
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/01278ae5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/01278ae5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/01278ae5

Branch: refs/heads/master
Commit: 01278ae56f0ac3d16ff5e05722055fee1332cd9a
Parents: 719c8be
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Mon Jun 17 09:10:15 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Mon Jun 17 09:10:15 2013 -0700

----------------------------------------------------------------------
 .../apache/drill/common/logical/data/Scan.java  |   4 +-
 .../org/apache/drill/exec/record/DeadBuf.java   |   2 +-
 .../record/vector/AbstractFixedValueVector.java |   8 +-
 .../exec/record/vector/BaseValueVector.java     |   5 +-
 .../apache/drill/exec/record/vector/Fixed4.java |  12 +-
 .../drill/exec/record/vector/NullableBit.java   |  20 +
 .../exec/record/vector/NullableFixed4.java      |  17 +-
 .../exec/record/vector/NullableValueVector.java |  12 +-
 .../exec/record/vector/NullableVarLen4.java     |  21 +
 .../drill/exec/record/vector/TypeHelper.java    |  33 +-
 .../drill/exec/record/vector/VarLen1.java       |   6 +-
 .../drill/exec/record/vector/VarLen2.java       |   6 +-
 .../drill/exec/record/vector/VarLen4.java       |  18 +-
 .../exec/record/vector/VariableVector.java      |  33 +-
 .../drill/exec/rpc/InboundRpcMessage.java       |   2 +-
 .../apache/drill/exec/schema/DiffSchema.java    |   1 +
 .../org/apache/drill/exec/schema/Field.java     |  74 +---
 .../apache/drill/exec/schema/IdGenerator.java   |  25 +-
 .../apache/drill/exec/schema/ListSchema.java    |   5 +-
 .../apache/drill/exec/schema/NamedField.java    |  21 +-
 .../apache/drill/exec/schema/OrderedField.java  |  19 +-
 .../drill/exec/schema/SchemaRecorder.java       | 122 ------
 .../exec/schema/json/jackson/JacksonHelper.java |  62 ++-
 .../schema/json/jackson/PhysicalOperator.java   |  36 --
 .../json/jackson/PhysicalOperatorIterator.java  |  31 --
 .../exec/schema/json/jackson/ScanJson.java      | 203 ---------
 .../transform/ProtobufSchemaTransformer.java    | 109 -----
 .../schema/transform/SchemaTransformer.java     |  30 --
 .../drill/exec/server/DrillbitContext.java      |   4 +-
 .../exec/store/BatchExceededException.java      |   9 +
 .../drill/exec/store/JSONRecordReader.java      | 423 +++++++++++++++++++
 .../apache/drill/exec/store/RecordReader.java   |   4 -
 .../apache/drill/exec/store/VectorHolder.java   |  59 +++
 .../drill/exec/store/JSONRecordReaderTest.java  | 290 +++++++++++++
 .../src/test/resources/scan_json_test_1.json    |  10 +
 .../src/test/resources/scan_json_test_2.json    |  21 +
 .../src/test/resources/scan_json_test_3.json    |  18 +
 .../src/test/resources/scan_json_test_4.json    |  14 +
 .../src/test/resources/scan_json_test_5.json    |  21 +
 .../src/test/resources/scan_json_test_6.json    |  14 +
 .../exec/ref/src/test/resources/donuts.json     |   7 +-
 .../ref/src/test/resources/simple_plan.json     |   1 +
 sandbox/prototype/pom.xml                       |  18 +-
 43 files changed, 1162 insertions(+), 688 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/01278ae5/sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Scan.java
----------------------------------------------------------------------
diff --git a/sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Scan.java b/sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Scan.java
index c8d396b..7933e40 100644
--- a/sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Scan.java
+++ b/sandbox/prototype/common/src/main/java/org/apache/drill/common/logical/data/Scan.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/01278ae5/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java
index dafb68c..0c2adcf 100644
+++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java
@@ -34,7 +34,7 @@ import io.netty.buffer.ByteBufIndexFinder;
 public class DeadBuf implements ByteBuf {
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DeadBuf.class);
  
-  private static final String ERROR_MESSAGE = "Attemped to access a DeadBuf.  This would happen if you attempted to interact with a buffer that has been moved or not yet initialized.";
+  private static final String ERROR_MESSAGE = "Attemped to access a DeadBuf. This would happen if you attempted to interact with a buffer that has been moved or not yet initialized.";
  
   public static final DeadBuf DEAD_BUFFER = new DeadBuf();
 

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/01278ae5/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/vector/AbstractFixedValueVector.java
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/vector/AbstractFixedValueVector.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/record/vector/AbstractFixedValueVector.java
index b32f067..8748285 100644
+++ b/s