Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
e5d0dc5f
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
e5d0dc5f
编写于
5月 13, 2016
作者:
G
gaohongtao
提交者:
gaoht
5月 13, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
single result set limit error
上级
23a8815d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
12 deletion
+44
-12
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetFactory.java
...angdang/ddframe/rdb/sharding/merger/ResultSetFactory.java
+10
-4
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/iterator/IteratorResultSetTest.java
...e/rdb/sharding/merger/iterator/IteratorResultSetTest.java
+34
-8
未找到文件。
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/merger/ResultSetFactory.java
浏览文件 @
e5d0dc5f
...
...
@@ -59,7 +59,7 @@ public final class ResultSetFactory {
}
if
(
1
==
filteredResultSets
.
size
())
{
log
.
trace
(
"Sharding-JDBC: Only one result set"
);
return
filteredResultSets
.
get
(
0
);
return
joinLimit
(
filteredResultSets
.
get
(
0
),
mergeContext
);
}
mergeContext
.
buildContextWithResultSet
((
WrapperResultSet
)
filteredResultSets
.
get
(
0
));
return
buildCoupling
(
buildReducer
(
filteredResultSets
,
mergeContext
),
mergeContext
);
...
...
@@ -97,9 +97,7 @@ public final class ResultSetFactory {
if
(
mergeContext
.
needToSort
())
{
currentResultSet
=
join
(
new
MemoryOrderByCouplingResultSet
(
mergeContext
.
getCurrentOrderByKeys
()),
currentResultSet
);
}
if
(
mergeContext
.
hasLimit
())
{
currentResultSet
=
join
(
new
LimitCouplingResultSet
(
mergeContext
.
getLimit
()),
currentResultSet
);
}
currentResultSet
=
joinLimit
(
currentResultSet
,
mergeContext
);
return
currentResultSet
;
}
...
...
@@ -108,4 +106,12 @@ public final class ResultSetFactory {
resultSet
.
init
(
preResultSet
);
return
resultSet
;
}
private
static
ResultSet
joinLimit
(
final
ResultSet
preResultSet
,
final
MergeContext
mergeContext
)
throws
SQLException
{
if
(
mergeContext
.
hasLimit
())
{
return
join
(
new
LimitCouplingResultSet
(
mergeContext
.
getLimit
()),
preResultSet
);
}
else
{
return
preResultSet
;
}
}
}
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/iterator/IteratorResultSetTest.java
浏览文件 @
e5d0dc5f
...
...
@@ -17,19 +17,19 @@
package
com.dangdang.ddframe.rdb.sharding.merger.iterator
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
com.dangdang.ddframe.rdb.sharding.merger.ResultSetFactory
;
import
com.dangdang.ddframe.rdb.sharding.merger.fixture.MockResultSet
;
import
com.dangdang.ddframe.rdb.sharding.parser.result.merger.Limit
;
import
com.dangdang.ddframe.rdb.sharding.parser.result.merger.MergeContext
;
import
org.junit.Test
;
import
java.sql.ResultSet
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
org.junit.Test
;
import
com.dangdang.ddframe.rdb.sharding.merger.ResultSetFactory
;
import
com.dangdang.ddframe.rdb.sharding.merger.fixture.MockResultSet
;
import
com.dangdang.ddframe.rdb.sharding.parser.result.merger.Limit
;
import
com.dangdang.ddframe.rdb.sharding.parser.result.merger.MergeContext
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertThat
;
public
final
class
IteratorResultSetTest
{
...
...
@@ -66,4 +66,30 @@ public final class IteratorResultSetTest {
}
assertThat
(
count
,
is
(
1
));
}
@Test
public
void
assertNextWithLimitForSingleResultSet
()
throws
SQLException
{
MergeContext
mergeContext
=
new
MergeContext
();
mergeContext
.
setLimit
(
new
Limit
(
2
,
3
));
ResultSet
resultSet
=
ResultSetFactory
.
getResultSet
(
Collections
.<
ResultSet
>
singletonList
(
new
MockResultSet
<>(
1
,
2
,
3
,
4
,
5
,
6
)),
mergeContext
);
int
count
=
0
;
while
(
resultSet
.
next
())
{
System
.
out
.
println
(
resultSet
.
getInt
(
1
));
count
++;
}
assertThat
(
count
,
is
(
3
));
}
@Test
public
void
assertNextWithLimitForSingleResultSetNotFull
()
throws
SQLException
{
MergeContext
mergeContext
=
new
MergeContext
();
mergeContext
.
setLimit
(
new
Limit
(
2
,
10
));
ResultSet
resultSet
=
ResultSetFactory
.
getResultSet
(
Collections
.<
ResultSet
>
singletonList
(
new
MockResultSet
<>(
1
,
2
,
3
,
4
,
5
,
6
)),
mergeContext
);
int
count
=
0
;
while
(
resultSet
.
next
())
{
count
++;
System
.
out
.
println
(
resultSet
.
getInt
(
1
));
}
assertThat
(
count
,
is
(
4
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录