Fixes for Partitioner merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/8cd9cacd Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/8cd9cacd Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/8cd9cacd Branch: refs/heads/master Commit: 8cd9cacd7f116c9ba5d18b21c288eba9b14fd786 Parents: b32c9ed Author: Jacques Nadeau <[email protected]> Authored: Thu Aug 15 18:37:07 2013 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Thu Aug 15 18:37:07 2013 -0700 ---------------------------------------------------------------------- .../org/apache/drill/exec/physical/impl/ImplCreator.java | 6 +----- .../drill/exec/work/RemoteFragmentRunnerListener.java | 9 +++------ .../org/apache/drill/exec/work/batch/BitComHandlerImpl.java | 5 +---- 3 files changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/8cd9cacd/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java index 8207304..2ce5c28 100644 --- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java +++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ImplCreator.java @@ -26,11 +26,8 @@ import org.apache.drill.exec.physical.base.AbstractPhysicalVisitor; import org.apache.drill.exec.physical.base.FragmentRoot; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.SubScan; -import org.apache.drill.exec.physical.base.Scan; -import org.apache.drill.exec.physical.config.HashPartitionSender; import org.apache.drill.exec.physical.config.Filter; -import org.apache.drill.exec.physical.config.MockScanBatchCreator; -import org.apache.drill.exec.physical.config.MockScanPOP; +import org.apache.drill.exec.physical.config.HashPartitionSender; import org.apache.drill.exec.physical.config.Project; import org.apache.drill.exec.physical.config.RandomReceiver; import org.apache.drill.exec.physical.config.Screen; @@ -45,7 +42,6 @@ import org.apache.drill.exec.physical.impl.svremover.SVRemoverCreator; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.store.json.JSONScanBatchCreator; import org.apache.drill.exec.store.json.JSONSubScan; -import org.apache.drill.exec.store.mock.MockGroupScanPOP; import org.apache.drill.exec.store.mock.MockScanBatchCreator; import org.apache.drill.exec.store.mock.MockSubScanPOP; import org.apache.drill.exec.store.parquet.ParquetRowGroupScan; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/8cd9cacd/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/RemoteFragmentRunnerListener.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/RemoteFragmentRunnerListener.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/RemoteFragmentRunnerListener.java index 48d7f5d..f7d4669 100644 --- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/RemoteFragmentRunnerListener.java +++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/RemoteFragmentRunnerListener.java @@ -20,20 +20,17 @@ package org.apache.drill.exec.work; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; import org.apache.drill.exec.proto.ExecProtos.FragmentStatus; -import org.apache.drill.exec.proto.ExecProtos.FragmentStatus.Builder; -import org.apache.drill.exec.proto.ExecProtos.FragmentStatus.FragmentState; import org.apache.drill.exec.rpc.bit.BitTunnel; -import org.apache.drill.exec.work.foreman.ErrorHelper; /** * Informs remote node as fragment changes state. */ -public class RemotingFragmentRunnerListener extends AbstractFragmentRunnerListener{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RemotingFragmentRunnerListener.class); +public class RemoteFragmentRunnerListener extends AbstractFragmentRunnerListener{ + static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(RemoteFragmentRunnerListener.class); private final BitTunnel tunnel; - public RemotingFragmentRunnerListener(FragmentContext context, BitTunnel tunnel) { + public RemoteFragmentRunnerListener(FragmentContext context, BitTunnel tunnel) { super(context); this.tunnel = tunnel; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/8cd9cacd/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BitComHandlerImpl.java ---------------------------------------------------------------------- diff --git a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BitComHandlerImpl.java b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BitComHandlerImpl.java index b6e0159..5807c87 100644 --- a/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BitComHandlerImpl.java +++ b/sandbox/prototype/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BitComHandlerImpl.java @@ -30,8 +30,6 @@ import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.base.FragmentRoot; import org.apache.drill.exec.physical.impl.ImplCreator; import org.apache.drill.exec.physical.impl.RootExec; -import org.apache.drill.exec.proto.ExecProtos.BitHandshake; -import org.apache.drill.exec.proto.ExecProtos.BitStatus; import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; import org.apache.drill.exec.proto.ExecProtos.FragmentRecordBatch; import org.apache.drill.exec.proto.ExecProtos.FragmentStatus; @@ -49,12 +47,11 @@ import org.apache.drill.exec.rpc.bit.BitRpcConfig; import org.apache.drill.exec.rpc.bit.BitTunnel; import org.apache.drill.exec.work.FragmentRunner; import org.apache.drill.exec.work.RemoteFragmentRunnerListener; -import org.apache.drill.exec.work.fragment.RemoteFragmentHandler; import org.apache.drill.exec.work.WorkManager.WorkerBee; import org.apache.drill.exec.work.fragment.IncomingFragmentHandler; +import org.apache.drill.exec.work.fragment.RemoteFragmentHandler; import com.google.common.collect.Maps; -import com.google.protobuf.MessageLite; public class BitComHandlerImpl implements BitComHandler { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BitComHandlerImpl.class);
