Merge branch 'main' into migrateJavaToLibrarain

Author: sofisl

.gitignore

@@ -86,3 +86,6 @@ monorepo
 *.tfstate.lock.info
 
 .jqwik-database
+
+# Python build artifacts for library_generation tool
+sdk-platform-java/hermetic_build/library_generation/build/

java-bigquery-jdbc/pom-it.xml

@@ -21,7 +21,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery-jdbc</artifactId>
-      <version>0.4.1-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery-jdbc:current} -->
       <type>test-jar</type>
       <scope>compile</scope>
     </dependency>

java-bigquery-jdbc/pom.xml

@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-bigquery-jdbc</artifactId>
-  <version>0.11.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery-jdbc:current} -->
+  <version>1.0.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery-jdbc:current} -->
   <packaging>jar</packaging>
   <name>BigQuery JDBC</name>
   <url>https://github.com/googleapis/google-cloud-java</url>

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaData.java

@@ -5080,40 +5080,35 @@ Pattern compileSqlLikePattern(String sqlLikePattern) {
     }
     StringBuilder regex = new StringBuilder(sqlLikePattern.length() * 2);
     regex.append('^');
+    boolean escaped = false;
     for (int i = 0; i < sqlLikePattern.length(); i++) {
       char c = sqlLikePattern.charAt(i);
-      switch (c) {
-        case '%':
-          regex.append(".*");
-          break;
-        case '_':
-          regex.append('.');
-          break;
-        case '\\':
-        case '.':
-        case '[':
-        case ']':
-        case '(':
-        case ')':
-        case '{':
-        case '}':
-        case '*':
-        case '+':
-        case '?':
-        case '^':
-        case '$':
-        case '|':
-          regex.append('\\').append(c);
-          break;
-        default:
-          regex.append(c);
-          break;
+      if (!escaped && c == '\\') {
+        escaped = true;
+        continue;
+      } else if (!escaped && c == '%') {
+        regex.append(".*");
+      } else if (!escaped && c == '_') {
+        regex.append('.');
+      } else {
+        if (isRegexMetacharacter(c)) {
+          regex.append('\\');
+        }
+        regex.append(c);
+        escaped = false;
       }
     }
+    if (escaped) {
+      regex.append('\\').append('\\');
+    }
     regex.append('$');
     return Pattern.compile(regex.toString(), Pattern.CASE_INSENSITIVE);
   }
 
+  private static boolean isRegexMetacharacter(char c) {
+    return "\\.[]{}()*+?^$|".indexOf(c) != -1;
+  }
+
   boolean needsListing(String pattern) {
     return pattern == null || pattern.contains("%") || pattern.contains("_");
   }

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQuerySqlTypeConverter.java

@@ -72,6 +72,7 @@ static SqlType getSqlTypeFromStatementType(StatementType statementType) {
       case "ROLLBACK_TRANSACTION":
         return SqlType.TCL;
       case "EXPORT_DATA":
+        return SqlType.EXPORT;
       case "EXPORT_MODEL":
       case "LOAD_DATA":
       default:

java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryStatement.java

@@ -685,15 +685,12 @@ void handleQueryResult(String query, TableResult results, SqlType queryType)
         break;
       case DML:
       case DML_EXTRA:
-        try {
-          Job completedJob = this.bigQuery.getJob(results.getJobId()).waitFor();
-          JobStatistics.QueryStatistics statistics = completedJob.getStatistics();
-          updateAffectedRowCount(statistics.getNumDmlAffectedRows());
-        } catch (InterruptedException ex) {
-          throw new BigQueryJdbcRuntimeException(ex);
-        } catch (NullPointerException ex) {
-          throw new BigQueryJdbcException(ex);
-        }
+        QueryStatistics dmlStats = getQueryStatisticsFromJob(results);
+        Long dmlRowCount =
+            (dmlStats != null && dmlStats.getNumDmlAffectedRows() != null)
+                ? dmlStats.getNumDmlAffectedRows()
+                : 0L;
+        updateAffectedRowCount(dmlRowCount);
         break;
       case TCL:
       case DDL:
@@ -725,8 +722,43 @@ void handleQueryResult(String query, TableResult results, SqlType queryType)
           throw new BigQueryJdbcException(ex);
         }
         break;
+      case EXPORT:
+        QueryStatistics exportStats = getQueryStatisticsFromJob(results);
+        Long exportRowCount = 0L;
+        if (exportStats != null) {
+          QueryStatistics.ExportDataStats dataStats = exportStats.getExportDataStats();
+          if (dataStats != null && dataStats.getRowCount() != null) {
+            exportRowCount = dataStats.getRowCount();
+          }
+        }
+        updateAffectedRowCount(exportRowCount);
+        break;
       case OTHER:
