Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
e55573aa
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 搜索 >>
提交
e55573aa
编写于
12月 13, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove useless TransactionType.find
上级
7085b3b9
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
29 deletion
+13
-29
sharding-core/src/main/java/io/shardingsphere/core/constant/transaction/TransactionType.java
...dingsphere/core/constant/transaction/TransactionType.java
+1
-16
sharding-core/src/main/java/io/shardingsphere/spi/transaction/ShardingTransactionHandlerRegistry.java
...e/spi/transaction/ShardingTransactionHandlerRegistry.java
+9
-9
sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java
.../shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java
+1
-1
sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSource.java
...shardingjdbc/jdbc/core/datasource/ShardingDataSource.java
+1
-1
sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java
...dingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java
+0
-1
sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/sctl/ShardingCTLSetBackendHandler.java
...rdingproxy/backend/sctl/ShardingCTLSetBackendHandler.java
+1
-1
未找到文件。
sharding-core/src/main/java/io/shardingsphere/core/constant/transaction/TransactionType.java
浏览文件 @
e55573aa
...
...
@@ -24,20 +24,5 @@ package io.shardingsphere.core.constant.transaction;
*/
public
enum
TransactionType
{
LOCAL
,
XA
,
BASE
;
/**
* Find transaction type by name.
*
* @param name name of transaction type
* @return transaction type
*/
public
static
TransactionType
find
(
final
String
name
)
{
for
(
TransactionType
each
:
TransactionType
.
values
())
{
if
(
name
.
equals
(
each
.
name
()))
{
return
each
;
}
}
throw
new
UnsupportedOperationException
(
String
.
format
(
"Cannot find transaction type of [%s]"
,
name
));
}
LOCAL
,
XA
,
BASE
}
sharding-core/src/main/java/io/shardingsphere/spi/transaction/ShardingTransactionHandlerRegistry.java
浏览文件 @
e55573aa
...
...
@@ -40,6 +40,15 @@ public final class ShardingTransactionHandlerRegistry {
private
static
final
ShardingTransactionHandlerRegistry
INSTANCE
=
new
ShardingTransactionHandlerRegistry
();
/**
* Get instance of sharding transaction handler registry.
*
* @return sharding transaction handler registry
*/
public
static
ShardingTransactionHandlerRegistry
getInstance
()
{
return
INSTANCE
;
}
/**
* Load sharding transaction handler.
*/
...
...
@@ -55,15 +64,6 @@ public final class ShardingTransactionHandlerRegistry {
}
}
/**
* Get instance of sharding transaction handler registry.
*
* @return sharding transaction handler registry
*/
public
static
ShardingTransactionHandlerRegistry
getInstance
()
{
return
INSTANCE
;
}
/**
* Get transaction handler by type.
*
...
...
sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/adapter/AbstractConnectionAdapter.java
浏览文件 @
e55573aa
...
...
@@ -84,7 +84,7 @@ public abstract class AbstractConnectionAdapter extends AbstractUnsupportedOpera
rootInvokeHook
.
start
();
this
.
transactionType
=
transactionType
;
shardingTransactionHandler
=
ShardingTransactionHandlerRegistry
.
getInstance
().
getHandler
(
transactionType
);
if
(
transactionType
!=
TransactionType
.
LOCAL
)
{
if
(
TransactionType
.
LOCAL
!=
transactionType
)
{
Preconditions
.
checkNotNull
(
shardingTransactionHandler
,
String
.
format
(
"Cannot find transaction manager of [%s]"
,
transactionType
));
}
}
...
...
sharding-jdbc/sharding-jdbc-core/src/main/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSource.java
浏览文件 @
e55573aa
...
...
@@ -69,7 +69,7 @@ public class ShardingDataSource extends AbstractDataSourceAdapter {
@Override
public
final
ShardingConnection
getConnection
()
{
if
(
TransactionType
.
XA
==
TransactionTypeHolder
.
get
())
{
if
(
null
!=
getXaDataSourceMap
()
&&
getXaDataSourceMap
().
isEmpty
())
{
if
(
null
!=
getXaDataSourceMap
()
&&
!
getXaDataSourceMap
().
isEmpty
())
{
return
new
ShardingConnection
(
getXaDataSourceMap
(),
shardingContext
,
TransactionType
.
XA
);
}
log
.
warn
(
"XA transaction resource have not load, using Local transaction instead!"
);
...
...
sharding-jdbc/sharding-jdbc-core/src/test/java/io/shardingsphere/shardingjdbc/jdbc/core/datasource/ShardingDataSourceTest.java
浏览文件 @
e55573aa
...
...
@@ -179,7 +179,6 @@ public final class ShardingDataSourceTest {
assertThat
(
shardingConnection
.
getDataSourceMap
().
size
(),
is
(
1
));
assertThat
(
shardingConnection
.
getTransactionType
(),
is
(
TransactionType
.
XA
));
assertThat
(
shardingConnection
.
getShardingTransactionHandler
(),
instanceOf
(
FixedXAShardingTransactionHandler
.
class
));
TransactionTypeHolder
.
set
(
TransactionType
.
LOCAL
);
shardingConnection
=
shardingDataSource
.
getConnection
();
assertThat
(
shardingConnection
.
getConnection
(
"ds"
),
is
(
dataSource
.
getConnection
()));
...
...
sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/backend/sctl/ShardingCTLSetBackendHandler.java
浏览文件 @
e55573aa
...
...
@@ -49,7 +49,7 @@ public final class ShardingCTLSetBackendHandler extends AbstractBackendHandler {
}
switch
(
shardingTCLStatement
.
get
().
getKey
())
{
case
"TRANSACTION_TYPE"
:
backendConnection
.
setTransactionType
(
TransactionType
.
find
(
shardingTCLStatement
.
get
().
getValue
()));
backendConnection
.
setTransactionType
(
TransactionType
.
valueOf
(
shardingTCLStatement
.
get
().
getValue
()));
break
;
default
:
return
new
CommandResponsePackets
(
new
ErrPacket
(
String
.
format
(
" could not support this sctl grammar [%s]."
,
sql
)));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录