mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-04 20:01:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3648 from actiontech/2110-fix

Browse Source 
fix  comma format inner 2159
This commit is contained in:
wenyh
2023-03-31 16:15:21 +08:00
committed by GitHub
parent c1bb1238d2 1c0915e736
commit 08699b8337
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/actiontech/dble/config/helper/GetAndSyncDbInstanceKeyVariables.java
View File

@@ -72,7 +72,7 @@ public class GetAndSyncDbInstanceKeyVariables implements Callable<KeyVariables>
if (!await) {
fail = true;
isFinish = true;
LOGGER.warn("test conn timeout，TCP connection may be lost");
LOGGER.warn("test conn timeout,TCP connection may be lost");
}
}
} catch (InterruptedException e) {

2
src/main/java/com/actiontech/dble/config/util/ParameterMapping.java
View File

@@ -194,7 +194,7 @@ public final class ParameterMapping {
throw (RuntimeException) targetException;
}
}
// won't happen generally，If it still happens ，maybe throw an exception and stop process is a good idea.
// won't happen generally,If it still happens ,maybe throw an exception and stop process is a good idea.
LOGGER.info("valueofError", t);
throw new IllegalStateException(t);
}

2
src/main/java/com/actiontech/dble/route/parser/druid/ServerSchemaStatVisitor.java
View File

@@ -355,7 +355,7 @@ public class ServerSchemaStatVisitor extends MySqlSchemaStatVisitor {
public boolean visit(SQLUnaryExpr x) {
switch (x.getOperator()) {
case Not:
// It doesn't match now it might match in the future，don't delete
// It doesn't match now it might match in the future,don't delete
case NOT:
case Compl:
return false;

2
src/main/java/com/actiontech/dble/server/status/GeneralLog.java
View File

@@ -26,7 +26,7 @@ public final class GeneralLog {
try {
this.generalLogFile = file.getCanonicalPath();
} catch (IOException e) {
LOGGER.warn("Invalid generalLogFile path configuration，exception: {}", e);
LOGGER.warn("Invalid generalLogFile path configuration,exception: {}", e);
this.generalLogFile = file.getAbsolutePath();
}
this.generalLogFileSize = SystemConfig.getInstance().getGeneralLogFileSize();

4
src/main/java/com/actiontech/dble/services/FrontendService.java
View File

@@ -53,9 +53,9 @@ public abstract class FrontendService<T extends UserConfig> extends AbstractServ
// will non null if is dong task
private volatile Long doingTaskThread = null;
private AtomicLong taskId = new AtomicLong(1);
// current task index，Will increased when every new task is processed。
// current task index,Will increased when every new task is processed。
private long currentTaskIndex = 0;
// consumed task id，Used to indicate next task id.(this=nextTaskId-1)
// consumed task id,Used to indicate next task id.(this=nextTaskId-1)
private volatile long consumedTaskId = 0;
// client capabilities
private final long clientCapabilities;

8
src/main/java/com/actiontech/dble/services/manager/response/ReloadConfig.java
View File

@@ -144,7 +144,7 @@ public final class ReloadConfig {
}
if (!reloadResult) {
packetResult.setSuccess(false);
packetResult.setErrorMsg("Reload config failure.The reason is reload interruputed by others,config should be reload");
packetResult.setErrorMsg("Reload Failure.The reason is reload interruputed by others,config should be reload");
packetResult.setErrorCode(ErrorCode.ER_RELOAD_INTERRUPUTED);
return;
}
@@ -199,7 +199,7 @@ public final class ReloadConfig {
try {
if (!ReloadManager.startReload(TRIGGER_TYPE_COMMAND, confStatus)) {
packetResult.setSuccess(false);
packetResult.setErrorMsg("Reload config failure.The reason is reload status error ,other client or cluster may in reload");
packetResult.setErrorMsg("Reload Failure.The reason is reload status error ,other client or cluster may in reload");
packetResult.setErrorCode(ErrorCode.ER_YES);
return;
}
@@ -215,7 +215,7 @@ public final class ReloadConfig {
return;
} else if (!reloadResult) {
packetResult.setSuccess(false);
packetResult.setErrorMsg("Reload config failure.The reason is reload interruputed by others,metadata should be reload");
packetResult.setErrorMsg("Reload Failure.The reason is reload interruputed by others,metadata should be reload");
packetResult.setErrorCode(ErrorCode.ER_RELOAD_INTERRUPUTED);
}
} finally {
@@ -226,7 +226,7 @@ public final class ReloadConfig {
private static void writeErrorResult(ManagerService c, String errorMsg) {
String sb = "Reload config failure.The reason is " + errorMsg;
String sb = "Reload Failure.The reason is " + errorMsg;
LOGGER.warn(sb);
c.writeErrMessage(ErrorCode.ER_YES, sb);
}

2
src/main/java/com/actiontech/dble/singleton/PauseShardingNodeManager.java
View File

@@ -71,7 +71,7 @@ public final class PauseShardingNodeManager {
}
/**
* in this implementation, when call this method 'fetchClusterStatus()',the port is already be listened ，but the server has not ready for accept connection yet. So,no FrontConnection will be created, we don't need to call 'waitForSelfPause()' to wait for connection paused;
* in this implementation, when call this method 'fetchClusterStatus()',the port is already be listened ,but the server has not ready for accept connection yet. So,no FrontConnection will be created, we don't need to call 'waitForSelfPause()' to wait for connection paused;
*
* @throws Exception
*/