提交 37b497e2 authored 作者: Thomas Mueller's avatar Thomas Mueller

--no commit message

--no commit message
上级 2ab24ddf
...@@ -69,8 +69,8 @@ import org.h2.message.TraceSystem; ...@@ -69,8 +69,8 @@ import org.h2.message.TraceSystem;
*/ */
public class Constants { public class Constants {
public static final int BUILD_ID = 53; public static final int BUILD_ID = 54;
private static final String BUILD = "2007-07-03"; private static final String BUILD = "2007-07-12";
public static final int VERSION_MAJOR = 1; public static final int VERSION_MAJOR = 1;
public static final int VERSION_MINOR = 0; public static final int VERSION_MINOR = 0;
...@@ -254,10 +254,10 @@ public class Constants { ...@@ -254,10 +254,10 @@ public class Constants {
public static String BASE_DIR = getStringSetting("h2.baseDir", null); public static String BASE_DIR = getStringSetting("h2.baseDir", null);
public static void setBaseDir(String dir) { public static void setBaseDir(String dir) {
if(!dir.endsWith("/")) { if(!dir.endsWith("/")) {
dir += "/"; dir += "/";
} }
BASE_DIR = dir; BASE_DIR = dir;
} }
public static boolean getBooleanSetting(String name, boolean defaultValue) { public static boolean getBooleanSetting(String name, boolean defaultValue) {
......
...@@ -7,7 +7,7 @@ package org.h2.engine; ...@@ -7,7 +7,7 @@ package org.h2.engine;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
public class DatabaseCloser extends Thread { public class DatabaseCloser extends Thread {
private final boolean shutdownHook; private final boolean shutdownHook;
private WeakReference databaseRef; private WeakReference databaseRef;
private int delayInMillis; private int delayInMillis;
......
...@@ -17,7 +17,7 @@ import org.h2.util.ObjectArray; ...@@ -17,7 +17,7 @@ import org.h2.util.ObjectArray;
*/ */
public abstract class DbObject { public abstract class DbObject {
public static final int TABLE_OR_VIEW=0, INDEX=1, USER=2, SEQUENCE=3, TRIGGER=4; public static final int TABLE_OR_VIEW=0, INDEX=1, USER=2, SEQUENCE=3, TRIGGER=4;
public static final int CONSTRAINT = 5, SETTING = 6, ROLE = 7, RIGHT = 8, FUNCTION_ALIAS = 9; public static final int CONSTRAINT = 5, SETTING = 6, ROLE = 7, RIGHT = 8, FUNCTION_ALIAS = 9;
public static final int SCHEMA = 10, CONSTANT = 11; public static final int SCHEMA = 10, CONSTANT = 11;
......
...@@ -17,7 +17,7 @@ import org.h2.value.ValueInt; ...@@ -17,7 +17,7 @@ import org.h2.value.ValueInt;
import org.h2.value.ValueString; import org.h2.value.ValueString;
public class MetaRecord { public class MetaRecord {
private int id; private int id;
private int objectType; private int objectType;
private int headPos; private int headPos;
......
...@@ -7,13 +7,13 @@ package org.h2.engine; ...@@ -7,13 +7,13 @@ package org.h2.engine;
import org.h2.command.Prepared; import org.h2.command.Prepared;
public class Procedure { public class Procedure {
private final String name; private final String name;
private final Prepared prepared; private final Prepared prepared;
public Procedure(String name, Prepared prepared) { public Procedure(String name, Prepared prepared) {
this.name = name; this.name = name;
this.prepared = prepared; this.prepared = prepared;
} }
public String getName() { public String getName() {
......
...@@ -35,7 +35,7 @@ import org.h2.value.ValueLong; ...@@ -35,7 +35,7 @@ import org.h2.value.ValueLong;
* @author Thomas * @author Thomas
*/ */
public class Session implements SessionInterface { public class Session implements SessionInterface {
private User user; private User user;
private int id; private int id;
private Database database; private Database database;
......
...@@ -11,7 +11,7 @@ import org.h2.message.Trace; ...@@ -11,7 +11,7 @@ import org.h2.message.Trace;
import org.h2.table.Table; import org.h2.table.Table;
public class Setting extends DbObject { public class Setting extends DbObject {
private int intValue; private int intValue;
private String stringValue; private String stringValue;
......
...@@ -94,10 +94,7 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2 ...@@ -94,10 +94,7 @@ java -Xmx512m -Xrunhprof:cpu=samples,depth=8 org.h2.tools.RunScript -url jdbc:h2
/* /*
whats faster, stringBuffer.append.append.append or buff.append buff.append... storages should be an int hash map
maybe replace StringBuffer with own class (StringCreator)
storages should be an inthashmap
Test with newest Hibernate Test with newest Hibernate
......
...@@ -200,13 +200,12 @@ public class TestCases extends TestBase { ...@@ -200,13 +200,12 @@ public class TestCases extends TestBase {
check("Hello", rs.getString(1)); check("Hello", rs.getString(1));
checkFalse(rs.next()); checkFalse(rs.next());
int todo; rs = stat.executeQuery("SELECT ? FROM DUAL UNION ALL SELECT ? FROM DUAL {1: 'Hello', 2:'World' }");
// rs = stat.executeQuery("SELECT ? FROM DUAL UNION ALL SELECT ? FROM DUAL {1: 'Hello', 2:'World' }"); rs.next();
// rs.next(); check("Hello", rs.getString(1));
// check("Hello", rs.getString(1)); rs.next();
// rs.next(); check("World", rs.getString(1));
// check("World", rs.getString(1)); checkFalse(rs.next());
// checkFalse(rs.next());
conn.close(); conn.close();
} }
......
...@@ -494,4 +494,4 @@ latin tgconstrname datallowconn atttypmod dattablespace attrelid ctid timestampt ...@@ -494,4 +494,4 @@ latin tgconstrname datallowconn atttypmod dattablespace attrelid ctid timestampt
nspname objsubid typnamespace rolcreaterole tgrelid spclocation relhasrules dont indkey postmaster nspname objsubid typnamespace rolcreaterole tgrelid spclocation relhasrules dont indkey postmaster
relkind autovacuum datlastsysoid attisdropped amname datacl deallocate tgdeferrable stats relkind autovacuum datlastsysoid attisdropped amname datacl deallocate tgdeferrable stats
spcacl relname rolvaliduntil attnotnull authid aclitem spcacl relname rolvaliduntil attnotnull authid aclitem
plpgsql interrupting spring oids plperl regex plpgsql interrupting spring oids plperl regex newest
\ No newline at end of file \ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论