Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
78aaf333
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,发现更多精彩内容 >>
提交
78aaf333
编写于
5月 09, 2017
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
generateId Object => Number
上级
68042d6a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
8 deletion
+8
-8
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/TableRule.java
...com/dangdang/ddframe/rdb/sharding/api/rule/TableRule.java
+1
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/insert/AbstractInsertParser.java
...parsing/parser/statement/insert/AbstractInsertParser.java
+1
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/PreparedSQLRouter.java
...ngdang/ddframe/rdb/sharding/router/PreparedSQLRouter.java
+6
-6
未找到文件。
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/rule/TableRule.java
浏览文件 @
78aaf333
...
...
@@ -215,7 +215,7 @@ public final class TableRule {
* @param columnName 列名称
* @return 生成的id
*/
public
Object
generateId
(
final
String
columnName
)
{
public
Number
generateId
(
final
String
columnName
)
{
Number
result
=
autoIncrementColumnMap
.
get
(
columnName
).
generateId
();
Preconditions
.
checkNotNull
(
result
);
return
result
;
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parsing/parser/statement/insert/AbstractInsertParser.java
浏览文件 @
78aaf333
...
...
@@ -161,7 +161,7 @@ public abstract class AbstractInsertParser implements SQLStatementParser {
int
count
=
0
;
for
(
ShardingColumnContext
each
:
shardingColumnContexts
)
{
if
(
each
.
isAutoIncrement
())
{
Number
autoIncrementedValue
=
(
Number
)
getShardingRule
().
findTableRule
(
sqlContext
.
getTables
().
get
(
0
).
getName
()).
generateId
(
each
.
getColumnName
());
Number
autoIncrementedValue
=
getShardingRule
().
findTableRule
(
sqlContext
.
getTables
().
get
(
0
).
getName
()).
generateId
(
each
.
getColumnName
());
if
(
parameters
.
isEmpty
())
{
itemsToken
.
getItems
().
add
(
autoIncrementedValue
.
toString
());
sqlExprs
.
add
(
new
SQLNumberExpr
(
autoIncrementedValue
));
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/router/PreparedSQLRouter.java
浏览文件 @
78aaf333
...
...
@@ -56,13 +56,13 @@ public class PreparedSQLRouter {
if
(
null
==
sqlContext
)
{
sqlContext
=
engine
.
parseSQL
(
logicSql
,
parameters
);
}
else
{
List
<
Object
>
generatedIds
=
generateId
();
List
<
Number
>
generatedIds
=
generateId
();
parameters
.
addAll
(
generatedIds
);
}
return
engine
.
routeSQL
(
sqlContext
,
parameters
);
}
private
List
<
Object
>
generateId
()
{
private
List
<
Number
>
generateId
()
{
if
(!(
sqlContext
instanceof
InsertSQLContext
))
{
return
Collections
.
emptyList
();
}
...
...
@@ -72,11 +72,11 @@ public class PreparedSQLRouter {
}
TableRule
tableRule
=
tableRuleOptional
.
get
();
GeneratedKeyContext
generatedKeyContext
=
((
InsertSQLContext
)
sqlContext
).
getGeneratedKeyContext
();
List
<
Object
>
result
=
new
ArrayList
<>(
generatedKeyContext
.
getColumns
().
size
());
List
<
Number
>
result
=
new
ArrayList
<>(
generatedKeyContext
.
getColumns
().
size
());
for
(
String
each
:
generatedKeyContext
.
getColumns
())
{
Object
i
d
=
tableRule
.
generateId
(
each
);
result
.
add
(
i
d
);
generatedKeyContext
.
putValue
(
each
,
i
d
);
Number
generatedI
d
=
tableRule
.
generateId
(
each
);
result
.
add
(
generatedI
d
);
generatedKeyContext
.
putValue
(
each
,
generatedI
d
);
}
return
result
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录