From c27d78ea44cb76d89c21af00a17822e50e22f3d4 Mon Sep 17 00:00:00 2001 From: yanhuqing666 Date: Thu, 15 Dec 2016 10:31:24 +0800 Subject: [PATCH] RecordTxn config from boolean to int --- Release_Note.md | 2 +- src/main/java/io/mycat/MycatServer.java | 2 +- src/main/java/io/mycat/config/model/SystemConfig.java | 6 +++--- src/main/java/io/mycat/log/transaction/TxnLogHelper.java | 2 +- src/main/resources/server_template.xml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Release_Note.md b/Release_Note.md index 57d692f25..08ab0a173 100644 --- a/Release_Note.md +++ b/Release_Note.md @@ -21,7 +21,7 @@ server.xml 文件中 system标签 下 1000 0 60000 -false +0 ``` 也可见server_template.xml diff --git a/src/main/java/io/mycat/MycatServer.java b/src/main/java/io/mycat/MycatServer.java index f5cbf03a2..1f9c75155 100644 --- a/src/main/java/io/mycat/MycatServer.java +++ b/src/main/java/io/mycat/MycatServer.java @@ -430,7 +430,7 @@ public class MycatServer { } // start transaction SQL log - if (config.getSystem().isRecordTxn()) { + if (config.getSystem().getRecordTxn() == 1) { txnLogProcessor = new TxnLogProcessor(bufferPool); txnLogProcessor.setName("TxnLogProcessor"); txnLogProcessor.start(); diff --git a/src/main/java/io/mycat/config/model/SystemConfig.java b/src/main/java/io/mycat/config/model/SystemConfig.java index 0e326d18f..1e53049ed 100644 --- a/src/main/java/io/mycat/config/model/SystemConfig.java +++ b/src/main/java/io/mycat/config/model/SystemConfig.java @@ -121,7 +121,7 @@ public final class SystemConfig { private int txIsolation; private int parserCommentVersion; private int sqlRecordCount; - private boolean recordTxn = false; + private int recordTxn = 0; // a page size private int bufferPoolPageSize; //minimum allocation unit @@ -687,11 +687,11 @@ public final class SystemConfig { this.sqlRecordCount = sqlRecordCount; } - public boolean isRecordTxn(){ + public int getRecordTxn(){ return recordTxn; } - public void setRecordTxn(boolean recordTxn){ + public void setRecordTxn(int recordTxn){ this.recordTxn = recordTxn; } diff --git a/src/main/java/io/mycat/log/transaction/TxnLogHelper.java b/src/main/java/io/mycat/log/transaction/TxnLogHelper.java index 4077435a4..e6af35ca6 100644 --- a/src/main/java/io/mycat/log/transaction/TxnLogHelper.java +++ b/src/main/java/io/mycat/log/transaction/TxnLogHelper.java @@ -5,7 +5,7 @@ import io.mycat.server.ServerConnection; public class TxnLogHelper { public static void putTxnLog(ServerConnection c, String sql){ - if (MycatServer.getInstance().getConfig().getSystem().isRecordTxn()) { + if (MycatServer.getInstance().getConfig().getSystem().getRecordTxn() == 1) { MycatServer.getInstance().getTxnLogProcessor().putTxnLog(c, sql); } } diff --git a/src/main/resources/server_template.xml b/src/main/resources/server_template.xml index a08daa83b..6fba02852 100644 --- a/src/main/resources/server_template.xml +++ b/src/main/resources/server_template.xml @@ -17,7 +17,7 @@ 1 0 0 -false + 0 2