Java: SeaweedOutputStream refactoring

other/java/client/src/main/java/seaweedfs/client/SeaweedOutputStream.java

@@ -21,8 +21,9 @@ public class SeaweedOutputStream extends OutputStream {
     private final int maxConcurrentRequestCount;
     private final ThreadPoolExecutor threadExecutor;
     private final ExecutorCompletionService<Void> completionService;
-    private final FilerProto.Entry.Builder entry;
     private final ConcurrentLinkedDeque<WriteOperation> writeOperations;
+    private final boolean shouldSaveMetadata = false;
+    private FilerProto.Entry.Builder entry;
     private long position;
     private boolean closed;
     private volatile IOException lastError;
@@ -31,21 +32,25 @@ public class SeaweedOutputStream extends OutputStream {
     private ByteBuffer buffer;
     private long outputIndex;
     private String replication = "000";
-    private boolean shouldSaveMetadata = false;
 
     public SeaweedOutputStream(FilerGrpcClient filerGrpcClient, final String fullpath) {
         this(filerGrpcClient, fullpath, "000");
     }
 
     public SeaweedOutputStream(FilerGrpcClient filerGrpcClient, final String fullpath, final String replication) {
-        this.replication = replication;
+        this(filerGrpcClient, fullpath, null, 0, 8 * 1024 * 1024, "000");
+    }
+
+    public SeaweedOutputStream(FilerGrpcClient filerGrpcClient, final String path, FilerProto.Entry.Builder entry,
+                               final long position, final int bufferSize, final String replication) {
         this.filerGrpcClient = filerGrpcClient;
-        this.path = fullpath;
-        this.position = 0;
+        this.replication = replication;
+        this.path = path;
+        this.position = position;
         this.closed = false;
         this.lastError = null;
         this.lastFlushOffset = 0;
-        this.bufferSize = 8 * 1024 * 1024;
+        this.bufferSize = bufferSize;
         this.buffer = ByteBufferPool.request(bufferSize);
         this.outputIndex = 0;
         this.writeOperations = new ConcurrentLinkedDeque<>();
@@ -60,6 +65,8 @@ public class SeaweedOutputStream extends OutputStream {
                 new LinkedBlockingQueue<Runnable>());
         this.completionService = new ExecutorCompletionService<>(this.threadExecutor);
 
+        this.entry = entry;
+        if (this.entry == null) {
             long now = System.currentTimeMillis() / 1000L;
 
             this.entry = FilerProto.Entry.newBuilder()
@@ -72,36 +79,8 @@ public class SeaweedOutputStream extends OutputStream {
                             .setMtime(now)
                             .clearGroupName()
                     );
-        this.shouldSaveMetadata = true;
-
         }
 
-    public SeaweedOutputStream(FilerGrpcClient filerGrpcClient, final String path, FilerProto.Entry.Builder entry,
-                               final long position, final int bufferSize, final String replication) {
-        this.filerGrpcClient = filerGrpcClient;
-        this.replication = replication;
-        this.path = path;
-        this.position = position;
-        this.closed = false;
-        this.lastError = null;
-        this.lastFlushOffset = 0;
-        this.bufferSize = bufferSize;
-        this.buffer = ByteBufferPool.request(bufferSize);
-        this.outputIndex = 0;
-        this.writeOperations = new ConcurrentLinkedDeque<>();
-
-        this.maxConcurrentRequestCount = Runtime.getRuntime().availableProcessors();
-
-        this.threadExecutor
-                = new ThreadPoolExecutor(maxConcurrentRequestCount,
-                maxConcurrentRequestCount,
-                120L,
-                TimeUnit.SECONDS,
-                new LinkedBlockingQueue<Runnable>());
-        this.completionService = new ExecutorCompletionService<>(this.threadExecutor);
-
-        this.entry = entry;
-
     }
 
     public static String getParentDirectory(String path) {
@@ -218,10 +197,6 @@ public class SeaweedOutputStream extends OutputStream {
             }
         }
 
-        if (shouldSaveMetadata) {
-            SeaweedWrite.writeMeta(filerGrpcClient, getParentDirectory(path), entry);
-        }
-
     }
 
     private synchronized void writeCurrentBufferToService() throws IOException {