Fix the logging for pushdown filters (#1201)

GoogleCloudDataproc · Mar 21, 2024 · f20529f · f20529f
1 parent eb21717
commit f20529f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...r-common/src/main/java/com/google/cloud/bigquery/connector/common/ReadSessionCreator.java b/...r-common/src/main/java/com/google/cloud/bigquery/connector/common/ReadSessionCreator.java
@@ -90,10 +90,16 @@ public ReadSessionResponse create(
       TableId table, ImmutableList<String> selectedFields, Optional<String> filter) {
     Instant sessionPrepStartTime = Instant.now();
     TableInfo tableDetails = bigQueryClient.getTable(table);
-
     TableInfo actualTable = getActualTable(tableDetails, selectedFields, filter);
 
     BigQueryReadClient bigQueryReadClient = bigQueryReadClientFactory.getBigQueryReadClient();
+    log.info(
+        "|creation a read session for table {}, parameters: "
+            + "|selectedFields=[{}],"
+            + "|filter=[{}]",
+        actualTable.getFriendlyName(),
+        String.join(",", selectedFields),
+        filter.orElse("None"));
 
     String tablePath = toTablePath(actualTable.getTableId());
     CreateReadSessionRequest request =

diff --git a/...r-common/src/main/java/com/google/cloud/spark/bigquery/direct/DirectBigQueryRelation.java b/...r-common/src/main/java/com/google/cloud/spark/bigquery/direct/DirectBigQueryRelation.java
@@ -111,14 +111,14 @@ public RDD<Row> buildScan(String[] requiredColumns) {
 
   @Override
   public RDD<Row> buildScan(String[] requiredColumns, Filter[] filters) {
+    compiledFilter = getCompiledFilter(filters);
     log.info(
         "|Querying table {}, parameters sent from Spark:"
             + "|requiredColumns=[{}],"
-            + "|filters=[{}]",
+            + "|filter=[{}]",
         getTableNameForLogging(),
         String.join(",", requiredColumns),
-        Arrays.stream(filters).map(f -> f.toString()).collect(Collectors.joining(",")));
-    compiledFilter = getCompiledFilter(filters);
+        compiledFilter);
     ReadSessionCreator readSessionCreator =
         new ReadSessionCreator(
             options.toReadSessionCreatorConfig(), bigQueryClient, bigQueryReadClientFactory);