drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [6/8] drill git commit: DRILL-4295: Removes obsolete protobuf-generated files
Date Tue, 09 Feb 2016 00:26:57 GMT
DRILL-4295: Removes obsolete protobuf-generated files

These files are obsolete protobuf-generated files, whose definition has been
removed.

Cleaning src/main/java files before calling protobuf compiler so that obsolete
files are removed from the directory.

Closes #333


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/fbb0165d
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/fbb0165d
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/fbb0165d

Branch: refs/heads/master
Commit: fbb0165def5e23b6b2f6a690d47dc5fbeb2bdbcb
Parents: 282dfd7
Author: Laurent Goujon <laurent@dremio.com>
Authored: Thu Jan 21 10:16:29 2016 -0800
Committer: Jason Altekruse <altekrusejason@gmail.com>
Committed: Mon Feb 8 14:55:57 2016 -0800

----------------------------------------------------------------------
 protocol/pom.xml                                |  23 ++
 .../drill/exec/proto/beans/RpcFailure.java      | 229 -------------------
 .../drill/exec/proto/beans/ViewPointer.java     | 185 ---------------
 3 files changed, 23 insertions(+), 414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/fbb0165d/protocol/pom.xml
----------------------------------------------------------------------
diff --git a/protocol/pom.xml b/protocol/pom.xml
index 304d20a..770ce02 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -51,6 +51,29 @@
       <build>
         <plugins>
           <plugin>
+            <artifactId>maven-clean-plugin</artifactId>
+            <version>3.0.0</version>
+            <configuration>
+              <filesets>
+                <fileset>
+                  <directory>src/main/java</directory>
+                  <includes>
+                    <include>**</include>
+                  </includes>
+                </fileset>
+              </filesets>
+            </configuration>
+            <executions>
+              <execution>
+                <id>clean-before-code-generation</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>clean</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <groupId>com.dyuproject.protostuff</groupId>
             <artifactId>protostuff-maven-plugin</artifactId>
             <version>1.0.8</version>

