You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/08/30 02:17:52 UTC
[2/2] git commit: Removed hardcoded foodmart schema information
Removed hardcoded foodmart schema information
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/e05f70c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/e05f70c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/e05f70c7
Branch: refs/heads/master
Commit: e05f70c7572e8d28af4e861eaca6b9a0e62a11e7
Parents: 97acf7d
Author: Marc Prud'hommeaux <mw...@cornell.edu>
Authored: Sun Jul 6 13:38:25 2014 -0400
Committer: Julian Hyde <jh...@apache.org>
Committed: Fri Aug 29 16:14:14 2014 -0700
----------------------------------------------------------------------
.../java/net/hydromatic/optiq/model/ModelHandler.java | 13 -------------
1 file changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/e05f70c7/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java b/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
index 91cd1bf..7c47d73 100644
--- a/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
+++ b/core/src/main/java/net/hydromatic/optiq/model/ModelHandler.java
@@ -139,19 +139,6 @@ public class ModelHandler {
schema.setPath(stringListList(jsonSchema.path));
}
populateSchema(jsonSchema, schema);
- if (schema.getName().equals("mat")) {
- // Inject by hand a Star Table. Later we'll add a JSON model element.
- final List<Table> tables = new ArrayList<Table>();
- final String[] tableNames = {
- "sales_fact_1997", "time_by_day", "product", "product_class"
- };
- final SchemaPlus schema2 = parentSchema.getSubSchema("foodmart");
- for (String tableName : tableNames) {
- tables.add(schema2.getTable(tableName));
- }
- final String tableName = "star";
- schema.add(tableName, StarTable.of(tables));
- }
}
private static ImmutableList<ImmutableList<String>> stringListList(