Refactor unused var in presto-bigquery

brandboat · ebyhr · commit 47e90d42b5e2 · 2020-11-02T09:44:12.000+09:00
diff --git a/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryClient.java b/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryClient.java
@@ -61,12 +61,6 @@ class BigQueryClient
         this.viewMaterializationDataset = config.getViewMaterializationDataset();
     }
 
-    // return empty if no filters are used
-    private static Optional<String> createWhereClause(String[] filters)
-    {
-        return Optional.empty();
-    }
-
     TableInfo getTable(TableId tableId)
     {
         TableId bigQueryTableId = tableIds.get(tableId);
@@ -153,19 +147,14 @@ String selectSql(TableId table, List<String> requiredColumns)
         String columns = requiredColumns.isEmpty() ? "*" :
                 requiredColumns.stream().map(column -> format("`%s`", column)).collect(joining(","));
 
-        return selectSql(table, columns, new String[] {});
+        return selectSql(table, columns);
     }
 
     // assuming the SELECT part is properly formatted, can be used to call functions such as COUNT and SUM
-    String selectSql(TableId table, String formattedColumns, String[] filters)
+    String selectSql(TableId table, String formattedColumns)
     {
         String tableName = fullTableName(table);
-
-        String whereClause = createWhereClause(filters)
-                .map(clause -> "WHERE " + clause)
-                .orElse("");
-
-        return format("SELECT %s FROM `%s` %s", formattedColumns, tableName, whereClause);
+        return format("SELECT %s FROM `%s`", formattedColumns, tableName);
     }
 
     private String fullTableName(TableId tableId)
diff --git a/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryConnectorFactory.java b/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryConnectorFactory.java
@@ -50,7 +50,7 @@ public Connector create(String catalogName, Map<String, String> config, Connecto
 
         Bootstrap app = new Bootstrap(
                 new JsonModule(),
-                new BigQueryConnectorModule(context.getNodeManager()),
+                new BigQueryConnectorModule(),
                 binder -> {
                     binder.bind(TypeManager.class).toInstance(context.getTypeManager());
                     binder.bind(NodeManager.class).toInstance(context.getNodeManager());
diff --git a/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryConnectorModule.java b/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQueryConnectorModule.java
@@ -32,13 +32,6 @@
 public class BigQueryConnectorModule
         implements Module
 {
-    private final NodeManager nodeManager;
-
-    public BigQueryConnectorModule(NodeManager nodeManager)
-    {
-        this.nodeManager = nodeManager;
-    }
-
     @Provides
     @Singleton
     public static HeaderProvider createHeaderProvider(NodeManager nodeManager)
diff --git a/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQuerySplitManager.java b/presto-bigquery/src/main/java/io/prestosql/plugin/bigquery/BigQuerySplitManager.java
@@ -119,7 +119,7 @@ private List<BigQuerySplit> createEmptyProjection(TableId tableId, int actualPar
             long numberOfRows;
             if (filter.isPresent()) {
                 // count the rows based on the filter
-                String sql = bigQueryClient.selectSql(tableId, "COUNT(*)", new String[] {filter.get()});
+                String sql = bigQueryClient.selectSql(tableId, "COUNT(*)");
                 TableResult result = bigQueryClient.query(sql);
                 numberOfRows = result.iterateAll().iterator().next().get(0).getLongValue();
             }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private List<BigQuerySplit> createEmptyProjection(TableId tableId, int actualPar`
`119`	`119`	`long numberOfRows;`
`120`	`120`	`if (filter.isPresent()) {`
`121`	`121`	`// count the rows based on the filter`
`122`		`- String sql = bigQueryClient.selectSql(tableId, "COUNT(*)", new String[] {filter.get()});`
	`122`	`+ String sql = bigQueryClient.selectSql(tableId, "COUNT(*)");`
`123`	`123`	`TableResult result = bigQueryClient.query(sql);`
`124`	`124`	`numberOfRows = result.iterateAll().iterator().next().get(0).getLongValue();`
`125`	`125`	`}`