diff --git a/pom.xml b/pom.xml index 65bfd04f4..0b5cb1871 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ UTF-8 - 1.5.0 + 1.75.0 2.18.0 diff --git a/src/main/java/com/actiontech/dble/cluster/general/impl/UcoreSender.java b/src/main/java/com/actiontech/dble/cluster/general/impl/UcoreSender.java index 3bb44b087..2c4565a7b 100644 --- a/src/main/java/com/actiontech/dble/cluster/general/impl/UcoreSender.java +++ b/src/main/java/com/actiontech/dble/cluster/general/impl/UcoreSender.java @@ -57,7 +57,7 @@ public final class UcoreSender extends AbstractConsulSender { LOGGER.error("error:", e); } Channel channel = ManagedChannelBuilder.forAddress(getIpList().get(0), - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); } @@ -71,7 +71,7 @@ public final class UcoreSender extends AbstractConsulSender { LOGGER.error("error:", e); } Channel channel = ManagedChannelBuilder.forAddress(getIpList().get(0), - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); if (!skipSyncUcores()) { startUpdateNodes(); @@ -132,7 +132,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); output = stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).lockOnSession(input); return output.getSessionId(); @@ -171,7 +171,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).putKv(input); return; @@ -198,7 +198,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); output = stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).getKv(input); } catch (Exception e2) { @@ -233,7 +233,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); output = stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).getKvTree(input); } catch (Exception e2) { @@ -268,7 +268,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).deleteKvTree(input); flag = true; @@ -295,7 +295,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).deleteKv(input); return; @@ -323,7 +323,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GRPC_SUBTIMEOUT, TimeUnit.SECONDS); UcoreInterface.SubscribeKvPrefixOutput output = stub.withDeadlineAfter(GRPC_SUBTIMEOUT, TimeUnit.SECONDS).subscribeKvPrefix(input); return groupSubscribeResult(output); @@ -348,7 +348,7 @@ public final class UcoreSender extends AbstractConsulSender { for (String ip : getIpList()) { ManagedChannel channel = null; try { - channel = ManagedChannelBuilder.forAddress(ip, ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + channel = ManagedChannelBuilder.forAddress(ip, ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).alert(input); return; @@ -372,7 +372,7 @@ public final class UcoreSender extends AbstractConsulSender { for (String ip : getIpList()) { ManagedChannel channel = null; try { - channel = ManagedChannelBuilder.forAddress(ip, ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + channel = ManagedChannelBuilder.forAddress(ip, ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).alertResolve(input); return true; @@ -418,7 +418,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); stub.withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS).renewSession(input); return true; @@ -455,7 +455,7 @@ public final class UcoreSender extends AbstractConsulSender { ManagedChannel channel = null; try { channel = ManagedChannelBuilder.forAddress(ip, - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = UcoreGrpc.newBlockingStub(channel).withDeadlineAfter(GRPC_SUBTIMEOUT, TimeUnit.SECONDS); return stub.withDeadlineAfter(GRPC_SUBTIMEOUT, TimeUnit.SECONDS).subscribeNodes(subscribeNodesInput); } catch (Exception e2) { diff --git a/src/main/java/com/actiontech/dble/cluster/general/impl/ushard/UshardSender.java b/src/main/java/com/actiontech/dble/cluster/general/impl/ushard/UshardSender.java index 2faf0cf85..9c42c1534 100644 --- a/src/main/java/com/actiontech/dble/cluster/general/impl/ushard/UshardSender.java +++ b/src/main/java/com/actiontech/dble/cluster/general/impl/ushard/UshardSender.java @@ -38,7 +38,7 @@ public class UshardSender extends AbstractConsulSender { @Override public void initConInfo() { Channel channel = ManagedChannelBuilder.forAddress("127.0.0.1", - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = DbleClusterGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); } @@ -47,7 +47,7 @@ public class UshardSender extends AbstractConsulSender { serverId = SystemConfig.getInstance().getServerId(); sourceComponentId = SystemConfig.getInstance().getInstanceName(); Channel channel = ManagedChannelBuilder.forAddress("127.0.0.1", - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = DbleClusterGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); startUpdateNodes(); ClusterToXml.loadKVtoFile(this); @@ -285,7 +285,7 @@ public class UshardSender extends AbstractConsulSender { } catch (Exception e) { LOGGER.warn("error in ucore nodes watch,try for another time", e); Channel channel = ManagedChannelBuilder.forAddress("127.0.0.1", - ClusterConfig.getInstance().getClusterPort()).usePlaintext(true).build(); + ClusterConfig.getInstance().getClusterPort()).usePlaintext().build(); stub = DbleClusterGrpc.newBlockingStub(channel).withDeadlineAfter(GENERAL_GRPC_TIMEOUT, TimeUnit.SECONDS); } }