[GitHub] [incubator-iceberg] aokolnychyi commented on a change in pull request #666: BaseRewriteManifests should keep different manifest for different partitionSpec

[GitBox <gi...@apache.org>]

aokolnychyi commented on a change in pull request #666: BaseRewriteManifests should keep different manifest for different partitionSpec
URL: https://github.com/apache/incubator-iceberg/pull/666#discussion_r355329680
 
 

 ##########
 File path: core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java
 ##########
 @@ -312,33 +311,58 @@ long getManifestTargetSizeBytes() {
   }
 
   class WriterWrapper {
-    private ManifestWriter writer;
-
-    synchronized void addEntry(ManifestEntry entry) {
-      if (writer == null) {
-        writer = newWriter();
-      } else if (writer.length() >= getManifestTargetSizeBytes()) {
-        close();
-        writer = newWriter();
+    private final Map<Integer, ManifestWriter> manifestWritersBySpecId = Collections.synchronizedMap(new HashMap<>());
+
+    synchronized void addEntry(ManifestEntry entry, int partitionSpecId) {
+      ManifestWriter manifestWriter = manifestWritersBySpecId.get(partitionSpecId);
+      if (manifestWriter == null) {
+        manifestWriter = addAndReturnNewWriter(partitionSpecId);
+      } else if (manifestWriter.length() >= getManifestTargetSizeBytes()) {
+        close(partitionSpecId);
+        manifestWriter = addAndReturnNewWriter(partitionSpecId);
       }
-      writer.existing(entry);
+      manifestWriter.existing(entry);
     }
 
-    private ManifestWriter newWriter() {
-      return new ManifestWriter(spec, manifestPath(manifestSuffix.getAndIncrement()), snapshotId());
+    private ManifestWriter addAndReturnNewWriter(int partitionSpecId) {
 
 Review comment:
   I would consider splitting this into two methods and calling them as necessary:
   
   ```
   private ManifestWriter newWriter(int partitionSpecId) {
     PartitionSpec spec = specsById.get(partitionSpecId);
     return new ManifestWriter(spec, manifestPath(manifestSuffix.getAndIncrement()), snapshotId());
   }
   ```
   
   ```
   private void addManifestWriter(int partitionSpecId, ManifestWriter manifestWriter) {
     if (manifestWritersBySpecId.contains(partitionSpecId)) {
       // throw some exception as this should not happen (will leak resources otherwise)
     }
     manifestWritersBySpecId.put(partitionSpecId, manifestWriter);
   }
   ```
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org