fixes

Author: reuvenlax

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiDynamicDestinationsTableRow.java

@@ -236,11 +236,6 @@ byte[] getSchemaHash() {
       return getSchemaHash.get();
     }
 
-    @Override
-    public byte[] getSchemaHash() {
-      return getSchemaHash.get();
-    }
-
     @Override
     public DescriptorProtos.DescriptorProto getDescriptor(boolean includeCdcColumns)
         throws Exception {

sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/UpgradeTableSchema.java

@@ -130,6 +130,7 @@ private static List<TableFieldSchema> getIncrementalSchemaHelper(
     List<TableFieldSchema> fields = Lists.newArrayList();
 
     Set<String> fieldsToRelax = relaxedFields.getOrDefault(prefix, Collections.emptySet());
+    // Add existing fields in the same order.
     for (TableFieldSchema fieldSchema : tableFields) {
       String fieldName = fieldSchema.getName().toLowerCase();
       TableFieldSchema.Builder clonedField = null;

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/BigQueryIOWriteTest.java

@@ -3476,7 +3476,6 @@ public void testStreamingInsertsExtendedErrorRetrieval() throws Exception {
   @Test
   public void testStorageApiErrorsWriteProto() throws Exception {
     assumeTrue(useStorageApi);
-    assumeTrue(useStorageApiApproximate); // REMOVE
     final Method method =
         useStorageApiApproximate ? Method.STORAGE_API_AT_LEAST_ONCE : Method.STORAGE_WRITE_API;
 

sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/bigquery/StorageApiDataTriggeredSchemaUpdateIT.java

@@ -283,15 +283,6 @@ private void runTest(Write.Method method) throws Exception {
 
     p.run().waitUntilFinish();
 
-    List<TableRow> response =
-        BQ_CLIENT.queryUnflattened(
-            String.format("SELECT * FROM [%s] ORDER BY number", tableSpec),
-            PROJECT,
-            true,
-            false,
-            bigQueryLocation);
-    System.err.println("FULL RESULT " + response);
-
     // Verification
     verifyTableSchemaUpdated(tableSpec, evolvedSchema);
     List<VerificationInfo> verifications =