提交 06eff7dd authored 作者: Thomas Mueller's avatar Thomas Mueller

Formatting

上级 0cd0c6ca
...@@ -2302,7 +2302,7 @@ public class Parser { ...@@ -2302,7 +2302,7 @@ public class Parser {
read("BY"); read("BY");
agg.setGroupConcatOrder(parseSimpleOrderList()); agg.setGroupConcatOrder(parseSimpleOrderList());
} }
if (readIf("SEPARATOR")) { if (readIf("SEPARATOR")) {
agg.setGroupConcatSeparator(readExpression()); agg.setGroupConcatSeparator(readExpression());
} }
......
...@@ -749,7 +749,7 @@ public class Select extends Query { ...@@ -749,7 +749,7 @@ public class Select extends Query {
} }
} }
} }
private int expandColumnList(TableFilter filter, int index) { private int expandColumnList(TableFilter filter, int index) {
Table t = filter.getTable(); Table t = filter.getTable();
String alias = filter.getTableAlias(); String alias = filter.getTableAlias();
......
...@@ -216,7 +216,7 @@ public class Database implements DataHandler { ...@@ -216,7 +216,7 @@ public class Database implements DataHandler {
readOnly = true; readOnly = true;
} }
if (dbSettings.mvStore && lockMethodName == null) { if (dbSettings.mvStore && lockMethodName == null) {
if (autoServerMode) { if (autoServerMode) {
fileLockMethod = FileLock.LOCK_FILE; fileLockMethod = FileLock.LOCK_FILE;
} else { } else {
fileLockMethod = FileLock.LOCK_FS; fileLockMethod = FileLock.LOCK_FS;
...@@ -614,8 +614,11 @@ public class Database implements DataHandler { ...@@ -614,8 +614,11 @@ public class Database implements DataHandler {
fileLockMethod == FileLock.LOCK_FS || fileLockMethod == FileLock.LOCK_FS ||
!persistent) { !persistent) {
throw DbException.getUnsupportedException( throw DbException.getUnsupportedException(
"autoServerMode && (readOnly || fileLockMethod == NO" + "autoServerMode && (readOnly || " +
" || fileLockMethod == SERIALIZED || fileLockMethod == FS || inMemory)"); "fileLockMethod == NO || " +
"fileLockMethod == SERIALIZED || " +
"fileLockMethod == FS || " +
"inMemory)");
} }
} }
String lockFileName = databaseName + Constants.SUFFIX_LOCK_FILE; String lockFileName = databaseName + Constants.SUFFIX_LOCK_FILE;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论