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

#1755 spell (#1766)

Browse Source
This commit is contained in:
tiger.yan
2020-04-02 17:45:09 +08:00
committed by GitHub
parent 1e1ac03945
commit 046532ad1d
7 changed files with 101 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-images/quick-start/server.xml
View File

@@ -28,7 +28,7 @@
<!--<property name="writeToBackendExecutor">4</property> -->
<!--<property name="fakeMySQLVersion">5.6.20</property>-->
<property name="sequnceHandlerType">2</property>
<property name="sequenceHandlerType">2</property>
<!-- serverBacklog size,default 2048-->
<property name="serverBacklog">2048</property>
<!--<property name="serverNodeId">1</property>-->
@@ -71,7 +71,7 @@
<property name="recordTxn">0</property>
<!--<property name="transactionLogBaseDir">/txlogs</property>-->
<!--<property name="transactionLogBaseName">server-tx</property>-->
<!--<property name="transactionRatateSize">16</property>--><!-- unit M -->
<!--<property name="transactionRotateSize">16</property>--><!-- unit M -->
<!-- XA transaction -->
<!-- use XA transaction ,if the mysql service crash,the unfinished XA commit/rollback will retry for several times

2
src/main/java/com/actiontech/dble/DbleServer.java
View File

@@ -218,7 +218,7 @@ public final class DbleServer {
txnLogProcessor.start();
}
SequenceManager.init(config.getSystem().getSequnceHandlerType());
SequenceManager.init(config.getSystem().getSequenceHandlerType());
LOGGER.info("===================================Sequence manager init finish===================================");

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

