Compilation fix

apache · Aug 30, 2022 · ff6b5a0 · ff6b5a0
1 parent 2eacbd4
commit ff6b5a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupIntoBatches.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/GroupIntoBatches.java
@@ -118,7 +118,8 @@ public class GroupIntoBatches<K, InputT>
   @AutoValue
   public abstract static class BatchingParams<InputT> implements Serializable {
     public static <InputT> BatchingParams<InputT> createDefault() {
-      return new AutoValue_GroupIntoBatches_BatchingParams(Long.MAX_VALUE, Long.MAX_VALUE, null, Duration.ZERO);
+      return new AutoValue_GroupIntoBatches_BatchingParams(
+          Long.MAX_VALUE, Long.MAX_VALUE, null, Duration.ZERO);
     }
 
     public static <InputT> BatchingParams<InputT> create(
@@ -163,7 +164,7 @@ public SerializableFunction<InputT, Long> getWeigher(Coder<InputT> valueCoder) {
       return weigher;
     }
   }
-  
+
   private final BatchingParams<InputT> params;
   private static final UUID workerUuid = UUID.randomUUID();
 
@@ -174,8 +175,7 @@ private GroupIntoBatches(BatchingParams<InputT> params) {
   /** Aim to create batches each with the specified element count. */
   public static <K, InputT> GroupIntoBatches<K, InputT> ofSize(long batchSize) {
     Preconditions.checkState(batchSize < Long.MAX_VALUE);
-    return new GroupIntoBatches<>(BatchingParams.createDefault())
-        .withSize(batchSize);
+    return new GroupIntoBatches<K, InputT>(BatchingParams.createDefault()).withSize(batchSize);
   }
 
   /**
@@ -189,7 +189,7 @@ public static <K, InputT> GroupIntoBatches<K, InputT> ofSize(long batchSize) {
    * {@link #ofByteSize(long, SerializableFunction)} to specify code to calculate the byte size.
    */
   public static <K, InputT> GroupIntoBatches<K, InputT> ofByteSize(long batchSizeBytes) {
-    return new GroupIntoBatches<>(BatchingParams.createDefault())
+    return new GroupIntoBatches<K, InputT>(BatchingParams.createDefault())
         .withByteSize(batchSizeBytes);
   }
 
@@ -199,7 +199,7 @@ public static <K, InputT> GroupIntoBatches<K, InputT> ofByteSize(long batchSizeB
    */
   public static <K, InputT> GroupIntoBatches<K, InputT> ofByteSize(
       long batchSizeBytes, SerializableFunction<InputT, Long> getElementByteSize) {
-    return new GroupIntoBatches<>(BatchingParams.createDefault())
+    return new GroupIntoBatches<K, InputT>(BatchingParams.createDefault())
         .withByteSize(batchSizeBytes, getElementByteSize);
   }
 
@@ -208,22 +208,18 @@ public BatchingParams<InputT> getBatchingParams() {
     return params;
   }
 
-  /**
-   * @see GroupIntoBatches#ofSize(long)
-   */
+  /** @see #ofSize(long)  */
   public GroupIntoBatches<K, InputT> withSize(long batchSize) {
     Preconditions.checkState(batchSize < Long.MAX_VALUE);
     return new GroupIntoBatches<>(
         BatchingParams.create(
-            params.getBatchSize(),
-            batchSizeBytes,
+            batchSize,
+            params.getBatchSizeBytes(),
             params.getElementByteSize(),
             params.getMaxBufferingDuration()));
   }
 
-  /**
-   * @see GroupIntoBatches#ofByteSize(long)
-   */
+  /** @see #ofByteSize(long)  */
   public GroupIntoBatches<K, InputT> withByteSize(long batchSizeBytes) {
     Preconditions.checkState(batchSizeBytes < Long.MAX_VALUE);
     return new GroupIntoBatches<>(
@@ -234,9 +230,7 @@ public GroupIntoBatches<K, InputT> withByteSize(long batchSizeBytes) {
             params.getMaxBufferingDuration()));
   }
 
-  /**
-   * @see GroupIntoBatches#ofByteSize(long, SerializableFunction)
-   */
+  /** @see #ofByteSize(long, SerializableFunction)  */
   public GroupIntoBatches<K, InputT> withByteSize(
       long batchSizeBytes, SerializableFunction<InputT, Long> getElementByteSize) {
     Preconditions.checkState(batchSizeBytes < Long.MAX_VALUE);

diff --git a/...o/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java b/...o/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigquery/BatchLoads.java
@@ -115,7 +115,7 @@ class BatchLoads<DestinationT, ElementT>
   static final int FILE_TRIGGERING_RECORD_COUNT = 500000;
   // If user triggering is supplied, we will trigger the file write after this many bytes are
   // written.
-  static final int FILE_TRIGGERING_BYTE_COUNT = 100 * (1L << 20) // 100MiB
+  static final long FILE_TRIGGERING_BYTE_COUNT = 100 * (1L << 20); // 100MiB
 
   // If using auto-sharding for unbounded data, we batch the records before triggering file write
   // to avoid generating too many small files.