DRILL-558: Remove workaround in OptiqScanner for skipping "metadata" subschema.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/26fee8a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/26fee8a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/26fee8a2 Branch: refs/heads/master Commit: 26fee8a2a2050c49de98ea20d4d05be27d840892 Parents: b75782d Author: vkorukanti <[email protected]> Authored: Tue Apr 22 20:47:43 2014 -0700 Committer: Aditya Kishore <[email protected]> Committed: Mon May 12 21:33:26 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/drill/exec/ops/FragmentContext.java | 2 +- .../src/main/java/org/apache/drill/exec/ops/QueryContext.java | 2 +- .../org/apache/drill/exec/store/ischema/OptiqProvider.java | 7 ++----- .../src/test/java/org/apache/drill/PlanningBase.java | 2 +- .../java/org/apache/drill/exec/store/TestOrphanSchema.java | 2 +- .../org/apache/drill/exec/store/ischema/OrphanSchema.java | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java index 38d76e0..3f9f181 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java @@ -128,7 +128,7 @@ public class FragmentContext implements Closeable { "This is a non-root fragment.")); return null; } else { - SchemaPlus root = Frameworks.createRootSchema(); + SchemaPlus root = Frameworks.createRootSchema(false); context.getStorage().getSchemaFactory().registerSchemas(connection.getSession(), root); return root; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java index e541200..36def17 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/QueryContext.java @@ -79,7 +79,7 @@ public class QueryContext{ } public SchemaPlus getRootSchema(){ - SchemaPlus rootSchema = Frameworks.createRootSchema(); + SchemaPlus rootSchema = Frameworks.createRootSchema(false); drillbitContext.getSchemaFactory().registerSchemas(session, rootSchema); return rootSchema; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java index 3ae1138..cb4f3d9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/OptiqProvider.java @@ -59,8 +59,7 @@ public class OptiqProvider { static public class Schemata extends Abstract { @Override public boolean visitSchema(String schemaName, Schema schema) { - if (schemaName != null && schemaName != "" && - !schemaName.equals("metadata") /* workaround until Drill upgrades to Optiq version which has the fix for #256 */) { + if (schemaName != null && schemaName != "") { writeRow("DRILL", schemaName, "<owner>"); } return false; @@ -174,9 +173,7 @@ public class OptiqProvider { * If the schema visitor returns true, then visit the tables. * If the table visitor returns true, then visit the fields (columns). */ - public boolean visitSchema(String schemaName, Schema schema){ - return !schemaName.equals("metadata"); //workaround until Drill upgrades to Optiq version which has the fix for #256 - } + public boolean visitSchema(String schemaName, Schema schema){return true;} public boolean visitTableName(String schemaName, String tableName){return true;} public boolean visitTable(String schemaName, String tableName, Table table){return true;} public boolean visitField(String schemaName, String tableName, RelDataTypeField field){return true;} http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java index e030da5..99e712b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/PlanningBase.java @@ -93,7 +93,7 @@ public class PlanningBase extends ExecTest{ final StoragePluginRegistry registry = new StoragePluginRegistry(dbContext); registry.init(); final FunctionImplementationRegistry functionRegistry = new FunctionImplementationRegistry(config); - final SchemaPlus root = Frameworks.createRootSchema(); + final SchemaPlus root = Frameworks.createRootSchema(false); registry.getSchemaFactory().registerSchemas(new UserSession(null, null, null), root); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOrphanSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOrphanSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOrphanSchema.java index 864793a..63bc0a9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOrphanSchema.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOrphanSchema.java @@ -55,7 +55,7 @@ public class TestOrphanSchema extends ExecTest { bitContext.getCache().run(); StoragePluginRegistry r = new StoragePluginRegistry(bitContext); - SchemaPlus plus = Frameworks.createRootSchema(); + SchemaPlus plus = Frameworks.createRootSchema(false); r.init(); r.getSchemaFactory().registerSchemas(new UserSession(null, null, null), plus); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/26fee8a2/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/OrphanSchema.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/OrphanSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/OrphanSchema.java index b4ed88a..acb5929 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/OrphanSchema.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/OrphanSchema.java @@ -55,7 +55,7 @@ public class OrphanSchema { // Using the mock context, get the orphan schema. StoragePluginRegistry r = new StoragePluginRegistry(bitContext); r.init(); - SchemaPlus plus = Frameworks.createRootSchema(); + SchemaPlus plus = Frameworks.createRootSchema(false); r.getSchemaFactory().registerSchemas(new UserSession(null, null, null), plus); return plus; }
