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

Switch to Threaded View
Drill, mail # dev - [48/53] [abbrv] git commit: Working Project merge build


Copy link to this message
-
[48/53] [abbrv] git commit: Working Project merge build
jacques@... 2013-07-20, 01:58
Working Project merge build
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/3d41be41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/3d41be41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/3d41be41

Branch: refs/heads/master
Commit: 3d41be41d6a1c9dab7256a1044370348848a1ec3
Parents: 80b1d24
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Tue Jul 16 10:45:25 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Fri Jul 19 14:53:31 2013 -0700

----------------------------------------------------------------------
 .../common/src/main/protobuf/Types.proto        |   1 +
 sandbox/prototype/exec/java-exec/pom.xml        |  30 -
 .../templates/FixedValueVectors.java            |  31 +
 .../templates/NullableValueVectors.java         |  28 +
 .../templates/RepeatedValueVectors.java         |  38 +-
 .../ValueVectors/templates/TypeHelper.java      |   6 +-
 .../templates/VariableLengthVectors.java        |  29 +
 .../drill/exec/expr/EvaluationVisitor.java      |   5 +-
 .../exec/expr/ValueVectorReadExpression.java    |   1 -
 .../exec/expr/ValueVectorWriteExpression.java   |   1 -
 .../drill/exec/expr/fn/FunctionHolder.java      |  15 +-
 .../exec/physical/config/MockRecordReader.java  |   6 +-
 .../drill/exec/physical/config/MockScanPOP.java |   2 +-
 .../exec/physical/impl/FilterRecordBatch.java   |  30 +-
 .../impl/FilteringRecordBatchTransformer.java   |   6 +-
 .../drill/exec/physical/impl/OutputMutator.java |  14 +-
 .../drill/exec/physical/impl/ScanBatch.java     |  84 +-
 .../drill/exec/physical/impl/VectorHolder.java  |  12 +-
 .../exec/physical/impl/WireRecordBatch.java     |  19 +-
 .../impl/filter/EvaluationPredicate.java        |   2 +-
 .../physical/impl/filter/ExampleFilter.java     |  10 +-
 .../physical/impl/filter/FilterTemplate.java    |   2 +-
 .../impl/project/ProjectRecordBatch.java        |  43 +-
 .../exec/physical/impl/project/Projector.java   |   3 +-
 .../impl/project/ProjectorTemplate.java         |  11 +-
 .../physical/impl/project/TransferPairing.java  |  35 -
 .../drill/exec/record/MaterializedField.java    |   5 +-
 .../apache/drill/exec/record/RecordBatch.java   |   8 +-
 .../drill/exec/record/RecordBatchLoader.java    |  32 +-
 .../apache/drill/exec/record/TransferPair.java  |   8 +
 .../apache/drill/exec/record/WritableBatch.java |   8 +-
 .../exec/record/selection/SelectionVector2.java |  49 ++
 .../exec/record/selection/SelectionVector4.java |  41 +
 .../drill/exec/record/vector/BitUtil.java       | 108 ---
 .../drill/exec/record/vector/BufBitSet.java     | 847 -------------------
 .../exec/record/vector/NullValueException.java  |   9 -
 .../exec/record/vector/NullableFixed8.java      |  43 -
 .../exec/record/vector/SelectionVector.java     |  49 --
 .../exec/record/vector/SelectionVector2.java    |  49 --
 .../exec/record/vector/SelectionVector4.java    |  41 -
 .../drill/exec/store/JSONRecordReader.java      |  19 +-
 .../drill/exec/vector/AllocationHelper.java     |  15 +
 .../drill/exec/vector/BaseValueVector.java      |   2 -
 .../org/apache/drill/exec/vector/BitVector.java |  27 +
 .../apache/drill/exec/vector/ValueVector.java   |   5 +-
 .../apache/drill/exec/expr/ExpressionTest.java  |  11 +-
 .../exec/physical/impl/SimpleRootExec.java      |   4 +-
 .../physical/impl/TestSimpleFragmentRun.java    |  58 +-
 .../impl/project/TestSimpleProjection.java      |  17 +-
 .../exec/record/vector/TestOpenBitSet.java      | 361 --------
 .../exec/record/vector/TestValueVector.java     |  55 +-
 .../drill/exec/store/JSONRecordReaderTest.java  |  41 +-
 52 files changed, 482 insertions(+), 1894 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3d41be41/sandbox/prototype/common/src/main/protobuf/Types.proto
--------------------------------------------------------diff --git a/sandbox/prototype/common/src/main/protobuf/Types.proto b/sandbox/prototype/common/src/main/protobuf/Types.proto
index 58399de..17e371d 100644
+++ b/sandbox/prototype/common/src/main/protobuf/Types.proto
@@ -15,6 +15,7 @@ enum MinorType {
     BIGINT = 6;   //  eight byte signed integer
     DECIMAL4 = 7;   //  a decimal supporting precision between 1 and 8 (4 bits for decimal location, 1 sign)
     DECIMAL8 = 8;   //  a decimal supporting precision between 9 and 18 (5 bits for decimal location, 1 sign)
+    DECIMAL12 = 9;   //  a decimal supporting precision between
     DECIMAL16 = 10;   //  a decimal supporting precision between 19 and 37 (6 bits for decimal location, 1 sign)
     MONEY = 11;   //  signed decimal with two digit precision
     DATE = 12;   //  days since 4713bc

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3d41be41/sandbox/prototype/exec/java-exec/pom.xml
diff --git a/sandbox/prototype/exec/java-exec/pom.xml b/sandbox/prototype/exec/java-exec/pom.xml
index f2f0bff..0290be1 100644
+++ b/sandbox/prototype/exec/java-exec/pom.xml
@@ -179,7 +179,6 @@
                 <exec executable="protoc">
                   <arg value="--java_out=${target.gen.source.path}" />
                   <arg value="--proto_path=${proto.cas.path}" />
-<<<<<<< HEAD
                   <arg value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" />
  <arg line="${proto.files}" />
  </exec>
@@ -226,34 +225,5 @@
  <!-- </plugin> -->
  </plugins>
  </build>
-======-                  <arg
-                    value="--proto_path=${project.basedir}/../../common/src/main/protobuf/" />
-                  <arg line="${proto.files}" />
-                </exec>
-              </tasks>
-              <sourceRoot>${target.gen.source.path}</sourceRoot>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!