This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new b1ba834 Rename ServerBootstrap/WorkerBootstrap to
ScalingServerBootstrap/ScalingWorkerBootstrap (#8877)
b1ba834 is described below
commit b1ba834cb58b55dea3d8839ea3074b046c9cbe56
Author: 邱鹿 Lucas <[email protected]>
AuthorDate: Mon Jan 4 16:58:46 2021 +0800
Rename ServerBootstrap/WorkerBootstrap to
ScalingServerBootstrap/ScalingWorkerBootstrap (#8877)
Co-authored-by: qiulu3 <Lucas209910>
---
.../src/main/resources/bin/server_start.bat | 2 +-
.../src/main/resources/bin/server_start.sh | 2 +-
.../src/main/resources/bin/server_stop.sh | 2 +-
.../src/main/resources/bin/worker_start.bat | 2 +-
.../src/main/resources/bin/worker_start.sh | 2 +-
.../src/main/resources/bin/worker_stop.sh | 2 +-
.../scaling/{ServerBootstrap.java => ScalingServerBootstrap.java} | 5 +++--
.../scaling/{WorkerBootstrap.java => ScalingWorkerBootstrap.java} | 5 +++--
8 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.bat
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.bat
index 49fccab..1c44bc8 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.bat
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.bat
@@ -25,7 +25,7 @@ set CLASS_PATH="..\conf;.;..;..\lib\*"
echo The classpath is %CLASS_PATH%
-set MAIN_CLASS=org.apache.shardingsphere.scaling.ServerBootstrap
+set MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingServerBootstrap
set JAVA_OPTS="-Djava.awt.headless=true -Djava.net.preferIPv4Stack=true"
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.sh
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.sh
index 0e77f84..0fb2625 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.sh
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_start.sh
@@ -41,7 +41,7 @@ JAVA_OPTS=" -Djava.awt.headless=true
-Djava.net.preferIPv4Stack=true "
JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC
-XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled
-XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods
-XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
-MAIN_CLASS=org.apache.shardingsphere.scaling.ServerBootstrap
+MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingServerBootstrap
echo "Starting the $SERVER_NAME ..."
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_stop.sh
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_stop.sh
index b05c06f..9a14be6 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_stop.sh
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/server_stop.sh
@@ -18,7 +18,7 @@
SERVER_NAME=ShardingSphere-Scaling
-MAIN_CLASS=org.apache.shardingsphere.scaling.ServerBootstrap
+MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingServerBootstrap
cd `dirname $0`
cd ..
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.bat
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.bat
index 18018f1..8cd3d09 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.bat
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.bat
@@ -25,7 +25,7 @@ set CLASS_PATH="..\conf;.;..;..\lib\*"
echo The classpath is %CLASS_PATH%
-set MAIN_CLASS=org.apache.shardingsphere.scaling.WorkerBootstrap
+set MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingWorkerBootstrap
set JAVA_OPTS="-Djava.awt.headless=true -Djava.net.preferIPv4Stack=true"
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.sh
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.sh
index c79ab9e..1d9f1fc 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.sh
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_start.sh
@@ -41,7 +41,7 @@ JAVA_OPTS=" -Djava.awt.headless=true
-Djava.net.preferIPv4Stack=true "
JAVA_MEM_OPTS=" -server -Xmx2g -Xms2g -Xmn1g -Xss256k -XX:+DisableExplicitGC
-XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled
-XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods
-XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
-MAIN_CLASS=org.apache.shardingsphere.scaling.WorkerBootstrap
+MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingWorkerBootstrap
echo "Starting the $SERVER_NAME ..."
diff --git
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_stop.sh
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_stop.sh
index da762b7..f66acb0 100644
---
a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_stop.sh
+++
b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/bin/worker_stop.sh
@@ -18,7 +18,7 @@
SERVER_NAME=ShardingSphere-Scaling
-MAIN_CLASS=org.apache.shardingsphere.scaling.WorkerBootstrap
+MAIN_CLASS=org.apache.shardingsphere.scaling.ScalingWorkerBootstrap
cd `dirname $0`
cd ..
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ServerBootstrap.java
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingServerBootstrap.java
similarity index 95%
rename from
shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ServerBootstrap.java
rename to
shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingServerBootstrap.java
index 35d7eae..fe85427 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ServerBootstrap.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingServerBootstrap.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.scaling;
+import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
@@ -37,7 +38,7 @@ import
org.apache.shardingsphere.scaling.web.HttpServerInitializer;
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
-public final class ServerBootstrap {
+public final class ScalingServerBootstrap {
/**
* Server Main entry.
@@ -58,7 +59,7 @@ public final class ServerBootstrap {
EventLoopGroup bossGroup = new NioEventLoopGroup(1);
EventLoopGroup workerGroup = new NioEventLoopGroup();
try {
- io.netty.bootstrap.ServerBootstrap bootstrap = new
io.netty.bootstrap.ServerBootstrap();
+ ServerBootstrap bootstrap = new ServerBootstrap();
bootstrap.option(ChannelOption.SO_BACKLOG, 1024);
bootstrap.group(bossGroup, workerGroup)
.channel(NioServerSocketChannel.class)
diff --git
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/WorkerBootstrap.java
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingWorkerBootstrap.java
similarity index 95%
rename from
shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/WorkerBootstrap.java
rename to
shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingWorkerBootstrap.java
index 3063433..17571c4 100644
---
a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/WorkerBootstrap.java
+++
b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/java/org/apache/shardingsphere/scaling/ScalingWorkerBootstrap.java
@@ -25,12 +25,13 @@ import
org.apache.shardingsphere.scaling.util.ServerConfigurationInitializer;
import java.util.Optional;
+
/**
* Bootstrap of ShardingSphere-Scaling worker.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
-public final class WorkerBootstrap {
+public final class ScalingWorkerBootstrap {
/**
* Worker Main entry.
@@ -53,7 +54,7 @@ public final class WorkerBootstrap {
private static synchronized void wait0() {
try {
- WorkerBootstrap.class.wait();
+ ScalingWorkerBootstrap.class.wait();
} catch (final InterruptedException ignored) {
}
}
