Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
aa1502f7
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,发现更多精彩内容 >>
未验证
提交
aa1502f7
编写于
8月 22, 2020
作者:
H
Haoran Meng
提交者:
GitHub
8月 22, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6999 from terrymanu/dev
Add test cases for shardingsphere-proxy-bootstrap module
上级
3e0332bb
a4020152
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
273 addition
and
10 deletion
+273
-10
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/db/DatabaseServerInfo.java
...rg/apache/shardingsphere/proxy/db/DatabaseServerInfo.java
+1
-1
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationBootstrap.java
...ingsphere/proxy/orchestration/OrchestrationBootstrap.java
+10
-9
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/db/DatabaseServerInfoTest.java
...pache/shardingsphere/proxy/db/DatabaseServerInfoTest.java
+57
-0
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRule.java
.../org/apache/shardingsphere/proxy/fixture/FixtureRule.java
+21
-0
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationBootstrapTest.java
...phere/proxy/orchestration/OrchestrationBootstrapTest.java
+68
-0
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml
...xy-bootstrap/src/test/resources/conf/local/config-db.yaml
+52
-0
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
...proxy-bootstrap/src/test/resources/conf/local/server.yaml
+36
-0
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
...-bootstrap/src/test/resources/conf/reg_center/server.yaml
+28
-0
未找到文件。
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/db/DatabaseServerInfo.java
浏览文件 @
aa1502f7
...
...
@@ -47,6 +47,6 @@ public final class DatabaseServerInfo {
@Override
public
String
toString
()
{
return
String
.
format
(
"
d
atabase name is `%s`, version is `%s`"
,
databaseName
,
databaseVersion
);
return
String
.
format
(
"
D
atabase name is `%s`, version is `%s`"
,
databaseName
,
databaseVersion
);
}
}
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationBootstrap.java
浏览文件 @
aa1502f7
...
...
@@ -82,7 +82,7 @@ public final class OrchestrationBootstrap {
}
private
Map
<
String
,
Map
<
String
,
DataSourceConfiguration
>>
getDataSourceConfigurationMap
(
final
Map
<
String
,
YamlProxyRuleConfiguration
>
ruleConfigs
)
{
Map
<
String
,
Map
<
String
,
DataSourceConfiguration
>>
result
=
new
LinkedHashMap
<>();
Map
<
String
,
Map
<
String
,
DataSourceConfiguration
>>
result
=
new
LinkedHashMap
<>(
ruleConfigs
.
size
(),
1
);
for
(
Entry
<
String
,
YamlProxyRuleConfiguration
>
entry
:
ruleConfigs
.
entrySet
())
{
result
.
put
(
entry
.
getKey
(),
DataSourceConverter
.
getDataSourceConfigurationMap
(
DataSourceConverter
.
getDataSourceParameterMap2
(
entry
.
getValue
().
getDataSources
())));
}
...
...
@@ -95,8 +95,9 @@ public final class OrchestrationBootstrap {
}
private
ProxyConfiguration
loadProxyConfiguration
()
{
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
schemaDataSources
=
loadDataSourceParametersMap
();
Map
<
String
,
Collection
<
RuleConfiguration
>>
schemaRules
=
loadSchemaRules
();
Collection
<
String
>
schemaNames
=
orchestrationFacade
.
getConfigCenter
().
getAllSchemaNames
();
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
schemaDataSources
=
loadDataSourceParametersMap
(
schemaNames
);
Map
<
String
,
Collection
<
RuleConfiguration
>>
schemaRules
=
loadSchemaRules
(
schemaNames
);
Authentication
authentication
=
orchestrationFacade
.
getConfigCenter
().
loadAuthentication
();
ClusterConfiguration
clusterConfig
=
orchestrationFacade
.
getConfigCenter
().
loadClusterConfiguration
();
MetricsConfiguration
metricsConfig
=
orchestrationFacade
.
getConfigCenter
().
loadMetricsConfiguration
();
...
...
@@ -104,17 +105,17 @@ public final class OrchestrationBootstrap {
return
new
ProxyConfiguration
(
schemaDataSources
,
schemaRules
,
authentication
,
clusterConfig
,
metricsConfig
,
props
);
}
private
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
loadDataSourceParametersMap
()
{
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
result
=
new
LinkedHashMap
<>();
for
(
String
each
:
orchestrationFacade
.
getConfigCenter
().
getAllSchemaNames
()
)
{
private
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
loadDataSourceParametersMap
(
final
Collection
<
String
>
schemaNames
)
{
Map
<
String
,
Map
<
String
,
DataSourceParameter
>>
result
=
new
LinkedHashMap
<>(
schemaNames
.
size
(),
1
);
for
(
String
each
:
schemaNames
)
{
result
.
put
(
each
,
DataSourceConverter
.
getDataSourceParameterMap
(
orchestrationFacade
.
getConfigCenter
().
loadDataSourceConfigurations
(
each
)));
}
return
result
;
}
private
Map
<
String
,
Collection
<
RuleConfiguration
>>
loadSchemaRules
()
{
Map
<
String
,
Collection
<
RuleConfiguration
>>
result
=
new
LinkedHashMap
<>();
for
(
String
each
:
orchestrationFacade
.
getConfigCenter
().
getAllSchemaNames
()
)
{
private
Map
<
String
,
Collection
<
RuleConfiguration
>>
loadSchemaRules
(
final
Collection
<
String
>
schemaNames
)
{
Map
<
String
,
Collection
<
RuleConfiguration
>>
result
=
new
LinkedHashMap
<>(
schemaNames
.
size
(),
1
);
for
(
String
each
:
schemaNames
)
{
result
.
put
(
each
,
orchestrationFacade
.
getConfigCenter
().
loadRuleConfigurations
(
each
));
}
return
result
;
...
...
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/db/DatabaseServerInfoTest.java
0 → 100644
浏览文件 @
aa1502f7
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.shardingsphere.proxy.db
;
import
org.apache.shardingsphere.infra.exception.ShardingSphereException
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Answers
;
import
org.mockito.Mock
;
import
org.mockito.junit.MockitoJUnitRunner
;
import
javax.sql.DataSource
;
import
java.sql.DatabaseMetaData
;
import
java.sql.SQLException
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
junit
.
Assert
.
assertThat
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
@RunWith
(
MockitoJUnitRunner
.
class
)
public
final
class
DatabaseServerInfoTest
{
@Mock
(
answer
=
Answers
.
RETURNS_DEEP_STUBS
)
private
DataSource
dataSource
;
@SuppressWarnings
(
"ResultOfObjectAllocationIgnored"
)
@Test
(
expected
=
ShardingSphereException
.
class
)
public
void
assertNewInstanceFailure
()
throws
SQLException
{
when
(
dataSource
.
getConnection
()).
thenThrow
(
SQLException
.
class
);
new
DatabaseServerInfo
(
dataSource
);
}
@Test
public
void
assertToString
()
throws
SQLException
{
DatabaseMetaData
databaseMetaData
=
mock
(
DatabaseMetaData
.
class
);
when
(
databaseMetaData
.
getDatabaseProductName
()).
thenReturn
(
"fixtureDB"
);
when
(
databaseMetaData
.
getDatabaseProductVersion
()).
thenReturn
(
"1.0.0"
);
when
(
dataSource
.
getConnection
().
getMetaData
()).
thenReturn
(
databaseMetaData
);
assertThat
(
new
DatabaseServerInfo
(
dataSource
).
toString
(),
is
(
"Database name is `fixtureDB`, version is `1.0.0`"
));
}
}
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/FixtureRule.java
0 → 100644
浏览文件 @
aa1502f7
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.shardingsphere.proxy.fixture
;
public
final
class
FixtureRule
{
}
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/orchestration/OrchestrationBootstrapTest.java
0 → 100644
浏览文件 @
aa1502f7
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.shardingsphere.proxy.orchestration
;
import
com.zaxxer.hikari.HikariDataSource
;
import
org.apache.shardingsphere.infra.config.DataSourceConfiguration
;
import
org.apache.shardingsphere.orchestration.core.facade.OrchestrationFacade
;
import
org.apache.shardingsphere.proxy.config.ProxyConfiguration
;
import
org.apache.shardingsphere.proxy.config.ProxyConfigurationLoader
;
import
org.apache.shardingsphere.proxy.config.YamlProxyConfiguration
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Answers
;
import
org.mockito.Mock
;
import
org.mockito.junit.MockitoJUnitRunner
;
import
java.io.IOException
;
import
java.util.Collections
;
import
static
org
.
mockito
.
Mockito
.
when
;
@RunWith
(
MockitoJUnitRunner
.
class
)
public
final
class
OrchestrationBootstrapTest
{
@Mock
(
answer
=
Answers
.
RETURNS_DEEP_STUBS
)
private
OrchestrationFacade
orchestrationFacade
;
private
OrchestrationBootstrap
orchestrationBootstrap
;
@Before
public
void
setUp
()
{
orchestrationBootstrap
=
new
OrchestrationBootstrap
(
orchestrationFacade
);
when
(
orchestrationFacade
.
getConfigCenter
().
getAllSchemaNames
()).
thenReturn
(
Collections
.
singletonList
(
"db"
));
when
(
orchestrationFacade
.
getConfigCenter
().
loadDataSourceConfigurations
(
"db"
)).
thenReturn
(
Collections
.
singletonMap
(
"db"
,
new
DataSourceConfiguration
(
HikariDataSource
.
class
.
getName
())));
}
@Test
public
void
assertInitFromRegistryCenter
()
throws
IOException
{
YamlProxyConfiguration
yamlProxyConfig
=
ProxyConfigurationLoader
.
load
(
"/conf/reg_center/"
);
assertProxyConfiguration
(
orchestrationBootstrap
.
init
(
new
YamlProxyConfiguration
(
yamlProxyConfig
.
getServerConfiguration
(),
yamlProxyConfig
.
getRuleConfigurations
())));
}
@Test
public
void
assertInitFromLocalConfiguration
()
throws
IOException
{
YamlProxyConfiguration
yamlProxyConfig
=
ProxyConfigurationLoader
.
load
(
"/conf/local"
);
assertProxyConfiguration
(
orchestrationBootstrap
.
init
(
new
YamlProxyConfiguration
(
yamlProxyConfig
.
getServerConfiguration
(),
yamlProxyConfig
.
getRuleConfigurations
())));
}
private
void
assertProxyConfiguration
(
final
ProxyConfiguration
actual
)
{
// TODO
}
}
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/config-db.yaml
0 → 100644
浏览文件 @
aa1502f7
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
schemaName
:
db
dataSources
:
ds_0
:
url
:
jdbc:fixturedb:xxx
username
:
root
password
:
pwd
ds_1
:
url
:
jdbc:fixturedb:xxx
username
:
root
password
:
pwd
rules
:
-
!SHARDING
tables
:
t_order
:
actualDataNodes
:
ds_${0..1}.t_order_${0..1}
tableStrategy
:
standard
:
shardingColumn
:
order_id
shardingAlgorithmName
:
t_order_inline
databaseStrategy
:
standard
:
shardingColumn
:
user_id
shardingAlgorithmName
:
database_inline
shardingAlgorithms
:
database_inline
:
type
:
INLINE
props
:
algorithm.expression
:
ds_${user_id % 2}
t_order_inline
:
type
:
INLINE
props
:
algorithm.expression
:
t_order_${order_id % 2}
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/local/server.yaml
0 → 100644
浏览文件 @
aa1502f7
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
orchestration
:
name
:
orchestration_ds
registryCenter
:
type
:
ZooKeeper
serverLists
:
localhost:2181
props
:
retryIntervalMilliseconds
:
500
timeToLiveSeconds
:
60
maxRetries
:
3
operationTimeoutMilliseconds
:
500
overwrite
:
false
authentication
:
users
:
root
:
password
:
root
sharding
:
password
:
sharding
authorizedSchemas
:
sharding_db
shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/resources/conf/reg_center/server.yaml
0 → 100644
浏览文件 @
aa1502f7
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
orchestration
:
name
:
orchestration_ds
registryCenter
:
type
:
ZooKeeper
serverLists
:
localhost:2181
props
:
retryIntervalMilliseconds
:
500
timeToLiveSeconds
:
60
maxRetries
:
3
operationTimeoutMilliseconds
:
500
overwrite
:
false
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录