You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/11/15 04:36:32 UTC
[incubator-iotdb] 01/06: rename sync client class name
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch fix_show_info
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 42695c6abd844feb40a7d6756430dedb93fe84a2
Author: lta <li...@163.com>
AuthorDate: Fri Nov 8 17:40:22 2019 +0800
rename sync client class name
---
.../ISyncClient.java} | 4 ++--
.../DataTransferManager.java => client/SyncClient.java} | 16 ++++++++--------
.../{transfer => client}/DataTransferManagerTest.java | 6 +++---
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/IDataTransferManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/client/ISyncClient.java
similarity index 97%
rename from server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/IDataTransferManager.java
rename to server/src/main/java/org/apache/iotdb/db/sync/sender/client/ISyncClient.java
index f218451..7c5e73a 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/IDataTransferManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/client/ISyncClient.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.db.sync.sender.transfer;
+package org.apache.iotdb.db.sync.sender.client;
import java.io.File;
import java.io.IOException;
@@ -31,7 +31,7 @@ import org.apache.thrift.TException;
* synchronized in <class>SyncFileManager</class>, these files are synchronized to the receiving end
* to complete the synchronization task.
*/
-public interface IDataTransferManager {
+public interface ISyncClient {
void init();
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java b/server/src/main/java/org/apache/iotdb/db/sync/sender/client/SyncClient.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
rename to server/src/main/java/org/apache/iotdb/db/sync/sender/client/SyncClient.java
index dc04a1a..69a3640 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/sender/client/SyncClient.java
@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.db.sync.sender.transfer;
+package org.apache.iotdb.db.sync.sender.client;
import static org.apache.iotdb.db.sync.conf.SyncConstant.CONFLICT_CODE;
import static org.apache.iotdb.db.sync.conf.SyncConstant.SUCCESS_CODE;
@@ -72,9 +72,9 @@ import org.apache.thrift.transport.TTransportException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class DataTransferManager implements IDataTransferManager {
+public class SyncClient implements ISyncClient {
- private static final Logger logger = LoggerFactory.getLogger(DataTransferManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(SyncClient.class);
private static SyncSenderConfig config = SyncSenderDescriptor.getInstance().getConfig();
@@ -114,11 +114,11 @@ public class DataTransferManager implements IDataTransferManager {
private ScheduledExecutorService executorService;
- private DataTransferManager() {
+ private SyncClient() {
init();
}
- public static DataTransferManager getInstance() {
+ public static SyncClient getInstance() {
return InstanceHolder.INSTANCE;
}
@@ -127,7 +127,7 @@ public class DataTransferManager implements IDataTransferManager {
*/
public static void main(String[] args) throws IOException {
Thread.currentThread().setName(ThreadName.SYNC_CLIENT.getName());
- IDataTransferManager fileSenderImpl = new DataTransferManager();
+ ISyncClient fileSenderImpl = new SyncClient();
fileSenderImpl.verifySingleton();
fileSenderImpl.startMonitor();
fileSenderImpl.startTimedTask();
@@ -655,7 +655,7 @@ public class DataTransferManager implements IDataTransferManager {
private static class InstanceHolder {
- private static final DataTransferManager INSTANCE = new DataTransferManager();
+ private static final SyncClient INSTANCE = new SyncClient();
}
private File getSyncLogFile() {
@@ -667,6 +667,6 @@ public class DataTransferManager implements IDataTransferManager {
}
public void setConfig(SyncSenderConfig config) {
- DataTransferManager.config = config;
+ SyncClient.config = config;
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManagerTest.java b/server/src/test/java/org/apache/iotdb/db/sync/sender/client/DataTransferManagerTest.java
similarity index 96%
rename from server/src/test/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManagerTest.java
rename to server/src/test/java/org/apache/iotdb/db/sync/sender/client/DataTransferManagerTest.java
index 305a2ea..49ae416 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/sender/transfer/DataTransferManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/sender/client/DataTransferManagerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.db.sync.sender.transfer;
+package org.apache.iotdb.db.sync.sender.client;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public class DataTransferManagerTest {
private static final Logger logger = LoggerFactory.getLogger(DataTransferManagerTest.class);
- private IDataTransferManager manager = DataTransferManager.getInstance();
+ private ISyncClient manager = SyncClient.getInstance();
private SyncSenderConfig config = SyncSenderDescriptor.getInstance().getConfig();
private String dataDir;
private ISyncSenderLogAnalyzer senderLogAnalyzer;
@@ -106,7 +106,7 @@ public class DataTransferManagerTest {
dataFileMap.putIfAbsent(sgFile.getName(), new HashSet<>());
for (File tsfile : sgFile.listFiles()) {
if (!tsfile.getName().endsWith(TsFileResource.RESOURCE_SUFFIX)) {
- ((DataTransferManager)manager).makeFileSnapshot(tsfile);
+ ((SyncClient)manager).makeFileSnapshot(tsfile);
}
dataFileMap.get(sgFile.getName()).add(tsfile.getName());
}