DRILL-5 - dropped useless schema listener framework
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/1d66bc75 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/1d66bc75 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/1d66bc75 Branch: refs/heads/master Commit: 1d66bc75871975b73151769c05c8edebb187669b Parents: cae05f8 Author: tdunning <[email protected]> Authored: Wed Oct 17 11:23:05 2012 -0700 Committer: tdunning <[email protected]> Committed: Wed Oct 17 11:23:05 2012 -0700 ---------------------------------------------------------------------- .../drill/plan/physical/operators/Operator.java | 7 ------- .../drill/plan/physical/operators/ScanJson.java | 4 +--- 2 files changed, 1 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1d66bc75/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/Operator.java ---------------------------------------------------------------------- diff --git a/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/Operator.java b/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/Operator.java index 4462508..c537ca1 100644 --- a/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/Operator.java +++ b/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/Operator.java @@ -75,7 +75,6 @@ public abstract class Operator implements Callable<Object> { } protected final List<DataListener> dataOut = Lists.newArrayList(); - protected final List<SchemaListener> schemaOut = Lists.newArrayList(); public void addDataListener(DataListener listener) { this.dataOut.add(listener); @@ -87,12 +86,6 @@ public abstract class Operator implements Callable<Object> { } } - protected void emitSchema(Schema schema) { - for (SchemaListener listener : schemaOut) { - listener.notify(schema); - } - } - public double eval() { throw new UnsupportedOperationException("default no can do"); //To change body of created methods use File | Settings | File Templates. } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/1d66bc75/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/ScanJson.java ---------------------------------------------------------------------- diff --git a/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/ScanJson.java b/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/ScanJson.java index 1f020ba..3c7ebe7 100644 --- a/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/ScanJson.java +++ b/sandbox/plan-parser/src/main/java/org/apache/drill/plan/physical/operators/ScanJson.java @@ -39,6 +39,7 @@ import java.util.Map; * Reads JSON formatted records from a file. */ public class ScanJson extends Operator { + public static void define() { Operator.defineOperator("scan-json", ScanJson.class); } @@ -74,9 +75,6 @@ public class ScanJson extends Operator { @Override public Object call() throws IOException { - JsonSchema schema = new JsonSchema(); - emitSchema(schema); - int count = 0; Reader in = input.getInput(); JsonStreamParser jp = new JsonStreamParser(in);
