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

Switch to Threaded View
Drill, mail # dev - [1/2] git commit: Update RPC framework to use Netty 4.0.3.Final Correct changes in RPC framework based on Netty API changes Fixed buffer reuse issues. Update buffer reference counting (clearly going to be problematic)


Copy link to this message
-
[1/2] git commit: Update RPC framework to use Netty 4.0.3.Final Correct changes in RPC framework based on Netty API changes Fixed buffer reuse issues. Update buffer reference counting (clearly going to be problematic)
jacques@... 2013-07-23, 05:10
Updated Branches:
  refs/heads/master a0ed8fc03 -> 93ddf2660
Update RPC framework to use Netty 4.0.3.Final
Correct changes in RPC framework based on Netty API changes
Fixed buffer reuse issues.  Update buffer reference counting (clearly going to be problematic)
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/430e0c0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/430e0c0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/430e0c0d

Branch: refs/heads/master
Commit: 430e0c0d7b4e41f60a274b6fb533cfa621d2cc3f
Parents: a0ed8fc
Author: Jacques Nadeau <[EMAIL PROTECTED]>
Authored: Mon Jul 22 11:59:22 2013 -0700
Committer: Jacques Nadeau <[EMAIL PROTECTED]>
Committed: Mon Jul 22 22:00:47 2013 -0700

----------------------------------------------------------------------
 .../common/expression/FunctionRegistry.java     |   2 +-
 sandbox/prototype/exec/java-exec/pom.xml        |   2 +-
 .../apache/drill/exec/client/DrillClient.java   |   6 +
 .../exec/physical/impl/SingleSenderCreator.java |   4 +-
 .../org/apache/drill/exec/record/DeadBuf.java   | 118 +++++++++----------
 .../drill/exec/record/RawFragmentBatch.java     |   1 +
 .../exec/rpc/AbstractHandshakeHandler.java      |  17 +--
 .../drill/exec/rpc/BaseRpcOutcomeListener.java  |   4 +-
 .../org/apache/drill/exec/rpc/BasicClient.java  |  12 +-
 .../org/apache/drill/exec/rpc/BasicServer.java  |  12 +-
 .../drill/exec/rpc/CoordinationQueue.java       |  31 ++---
 .../apache/drill/exec/rpc/DrillRpcFuture.java   |   4 +
 .../drill/exec/rpc/DrillRpcFutureImpl.java      |  21 +++-
 .../drill/exec/rpc/PositiveAtomicInteger.java   |   2 +-
 .../java/org/apache/drill/exec/rpc/RpcBus.java  |  28 +++--
 .../apache/drill/exec/rpc/RpcCheckedFuture.java |  14 +++
 .../org/apache/drill/exec/rpc/RpcConstants.java |   1 +
 .../org/apache/drill/exec/rpc/RpcDecoder.java   |  14 +--
 .../org/apache/drill/exec/rpc/RpcEncoder.java   |  37 +++---
 .../org/apache/drill/exec/rpc/RpcOutcome.java   |   4 +-
 .../drill/exec/rpc/RpcOutcomeListener.java      |   4 +-
 .../exec/rpc/ZeroCopyProtobufLengthDecoder.java |  73 ++++++------
 .../drill/exec/rpc/bit/FutureBitCommand.java    |   6 +-
 .../drill/exec/rpc/bit/ListeningBitCommand.java |  11 +-
 .../drill/exec/rpc/user/QueryResultBatch.java   |   1 +
 .../drill/exec/rpc/user/QueryResultHandler.java |   2 +-
 .../drill/exec/vector/BaseDataValueVector.java  |   5 +-
 .../work/foreman/RunningFragmentManager.java    |   4 +-
 28 files changed, 249 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/430e0c0d/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/FunctionRegistry.java
----------------------------------------------------------------------
diff --git a/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/FunctionRegistry.java b/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/FunctionRegistry.java
index 28fa2db..2808356 100644
--- a/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/FunctionRegistry.java
+++ b/sandbox/prototype/common/src/main/java/org/apache/drill/common/expression/FunctionRegistry.java
@@ -47,7 +47,7 @@ public class FunctionRegistry {
           for(String rn : d.getRegisteredNames()){
            
             FunctionDefinition d2 = funcs.put(rn, d);
-            logger.debug("Registering function {}", d);
+//            logger.debug("Registering function {}", d);
             if(d2 != null){
               throw new ExceptionInInitializerError(String.format("Failure while registering functions.  The function %s tried to register with the name %s but the function %s already registered with that name.", d.getName(), rn, d2.getName()) );
             }

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/430e0c0d/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 a2baa32..8893044 100644
+++ b/sandbox/prototype/exec/java-exec/pom.xml
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-all</artifactId>
-      <version>4.0.0.CR2</version>
+      <version>4.0.3.Final</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/430e0c0d/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
index 5d80ee4..b2503c1 100644
+++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Iterables.get;
 import static org.apache.drill.exec.proto.UserProtos.QueryResultsMode.STREAM_FULL;
 import static org.apache.drill.exec.proto.UserProtos.RunQuery.newBuilder;
+import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -178,6 +179,11 @@ public class DrillClient implements Closeable{
     protected RpcException mapException(Exception e) {
       return RpcException.mapException(e);
     }
+
+    @Override
+    public ByteBuf getBuffer() {
+      return null;
+    }
    
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/430e0c0d/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SingleSenderCreator.java
diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/