Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
ffe1a24d
提交
ffe1a24d
authored
7月 04, 2014
作者:
Thomas Mueller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix formatting
上级
5e9911e5
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
44 行增加
和
29 行删除
+44
-29
advanced.html
h2/src/docsrc/html/advanced.html
+3
-3
changelog.html
h2/src/docsrc/html/changelog.html
+4
-4
Engine.java
h2/src/main/org/h2/engine/Engine.java
+3
-1
Session.java
h2/src/main/org/h2/engine/Session.java
+2
-1
SessionInterface.java
h2/src/main/org/h2/engine/SessionInterface.java
+3
-2
SessionRemote.java
h2/src/main/org/h2/engine/SessionRemote.java
+5
-2
JdbcConnection.java
h2/src/main/org/h2/jdbc/JdbcConnection.java
+2
-2
help.csv
h2/src/main/org/h2/res/help.csv
+2
-1
WebServer.java
h2/src/main/org/h2/server/web/WebServer.java
+15
-8
WebSession.java
h2/src/main/org/h2/server/web/WebSession.java
+2
-1
TestCluster.java
h2/src/test/org/h2/test/db/TestCluster.java
+2
-3
TestTempTables.java
h2/src/test/org/h2/test/db/TestTempTables.java
+1
-1
没有找到文件。
h2/src/docsrc/html/advanced.html
浏览文件 @
ffe1a24d
...
...
@@ -395,14 +395,14 @@ It is also possible to get the list of servers by using Connection.getClientInfo
</p>
<p>
The property list returned from
<code>
getClientInfo()
</code>
contains a
<code>
numServers
</code>
property that returns the
The property list returned from
<code>
getClientInfo()
</code>
contains a
<code>
numServers
</code>
property that returns the
number of servers that are in the connection list. To get the actual servers,
<code>
getClientInfo()
</code>
also has
properties
<code>
server0
</code>
..
<code>
serverX
</code>
, where serverX is the number of servers minus 1.
</p>
<p>
Example: To get the 2nd server in the connection list one uses
<code>
getClientInfo('server1')
<
code>
.
<b>
Note:
</b>
The
<code>
serverX
</code>
property only returns IP addresses and ports and not hostnames.
Example: To get the 2nd server in the connection list one uses
<code>
getClientInfo('server1')
<
/code>
.
<
b>
Note:
</b>
The
<
code>
serverX
</code>
property only returns IP addresses and ports and not hostnames.
</p>
<h3>
Clustering Algorithm and Limitations
</h3>
...
...
h2/src/docsrc/html/changelog.html
浏览文件 @
ffe1a24d
...
...
@@ -18,16 +18,16 @@ Change Log
<h2>
Next Version (unreleased)
</h2>
<ul><li>
MVStore: new utility to compress a store.
</li><li>
Sequences of temporary tables (auto-increment or identity columns)
</li><li>
Sequences of temporary tables (auto-increment or identity columns)
were persisted unnecessarily in the database file, and were not removed
when re-opening the database.
</li><li>
MVStore: an IndexOutOfBoundsException could sometimes
occur MVMap.openVersion when concurrently accessing the store.
</li><li>
The LIRS cache now re-sizes the internal hash map if needed.
</li><li>
Optionally persist session history in the H2 console. (patch from Martin Grajcar)
<
ul
><li>
Add client-info property to get the number of servers currently in the cluster
and which servers that are available. (patch from Nikolaj Fogh)
</li><li>
Fix bug in changing encrypted DB password that kept the file handle
<
/li
><li>
Add client-info property to get the number of servers currently in the cluster
and which servers that are available. (patch from Nikolaj Fogh)
</li><li>
Fix bug in changing encrypted DB password that kept the file handle
open when the wrong password was supplied. (test case from Jens Hohmuth).
</li></ul>
...
...
h2/src/main/org/h2/engine/Engine.java
浏览文件 @
ffe1a24d
...
...
@@ -32,7 +32,9 @@ public class Engine implements SessionFactory {
SysProperties
.
DELAY_WRONG_PASSWORD_MIN
;
private
boolean
jmx
;
private
Engine
()
{}
private
Engine
()
{
// use getInstance()
}
public
static
Engine
getInstance
()
{
return
INSTANCE
;
...
...
h2/src/main/org/h2/engine/Session.java
浏览文件 @
ffe1a24d
...
...
@@ -127,10 +127,11 @@ public class Session extends SessionWithState {
this
.
currentSchemaName
=
Constants
.
SCHEMA_MAIN
;
}
@Override
public
ArrayList
<
String
>
getClusterServers
()
{
return
new
ArrayList
<
String
>();
}
public
boolean
setCommitOrRollbackDisabled
(
boolean
x
)
{
boolean
old
=
commitOrRollbackDisabled
;
commitOrRollbackDisabled
=
x
;
...
...
h2/src/main/org/h2/engine/SessionInterface.java
浏览文件 @
ffe1a24d
...
...
@@ -21,10 +21,11 @@ public interface SessionInterface extends Closeable {
/**
* Get the list of the cluster servers for this session.
*
* @return A list of "IP:PORT" strings for the cluster servers in this session.
* @return A list of "ip:port" strings for the cluster servers in this
* session.
*/
ArrayList
<
String
>
getClusterServers
();
/**
* Parse a command and prepare it for execution.
*
...
...
h2/src/main/org/h2/engine/SessionRemote.java
浏览文件 @
ffe1a24d
...
...
@@ -95,15 +95,18 @@ public class SessionRemote extends SessionWithState implements DataHandler {
this
.
connectionInfo
=
ci
;
}
@Override
public
ArrayList
<
String
>
getClusterServers
()
{
ArrayList
<
String
>
serverList
=
new
ArrayList
<
String
>();
for
(
int
i
=
0
;
i
<
transferList
.
size
();
i
++)
{
Transfer
transfer
=
transferList
.
get
(
i
);
serverList
.
add
(
transfer
.
getSocket
().
getInetAddress
().
getHostAddress
().
toString
()
+
":"
+
String
.
valueOf
(
transfer
.
getSocket
().
getPort
()));
serverList
.
add
(
transfer
.
getSocket
().
getInetAddress
().
getHostAddress
()
+
":"
+
transfer
.
getSocket
().
getPort
());
}
return
serverList
;
}
private
Transfer
initTransfer
(
ConnectionInfo
ci
,
String
db
,
String
server
)
throws
IOException
{
Socket
socket
=
NetUtils
.
createSocket
(
server
,
...
...
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @
ffe1a24d
...
...
@@ -1724,7 +1724,7 @@ public class JdbcConnection extends TraceObject implements Connection {
try
{
if
(
isDebugEnabled
())
{
debugCode
(
"getClientInfo();"
);
}
}
checkClosed
();
ArrayList
<
String
>
serverList
=
session
.
getClusterServers
();
Properties
p
=
new
Properties
();
...
...
@@ -1752,7 +1752,7 @@ public class JdbcConnection extends TraceObject implements Connection {
debugCodeCall
(
"getClientInfo"
,
name
);
}
checkClosed
();
Properties
p
=
getClientInfo
();
Properties
p
=
getClientInfo
();
return
p
.
getProperty
(
name
);
}
catch
(
Exception
e
)
{
throw
logAndConvert
(
e
);
...
...
h2/src/main/org/h2/res/help.csv
浏览文件 @
ffe1a24d
...
...
@@ -1408,7 +1408,8 @@ Returns the name of the default schema for this session."
"Functions (System)","SCOPE_IDENTITY","
SCOPE_IDENTITY()
","
Returns the last inserted identity value for this session for the current scope."
Returns the last inserted identity value for this session for the current scope
(ie."
"Functions (System)","SESSION_ID","
SESSION_ID()
","
...
...
h2/src/main/org/h2/server/web/WebServer.java
浏览文件 @
ffe1a24d
...
...
@@ -48,8 +48,6 @@ import org.h2.util.Utils;
*/
public
class
WebServer
implements
Service
{
private
static
final
String
COMMAND_HISTORY
=
"commandHistory"
;
static
final
String
TRANSFER
=
"transfer"
;
static
final
String
[][]
LANGUAGES
=
{
...
...
@@ -75,6 +73,8 @@ public class WebServer implements Service {
{
"zh_TW"
,
"\u4e2d\u6587 (\u7e41\u9ad4)"
},
};
private
static
final
String
COMMAND_HISTORY
=
"commandHistory"
;
private
static
final
String
DEFAULT_LANGUAGE
=
"en"
;
private
static
final
String
[]
GENERIC
=
{
...
...
@@ -539,7 +539,7 @@ public class WebServer implements Service {
commandHistoryString
=
""
;
}
}
else
{
commandHistoryString
=
null
;
commandHistoryString
=
null
;
}
}
...
...
@@ -549,10 +549,12 @@ public class WebServer implements Service {
return
result
;
}
// Split the commandHistoryString on non-escaped semicolons and unescape it.
// Split the commandHistoryString on non-escaped semicolons
// and unescape it.
StringBuilder
sb
=
new
StringBuilder
();
for
(
int
end
=
0
;
;
end
++)
{
if
(
end
==
commandHistoryString
.
length
()
||
commandHistoryString
.
charAt
(
end
)
==
';'
)
{
for
(
int
end
=
0
;;
end
++)
{
if
(
end
==
commandHistoryString
.
length
()
||
commandHistoryString
.
charAt
(
end
)
==
';'
)
{
if
(
sb
.
length
()
>
0
)
{
result
.
add
(
sb
.
toString
());
sb
.
delete
(
0
,
sb
.
length
());
...
...
@@ -560,16 +562,21 @@ public class WebServer implements Service {
if
(
end
==
commandHistoryString
.
length
())
{
break
;
}
}
else
if
(
commandHistoryString
.
charAt
(
end
)
==
'\\'
&&
end
<
commandHistoryString
.
length
()
-
1
)
{
}
else
if
(
commandHistoryString
.
charAt
(
end
)
==
'\\'
&&
end
<
commandHistoryString
.
length
()
-
1
)
{
sb
.
append
(
commandHistoryString
.
charAt
(++
end
));
}
else
{
sb
.
append
(
commandHistoryString
.
charAt
(
end
));
}
}
return
result
;
}
/**
* Save the command history to the properties file.
*
* @param commandHistory the history
*/
public
void
saveCommandHistoryList
(
ArrayList
<
String
>
commandHistory
)
{
StringBuilder
sb
=
new
StringBuilder
();
for
(
String
s
:
commandHistory
)
{
...
...
h2/src/main/org/h2/server/web/WebSession.java
浏览文件 @
ffe1a24d
...
...
@@ -67,7 +67,8 @@ class WebSession {
WebSession
(
WebServer
server
)
{
this
.
server
=
server
;
// This must be stored in the session rather than in the server.
// Otherwise, one client could allow saving history for others (insecure).
// Otherwise, one client could allow
// saving history for others (insecure).
this
.
commandHistory
=
server
.
getCommandHistoryList
();
}
...
...
h2/src/test/org/h2/test/db/TestCluster.java
浏览文件 @
ffe1a24d
...
...
@@ -280,12 +280,11 @@ public class TestCluster extends TestBase {
conn
=
getConnection
(
urlCluster
,
user
,
password
);
Properties
p
=
conn
.
getClientInfo
();
assertEquals
(
"2"
,
p
.
getProperty
(
"numServers"
));
assertEquals
(
"2"
,
p
.
getProperty
(
"numServers"
));
assertEquals
(
"127.0.0.1:"
+
port1
,
p
.
getProperty
(
"server0"
));
assertEquals
(
"127.0.0.1:"
+
port2
,
p
.
getProperty
(
"server1"
));
assertEquals
(
"2"
,
conn
.
getClientInfo
(
"numServers"
));
assertEquals
(
"2"
,
conn
.
getClientInfo
(
"numServers"
));
assertEquals
(
"127.0.0.1:"
+
port1
,
conn
.
getClientInfo
(
"server0"
));
assertEquals
(
"127.0.0.1:"
+
port2
,
conn
.
getClientInfo
(
"server1"
));
conn
.
close
();
...
...
h2/src/test/org/h2/test/db/TestTempTables.java
浏览文件 @
ffe1a24d
...
...
@@ -47,7 +47,7 @@ public class TestTempTables extends TestBase {
c2
.
close
();
deleteDb
(
"tempTables"
);
}
private
void
testTempSequence
()
throws
SQLException
{
deleteDb
(
"tempTables"
);
Connection
conn
=
getConnection
(
"tempTables"
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论