mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-06 14:30:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix comma format inner 2159

Browse Source 
fix  comma format inner 2159
This commit is contained in:
ylinzhu
2023-03-28 17:33:06 +08:00
committed by GitHub
parent 593471de84 e4739bf28b
commit 3acdc1bfca
13 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/config/helper/GetAndSyncDbInstanceKeyVariables.java
+1 -1
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) {
src/main/java/com/actiontech/dble/config/model/SystemConfig.java
+2 -2
View File
@@ -1799,7 +1799,7 @@ public final class SystemConfig {
}
int length = 11;
if (val.length() > length) {
problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal，the value contains a maximum of " + length + " characters");
problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal,the value contains a maximum of " + length + " characters");
}
String chinese = val.replaceAll(DBConverter.PATTERN_DB.toString(), "");
@@ -1808,7 +1808,7 @@ public final class SystemConfig {
}
if (!StringUtil.isChinese(chinese)) {
problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal，the " + Charset.defaultCharset().name() + " encoding is recommended, Property [ " + name + " ] show be use u4E00-u9FA5a-zA-Z_0-9\\-\\.");
problemReporter.warn("Property [ " + name + " ] " + val + " in bootstrap.cnf is illegal,the " + Charset.defaultCharset().name() + " encoding is recommended, Property [ " + name + " ] show be use u4E00-u9FA5a-zA-Z_0-9\\-\\.");
}
}
}
src/main/java/com/actiontech/dble/config/util/ParameterMapping.java
+1 -1
View File
@@ -211,7 +211,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);
}
src/main/java/com/actiontech/dble/meta/DDLProxyMetaManager.java
+1 -1
View File
@@ -66,7 +66,7 @@ public final class DDLProxyMetaManager {
ClusterHelper clusterHelper = ClusterHelper.getInstance(ClusterOperation.DDL);
DistributeLock lock = clusterHelper.createDistributeLock(ddlLockPathMeta, ddlInfo);
if (!lock.acquire()) {
DDLTraceHelper.log(shardingService, d -> d.info(DDLTraceHelper.Stage.notice_cluster_ddl_prepare, "Failed to acquire table[" + tableFullName + "]'s ddlLock，the ddlLock's path is " + ddlLockPathMeta));
DDLTraceHelper.log(shardingService, d -> d.info(DDLTraceHelper.Stage.notice_cluster_ddl_prepare, "Failed to acquire table[" + tableFullName + "]'s ddlLock,the ddlLock's path is " + ddlLockPathMeta));
String msg = "Found another instance doing ddl, duo to table[" + tableFullName + "]'s ddlLock is exists";
throw new Exception(msg);
}
src/main/java/com/actiontech/dble/plan/optimizer/JoinChooser.java
+7 -7
View File
@@ -45,11 +45,11 @@ public class JoinChooser {
private final HintPlanInfo hintPlanInfo;
private final Comparator<JoinRelationDag> defaultCmp = (o1, o2) -> {
if (o1.relations.erRelationLst.size() > 0 && o2.relations.erRelationLst.size() > 0) {
if (o1.relations.isInner == o2.relations.isInner) { // both er，both inner or not inner
if (o1.relations.isInner == o2.relations.isInner) { // both er,both inner or not inner
return 0;
} else if (o1.relations.isInner) { // both er，o1 inner,o2 notinner
} else if (o1.relations.isInner) { // both er,o1 inner,o2 notinner
return -1;
} else { //if (o2.relations.isInner) { both er，o1 not inner,o2 inner
} else { //if (o2.relations.isInner) { both er,o1 not inner,o2 inner
return 1;
}
} else if (o1.relations.erRelationLst.size() > 0) { // if o2 is not ER join, o1 is ER join, o1<o2
@@ -61,11 +61,11 @@ public class JoinChooser {
boolean o1Global = o1.node.getUnGlobalTableCount() == 0;
boolean o2Global = o2.node.getUnGlobalTableCount() == 0;
if (o1Global == o2Global) {
if (o1.relations.isInner == o2.relations.isInner) { // both er，both inner or not inner
if (o1.relations.isInner == o2.relations.isInner) { // both er,both inner or not inner
return 0;
} else if (o1.relations.isInner) { // both er，o1 inner,o2 notinner
} else if (o1.relations.isInner) { // both er,o1 inner,o2 notinner
return -1;
} else { //if (o2.relations.isInner) { both er，o1 not inner,o2 inner
} else { //if (o2.relations.isInner) { both er,o1 not inner,o2 inner
return 1;
}
} else if (o1Global) {
@@ -310,7 +310,7 @@ public class JoinChooser {
select * from a inner join b on a.id=b.id inner join c on b.id=c.id inner join d on c.id=d.id where b.id=1
the join order is a->b->c->d and the hint is c->d->b->a.
we choose 'c' as root, then dag like this (c->d) & (c->b<-a)
when visited c. b is one of rightNodes of c， and the degree of b is 2.
when visited c. b is one of rightNodes of c, and the degree of b is 2.
*/
// if (rightNode.degree == 0) {
nextAccessDagNodes.put(rightNode, new DagLine(currentNode, rightNode));
src/main/java/com/actiontech/dble/route/parser/druid/ServerSchemaStatVisitor.java
+1 -1
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;
src/main/java/com/actiontech/dble/rwsplit/RWSplitNonBlockingSession.java
+1 -1
View File
@@ -148,7 +148,7 @@ public class RWSplitNonBlockingSession extends Session {
if (this.getPreWriteResponseTime() > 0 && System.currentTimeMillis() - this.getPreWriteResponseTime() <= rwStickyTime) {
isMaster = true;
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("because in the sticky time range，so select write instance");
LOGGER.debug("because in the sticky time range,so select write instance");
}
} else {
resetLastSqlResponseTime();
src/main/java/com/actiontech/dble/server/status/GeneralLog.java
+1 -1
View File
@@ -31,7 +31,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();
src/main/java/com/actiontech/dble/services/BackendService.java
+1 -1
View File
@@ -449,7 +449,7 @@ public abstract class BackendService extends AbstractService {
}
/**
* Temporary way，it will be revised in the future
* Temporary way,it will be revised in the future
*
* @param service
* @return
src/main/java/com/actiontech/dble/services/FrontendService.java
+2 -2
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;
src/main/java/com/actiontech/dble/services/manager/information/tables/DbleDbInstance.java
+1 -1
View File
@@ -562,7 +562,7 @@ public class DbleDbInstance extends ManagerWritableTable {
return;
}
if (!StringUtil.isChinese(chinese)) {
throw new ConfigException("Column [ " + name + " ] " + val + " is illegal，the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ] show be use u4E00-u9FA5a-zA-Z_0-9\\-\\.");
throw new ConfigException("Column [ " + name + " ] " + val + " is illegal,the " + Charset.defaultCharset().name() + " encoding is recommended, Column [ " + name + " ] show be use u4E00-u9FA5a-zA-Z_0-9\\-\\.");
}
}
}
src/main/java/com/actiontech/dble/services/manager/response/ReloadConfig.java
+4 -4
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);
}
src/main/java/com/actiontech/dble/singleton/PauseShardingNodeManager.java
+1 -1
View File
@@ -72,7 +72,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
*/