[iotdb] branch new_sync updated: [IOTDB-2630] new_sync branch, enhance class SenderService etc. (#5140)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch new_sync
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/new_sync by this push:
     new f834210  [IOTDB-2630] new_sync branch, enhance class SenderService etc. (#5140)
f834210 is described below

commit f8342106407bdcc0ec5b8740000091a3a48c5e2e
Author: Jamber <ja...@sina.com>
AuthorDate: Wed Mar 2 16:50:55 2022 +0800

    [IOTDB-2630] new_sync branch, enhance class SenderService etc. (#5140)
    
    Co-authored-by: haiyi.zb <ha...@alibaba-inc.com>
---
 .../apache/iotdb/db/newsync/pipedata/SchemaPipeData.java  |  2 +-
 .../apache/iotdb/db/newsync/receiver/ReceiverService.java |  5 ++++-
 .../iotdb/db/newsync/sender/service/SenderService.java    | 15 +++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/newsync/pipedata/SchemaPipeData.java b/server/src/main/java/org/apache/iotdb/db/newsync/pipedata/SchemaPipeData.java
index 809a0e2..53164d2 100644
--- a/server/src/main/java/org/apache/iotdb/db/newsync/pipedata/SchemaPipeData.java
+++ b/server/src/main/java/org/apache/iotdb/db/newsync/pipedata/SchemaPipeData.java
@@ -81,7 +81,7 @@ public class SchemaPipeData extends PipeData {
   @Override
   public void sendToTransport() {
     // senderTransport(getBytes(), this);
-    System.out.println(this);
+    // System.out.println(this);
   }
 
   @Override
diff --git a/server/src/main/java/org/apache/iotdb/db/newsync/receiver/ReceiverService.java b/server/src/main/java/org/apache/iotdb/db/newsync/receiver/ReceiverService.java
index 3dcca71..7729815 100644
--- a/server/src/main/java/org/apache/iotdb/db/newsync/receiver/ReceiverService.java
+++ b/server/src/main/java/org/apache/iotdb/db/newsync/receiver/ReceiverService.java
@@ -46,7 +46,10 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.apache.iotdb.db.conf.IoTDBConstant.*;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_CREATED_TIME;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_PIPE_NAME;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_PIPE_REMOTE_IP;
+import static org.apache.iotdb.db.conf.IoTDBConstant.COLUMN_PIPE_STATUS;
 
 public class ReceiverService implements IService {
   private static final Logger logger = LoggerFactory.getLogger(ReceiverService.class);
diff --git a/server/src/main/java/org/apache/iotdb/db/newsync/sender/service/SenderService.java b/server/src/main/java/org/apache/iotdb/db/newsync/sender/service/SenderService.java
index 8e1ad25..2caa321 100644
--- a/server/src/main/java/org/apache/iotdb/db/newsync/sender/service/SenderService.java
+++ b/server/src/main/java/org/apache/iotdb/db/newsync/sender/service/SenderService.java
@@ -63,15 +63,14 @@ public class SenderService implements IService {
     senderLogger = new SenderLogger();
   }
 
+  private static class SenderServiceHolder {
+    private static final SenderService INSTANCE = new SenderService();
+
+    private SenderServiceHolder() {}
+  }
+
   public static SenderService getInstance() {
-    if (senderService == null) {
-      synchronized (SenderService.class) {
-        if (senderService == null) {
-          senderService = new SenderService();
-        }
-      }
-    }
-    return senderService;
+    return SenderService.SenderServiceHolder.INSTANCE;
   }
 
   /** pipesink * */