Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
53c5d5cb
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 搜索 >>
提交
53c5d5cb
编写于
8月 30, 2017
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor AbstractDataSourceAdapter
上级
5c61f05e
变更
22
隐藏空白更改
内联
并排
Showing
22 changed file
with
55 addition
and
44 deletion
+55
-44
sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/datasource/SpringShardingDataSource.java
.../sharding/spring/datasource/SpringShardingDataSource.java
+2
-1
sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/main/java/com/dangdang/ddframe/rdb/sharding/config/yaml/api/YamlShardingDataSource.java
.../rdb/sharding/config/yaml/api/YamlShardingDataSource.java
+4
-3
sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/YamlShardingDataSourceTest.java
.../rdb/sharding/config/yaml/YamlShardingDataSourceTest.java
+8
-7
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/MasterSlaveDataSourceFactory.java
...dframe/rdb/sharding/api/MasterSlaveDataSourceFactory.java
+3
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/ShardingDataSourceFactory.java
...g/ddframe/rdb/sharding/api/ShardingDataSourceFactory.java
+5
-2
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractDataSourceAdapter.java
.../rdb/sharding/jdbc/adapter/AbstractDataSourceAdapter.java
+2
-6
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/MasterSlaveDataSource.java
.../sharding/jdbc/core/datasource/MasterSlaveDataSource.java
+1
-1
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/ShardingDataSource.java
...rdb/sharding/jdbc/core/datasource/ShardingDataSource.java
+2
-2
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/base/AbstractSQLAssertTest.java
...ngdang/ddframe/rdb/common/base/AbstractSQLAssertTest.java
+4
-4
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/base/AbstractShardingJDBCDatabaseAndTableTest.java
...common/base/AbstractShardingJDBCDatabaseAndTableTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/NullableShardingTableOnlyTest.java
...ame/rdb/integrate/type/NullableShardingTableOnlyTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseAndTableDynamicTest.java
...b/integrate/type/ShardingDatabaseAndTableDynamicTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseAndTableTest.java
...rame/rdb/integrate/type/ShardingDatabaseAndTableTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseOnlyTest.java
.../ddframe/rdb/integrate/type/ShardingDatabaseOnlyTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingMasterSlaveTest.java
...g/ddframe/rdb/integrate/type/ShardingMasterSlaveTest.java
+2
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingTableOnlyTest.java
...ang/ddframe/rdb/integrate/type/ShardingTableOnlyTest.java
+5
-4
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/hint/base/AbstractHintTest.java
...dframe/rdb/integrate/type/hint/base/AbstractHintTest.java
+1
-1
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/ShardingDataSourceTest.java
...sharding/jdbc/core/datasource/ShardingDataSourceTest.java
+1
-1
sharding-jdbc-example/sharding-jdbc-example-jdbc-masterslave/src/main/java/com/dangdang/ddframe/rdb/sharding/example/jdbc/masterslave/Main.java
...g/ddframe/rdb/sharding/example/jdbc/masterslave/Main.java
+2
-2
sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/src/main/java/com/dangdang/ddframe/rdb/sharding/example/transaction/Main.java
...ngdang/ddframe/rdb/sharding/example/transaction/Main.java
+1
-1
sharding-jdbc-example/sharding-jdbc-example-jdbc/src/main/java/com/dangdang/ddframe/rdb/sharding/example/jdbc/Main.java
.../com/dangdang/ddframe/rdb/sharding/example/jdbc/Main.java
+1
-1
sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/com/dangdang/ddframe/rdb/transaction/soft/base/AbstractSoftTransactionIntegrationTest.java
...ion/soft/base/AbstractSoftTransactionIntegrationTest.java
+1
-1
未找到文件。
sharding-jdbc-config-parent/sharding-jdbc-config-spring/src/main/java/com/dangdang/ddframe/rdb/sharding/spring/datasource/SpringShardingDataSource.java
浏览文件 @
53c5d5cb
...
...
@@ -21,6 +21,7 @@ import com.dangdang.ddframe.rdb.sharding.config.common.api.ShardingRuleBuilder;
import
com.dangdang.ddframe.rdb.sharding.config.common.api.config.ShardingRuleConfig
;
import
com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSource
;
import
java.sql.SQLException
;
import
java.util.Properties
;
/**
...
...
@@ -30,7 +31,7 @@ import java.util.Properties;
*/
public
class
SpringShardingDataSource
extends
ShardingDataSource
{
public
SpringShardingDataSource
(
final
ShardingRuleConfig
shardingRuleConfig
,
final
Properties
props
)
{
public
SpringShardingDataSource
(
final
ShardingRuleConfig
shardingRuleConfig
,
final
Properties
props
)
throws
SQLException
{
super
(
new
ShardingRuleBuilder
(
shardingRuleConfig
).
build
(),
props
);
}
}
sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/main/java/com/dangdang/ddframe/rdb/sharding/config/yaml/api/YamlShardingDataSource.java
浏览文件 @
53c5d5cb
...
...
@@ -29,6 +29,7 @@ import java.io.File;
import
java.io.FileInputStream
;
import
java.io.IOException
;
import
java.io.InputStreamReader
;
import
java.sql.SQLException
;
import
java.util.Map
;
/**
...
...
@@ -38,15 +39,15 @@ import java.util.Map;
*/
public
class
YamlShardingDataSource
extends
ShardingDataSource
{
public
YamlShardingDataSource
(
final
File
yamlFile
)
throws
IOException
{
public
YamlShardingDataSource
(
final
File
yamlFile
)
throws
IOException
,
SQLException
{
super
(
new
ShardingRuleBuilder
(
yamlFile
.
getName
(),
unmarshal
(
yamlFile
)).
build
(),
unmarshal
(
yamlFile
).
getProps
());
}
public
YamlShardingDataSource
(
final
Map
<
String
,
DataSource
>
dataSource
,
final
File
yamlFile
)
throws
IOException
{
public
YamlShardingDataSource
(
final
Map
<
String
,
DataSource
>
dataSource
,
final
File
yamlFile
)
throws
IOException
,
SQLException
{
super
(
new
ShardingRuleBuilder
(
yamlFile
.
getName
(),
dataSource
,
unmarshal
(
yamlFile
)).
build
(),
unmarshal
(
yamlFile
).
getProps
());
}
public
YamlShardingDataSource
(
final
String
logRoot
,
final
byte
[]
yamlByteArray
)
throws
IOException
{
public
YamlShardingDataSource
(
final
String
logRoot
,
final
byte
[]
yamlByteArray
)
throws
IOException
,
SQLException
{
super
(
new
ShardingRuleBuilder
(
logRoot
,
unmarshal
(
yamlByteArray
)).
build
(),
unmarshal
(
yamlByteArray
).
getProps
());
}
...
...
sharding-jdbc-config-parent/sharding-jdbc-config-yaml/src/test/java/com/dangdang/ddframe/rdb/sharding/config/yaml/YamlShardingDataSourceTest.java
浏览文件 @
53c5d5cb
...
...
@@ -33,6 +33,7 @@ import java.io.File;
import
java.io.IOException
;
import
java.lang.reflect.Field
;
import
java.net.URISyntaxException
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.Map
;
...
...
@@ -47,7 +48,7 @@ import static org.junit.Assert.fail;
public
class
YamlShardingDataSourceTest
{
@Test
public
void
assertAll
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
{
public
void
assertAll
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
,
SQLException
{
ShardingRule
shardingRule
=
getShardingRule
(
"/config/config-all.yaml"
);
assertThat
(
shardingRule
.
getTableRules
().
size
(),
is
(
3
));
assertThat
(
shardingRule
.
getBindingTableRules
().
size
(),
is
(
1
));
...
...
@@ -56,7 +57,7 @@ public class YamlShardingDataSourceTest {
}
@Test
public
void
assertMin
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntax
Exception
{
public
void
assertMin
()
throws
IOException
,
ReflectiveOperationException
,
URISyntaxException
,
SQL
Exception
{
Map
<
String
,
DataSource
>
dataSourceMap
=
new
HashMap
<>(
1
);
dataSourceMap
.
put
(
"ds"
,
createDataSource
());
ShardingRule
shardingRule
=
getShardingRule
(
dataSourceMap
,
"/config/config-min.yaml"
);
...
...
@@ -64,7 +65,7 @@ public class YamlShardingDataSourceTest {
}
@Test
public
void
assertDynamic
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntax
Exception
{
public
void
assertDynamic
()
throws
IOException
,
ReflectiveOperationException
,
URISyntaxException
,
SQL
Exception
{
Map
<
String
,
DataSource
>
dataSourceMap
=
new
HashMap
<>(
1
);
dataSourceMap
.
put
(
"ds"
,
createDataSource
());
ShardingRule
shardingRule
=
getShardingRule
(
dataSourceMap
,
"/config/config-dynamic.yaml"
);
...
...
@@ -91,12 +92,12 @@ public class YamlShardingDataSourceTest {
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
assertClassNotFound
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
{
public
void
assertClassNotFound
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
,
SQLException
{
getShardingRule
(
"/config/config-classNotFound.yaml"
);
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
public
void
assertBindingError
()
throws
IOException
,
NoSuchFieldException
,
IllegalAccessException
,
URISyntax
Exception
{
public
void
assertBindingError
()
throws
IOException
,
ReflectiveOperationException
,
URISyntaxException
,
SQL
Exception
{
Map
<
String
,
DataSource
>
dataSourceMap
=
new
HashMap
<>(
1
);
dataSourceMap
.
put
(
"ds"
,
createDataSource
());
ShardingRule
shardingRule
=
getShardingRule
(
dataSourceMap
,
"/config/config-bindingError.yaml"
);
...
...
@@ -105,11 +106,11 @@ public class YamlShardingDataSourceTest {
}
}
private
ShardingRule
getShardingRule
(
final
String
fileName
)
throws
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
,
IOException
{
private
ShardingRule
getShardingRule
(
final
String
fileName
)
throws
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
,
IOException
,
SQLException
{
return
getShardingRule
(
new
YamlShardingDataSource
(
new
File
(
getClass
().
getResource
(
fileName
).
toURI
())));
}
private
ShardingRule
getShardingRule
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
String
fileName
)
throws
NoSuchFieldException
,
IllegalAccessException
,
URISyntaxException
,
IO
Exception
{
private
ShardingRule
getShardingRule
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
String
fileName
)
throws
ReflectiveOperationException
,
URISyntaxException
,
IOException
,
SQL
Exception
{
return
getShardingRule
(
new
YamlShardingDataSource
(
dataSourceMap
,
new
File
(
getClass
().
getResource
(
fileName
).
toURI
())));
}
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/MasterSlaveDataSourceFactory.java
浏览文件 @
53c5d5cb
...
...
@@ -23,6 +23,7 @@ import lombok.AccessLevel;
import
lombok.NoArgsConstructor
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
/**
* Master-slave data source factory.
...
...
@@ -42,8 +43,9 @@ public final class MasterSlaveDataSourceFactory {
* @param slaveDataSource data source for slave
* @param otherSlaveDataSources other data sources for slave
* @return master-slave data source
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
String
name
,
final
DataSource
masterDataSource
,
final
DataSource
slaveDataSource
,
final
DataSource
...
otherSlaveDataSources
)
{
public
static
DataSource
createDataSource
(
final
String
name
,
final
DataSource
masterDataSource
,
final
DataSource
slaveDataSource
,
final
DataSource
...
otherSlaveDataSources
)
throws
SQLException
{
return
new
MasterSlaveDataSource
(
name
,
masterDataSource
,
Lists
.
asList
(
slaveDataSource
,
otherSlaveDataSources
));
}
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/api/ShardingDataSourceFactory.java
浏览文件 @
53c5d5cb
...
...
@@ -23,6 +23,7 @@ import lombok.AccessLevel;
import
lombok.NoArgsConstructor
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Properties
;
/**
...
...
@@ -38,8 +39,9 @@ public final class ShardingDataSourceFactory {
*
* @param shardingRule rule for databases and tables sharding
* @return sharding data source
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
ShardingRule
shardingRule
)
{
public
static
DataSource
createDataSource
(
final
ShardingRule
shardingRule
)
throws
SQLException
{
return
new
ShardingDataSource
(
shardingRule
);
}
...
...
@@ -49,8 +51,9 @@ public final class ShardingDataSourceFactory {
* @param shardingRule rule for databases and tables sharding
* @param props properties for data source
* @return sharding data source
* @throws SQLException SQL exception
*/
public
static
DataSource
createDataSource
(
final
ShardingRule
shardingRule
,
final
Properties
props
)
{
public
static
DataSource
createDataSource
(
final
ShardingRule
shardingRule
,
final
Properties
props
)
throws
SQLException
{
return
new
ShardingDataSource
(
shardingRule
,
props
);
}
}
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractDataSourceAdapter.java
浏览文件 @
53c5d5cb
...
...
@@ -17,7 +17,6 @@
package
com.dangdang.ddframe.rdb.sharding.jdbc.adapter
;
import
com.dangdang.ddframe.rdb.sharding.exception.ShardingJdbcException
;
import
com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AbstractUnsupportedOperationDataSource
;
import
com.google.common.base.Preconditions
;
import
lombok.Getter
;
...
...
@@ -42,11 +41,11 @@ public abstract class AbstractDataSourceAdapter extends AbstractUnsupportedOpera
private
PrintWriter
logWriter
=
new
PrintWriter
(
System
.
out
);
public
AbstractDataSourceAdapter
(
final
Collection
<
DataSource
>
dataSources
)
{
public
AbstractDataSourceAdapter
(
final
Collection
<
DataSource
>
dataSources
)
throws
SQLException
{
databaseProductName
=
getDatabaseProductName
(
dataSources
);
}
private
String
getDatabaseProductName
(
final
Collection
<
DataSource
>
dataSources
)
{
private
String
getDatabaseProductName
(
final
Collection
<
DataSource
>
dataSources
)
throws
SQLException
{
String
result
=
null
;
for
(
DataSource
each
:
dataSources
)
{
String
databaseProductName
;
...
...
@@ -55,9 +54,6 @@ public abstract class AbstractDataSourceAdapter extends AbstractUnsupportedOpera
}
else
{
try
(
Connection
connection
=
each
.
getConnection
())
{
databaseProductName
=
connection
.
getMetaData
().
getDatabaseProductName
();
// TODO throw
}
catch
(
final
SQLException
ex
)
{
throw
new
ShardingJdbcException
(
ex
);
}
}
Preconditions
.
checkState
(
null
==
result
||
result
.
equals
(
databaseProductName
),
String
.
format
(
"Database type inconsistent with '%s' and '%s'"
,
result
,
databaseProductName
));
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/MasterSlaveDataSource.java
浏览文件 @
53c5d5cb
...
...
@@ -58,7 +58,7 @@ public final class MasterSlaveDataSource extends AbstractDataSourceAdapter {
private
final
SlaveLoadBalanceStrategy
slaveLoadBalanceStrategy
=
new
RoundRobinSlaveLoadBalanceStrategy
();
public
MasterSlaveDataSource
(
final
String
name
,
final
DataSource
masterDataSource
,
final
List
<
DataSource
>
slaveDataSources
)
{
public
MasterSlaveDataSource
(
final
String
name
,
final
DataSource
masterDataSource
,
final
List
<
DataSource
>
slaveDataSources
)
throws
SQLException
{
super
(
getAllDataSources
(
masterDataSource
,
slaveDataSources
));
this
.
name
=
name
;
this
.
masterDataSource
=
masterDataSource
;
...
...
sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/ShardingDataSource.java
浏览文件 @
53c5d5cb
...
...
@@ -42,11 +42,11 @@ public class ShardingDataSource extends AbstractDataSourceAdapter implements Aut
private
final
ShardingContext
shardingContext
;
public
ShardingDataSource
(
final
ShardingRule
shardingRule
)
{
public
ShardingDataSource
(
final
ShardingRule
shardingRule
)
throws
SQLException
{
this
(
shardingRule
,
new
Properties
());
}
public
ShardingDataSource
(
final
ShardingRule
shardingRule
,
final
Properties
props
)
{
public
ShardingDataSource
(
final
ShardingRule
shardingRule
,
final
Properties
props
)
throws
SQLException
{
super
(
shardingRule
.
getDataSourceRule
().
getDataSources
());
shardingProperties
=
new
ShardingProperties
(
null
==
props
?
new
Properties
()
:
props
);
int
executorSize
=
shardingProperties
.
getValue
(
ShardingPropertiesConstant
.
EXECUTOR_SIZE
);
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/base/AbstractSQLAssertTest.java
浏览文件 @
53c5d5cb
...
...
@@ -85,19 +85,19 @@ public abstract class AbstractSQLAssertTest extends AbstractSQLTest {
protected
abstract
ShardingTestStrategy
getShardingStrategy
();
protected
abstract
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
();
protected
abstract
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
;
@Test
public
void
assertWithPreparedStatement
()
{
public
void
assertWithPreparedStatement
()
throws
SQLException
{
execute
(
true
);
}
@Test
public
void
assertWithStatement
()
{
public
void
assertWithStatement
()
throws
SQLException
{
execute
(
false
);
}
private
void
execute
(
final
boolean
isPreparedStatement
)
{
private
void
execute
(
final
boolean
isPreparedStatement
)
throws
SQLException
{
for
(
Map
.
Entry
<
DatabaseType
,
ShardingDataSource
>
each
:
getShardingDataSources
().
entrySet
())
{
if
(
getCurrentDatabaseType
()
==
each
.
getKey
())
{
try
{
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/common/base/AbstractShardingJDBCDatabaseAndTableTest.java
浏览文件 @
53c5d5cb
...
...
@@ -33,6 +33,7 @@ import org.junit.runner.RunWith;
import
org.junit.runners.Parameterized
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
...
...
@@ -52,7 +53,7 @@ public abstract class AbstractShardingJDBCDatabaseAndTableTest extends AbstractS
}
@Before
public
void
initShardingDataSources
()
{
public
void
initShardingDataSources
()
throws
SQLException
{
Map
<
DatabaseType
,
Map
<
String
,
DataSource
>>
dataSourceMap
=
createDataSourceMap
();
for
(
Map
.
Entry
<
DatabaseType
,
Map
<
String
,
DataSource
>>
each
:
dataSourceMap
.
entrySet
())
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
each
.
getValue
());
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/NullableShardingTableOnlyTest.java
浏览文件 @
53c5d5cb
...
...
@@ -35,6 +35,7 @@ import org.junit.AfterClass;
import
org.junit.runners.Parameterized
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
...
...
@@ -78,7 +79,7 @@ public class NullableShardingTableOnlyTest extends AbstractSQLAssertTest {
}
@Override
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseAndTableDynamicTest.java
浏览文件 @
53c5d5cb
...
...
@@ -33,6 +33,7 @@ import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSource
import
org.junit.AfterClass
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
...
...
@@ -70,7 +71,7 @@ public class ShardingDatabaseAndTableDynamicTest extends AbstractSQLAssertTest {
}
@Override
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseAndTableTest.java
浏览文件 @
53c5d5cb
...
...
@@ -33,6 +33,7 @@ import com.dangdang.ddframe.rdb.sharding.jdbc.core.datasource.ShardingDataSource
import
org.junit.AfterClass
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
...
...
@@ -70,7 +71,7 @@ public class ShardingDatabaseAndTableTest extends AbstractSQLAssertTest {
}
@Override
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingDatabaseOnlyTest.java
浏览文件 @
53c5d5cb
...
...
@@ -34,6 +34,7 @@ import com.dangdang.ddframe.rdb.sharding.keygen.fixture.IncrementKeyGenerator;
import
org.junit.AfterClass
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
...
...
@@ -71,7 +72,7 @@ public class ShardingDatabaseOnlyTest extends AbstractSQLAssertTest {
}
@Override
protected
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingMasterSlaveTest.java
浏览文件 @
53c5d5cb
...
...
@@ -36,6 +36,7 @@ import org.junit.After;
import
org.junit.AfterClass
;
import
javax.sql.DataSource
;
import
java.sql.SQLException
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.HashMap
;
...
...
@@ -83,7 +84,7 @@ public class ShardingMasterSlaveTest extends AbstractSQLAssertTest {
}
@Override
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/ShardingTableOnlyTest.java
浏览文件 @
53c5d5cb
...
...
@@ -36,6 +36,7 @@ import org.junit.Before;
import
javax.sql.DataSource
;
import
java.sql.Connection
;
import
java.sql.SQLException
;
import
java.sql.Statement
;
import
java.util.Arrays
;
import
java.util.Collections
;
...
...
@@ -62,7 +63,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest {
}
@Override
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
())
{
return
shardingDataSources
;
}
...
...
@@ -103,7 +104,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest {
}
@Before
public
void
initD
dlTables
()
{
public
void
initD
DLTables
()
throws
SQLException
{
if
(
getSql
().
startsWith
(
"ALTER"
)
||
getSql
().
startsWith
(
"TRUNCATE"
)
||
getSql
().
startsWith
(
"DROP"
))
{
if
(
getSql
().
contains
(
"TEMP"
))
{
executeSql
(
"CREATE TEMPORARY TABLE t_log(id int, status varchar(10))"
);
...
...
@@ -114,7 +115,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest {
}
@After
public
void
cleanupDdlTables
()
{
public
void
cleanupDdlTables
()
throws
SQLException
{
if
(
getSql
().
contains
(
"TEMP"
)
&&
DatabaseType
.
Oracle
!=
getCurrentDatabaseType
())
{
return
;
}
...
...
@@ -123,7 +124,7 @@ public class ShardingTableOnlyTest extends AbstractSQLAssertTest {
}
}
private
void
executeSql
(
final
String
sql
)
{
private
void
executeSql
(
final
String
sql
)
throws
SQLException
{
for
(
Map
.
Entry
<
DatabaseType
,
ShardingDataSource
>
each
:
getShardingDataSources
().
entrySet
())
{
if
(
getCurrentDatabaseType
()
==
each
.
getKey
())
{
try
(
Connection
conn
=
each
.
getValue
().
getConnection
();
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/type/hint/base/AbstractHintTest.java
浏览文件 @
53c5d5cb
...
...
@@ -68,7 +68,7 @@ public abstract class AbstractHintTest extends AbstractSQLTest {
"integrate/dataset/db/init/db_9.xml"
);
}
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
{
protected
final
Map
<
DatabaseType
,
ShardingDataSource
>
getShardingDataSources
()
throws
SQLException
{
if
(!
shardingDataSources
.
isEmpty
()
&&
!
isShutdown
)
{
return
shardingDataSources
;
}
...
...
sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/core/datasource/ShardingDataSourceTest.java
浏览文件 @
53c5d5cb
...
...
@@ -118,7 +118,7 @@ public final class ShardingDataSourceTest {
assertThat
(
createShardingDataSource
(
dataSourceMap
).
getConnection
().
getConnection
(
"ds"
,
SQLType
.
DQL
),
is
(
dataSource
.
getConnection
()));
}
private
ShardingDataSource
createShardingDataSource
(
final
Map
<
String
,
DataSource
>
dataSourceMap
)
{
private
ShardingDataSource
createShardingDataSource
(
final
Map
<
String
,
DataSource
>
dataSourceMap
)
throws
SQLException
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
dataSourceMap
);
TableRule
tableRule
=
TableRule
.
builder
(
"logicTable"
).
actualTables
(
Arrays
.
asList
(
"table_0"
,
"table_1"
,
"table_2"
)).
dataSourceRule
(
dataSourceRule
).
build
();
return
new
ShardingDataSource
(
ShardingRule
.
builder
()
...
...
sharding-jdbc-example/sharding-jdbc-example-jdbc-masterslave/src/main/java/com/dangdang/ddframe/rdb/sharding/example/jdbc/masterslave/Main.java
浏览文件 @
53c5d5cb
...
...
@@ -101,7 +101,7 @@ public final class Main {
}
}
private
static
ShardingDataSource
getShardingDataSource
()
{
private
static
ShardingDataSource
getShardingDataSource
()
throws
SQLException
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
createDataSourceMap
());
TableRule
orderTableRule
=
TableRule
.
builder
(
"t_order"
).
actualTables
(
Arrays
.
asList
(
"t_order_0"
,
"t_order_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
TableRule
orderItemTableRule
=
TableRule
.
builder
(
"t_order_item"
).
actualTables
(
Arrays
.
asList
(
"t_order_item_0"
,
"t_order_item_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
...
...
@@ -112,7 +112,7 @@ public final class Main {
return
new
ShardingDataSource
(
shardingRule
);
}
private
static
Map
<
String
,
DataSource
>
createDataSourceMap
()
{
private
static
Map
<
String
,
DataSource
>
createDataSourceMap
()
throws
SQLException
{
Map
<
String
,
DataSource
>
result
=
new
HashMap
<>(
2
);
result
.
put
(
"ds_0"
,
MasterSlaveDataSourceFactory
.
createDataSource
(
"ds_0"
,
createDataSource
(
"ds_0_master"
),
createDataSource
(
"ds_0_slave_0"
),
createDataSource
(
"ds_0_slave_1"
)));
result
.
put
(
"ds_1"
,
MasterSlaveDataSourceFactory
.
createDataSource
(
"ds_1"
,
createDataSource
(
"ds_1_master"
),
createDataSource
(
"ds_1_slave_0"
),
createDataSource
(
"ds_1_slave_1"
)));
...
...
sharding-jdbc-example/sharding-jdbc-example-jdbc-transaction/src/main/java/com/dangdang/ddframe/rdb/sharding/example/transaction/Main.java
浏览文件 @
53c5d5cb
...
...
@@ -80,7 +80,7 @@ public final class Main {
}
}
private
static
DataSource
getShardingDataSource
()
{
private
static
DataSource
getShardingDataSource
()
throws
SQLException
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
createDataSourceMap
());
TableRule
orderTableRule
=
TableRule
.
builder
(
"t_order"
).
actualTables
(
Arrays
.
asList
(
"t_order_0"
,
"t_order_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
TableRule
orderItemTableRule
=
TableRule
.
builder
(
"t_order_item"
).
actualTables
(
Arrays
.
asList
(
"t_order_item_0"
,
"t_order_item_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
...
...
sharding-jdbc-example/sharding-jdbc-example-jdbc/src/main/java/com/dangdang/ddframe/rdb/sharding/example/jdbc/Main.java
浏览文件 @
53c5d5cb
...
...
@@ -119,7 +119,7 @@ public final class Main {
}
}
private
static
ShardingDataSource
getShardingDataSource
()
{
private
static
ShardingDataSource
getShardingDataSource
()
throws
SQLException
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
createDataSourceMap
());
TableRule
orderTableRule
=
TableRule
.
builder
(
"t_order"
).
actualTables
(
Arrays
.
asList
(
"t_order_0"
,
"t_order_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
TableRule
orderItemTableRule
=
TableRule
.
builder
(
"t_order_item"
).
actualTables
(
Arrays
.
asList
(
"t_order_item_0"
,
"t_order_item_1"
)).
dataSourceRule
(
dataSourceRule
).
build
();
...
...
sharding-jdbc-transaction-parent/sharding-jdbc-transaction/src/test/java/com/dangdang/ddframe/rdb/transaction/soft/base/AbstractSoftTransactionIntegrationTest.java
浏览文件 @
53c5d5cb
...
...
@@ -47,7 +47,7 @@ public abstract class AbstractSoftTransactionIntegrationTest {
prepareEnv
();
}
private
void
prepareEnv
()
{
private
void
prepareEnv
()
throws
SQLException
{
DataSourceRule
dataSourceRule
=
new
DataSourceRule
(
createDataSourceMap
());
TableRule
tableRule
=
TableRule
.
builder
(
"transaction_test"
).
dataSourceRule
(
dataSourceRule
).
build
();
ShardingRule
shardingRule
=
ShardingRule
.
builder
().
dataSourceRule
(
dataSourceRule
).
tableRules
(
Lists
.
newArrayList
(
tableRule
)).
build
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录