chore(cleanup): address review comments for spangres parser (#1752)

googleapis · Mar 16, 2022 · a008790 · a008790
1 parent 4a341a2
commit a008790
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/...cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatements.java b/...cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatements.java
@@ -26,17 +26,17 @@
 
 /** This class reads and parses the {@link ClientSideStatement}s from the json file. */
 class ClientSideStatements {
-  private static final String STATEMENTS_DEFINITION_FILE = "ClientSideStatements.json";
+  private static final String GSQL_STATEMENTS_DEFINITION_FILE = "ClientSideStatements.json";
   private static final String PG_STATEMENTS_DEFINITION_FILE = "PG_ClientSideStatements.json";
-  private static final ClientSideStatements INSTANCE = importStatements();
-  private static final ClientSideStatements PG_INSTANCE = pgImportStatements();
+  private static final ClientSideStatements GSQL_STATEMENTS = importGsqlStatements();
+  private static final ClientSideStatements PG_STATEMENTS = importPgStatements();
 
   static ClientSideStatements getInstance(Dialect dialect) {
     switch (dialect) {
       case GOOGLE_STANDARD_SQL:
-        return INSTANCE;
+        return GSQL_STATEMENTS;
       case POSTGRESQL:
-        return PG_INSTANCE;
+        return PG_STATEMENTS;
       default:
         throw SpannerExceptionFactory.newSpannerException(
             ErrorCode.INVALID_ARGUMENT, "Unknown or unsupported dialect: " + dialect);
@@ -46,18 +46,18 @@ static ClientSideStatements getInstance(Dialect dialect) {
   /**
    * Reads statement definitions from ClientSideStatements.json and parses these as Java objects.
    */
-  private static ClientSideStatements importStatements() {
+  private static ClientSideStatements importGsqlStatements() {
     Gson gson = new Gson();
     return gson.fromJson(
         new InputStreamReader(
-            ClientSideStatements.class.getResourceAsStream(STATEMENTS_DEFINITION_FILE)),
+            ClientSideStatements.class.getResourceAsStream(GSQL_STATEMENTS_DEFINITION_FILE)),
         ClientSideStatements.class);
   }
 
   /**
    * Reads statement definitions from PG_ClientSideStatements.json and parses these as Java objects.
    */
-  private static ClientSideStatements pgImportStatements() {
+  private static ClientSideStatements importPgStatements() {
     Gson gson = new Gson();
     return gson.fromJson(
         new InputStreamReader(

diff --git a/...test/resources/com/google/cloud/spanner/connection/postgresql/SetStatementTimeoutTest.sql b/...test/resources/com/google/cloud/spanner/connection/postgresql/SetStatementTimeoutTest.sql
@@ -100,6 +100,10 @@ SET STATEMENT_TIMEOUT='1001us';
 @EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1001us'
 SHOW VARIABLE STATEMENT_TIMEOUT;
 
+SET STATEMENT_TIMEOUT='1000000ns';
+@EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1ms'
+SHOW VARIABLE STATEMENT_TIMEOUT;
+
 SET STATEMENT_TIMEOUT='1000ms';
 @EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1s'
 SHOW VARIABLE STATEMENT_TIMEOUT;
@@ -108,10 +112,6 @@ SET STATEMENT_TIMEOUT='1001ms';
 @EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1001ms'
 SHOW VARIABLE STATEMENT_TIMEOUT;
 
-SET STATEMENT_TIMEOUT='1000000ns';
-@EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1ms'
-SHOW VARIABLE STATEMENT_TIMEOUT;
-
 SET STATEMENT_TIMEOUT='1000000000ns';
 @EXPECT RESULT_SET 'STATEMENT_TIMEOUT','1s'
 SHOW VARIABLE STATEMENT_TIMEOUT;