Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录/注册
切换导航
H
h2database
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Administrator
h2database
Commits
448798ae
提交
448798ae
authored
6 年前
作者:
Evgenij Ryazanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some warnings
上级
24108bee
master
version-1.4.198
无相关合并请求
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
15 行增加
和
8 行删除
+15
-8
ToChar.java
h2/src/main/org/h2/expression/function/ToChar.java
+3
-2
MVMap.java
h2/src/main/org/h2/mvstore/MVMap.java
+1
-1
MVStore.java
h2/src/main/org/h2/mvstore/MVStore.java
+1
-0
Page.java
h2/src/main/org/h2/mvstore/Page.java
+2
-0
Value.java
h2/src/main/org/h2/value/Value.java
+2
-1
ValueDecimal.java
h2/src/main/org/h2/value/ValueDecimal.java
+3
-2
BenchCThread.java
h2/src/test/org/h2/test/bench/BenchCThread.java
+2
-1
TestLIRSMemoryConsumption.java
h2/src/test/org/h2/test/db/TestLIRSMemoryConsumption.java
+1
-1
没有找到文件。
h2/src/main/org/h2/expression/function/ToChar.java
浏览文件 @
448798ae
...
...
@@ -6,6 +6,7 @@
package
org
.
h2
.
expression
.
function
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.text.DateFormatSymbols
;
import
java.text.DecimalFormat
;
import
java.text.DecimalFormatSymbols
;
...
...
@@ -233,7 +234,7 @@ public class ToChar {
int
separator
=
findDecimalSeparator
(
format
);
int
formatScale
=
calculateScale
(
format
,
separator
);
if
(
formatScale
<
number
.
scale
())
{
number
=
number
.
setScale
(
formatScale
,
BigDecimal
.
ROUND_
HALF_UP
);
number
=
number
.
setScale
(
formatScale
,
RoundingMode
.
HALF_UP
);
}
// any 9s to the left of the decimal separator but to the right of a
...
...
@@ -461,7 +462,7 @@ public class ToChar {
}
}
int
i
=
number
.
setScale
(
0
,
BigDecimal
.
ROUND_
HALF_UP
).
intValue
();
int
i
=
number
.
setScale
(
0
,
RoundingMode
.
HALF_UP
).
intValue
();
String
hex
=
Integer
.
toHexString
(
i
);
if
(
digits
<
hex
.
length
())
{
hex
=
StringUtils
.
pad
(
""
,
digits
+
1
,
"#"
,
true
);
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/mvstore/MVMap.java
浏览文件 @
448798ae
...
...
@@ -1056,7 +1056,7 @@ public class MVMap<K, V> extends AbstractMap<K, V>
return
getVersion
(
getRoot
());
}
private
long
getVersion
(
RootReference
rootReference
)
{
private
static
long
getVersion
(
RootReference
rootReference
)
{
RootReference
previous
=
rootReference
.
previous
;
return
previous
==
null
||
previous
.
root
!=
rootReference
.
root
||
previous
.
appendCounter
!=
rootReference
.
appendCounter
?
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/mvstore/MVStore.java
浏览文件 @
448798ae
...
...
@@ -905,6 +905,7 @@ public class MVStore implements AutoCloseable {
/**
* Close the file and the store. Unsaved changes are written to disk first.
*/
@Override
public
void
close
()
{
if
(
closed
)
{
return
;
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/mvstore/Page.java
浏览文件 @
448798ae
...
...
@@ -1236,10 +1236,12 @@ public abstract class Page implements Cloneable
}
}
@Override
public
boolean
isComplete
()
{
return
complete
;
}
@Override
public
void
setComplete
()
{
recalculateTotalCount
();
complete
=
true
;
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/value/Value.java
浏览文件 @
448798ae
...
...
@@ -11,6 +11,7 @@ import java.io.Reader;
import
java.io.StringReader
;
import
java.lang.ref.SoftReference
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.nio.charset.StandardCharsets
;
import
java.sql.Date
;
import
java.sql.PreparedStatement
;
...
...
@@ -1431,7 +1432,7 @@ public abstract class Value {
throw
DbException
.
get
(
ErrorCode
.
NUMERIC_VALUE_OUT_OF_RANGE_2
,
x
.
toString
(),
getColumnName
(
column
));
}
return
x
.
setScale
(
0
,
BigDecimal
.
ROUND_
HALF_UP
).
longValue
();
return
x
.
setScale
(
0
,
RoundingMode
.
HALF_UP
).
longValue
();
}
private
static
String
getColumnName
(
Object
column
)
{
...
...
This diff is collapsed.
Click to expand it.
h2/src/main/org/h2/value/ValueDecimal.java
浏览文件 @
448798ae
...
...
@@ -6,6 +6,7 @@
package
org
.
h2
.
value
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.sql.PreparedStatement
;
import
java.sql.SQLException
;
...
...
@@ -95,7 +96,7 @@ public class ValueDecimal extends Value {
}
BigDecimal
bd
=
value
.
divide
(
dec
.
value
,
value
.
scale
()
+
DIVIDE_SCALE_ADD
,
BigDecimal
.
ROUND_
HALF_DOWN
);
RoundingMode
.
HALF_DOWN
);
if
(
bd
.
signum
()
==
0
)
{
bd
=
BigDecimal
.
ZERO
;
}
else
if
(
bd
.
scale
()
>
0
)
{
...
...
@@ -265,7 +266,7 @@ public class ValueDecimal extends Value {
if
(
scale
>
BIG_DECIMAL_SCALE_MAX
||
scale
<
-
BIG_DECIMAL_SCALE_MAX
)
{
throw
DbException
.
getInvalidValueException
(
"scale"
,
scale
);
}
return
bd
.
setScale
(
scale
,
BigDecimal
.
ROUND_
HALF_UP
);
return
bd
.
setScale
(
scale
,
RoundingMode
.
HALF_UP
);
}
}
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/bench/BenchCThread.java
浏览文件 @
448798ae
...
...
@@ -6,6 +6,7 @@
package
org
.
h2
.
test
.
bench
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
import
java.sql.PreparedStatement
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
...
...
@@ -214,7 +215,7 @@ public class BenchCThread {
BigDecimal
olAmount
=
new
BigDecimal
(
olQuantity
).
multiply
(
price
).
multiply
(
ONE
.
add
(
wTax
).
add
(
tax
)).
multiply
(
ONE
.
subtract
(
discount
));
olAmount
=
olAmount
.
setScale
(
2
,
BigDecimal
.
ROUND_
HALF_UP
);
olAmount
=
olAmount
.
setScale
(
2
,
RoundingMode
.
HALF_UP
);
amt
[
number
-
1
]
=
olAmount
;
total
=
total
.
add
(
olAmount
);
prep
=
prepare
(
"INSERT INTO ORDER_LINE (OL_O_ID, OL_D_ID, OL_W_ID, OL_NUMBER, "
...
...
This diff is collapsed.
Click to expand it.
h2/src/test/org/h2/test/db/TestLIRSMemoryConsumption.java
浏览文件 @
448798ae
...
...
@@ -102,7 +102,7 @@ public class TestLIRSMemoryConsumption extends TestDb {
return
2560
;
}
private
long
getMemUsedKb
()
{
private
static
long
getMemUsedKb
()
{
Runtime
rt
=
Runtime
.
getRuntime
();
long
memory
=
Long
.
MAX_VALUE
;
for
(
int
i
=
0
;
i
<
8
;
i
++)
{
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论