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

Switch to Threaded View
Drill >> mail # dev >> [09/12] git commit: DRILL-233: Move protobuf IDLs to a separate module and check in the compile Java sources


Copy link to this message
-
[09/12] git commit: DRILL-233: Move protobuf IDLs to a separate module and check in the compile Java sources
DRILL-233: Move protobuf IDLs to a separate module and check in the compile Java sources
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/07c6c21d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/07c6c21d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/07c6c21d

Branch: refs/heads/master
Commit: 07c6c21d1556e1bf93160da2f0c2158c3ab97bb9
Parents: c9155ee
Author: Aditya Kishore <[EMAIL PROTECTED]>
Authored: Tue Sep 10 22:16:45 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Wed Sep 18 18:15:57 2013 -0700

----------------------------------------------------------------------
 common/pom.xml                                  |   19 +-
 common/src/main/protobuf/Types.proto            |   79 -
 distribution/pom.xml                            |    5 +
 distribution/src/assemble/bin.xml               |    4 +
 exec/java-exec/pom.xml                          |   36 +-
 .../src/main/protobuf/Coordination.proto        |   26 -
 .../src/main/protobuf/ExecutionProtos.proto     |   98 -
 .../src/main/protobuf/GeneralRPC.proto          |   39 -
 .../java-exec/src/main/protobuf/SchemaDef.proto |   31 -
 exec/java-exec/src/main/protobuf/User.proto     |   90 -
 .../src/main/protobuf/UserBitShared.proto       |   47 -
 pom.xml                                         |    1 +
 protocol/pom.xml                                |  122 +
 protocol/readme.txt                             |   13 +
 .../apache/drill/common/types/TypeProtos.java   | 1636 ++++
 .../drill/exec/proto/CoordinationProtos.java    | 2387 ++++++
 .../org/apache/drill/exec/proto/ExecProtos.java | 7095 ++++++++++++++++++
 .../drill/exec/proto/GeneralRPCProtos.java      | 2888 +++++++
 .../drill/exec/proto/SchemaDefProtos.java       | 1907 +++++
 .../apache/drill/exec/proto/UserBitShared.java  | 4969 ++++++++++++
 .../org/apache/drill/exec/proto/UserProtos.java | 5185 +++++++++++++
 protocol/src/main/protobuf/Coordination.proto   |   26 +
 .../src/main/protobuf/ExecutionProtos.proto     |   98 +
 protocol/src/main/protobuf/GeneralRPC.proto     |   39 +
 protocol/src/main/protobuf/SchemaDef.proto      |   31 +
 protocol/src/main/protobuf/Types.proto          |   79 +
 protocol/src/main/protobuf/User.proto           |   90 +
 protocol/src/main/protobuf/UserBitShared.proto  |   47 +
 28 files changed, 26632 insertions(+), 455 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/07c6c21d/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 19a9bea..7b3c697 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -29,6 +29,11 @@
   <name>Common (Logical Plan, Base expressions)</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.drill</groupId>
+      <artifactId>drill-protocol</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -126,20 +131,6 @@
           </execution>
         </executions>
       </plugin>
-
-
-      <plugin>
-        <groupId>com.github.igor-petruk.protobuf</groupId>
-        <artifactId>protobuf-maven-plugin</artifactId>
-        <version>0.6.3</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/07c6c21d/common/src/main/protobuf/Types.proto
----------------------------------------------------------------------
diff --git a/common/src/main/protobuf/Types.proto b/common/src/main/protobuf/Types.proto
deleted file mode 100644
index 3434110..0000000
--- a/common/src/main/protobuf/Types.proto
+++ /dev/null
@@ -1,79 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// 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.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common;
-
-option java_package = "org.apache.drill.common.types";
-option java_outer_classname = "TypeProtos";
-option optimize_for = SPEED;
-
-
-enum MinorType {
-    LATE = 0;   //  late binding type
-    MAP = 1;   //  an empty map column.  Useful for conceptual setup.  Children listed within here
-    REPEATMAP = 2;   //  a repeated map column (means that multiple children sit below this)
-    TINYINT = 3;   //  single byte signed integer
-    SMALLINT = 4;   //  two byte signed integer
-    INT = 5;   //  four byte signed integer
-    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 19 and 28 (5 bits for decimal location, 1 sign)
-    DECIMAL16 = 10;   //  a decimal supporting precision between 29 and 37 (6 bits for decimal location, 1 sign)
-    MONEY = 11;   //  signed decimal with two digit precision
-    DATE = 12;   //  days s