-        throw new BigQueryJdbcException(String.format("Unexpected value: " + queryType));
+        String truncatedQuery = truncateQuery(query);
+        String id =
+            (results.getJobId() != null) ? results.getJobId().getJob() : results.getQueryId();
+        LOG.warning(
+            "Encountered unmapped SQL statement type [Job/Query ID: %s]. Treating as update statement: %s",
+            id, truncatedQuery);
+        updateAffectedRowCount(results.getTotalRows());
+        break;
+    }
+  }
+
+  private QueryStatistics getQueryStatisticsFromJob(TableResult results) throws SQLException {
+    try {
+      Job job = this.bigQuery.getJob(results.getJobId());
+      Job completedJob = (job != null) ? job.waitFor() : null;
+      JobStatistics stats = (completedJob != null) ? completedJob.getStatistics() : null;
+      if (stats instanceof QueryStatistics) {
+        return (QueryStatistics) stats;
+      }
+      return null;
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+      throw new BigQueryJdbcRuntimeException("Interrupted while waiting for job completion", ex);
+    } catch (BigQueryException ex) {
+      throw new BigQueryJdbcException("BigQueryException while waiting for job completion", ex);
     }
   }
 
@@ -1589,13 +1621,19 @@ protected void logQueryExecutionStart(String sql) {
     if (sql == null) {
       return;
     }
-    String sanitizedSql = sql.trim().replaceAll("\\s+", " ");
-    String truncatedSql =
-        sanitizedSql.length() > 256 ? sanitizedSql.substring(0, 256) + "..." : sanitizedSql;
+    String truncatedSql = truncateQuery(sql);
     LOG.info("Executing query: " + truncatedSql);
     LOG.info("Using query settings: " + this.querySettings.toString());
   }
 
+  private String truncateQuery(String sql) {
+    if (sql == null) {
+      return null;
+    }
+    String sanitizedSql = sql.trim().replaceAll("\\s+", " ");
+    return sanitizedSql.length() > 256 ? sanitizedSql.substring(0, 256) + "..." : sanitizedSql;
+  }
+
   /** Throws a {@link BigQueryJdbcException} if this object is closed */
   void checkClosed() throws SQLException {
     if (isClosed()) {
@@ -1610,6 +1648,7 @@ enum SqlType {
     DDL,
     SCRIPT,
     TCL,
+    EXPORT,
     OTHER
   }
 

java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryDatabaseMetaDataTest.java

@@ -243,6 +243,23 @@ public void testCompileSqlLikePattern() {
     assertNotNull(bracketPattern);
     assertTrue(bracketPattern.matcher("array[0]").matches());
     assertFalse(bracketPattern.matcher("array_0_").matches());
+
+    // Escaped wildcards
+    Pattern escapedUnderscore = dbMetadata.compileSqlLikePattern("test\\_table");
+    assertNotNull(escapedUnderscore);
+    assertTrue(escapedUnderscore.matcher("test_table").matches());
+    assertFalse(escapedUnderscore.matcher("test1table").matches());
+
+    Pattern escapedPercent = dbMetadata.compileSqlLikePattern("100\\%discount");
+    assertNotNull(escapedPercent);
+    assertTrue(escapedPercent.matcher("100%discount").matches());
+    assertFalse(escapedPercent.matcher("100PERCENTdiscount").matches());
+
+    // Escape character at the end
+    Pattern escapeLast = dbMetadata.compileSqlLikePattern("test\\");
+    assertNotNull(escapeLast);
+    assertTrue(escapeLast.matcher("test\\").matches());
+    assertFalse(escapeLast.matcher("test").matches());
   }
 
   @Test

java-spanner/google-cloud-spanner/clirr-ignored-differences.xml

@@ -910,21 +910,21 @@
     <method>java.lang.Object runTransaction(com.google.cloud.spanner.connection.Connection$TransactionCallable)</method>
   </difference>
 
-  <!-- Added experimental host option -->
+  <!-- Added Spanner Omni option -->
   <difference>
     <differenceType>7012</differenceType>
     <className>com/google/cloud/spanner/SpannerOptions$SpannerEnvironment</className>
-    <method>com.google.auth.oauth2.GoogleCredentials getDefaultExperimentalHostCredentials()</method>
+    <method>com.google.auth.oauth2.GoogleCredentials getDefaultSpannerOmniCredentials()</method>
   </difference>
   <difference>
     <differenceType>7002</differenceType>
     <className>com/google/cloud/spanner/SpannerOptions$SpannerEnvironment</className>
-    <method>com.google.auth.oauth2.GoogleCredentials getDefaultExternalHostCredentials()</method>
+    <method>com.google.auth.oauth2.GoogleCredentials getDefaultSpannerOmniCredentials()</method>
   </difference>
   <difference>
     <differenceType>7002</differenceType>
     <className>com/google/cloud/spanner/SpannerOptions</className>
-    <method>com.google.auth.oauth2.GoogleCredentials getDefaultExternalHostCredentialsFromSysEnv()</method>
+    <method>com.google.auth.oauth2.GoogleCredentials getDefaultSpannerOmniCredentialsFromSysEnv()</method>
   </difference>
 
   <!-- Default sequence kind -->