address pr

guilongyang · Nov 8, 2019 · 31f04e7 · 31f04e7
1 parent 457a570
commit 31f04e7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/fili-core/src/main/java/com/yahoo/bard/webservice/application/AbstractBinderFactory.java b/fili-core/src/main/java/com/yahoo/bard/webservice/application/AbstractBinderFactory.java
@@ -840,9 +840,6 @@ protected DataSourceMetadataLoadTask buildDataSourceMetadataLoader(
             DataSourceMetadataService metadataService,
             ObjectMapper mapper
     ) {
-        InjectableValues.Std injectableValues = new InjectableValues.Std();
-        injectableValues.addValue(DataSegment.PruneLoadSpecHolder.class, DataSegment.PruneLoadSpecHolder.DEFAULT);
-        mapper.setInjectableValues(injectableValues);
         return new DataSourceMetadataLoadTask(
                 physicalTableDictionary,
                 metadataService,

diff --git a/fili-sql/pom.xml b/fili-sql/pom.xml
@@ -56,14 +56,11 @@
             <artifactId>presto-jdbc</artifactId>
             <version>${presto.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
             <version>3.10.0</version>
         </dependency>
-
-
     </dependencies>
 
 </project>
diff --git a/.../java/com/yahoo/bard/webservice/data/config/table/ConcreteSqlPhysicalTableDefinition.java b/.../java/com/yahoo/bard/webservice/data/config/table/ConcreteSqlPhysicalTableDefinition.java
@@ -30,6 +30,31 @@ public class ConcreteSqlPhysicalTableDefinition extends ConcretePhysicalTableDef
     private final String timestampColumn;
     private final String catalog;
 
+    /**
+     * Define a sql backed physical table using a zoned time grain. Requires the schema and timestamp column to be
+     * specified.
+     *
+     * @param schemaName  The name of sql schema this table is on.
+     * @param timestampColumn  The name of the timestamp column to be used for the database.
+     * @param name  The table name
+     * @param timeGrain  The zoned time grain
+     * @param metricNames  The Set of metric names on the table
+     * @param dimensionConfigs  The dimension configurations
+     */
+    public ConcreteSqlPhysicalTableDefinition(
+            String schemaName,
+            String timestampColumn,
+            TableName name,
+            ZonedTimeGrain timeGrain,
+            Set<FieldName> metricNames,
+            Set<? extends DimensionConfig> dimensionConfigs
+    ) {
+        super(name, timeGrain, metricNames, dimensionConfigs);
+        this.schemaName = schemaName;
+        this.timestampColumn = timestampColumn;
+        this.catalog = null;
+    }
+
     /**
      * Define a sql backed physical table using a zoned time grain. Requires the schema and timestamp column to be
      * specified.