提交 12c060fc authored 作者: Thomas Mueller's avatar Thomas Mueller

Formatting

上级 6f5fa525
...@@ -253,7 +253,7 @@ performance characteristics) until data is persisted. ...@@ -253,7 +253,7 @@ performance characteristics) until data is persisted.
As in all map implementations, keys need to be immutable, that means As in all map implementations, keys need to be immutable, that means
changing the key object after an entry has been added is not allowed. changing the key object after an entry has been added is not allowed.
If a file name is specified, the value may also not be changed after If a file name is specified, the value may also not be changed after
adding an entry, because it might be serialized adding an entry, because it might be serialized
(which could happen at any time when autocommit is enabled). (which could happen at any time when autocommit is enabled).
</p> </p>
...@@ -327,7 +327,7 @@ this should improve write performance for file systems and storage systems ...@@ -327,7 +327,7 @@ this should improve write performance for file systems and storage systems
that do not efficiently support small random writes, such as Btrfs, as well as SSDs. that do not efficiently support small random writes, such as Btrfs, as well as SSDs.
(According to a test, write throughput of a common SSD increases with write block size, (According to a test, write throughput of a common SSD increases with write block size,
until a block size of 2 MB, and then does not further increase.) until a block size of 2 MB, and then does not further increase.)
By default, changes are automatically written when more than a number of pages are modified, By default, changes are automatically written when more than a number of pages are modified,
and once every second in a background thread, even if only little data was changed. and once every second in a background thread, even if only little data was changed.
Changes can also be written explicitly by calling <code>commit()</code>. Changes can also be written explicitly by calling <code>commit()</code>.
</p><p> </p><p>
......
...@@ -150,7 +150,7 @@ import org.h2.value.ValueTimestamp; ...@@ -150,7 +150,7 @@ import org.h2.value.ValueTimestamp;
/** /**
* The parser is used to convert a SQL statement string to an command object. * The parser is used to convert a SQL statement string to an command object.
* *
* @author Thomas Mueller * @author Thomas Mueller
* @author Noel Grandin * @author Noel Grandin
* @author Nicolas Fortin, Atelier SIG, IRSTV FR CNRS 24888 * @author Nicolas Fortin, Atelier SIG, IRSTV FR CNRS 24888
...@@ -211,7 +211,7 @@ public class Parser { ...@@ -211,7 +211,7 @@ public class Parser {
/** /**
* Parse the statement and prepare it for execution. * Parse the statement and prepare it for execution.
* *
* @param sql the SQL statement to parse * @param sql the SQL statement to parse
* @return the prepared object * @return the prepared object
*/ */
...@@ -226,7 +226,7 @@ public class Parser { ...@@ -226,7 +226,7 @@ public class Parser {
/** /**
* Parse a statement or a list of statements, and prepare it for execution. * Parse a statement or a list of statements, and prepare it for execution.
* *
* @param sql the SQL statement to parse * @param sql the SQL statement to parse
* @return the command object * @return the command object
*/ */
...@@ -259,7 +259,7 @@ public class Parser { ...@@ -259,7 +259,7 @@ public class Parser {
/** /**
* Parse the statement, but don't prepare it for execution. * Parse the statement, but don't prepare it for execution.
* *
* @param sql the SQL statement to parse * @param sql the SQL statement to parse
* @return the prepared object * @return the prepared object
*/ */
...@@ -3575,7 +3575,7 @@ public class Parser { ...@@ -3575,7 +3575,7 @@ public class Parser {
/** /**
* Checks if this string is a SQL keyword. * Checks if this string is a SQL keyword.
* *
* @param s the token to check * @param s the token to check
* @param supportOffsetFetch if OFFSET and FETCH are keywords * @param supportOffsetFetch if OFFSET and FETCH are keywords
* @return true if it is a keyword * @return true if it is a keyword
...@@ -5684,7 +5684,7 @@ public class Parser { ...@@ -5684,7 +5684,7 @@ public class Parser {
/** /**
* Add double quotes around an identifier if required. * Add double quotes around an identifier if required.
* *
* @param s the identifier * @param s the identifier
* @return the quoted identifier * @return the quoted identifier
*/ */
...@@ -5715,7 +5715,7 @@ public class Parser { ...@@ -5715,7 +5715,7 @@ public class Parser {
/** /**
* Parse a SQL code snippet that represents an expression. * Parse a SQL code snippet that represents an expression.
* *
* @param sql the code snippet * @param sql the code snippet
* @return the expression object * @return the expression object
*/ */
...@@ -5728,7 +5728,7 @@ public class Parser { ...@@ -5728,7 +5728,7 @@ public class Parser {
/** /**
* Parse a SQL code snippet that represents a table name. * Parse a SQL code snippet that represents a table name.
* *
* @param sql the code snippet * @param sql the code snippet
* @return the table object * @return the table object
*/ */
......
...@@ -46,9 +46,11 @@ public class CreateFunctionAlias extends SchemaCommand { ...@@ -46,9 +46,11 @@ public class CreateFunctionAlias extends SchemaCommand {
int id = getObjectId(); int id = getObjectId();
FunctionAlias functionAlias; FunctionAlias functionAlias;
if (javaClassMethod != null) { if (javaClassMethod != null) {
functionAlias = FunctionAlias.newInstance(getSchema(), id, aliasName, javaClassMethod, force, bufferResultSetToLocalTemp); functionAlias = FunctionAlias.newInstance(
getSchema(), id, aliasName, javaClassMethod, force, bufferResultSetToLocalTemp);
} else { } else {
functionAlias = FunctionAlias.newInstanceFromSource(getSchema(), id, aliasName, source, force, bufferResultSetToLocalTemp); functionAlias = FunctionAlias.newInstanceFromSource(
getSchema(), id, aliasName, source, force, bufferResultSetToLocalTemp);
} }
functionAlias.setDeterministic(deterministic); functionAlias.setDeterministic(deterministic);
db.addSchemaObject(session, functionAlias); db.addSchemaObject(session, functionAlias);
...@@ -83,6 +85,8 @@ public class CreateFunctionAlias extends SchemaCommand { ...@@ -83,6 +85,8 @@ public class CreateFunctionAlias extends SchemaCommand {
/** /**
* Should the return value ResultSet be buffered in a local temporary file? * Should the return value ResultSet be buffered in a local temporary file?
*
* @param b the new value
*/ */
public void setBufferResultSetToLocalTemp(boolean b) { public void setBufferResultSetToLocalTemp(boolean b) {
this.bufferResultSetToLocalTemp = b; this.bufferResultSetToLocalTemp = b;
......
...@@ -48,7 +48,7 @@ public class Insert extends Prepared implements ResultTarget { ...@@ -48,7 +48,7 @@ public class Insert extends Prepared implements ResultTarget {
private boolean sortedInsertMode; private boolean sortedInsertMode;
private int rowNumber; private int rowNumber;
private boolean insertFromSelect; private boolean insertFromSelect;
/** /**
* for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE .... * for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE ....
*/ */
...@@ -81,7 +81,7 @@ public class Insert extends Prepared implements ResultTarget { ...@@ -81,7 +81,7 @@ public class Insert extends Prepared implements ResultTarget {
/** /**
* Keep a collection of the columns to pass to update if a duplicate key * Keep a collection of the columns to pass to update if a duplicate key
* happens, for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE .... * happens, for MySQL-style INSERT ... ON DUPLICATE KEY UPDATE ....
* *
* @param column the column * @param column the column
* @param expression the expression * @param expression the expression
*/ */
...@@ -318,9 +318,9 @@ public class Insert extends Prepared implements ResultTarget { ...@@ -318,9 +318,9 @@ public class Insert extends Prepared implements ResultTarget {
throw de; throw de;
} }
if (duplicateKeyAssignmentMap == null || duplicateKeyAssignmentMap.isEmpty()) { if (duplicateKeyAssignmentMap == null || duplicateKeyAssignmentMap.isEmpty()) {
throw de; throw de;
} }
ArrayList<String> variableNames = new ArrayList<String>(duplicateKeyAssignmentMap.size()); ArrayList<String> variableNames = new ArrayList<String>(duplicateKeyAssignmentMap.size());
for (int i = 0; i < columns.length; i++) { for (int i = 0; i < columns.length; i++) {
String key = session.getCurrentSchemaName() + "." + table.getName() + "." + columns[i].getName(); String key = session.getCurrentSchemaName() + "." + table.getName() + "." + columns[i].getName();
...@@ -358,7 +358,7 @@ public class Insert extends Prepared implements ResultTarget { ...@@ -358,7 +358,7 @@ public class Insert extends Prepared implements ResultTarget {
if (indexColumn.getName() == insertColumn.getName()) { if (indexColumn.getName() == insertColumn.getName()) {
foundIndex = index; foundIndex = index;
break; break;
} }
foundIndex = null; foundIndex = null;
} }
if (foundIndex == null) { if (foundIndex == null) {
......
...@@ -110,9 +110,6 @@ public class Set extends Prepared { ...@@ -110,9 +110,6 @@ public class Set extends Prepared {
} }
case SetTypes.COLLATION: { case SetTypes.COLLATION: {
session.getUser().checkAdmin(); session.getUser().checkAdmin();
final boolean binaryUnsigned = database.getCompareMode().isBinaryUnsigned(); final boolean binaryUnsigned = database.getCompareMode().isBinaryUnsigned();
CompareMode compareMode; CompareMode compareMode;
StringBuilder buff = new StringBuilder(stringValue); StringBuilder buff = new StringBuilder(stringValue);
......
...@@ -1721,7 +1721,7 @@ public class ErrorCode { ...@@ -1721,7 +1721,7 @@ public class ErrorCode {
/** /**
* The error with code <code>90127</code> is thrown when * The error with code <code>90127</code> is thrown when
* trying to update or delete a row in a result set if the result set is * trying to update or delete a row in a result set if the result set is
* not updatable. Result sets are only updatable if: * not updatable. Result sets are only updatable if:
* the statement was created with updatable concurrency; * the statement was created with updatable concurrency;
* all columns of the result set are from the same table; * all columns of the result set are from the same table;
* the table is a data table (not a system table or view); * the table is a data table (not a system table or view);
......
...@@ -60,9 +60,12 @@ public class FunctionAlias extends SchemaObjectBase { ...@@ -60,9 +60,12 @@ public class FunctionAlias extends SchemaObjectBase {
* @param name the name * @param name the name
* @param javaClassMethod the class and method name * @param javaClassMethod the class and method name
* @param force create the object even if the class or method does not exist * @param force create the object even if the class or method does not exist
* @param bufferResultSetToLocalTemp whether the result should be buffered
* @return the database object * @return the database object
*/ */
public static FunctionAlias newInstance(Schema schema, int id, String name, String javaClassMethod, boolean force, boolean bufferResultSetToLocalTemp) { public static FunctionAlias newInstance(
Schema schema, int id, String name, String javaClassMethod,
boolean force, boolean bufferResultSetToLocalTemp) {
FunctionAlias alias = new FunctionAlias(schema, id, name); FunctionAlias alias = new FunctionAlias(schema, id, name);
int paren = javaClassMethod.indexOf('('); int paren = javaClassMethod.indexOf('(');
int lastDot = javaClassMethod.lastIndexOf('.', paren < 0 ? javaClassMethod.length() : paren); int lastDot = javaClassMethod.lastIndexOf('.', paren < 0 ? javaClassMethod.length() : paren);
...@@ -84,9 +87,12 @@ public class FunctionAlias extends SchemaObjectBase { ...@@ -84,9 +87,12 @@ public class FunctionAlias extends SchemaObjectBase {
* @param name the name * @param name the name
* @param source the source code * @param source the source code
* @param force create the object even if the class or method does not exist * @param force create the object even if the class or method does not exist
* @param bufferResultSetToLocalTemp whether the result should be buffered
* @return the database object * @return the database object
*/ */
public static FunctionAlias newInstanceFromSource(Schema schema, int id, String name, String source, boolean force, boolean bufferResultSetToLocalTemp) { public static FunctionAlias newInstanceFromSource(
Schema schema, int id, String name, String source, boolean force,
boolean bufferResultSetToLocalTemp) {
FunctionAlias alias = new FunctionAlias(schema, id, name); FunctionAlias alias = new FunctionAlias(schema, id, name);
alias.source = source; alias.source = source;
alias.bufferResultSetToLocalTemp = bufferResultSetToLocalTemp; alias.bufferResultSetToLocalTemp = bufferResultSetToLocalTemp;
...@@ -513,6 +519,8 @@ public class FunctionAlias extends SchemaObjectBase { ...@@ -513,6 +519,8 @@ public class FunctionAlias extends SchemaObjectBase {
/** /**
* Should the return value ResultSet be buffered in a local temporary file? * Should the return value ResultSet be buffered in a local temporary file?
*
* @return true if yes
*/ */
public boolean isBufferResultSetToLocalTemp() { public boolean isBufferResultSetToLocalTemp() {
return bufferResultSetToLocalTemp; return bufferResultSetToLocalTemp;
......
...@@ -137,7 +137,7 @@ public class Mode { ...@@ -137,7 +137,7 @@ public class Mode {
* MySQL style INSERT ... ON DUPLICATE KEY UPDATE ... * MySQL style INSERT ... ON DUPLICATE KEY UPDATE ...
*/ */
public boolean onDuplicateKeyUpdate; public boolean onDuplicateKeyUpdate;
private final String name; private final String name;
static { static {
...@@ -210,7 +210,7 @@ public class Mode { ...@@ -210,7 +210,7 @@ public class Mode {
/** /**
* Get the mode with the given name. * Get the mode with the given name.
* *
* @param name the name of the mode * @param name the name of the mode
* @return the mode object * @return the mode object
*/ */
......
...@@ -46,7 +46,7 @@ public class FunctionIndex extends BaseIndex { ...@@ -46,7 +46,7 @@ public class FunctionIndex extends BaseIndex {
@Override @Override
public Cursor find(Session session, SearchRow first, SearchRow last) { public Cursor find(Session session, SearchRow first, SearchRow last) {
if (functionTable.isBufferResultSetToLocalTemp()) { if (functionTable.isBufferResultSetToLocalTemp()) {
return new FunctionCursor(functionTable.getResult(session)); return new FunctionCursor(functionTable.getResult(session));
} }
return new FunctionCursorResultSet(session, functionTable.getResultSet(session)); return new FunctionCursorResultSet(session, functionTable.getResultSet(session));
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论