http://git-wip-us.apache.org/repos/asf/drill/blob/fbb0165d/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcFailure.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcFailure.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcFailure.java
deleted file mode 100644
index 84bb1ca..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcFailure.java
+++ /dev/null
@@ -1,229 +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.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class RpcFailure implements Externalizable, Message<RpcFailure>, Schema<RpcFailure>
-{
-
-    public static Schema<RpcFailure> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static RpcFailure getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final RpcFailure DEFAULT_INSTANCE = new RpcFailure();
-
-    
-    private long errorId;
-    private int errorCode;
-    private String shortError;
-    private String longError;
-
-    public RpcFailure()
-    {
-        
-    }
-
-    // getters and setters
-
-    // errorId
-
-    public long getErrorId()
-    {
-        return errorId;
-    }
-
-    public RpcFailure setErrorId(long errorId)
-    {
-        this.errorId = errorId;
-        return this;
-    }
-
-    // errorCode
-
-    public int getErrorCode()
-    {
-        return errorCode;
-    }
-
-    public RpcFailure setErrorCode(int errorCode)
-    {
-        this.errorCode = errorCode;
-        return this;
-    }
-
-    // shortError
-
-    public String getShortError()
-    {
-        return shortError;
-    }
-
-    public RpcFailure setShortError(String shortError)
-    {
-        this.shortError = shortError;
-        return this;
-    }
-
-    // longError
-
-    public String getLongError()
-    {
-        return longError;
-    }
-
-    public RpcFailure setLongError(String longError)
-    {
-        this.longError = longError;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<RpcFailure> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public RpcFailure newMessage()
-    {
-        return new RpcFailure();
-    }
-
-    public Class<RpcFailure> typeClass()
-    {
-        return RpcFailure.class;
-    }
-
-    public String messageName()
-    {
-        return RpcFailure.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return RpcFailure.class.getName();
-    }
-
-    public boolean isInitialized(RpcFailure message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, RpcFailure message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.errorId = input.readInt64();
-                    break;
-                case 2:
-                    message.errorCode = input.readInt32();
-                    break;
-                case 3:
-                    message.shortError = input.readString();
-                    break;
-                case 4:
-                    message.longError = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, RpcFailure message) throws IOException
-    {
-        if(message.errorId != 0)
-            output.writeInt64(1, message.errorId, false);
-
-        if(message.errorCode != 0)
-            output.writeInt32(2, message.errorCode, false);
-
-        if(message.shortError != null)
-            output.writeString(3, message.shortError, false);
-
-        if(message.longError != null)
-            output.writeString(4, message.longError, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "errorId";
-            case 2: return "errorCode";
-            case 3: return "shortError";
-            case 4: return "longError";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("errorId", 1);
-        __fieldMap.put("errorCode", 2);
-        __fieldMap.put("shortError", 3);
-        __fieldMap.put("longError", 4);
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/drill/blob/fbb0165d/protocol/src/main/java/org/apache/drill/exec/proto/beans/ViewPointer.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ViewPointer.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ViewPointer.java
deleted file mode 100644
index 2f583fa..0000000
--- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ViewPointer.java
+++ /dev/null
@@ -1,185 +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.
- */
-// Generated by http://code.google.com/p/protostuff/ ... DO NOT EDIT!
-// Generated from protobuf
-
-package org.apache.drill.exec.proto.beans;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import com.dyuproject.protostuff.GraphIOUtil;
-import com.dyuproject.protostuff.Input;
-import com.dyuproject.protostuff.Message;
-import com.dyuproject.protostuff.Output;
-import com.dyuproject.protostuff.Schema;
-
-public final class ViewPointer implements Externalizable, Message<ViewPointer>, Schema<ViewPointer>
-{
-
-    public static Schema<ViewPointer> getSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    public static ViewPointer getDefaultInstance()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    static final ViewPointer DEFAULT_INSTANCE = new ViewPointer();
-
-    
-    private String name;
-    private String path;
-
-    public ViewPointer()
-    {
-        
-    }
-
-    // getters and setters
-
-    // name
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public ViewPointer setName(String name)
-    {
-        this.name = name;
-        return this;
-    }
-
-    // path
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public ViewPointer setPath(String path)
-    {
-        this.path = path;
-        return this;
-    }
-
-    // java serialization
-
-    public void readExternal(ObjectInput in) throws IOException
-    {
-        GraphIOUtil.mergeDelimitedFrom(in, this, this);
-    }
-
-    public void writeExternal(ObjectOutput out) throws IOException
-    {
-        GraphIOUtil.writeDelimitedTo(out, this, this);
-    }
-
-    // message method
-
-    public Schema<ViewPointer> cachedSchema()
-    {
-        return DEFAULT_INSTANCE;
-    }
-
-    // schema methods
-
-    public ViewPointer newMessage()
-    {
-        return new ViewPointer();
-    }
-
-    public Class<ViewPointer> typeClass()
-    {
-        return ViewPointer.class;
-    }
-
-    public String messageName()
-    {
-        return ViewPointer.class.getSimpleName();
-    }
-
-    public String messageFullName()
-    {
-        return ViewPointer.class.getName();
-    }
-
-    public boolean isInitialized(ViewPointer message)
-    {
-        return true;
-    }
-
-    public void mergeFrom(Input input, ViewPointer message) throws IOException
-    {
-        for(int number = input.readFieldNumber(this);; number = input.readFieldNumber(this))
-        {
-            switch(number)
-            {
-                case 0:
-                    return;
-                case 1:
-                    message.name = input.readString();
-                    break;
-                case 2:
-                    message.path = input.readString();
-                    break;
-                default:
-                    input.handleUnknownField(number, this);
-            }   
-        }
-    }
-
-
-    public void writeTo(Output output, ViewPointer message) throws IOException
-    {
-        if(message.name != null)
-            output.writeString(1, message.name, false);
-
-        if(message.path != null)
-            output.writeString(2, message.path, false);
-    }
-
-    public String getFieldName(int number)
-    {
-        switch(number)
-        {
-            case 1: return "name";
-            case 2: return "path";
-            default: return null;
-        }
-    }
-
-    public int getFieldNumber(String name)
-    {
-        final Integer number = __fieldMap.get(name);
-        return number == null ? 0 : number.intValue();
-    }
-
-    private static final java.util.HashMap<String,Integer> __fieldMap = new java.util.HashMap<String,Integer>();
-    static
-    {
-        __fieldMap.put("name", 1);
-        __fieldMap.put("path", 2);
-    }
-    
-}


Mime
View raw message