@@ -113,7 +113,7 @@ public class ConfigInitializer implements ProblemReporter {
}
// add global sequence node when it is some dedicated servers */
if (system.getSequnceHandlerType() == SystemConfig.SEQUENCE_HANDLER_MYSQL) {
if (system.getSequenceHandlerType() == SystemConfig.SEQUENCE_HANDLER_MYSQL) {
IncrSequenceMySQLHandler redundancy = new IncrSequenceMySQLHandler();
redundancy.load(false);
allUseDataNode.addAll(redundancy.getDataNodes());

164
src/main/java/com/actiontech/dble/config/model/SystemConfig.java
View File

@@ -27,7 +27,7 @@ public final class SystemConfig {
public static final int SEQUENCE_HANDLER_LOCAL_TIME = 2;
public static final int SEQUENCE_HANDLER_ZK_DISTRIBUTED = 3;
public static final int SEQUENCE_HANDLER_ZK_GLOBAL_INCREMENT = 4;
private static final String WARNING_FORMATE = "Property [ %s ] '%d' in server.xml is illegal, use %d replaced";
private static final String WARNING_FORMAT = "Property [ %s ] '%d' in server.xml is illegal, use %d replaced";
/*
* the supported protocol version of MySQL
* For Other MySQL branch ,like MariaDB 10.1.x,
@@ -48,7 +48,7 @@ public final class SystemConfig {
private int complexExecutor = processorExecutor > 8 ? 8 : processorExecutor;
private int writeToBackendExecutor = (DEFAULT_PROCESSORS != 1) ? DEFAULT_PROCESSORS : 2;
private String fakeMySQLVersion = null;
private int sequnceHandlerType = SEQUENCE_HANDLER_LOCAL_TIME;
private int sequenceHandlerType = SEQUENCE_HANDLER_LOCAL_TIME;
private int serverBacklog = 2048;
private int serverNodeId = 1;
private long showBinlogStatusTimeout = 60 * 1000;
@@ -88,7 +88,7 @@ public final class SystemConfig {
private int recordTxn = 0;
private String transactionLogBaseDir = SystemConfig.getHomePath() + File.separatorChar + "txlogs" + File.separatorChar;
private String transactionLogBaseName = "server-tx";
private int transactionRatateSize = 16; // M
private int transactionRotateSize = 16; // M
//XA transaction
private long xaSessionCheckPeriod = 1000L;
@@ -165,19 +165,25 @@ public final class SystemConfig {
this.problemReporter = problemReporter;
}
public int getTransactionRatateSize() {
return transactionRatateSize;
public int getTransactionRotateSize() {
return transactionRotateSize;
}
@SuppressWarnings("unused")
public void setTransactionRatateSize(int transactionRatateSize) {
if (transactionRatateSize > 0) {
this.transactionRatateSize = transactionRatateSize;
public void setTransactionRotateSize(int transactionRotateSize) {
if (transactionRotateSize > 0) {
this.transactionRotateSize = transactionRotateSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "transactionRatateSize", transactionRatateSize, this.transactionRatateSize));
problemReporter.warn(String.format(WARNING_FORMAT, "transactionRotateSize", transactionRotateSize, this.transactionRotateSize));
}
}
//only for compatibility
@SuppressWarnings("unused")
public void setTransactionRatateSize(int transactionRatateSize) {
setTransactionRotateSize(transactionRatateSize);
}
public String getTransactionLogBaseDir() {
return transactionLogBaseDir;
}
@@ -224,19 +230,25 @@ public final class SystemConfig {
}
public int getSequnceHandlerType() {
return sequnceHandlerType;
public int getSequenceHandlerType() {
return sequenceHandlerType;
}
@SuppressWarnings("unused")
public void setSequnceHandlerType(int sequnceHandlerType) {
if (sequnceHandlerType >= 1 && sequnceHandlerType <= 4) {
this.sequnceHandlerType = sequnceHandlerType;
public void setSequenceHandlerType(int sequenceHandlerType) {
if (sequenceHandlerType >= 1 && sequenceHandlerType <= 4) {
this.sequenceHandlerType = sequenceHandlerType;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "sequnceHandlerType", sequnceHandlerType, this.sequnceHandlerType));
problemReporter.warn(String.format(WARNING_FORMAT, "sequenceHandlerType", sequenceHandlerType, this.sequenceHandlerType));
}
}
//only for compatibility
@SuppressWarnings("unused")
public void setSequnceHandlerType(int sequnceHandlerType) {
setSequenceHandlerType(sequnceHandlerType);
}
public int getMaxPacketSize() {
return maxPacketSize;
}
@@ -246,7 +258,7 @@ public final class SystemConfig {
if (maxPacketSize >= 1024 && maxPacketSize <= 1073741824) {
this.maxPacketSize = maxPacketSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxPacketSize", maxPacketSize, this.maxPacketSize));
problemReporter.warn(String.format(WARNING_FORMAT, "maxPacketSize", maxPacketSize, this.maxPacketSize));
}
}
@@ -301,7 +313,7 @@ public final class SystemConfig {
if (useSqlStat >= 0 && useSqlStat <= 1) {
this.useSqlStat = useSqlStat;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "useSqlStat", useSqlStat, this.useSqlStat));
problemReporter.warn(String.format(WARNING_FORMAT, "useSqlStat", useSqlStat, this.useSqlStat));
}
}
@@ -314,7 +326,7 @@ public final class SystemConfig {
if (useCompression >= 0 && useCompression <= 1) {
this.useCompression = useCompression;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "useCompression", useCompression, this.useCompression));
problemReporter.warn(String.format(WARNING_FORMAT, "useCompression", useCompression, this.useCompression));
}
}
@@ -376,7 +388,7 @@ public final class SystemConfig {
if (processors > 0) {
this.processors = processors;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "processors", processors, this.processors));
problemReporter.warn(String.format(WARNING_FORMAT, "processors", processors, this.processors));
}
}
@@ -389,7 +401,7 @@ public final class SystemConfig {
if (backendProcessors > 0) {
this.backendProcessors = backendProcessors;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "backendProcessors", backendProcessors, this.backendProcessors));
problemReporter.warn(String.format(WARNING_FORMAT, "backendProcessors", backendProcessors, this.backendProcessors));
}
}
@@ -402,7 +414,7 @@ public final class SystemConfig {
if (processorExecutor > 0) {
this.processorExecutor = processorExecutor;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "processorExecutor", processorExecutor, this.processorExecutor));
problemReporter.warn(String.format(WARNING_FORMAT, "processorExecutor", processorExecutor, this.processorExecutor));
}
}
@@ -415,7 +427,7 @@ public final class SystemConfig {
if (backendProcessorExecutor > 0) {
this.backendProcessorExecutor = backendProcessorExecutor;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "backendProcessorExecutor", backendProcessorExecutor, this.backendProcessorExecutor));
problemReporter.warn(String.format(WARNING_FORMAT, "backendProcessorExecutor", backendProcessorExecutor, this.backendProcessorExecutor));
}
}
@@ -428,7 +440,7 @@ public final class SystemConfig {
if (complexExecutor > 0) {
this.complexExecutor = complexExecutor;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "complexExecutor", complexExecutor, this.complexExecutor));
problemReporter.warn(String.format(WARNING_FORMAT, "complexExecutor", complexExecutor, this.complexExecutor));
}
}
@@ -441,7 +453,7 @@ public final class SystemConfig {
if (idleTimeout > 0) {
this.idleTimeout = idleTimeout;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "idleTimeout", idleTimeout, this.idleTimeout));
problemReporter.warn(String.format(WARNING_FORMAT, "idleTimeout", idleTimeout, this.idleTimeout));
}
}
@@ -454,7 +466,7 @@ public final class SystemConfig {
if (processorCheckPeriod > 0) {
this.processorCheckPeriod = processorCheckPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "processorCheckPeriod", processorCheckPeriod, this.processorCheckPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "processorCheckPeriod", processorCheckPeriod, this.processorCheckPeriod));
}
}
@@ -467,7 +479,7 @@ public final class SystemConfig {
if (xaSessionCheckPeriod > 0) {
this.xaSessionCheckPeriod = xaSessionCheckPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "xaSessionCheckPeriod", xaSessionCheckPeriod, this.xaSessionCheckPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "xaSessionCheckPeriod", xaSessionCheckPeriod, this.xaSessionCheckPeriod));
}
}
@@ -480,7 +492,7 @@ public final class SystemConfig {
if (xaLogCleanPeriod > 0) {
this.xaLogCleanPeriod = xaLogCleanPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "xaLogCleanPeriod", xaLogCleanPeriod, this.xaLogCleanPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "xaLogCleanPeriod", xaLogCleanPeriod, this.xaLogCleanPeriod));
}
}
@@ -493,7 +505,7 @@ public final class SystemConfig {
if (dataNodeIdleCheckPeriod > 0) {
this.dataNodeIdleCheckPeriod = dataNodeIdleCheckPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "dataNodeIdleCheckPeriod", dataNodeIdleCheckPeriod, this.dataNodeIdleCheckPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "dataNodeIdleCheckPeriod", dataNodeIdleCheckPeriod, this.dataNodeIdleCheckPeriod));
}
}
@@ -506,7 +518,7 @@ public final class SystemConfig {
if (dataNodeHeartbeatPeriod > 0) {
this.dataNodeHeartbeatPeriod = dataNodeHeartbeatPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "dataNodeHeartbeatPeriod", dataNodeHeartbeatPeriod, this.dataNodeHeartbeatPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "dataNodeHeartbeatPeriod", dataNodeHeartbeatPeriod, this.dataNodeHeartbeatPeriod));
}
}
@@ -519,7 +531,7 @@ public final class SystemConfig {
if (sqlExecuteTimeout > 0) {
this.sqlExecuteTimeout = sqlExecuteTimeout;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "sqlExecuteTimeout", sqlExecuteTimeout, this.sqlExecuteTimeout));
problemReporter.warn(String.format(WARNING_FORMAT, "sqlExecuteTimeout", sqlExecuteTimeout, this.sqlExecuteTimeout));
}
}
@@ -533,7 +545,7 @@ public final class SystemConfig {
if (showBinlogStatusTimeout > 0) {
this.showBinlogStatusTimeout = sqlExecuteTimeout;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "showBinlogStatusTimeout", showBinlogStatusTimeout, this.showBinlogStatusTimeout));
problemReporter.warn(String.format(WARNING_FORMAT, "showBinlogStatusTimeout", showBinlogStatusTimeout, this.showBinlogStatusTimeout));
}
}
@@ -547,7 +559,7 @@ public final class SystemConfig {
if (txIsolation >= 1 && txIsolation <= 4) {
this.txIsolation = txIsolation;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "txIsolation", txIsolation, this.txIsolation));
problemReporter.warn(String.format(WARNING_FORMAT, "txIsolation", txIsolation, this.txIsolation));
}
}
@@ -560,7 +572,7 @@ public final class SystemConfig {
if (autocommit >= 0 && autocommit <= 1) {
this.autocommit = autocommit;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "autocommit", autocommit, this.autocommit));
problemReporter.warn(String.format(WARNING_FORMAT, "autocommit", autocommit, this.autocommit));
}
}
@@ -574,7 +586,7 @@ public final class SystemConfig {
if (sqlRecordCount > 0) {
this.sqlRecordCount = sqlRecordCount;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "sqlRecordCount", sqlRecordCount, this.sqlRecordCount));
problemReporter.warn(String.format(WARNING_FORMAT, "sqlRecordCount", sqlRecordCount, this.sqlRecordCount));
}
}
@@ -587,7 +599,7 @@ public final class SystemConfig {
if (recordTxn >= 0 && recordTxn <= 1) {
this.recordTxn = recordTxn;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "recordTxn", recordTxn, this.recordTxn));
problemReporter.warn(String.format(WARNING_FORMAT, "recordTxn", recordTxn, this.recordTxn));
}
}
@@ -600,7 +612,7 @@ public final class SystemConfig {
if (bufferPoolChunkSize > 0) {
this.bufferPoolChunkSize = bufferPoolChunkSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "bufferPoolChunkSize", bufferPoolChunkSize, this.bufferPoolChunkSize));
problemReporter.warn(String.format(WARNING_FORMAT, "bufferPoolChunkSize", bufferPoolChunkSize, this.bufferPoolChunkSize));
}
}
@@ -613,7 +625,7 @@ public final class SystemConfig {
if (maxResultSet > 0) {
this.maxResultSet = maxResultSet;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxResultSet", maxResultSet, this.maxResultSet));
problemReporter.warn(String.format(WARNING_FORMAT, "maxResultSet", maxResultSet, this.maxResultSet));
}
}
@@ -626,7 +638,7 @@ public final class SystemConfig {
if (bufferUsagePercent >= 0 && bufferUsagePercent <= 100) {
this.bufferUsagePercent = bufferUsagePercent;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "bufferUsagePercent", bufferUsagePercent, this.bufferUsagePercent));
problemReporter.warn(String.format(WARNING_FORMAT, "bufferUsagePercent", bufferUsagePercent, this.bufferUsagePercent));
}
}
@@ -639,7 +651,7 @@ public final class SystemConfig {
if (clearBigSqLResultSetMapMs > 0) {
this.clearBigSqLResultSetMapMs = clearBigSqLResultSetMapMs;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "clearBigSqLResultSetMapMs", clearBigSqLResultSetMapMs, this.clearBigSqLResultSetMapMs));
problemReporter.warn(String.format(WARNING_FORMAT, "clearBigSqLResultSetMapMs", clearBigSqLResultSetMapMs, this.clearBigSqLResultSetMapMs));
}
}
@@ -652,7 +664,7 @@ public final class SystemConfig {
if (bufferPoolPageSize > 0) {
this.bufferPoolPageSize = bufferPoolPageSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "bufferPoolPageSize", bufferPoolPageSize, this.bufferPoolPageSize));
problemReporter.warn(String.format(WARNING_FORMAT, "bufferPoolPageSize", bufferPoolPageSize, this.bufferPoolPageSize));
}
}
@@ -666,7 +678,7 @@ public final class SystemConfig {
this.bufferPoolPageNumber = bufferPoolPageNumber;
useDefaultPageNumber = false;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "bufferPoolPageNumber", bufferPoolPageNumber, this.bufferPoolPageNumber));
problemReporter.warn(String.format(WARNING_FORMAT, "bufferPoolPageNumber", bufferPoolPageNumber, this.bufferPoolPageNumber));
}
}
@@ -686,7 +698,7 @@ public final class SystemConfig {
if (frontSocketSoRcvbuf > 0) {
this.frontSocketSoRcvbuf = frontSocketSoRcvbuf;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "frontSocketSoRcvbuf", frontSocketSoRcvbuf, this.frontSocketSoRcvbuf));
problemReporter.warn(String.format(WARNING_FORMAT, "frontSocketSoRcvbuf", frontSocketSoRcvbuf, this.frontSocketSoRcvbuf));
}
}
@@ -699,7 +711,7 @@ public final class SystemConfig {
if (frontSocketSoSndbuf > 0) {
this.frontSocketSoSndbuf = frontSocketSoSndbuf;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "frontSocketSoSndbuf", frontSocketSoSndbuf, this.frontSocketSoSndbuf));
problemReporter.warn(String.format(WARNING_FORMAT, "frontSocketSoSndbuf", frontSocketSoSndbuf, this.frontSocketSoSndbuf));
}
}
@@ -712,7 +724,7 @@ public final class SystemConfig {
if (backSocketSoRcvbuf > 0) {
this.backSocketSoRcvbuf = backSocketSoRcvbuf;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "backSocketSoRcvbuf", backSocketSoRcvbuf, this.backSocketSoRcvbuf));
problemReporter.warn(String.format(WARNING_FORMAT, "backSocketSoRcvbuf", backSocketSoRcvbuf, this.backSocketSoRcvbuf));
}
}
@@ -725,7 +737,7 @@ public final class SystemConfig {
if (backSocketSoSndbuf > 0) {
this.backSocketSoSndbuf = backSocketSoSndbuf;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "backSocketSoSndbuf", backSocketSoSndbuf, this.backSocketSoSndbuf));
problemReporter.warn(String.format(WARNING_FORMAT, "backSocketSoSndbuf", backSocketSoSndbuf, this.backSocketSoSndbuf));
}
}
@@ -738,7 +750,7 @@ public final class SystemConfig {
if (frontSocketNoDelay >= 0 && frontSocketNoDelay <= 1) {
this.frontSocketNoDelay = frontSocketNoDelay;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "frontSocketNoDelay", frontSocketNoDelay, this.frontSocketNoDelay));
problemReporter.warn(String.format(WARNING_FORMAT, "frontSocketNoDelay", frontSocketNoDelay, this.frontSocketNoDelay));
}
}
@@ -751,7 +763,7 @@ public final class SystemConfig {
if (backSocketNoDelay >= 0 && backSocketNoDelay <= 1) {
this.backSocketNoDelay = backSocketNoDelay;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "backSocketNoDelay", backSocketNoDelay, this.backSocketNoDelay));
problemReporter.warn(String.format(WARNING_FORMAT, "backSocketNoDelay", backSocketNoDelay, this.backSocketNoDelay));
}
}
@@ -764,7 +776,7 @@ public final class SystemConfig {
if (usingAIO >= 0 && usingAIO <= 1) {
this.usingAIO = usingAIO;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "usingAIO", usingAIO, this.usingAIO));
problemReporter.warn(String.format(WARNING_FORMAT, "usingAIO", usingAIO, this.usingAIO));
}
}
@@ -777,7 +789,7 @@ public final class SystemConfig {
if (serverNodeId > 0) {
this.serverNodeId = serverNodeId;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "serverNodeId", serverNodeId, this.serverNodeId));
problemReporter.warn(String.format(WARNING_FORMAT, "serverNodeId", serverNodeId, this.serverNodeId));
}
}
@@ -790,7 +802,7 @@ public final class SystemConfig {
if (checkTableConsistency >= 0 && checkTableConsistency <= 1) {
this.checkTableConsistency = checkTableConsistency;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "checkTableConsistency", checkTableConsistency, this.checkTableConsistency));
problemReporter.warn(String.format(WARNING_FORMAT, "checkTableConsistency", checkTableConsistency, this.checkTableConsistency));
}
}
@@ -803,7 +815,7 @@ public final class SystemConfig {
if (checkTableConsistencyPeriod > 0) {
this.checkTableConsistencyPeriod = checkTableConsistencyPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "checkTableConsistencyPeriod", checkTableConsistencyPeriod, this.checkTableConsistencyPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "checkTableConsistencyPeriod", checkTableConsistencyPeriod, this.checkTableConsistencyPeriod));
}
}
@@ -816,7 +828,7 @@ public final class SystemConfig {
if (nestLoopRowsSize > 0) {
this.nestLoopRowsSize = nestLoopRowsSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "nestLoopRowsSize", nestLoopRowsSize, this.nestLoopRowsSize));
problemReporter.warn(String.format(WARNING_FORMAT, "nestLoopRowsSize", nestLoopRowsSize, this.nestLoopRowsSize));
}
}
@@ -829,7 +841,7 @@ public final class SystemConfig {
if (joinQueueSize > 0) {
this.joinQueueSize = joinQueueSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "joinQueueSize", joinQueueSize, this.joinQueueSize));
problemReporter.warn(String.format(WARNING_FORMAT, "joinQueueSize", joinQueueSize, this.joinQueueSize));
}
}
@@ -842,7 +854,7 @@ public final class SystemConfig {
if (mergeQueueSize > 0) {
this.mergeQueueSize = mergeQueueSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "mergeQueueSize", mergeQueueSize, this.mergeQueueSize));
problemReporter.warn(String.format(WARNING_FORMAT, "mergeQueueSize", mergeQueueSize, this.mergeQueueSize));
}
}
@@ -855,7 +867,7 @@ public final class SystemConfig {
if (otherMemSize > 0) {
this.otherMemSize = otherMemSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "otherMemSize", otherMemSize, this.otherMemSize));
problemReporter.warn(String.format(WARNING_FORMAT, "otherMemSize", otherMemSize, this.otherMemSize));
}
}
@@ -868,7 +880,7 @@ public final class SystemConfig {
if (orderMemSize > 0) {
this.orderMemSize = orderMemSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "orderMemSize", orderMemSize, this.orderMemSize));
problemReporter.warn(String.format(WARNING_FORMAT, "orderMemSize", orderMemSize, this.orderMemSize));
}
}
@@ -881,7 +893,7 @@ public final class SystemConfig {
if (joinMemSize > 0) {
this.joinMemSize = joinMemSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "joinMemSize", joinMemSize, this.joinMemSize));
problemReporter.warn(String.format(WARNING_FORMAT, "joinMemSize", joinMemSize, this.joinMemSize));
}
}
@@ -894,7 +906,7 @@ public final class SystemConfig {
if (mappedFileSize > 0) {
this.mappedFileSize = mappedFileSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "mappedFileSize", mappedFileSize, this.mappedFileSize));
problemReporter.warn(String.format(WARNING_FORMAT, "mappedFileSize", mappedFileSize, this.mappedFileSize));
}
}
@@ -907,7 +919,7 @@ public final class SystemConfig {
if (nestLoopConnSize > 0) {
this.nestLoopConnSize = nestLoopConnSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "nestLoopConnSize", nestLoopConnSize, this.nestLoopConnSize));
problemReporter.warn(String.format(WARNING_FORMAT, "nestLoopConnSize", nestLoopConnSize, this.nestLoopConnSize));
}
}
@@ -920,7 +932,7 @@ public final class SystemConfig {
if (orderByQueueSize > 0) {
this.orderByQueueSize = orderByQueueSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "orderByQueueSize", orderByQueueSize, this.orderByQueueSize));
problemReporter.warn(String.format(WARNING_FORMAT, "orderByQueueSize", orderByQueueSize, this.orderByQueueSize));
}
}
@@ -952,7 +964,7 @@ public final class SystemConfig {
if (useCostTimeStat >= 0 && useCostTimeStat <= 1) {
this.useCostTimeStat = useCostTimeStat;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "useCostTimeStat", useCostTimeStat, this.useCostTimeStat));
problemReporter.warn(String.format(WARNING_FORMAT, "useCostTimeStat", useCostTimeStat, this.useCostTimeStat));
}
}
@@ -965,7 +977,7 @@ public final class SystemConfig {
if (maxCostStatSize > 0) {
this.maxCostStatSize = maxCostStatSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxCostStatSize", maxCostStatSize, this.maxCostStatSize));
problemReporter.warn(String.format(WARNING_FORMAT, "maxCostStatSize", maxCostStatSize, this.maxCostStatSize));
}
}
@@ -978,7 +990,7 @@ public final class SystemConfig {
if (costSamplePercent >= 0 && costSamplePercent <= 100) {
this.costSamplePercent = costSamplePercent;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "costSamplePercent", costSamplePercent, this.costSamplePercent));
problemReporter.warn(String.format(WARNING_FORMAT, "costSamplePercent", costSamplePercent, this.costSamplePercent));
}
}
@@ -991,7 +1003,7 @@ public final class SystemConfig {
if (useThreadUsageStat >= 0 && useThreadUsageStat <= 1) {
this.useThreadUsageStat = useThreadUsageStat;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "useThreadUsageStat", useThreadUsageStat, this.useThreadUsageStat));
problemReporter.warn(String.format(WARNING_FORMAT, "useThreadUsageStat", useThreadUsageStat, this.useThreadUsageStat));
}
}
@@ -1005,7 +1017,7 @@ public final class SystemConfig {
if (usePerformanceMode >= 0 && usePerformanceMode <= 1) {
this.usePerformanceMode = usePerformanceMode;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "usePerformanceMode", usePerformanceMode, this.usePerformanceMode));
problemReporter.warn(String.format(WARNING_FORMAT, "usePerformanceMode", usePerformanceMode, this.usePerformanceMode));
}
}
@@ -1018,7 +1030,7 @@ public final class SystemConfig {
if (useSerializableMode >= 0 && useSerializableMode <= 1) {
this.useSerializableMode = useSerializableMode;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "useSerializableMode", useSerializableMode, this.useSerializableMode));
problemReporter.warn(String.format(WARNING_FORMAT, "useSerializableMode", useSerializableMode, this.useSerializableMode));
}
}
@@ -1041,7 +1053,7 @@ public final class SystemConfig {
if (enableSlowLog >= 0 && enableSlowLog <= 1) {
this.enableSlowLog = enableSlowLog;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "enableSlowLog", enableSlowLog, this.enableSlowLog));
problemReporter.warn(String.format(WARNING_FORMAT, "enableSlowLog", enableSlowLog, this.enableSlowLog));
}
}
@@ -1072,7 +1084,7 @@ public final class SystemConfig {
if (flushSlowLogPeriod > 0) {
this.flushSlowLogPeriod = flushSlowLogPeriod;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "flushSlowLogPeriod", flushSlowLogPeriod, this.flushSlowLogPeriod));
problemReporter.warn(String.format(WARNING_FORMAT, "flushSlowLogPeriod", flushSlowLogPeriod, this.flushSlowLogPeriod));
}
}
@@ -1085,7 +1097,7 @@ public final class SystemConfig {
if (flushSlowLogSize > 0) {
this.flushSlowLogSize = flushSlowLogSize;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "flushSlowLogSize", flushSlowLogSize, this.flushSlowLogSize));
problemReporter.warn(String.format(WARNING_FORMAT, "flushSlowLogSize", flushSlowLogSize, this.flushSlowLogSize));
}
}
@@ -1098,7 +1110,7 @@ public final class SystemConfig {
if (sqlSlowTime > 0) {
this.sqlSlowTime = sqlSlowTime;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "sqlSlowTime", sqlSlowTime, this.sqlSlowTime));
problemReporter.warn(String.format(WARNING_FORMAT, "sqlSlowTime", sqlSlowTime, this.sqlSlowTime));
}
}
@@ -1111,7 +1123,7 @@ public final class SystemConfig {
if (enableAlert >= 0 && enableAlert <= 1) {
this.enableAlert = enableAlert;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "enableAlert", enableAlert, this.enableAlert));
problemReporter.warn(String.format(WARNING_FORMAT, "enableAlert", enableAlert, this.enableAlert));
}
}
@@ -1123,7 +1135,7 @@ public final class SystemConfig {
if (maxCon >= 0) {
this.maxCon = maxCon;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxCon", maxCon, this.maxCon));
problemReporter.warn(String.format(WARNING_FORMAT, "maxCon", maxCon, this.maxCon));
}
}
@@ -1136,7 +1148,7 @@ public final class SystemConfig {
if (maxCharsPerColumn > 0 && maxCharsPerColumn <= 7 * 1024 * 256) {
this.maxCharsPerColumn = maxCharsPerColumn;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxCharsPerColumn", maxCharsPerColumn, this.maxCharsPerColumn));
problemReporter.warn(String.format(WARNING_FORMAT, "maxCharsPerColumn", maxCharsPerColumn, this.maxCharsPerColumn));
}
}
@@ -1149,7 +1161,7 @@ public final class SystemConfig {
if (maxRowSizeToFile > 0) {
this.maxRowSizeToFile = maxRowSizeToFile;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "maxRowSizeToFile", maxRowSizeToFile, this.maxRowSizeToFile));
problemReporter.warn(String.format(WARNING_FORMAT, "maxRowSizeToFile", maxRowSizeToFile, this.maxRowSizeToFile));
}
}
@@ -1175,7 +1187,7 @@ public final class SystemConfig {
if (xaRetryCount >= 0) {
this.xaRetryCount = xaRetryCount;
} else if (this.problemReporter != null) {
problemReporter.warn(String.format(WARNING_FORMATE, "xaRetryCount", xaRetryCount, this.xaRetryCount));
problemReporter.warn(String.format(WARNING_FORMAT, "xaRetryCount", xaRetryCount, this.xaRetryCount));
}
}
@@ -1193,7 +1205,7 @@ public final class SystemConfig {
", complexExecutor=" + complexExecutor +
", writeToBackendExecutor=" + writeToBackendExecutor +
", fakeMySQLVersion=" + fakeMySQLVersion +
", sequnceHandlerType=" + sequnceHandlerType +
", sequenceHandlerType=" + sequenceHandlerType +
", serverBacklog=" + serverBacklog +
", serverNodeId=" + serverNodeId +
", showBinlogStatusTimeout=" + showBinlogStatusTimeout +

2
src/main/java/com/actiontech/dble/log/transaction/TxnLogProcessor.java
View File

@@ -34,7 +34,7 @@ public class TxnLogProcessor extends Thread {
this.queue = new LinkedBlockingQueue<>(256);
ServerConfig config = DbleServer.getInstance().getConfig();
SystemConfig systemConfig = config.getSystem();
this.store = new DailyRotateLogStore(systemConfig.getTransactionLogBaseDir(), systemConfig.getTransactionLogBaseName(), "log", systemConfig.getTransactionRatateSize(), null);
this.store = new DailyRotateLogStore(systemConfig.getTransactionLogBaseDir(), systemConfig.getTransactionLogBaseName(), "log", systemConfig.getTransactionRotateSize(), null);
}
@Override

10
src/main/java/com/actiontech/dble/manager/response/ShowSysParam.java
View File

@@ -81,7 +81,7 @@ public final class ShowSysParam {
paramValues.add(sysConfig.getComplexExecutor() + "");
paramValues.add(sysConfig.getWriteToBackendExecutor() + "");
paramValues.add(sysConfig.getFakeMySQLVersion());
paramValues.add(sysConfig.getSequnceHandlerType() > 4 || sysConfig.getSequnceHandlerType() < 1 ? "Incorrect Sequence Type" : SEQUENCES[sysConfig.getSequnceHandlerType()]);
paramValues.add(sysConfig.getSequenceHandlerType() > 4 || sysConfig.getSequenceHandlerType() < 1 ? "Incorrect Sequence Type" : SEQUENCES[sysConfig.getSequenceHandlerType()]);
paramValues.add(sysConfig.getServerBacklog() + "");
paramValues.add(sysConfig.getServerNodeId() + "");
paramValues.add(sysConfig.getShowBinlogStatusTimeout() + "ms");
@@ -107,7 +107,7 @@ public final class ShowSysParam {
paramValues.add(sysConfig.getRecordTxn() + "");
paramValues.add(sysConfig.getTransactionLogBaseDir());
paramValues.add(sysConfig.getTransactionLogBaseName());
paramValues.add(sysConfig.getTransactionRatateSize() + "M");
paramValues.add(sysConfig.getTransactionRotateSize() + "M");
paramValues.add(sysConfig.getXaRecoveryLogBaseDir());
paramValues.add(sysConfig.getXaRecoveryLogBaseName());
paramValues.add(sysConfig.getXaSessionCheckPeriod() + "ms");
@@ -179,7 +179,7 @@ public final class ShowSysParam {
"complexExecutor",
"writeToBackendExecutor",
"fakeMySQLVersion",
"sequnceHandlerType",
"sequenceHandlerType",
"serverBacklog",
"serverNodeId",
"showBinlogStatusTimeout",
@@ -205,7 +205,7 @@ public final class ShowSysParam {
"recordTxn",
"transactionLogBaseDir",
"transactionLogBaseName",
"transactionRatateSize",
"transactionRotateSize",
"xaRecoveryLogBaseDir",
"xaRecoveryLogBaseName",
"xaSessionCheckPeriod",
@@ -300,7 +300,7 @@ public final class ShowSysParam {
"The chunk size of memory bufferPool. The min direct memory used for allocating",
"The page size of memory bufferPool. The max direct memory used for allocating",
"The page number of memory bufferPool. The All bufferPool size is PageNumber * PageSize",
"The Memory linked file size,whan complex query resultSet is too large the Memory will be turned to file temporary",
"The Memory linked file size,when complex query resultSet is too large the Memory will be turned to file temporary",
"Whether the SQL statistics function is enable or not.The default value is 1",
"The slow SQL statistics limit,if the slow SQL record is large than the size,the record will be clear.The default value is 10",
"The large resultSet SQL standard.The default value is 512*1024B",

6
src/main/resources/server_template.xml
View File

@@ -28,7 +28,7 @@
<!--<property name="writeToBackendExecutor">4</property> -->
<!--<property name="fakeMySQLVersion">5.6.20</property>-->
<property name="sequnceHandlerType">2</property>
<property name="sequenceHandlerType">2</property>
<!-- serverBacklog size,default 2048-->
<property name="serverBacklog">2048</property>
<!--<property name="serverNodeId">1</property>-->
@@ -66,11 +66,11 @@
<property name="idleTimeout">1800000</property><!-- unit millisecond -->
<!-- transaction log -->
<!-- 1 enable record the transaction log, 0 disable ,the unit of transactionRatateSize is M -->
<!-- 1 enable record the transaction log, 0 disable ,the unit of transactionRotateSize is M -->
<property name="recordTxn">0</property>
<!--<property name="transactionLogBaseDir">/txlogs</property>-->
<!--<property name="transactionLogBaseName">server-tx</property>-->
<!--<property name="transactionRatateSize">16</property>-->
<!--<property name="transactionRotateSize">16</property>-->
<!-- XA transaction -->
<!-- use XA transaction ,if the mysql service crash,the unfinished XA commit/rollback will retry for several times