You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2020/08/26 07:39:41 UTC

[GitHub] [shardingsphere] gzdzss opened a new pull request #7078: Refactor test case

gzdzss opened a new pull request #7078:
URL: https://github.com/apache/shardingsphere/pull/7078


   
   Fixes #7075.
   
   Changes proposed in this pull request:
   - Use YAML file instead of inline string in OrchestrationSpringBootRegistryMasterSlaveTest
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] menghaoranss merged pull request #7078: Refactor test case

Posted by GitBox <gi...@apache.org>.
menghaoranss merged pull request #7078:
URL: https://github.com/apache/shardingsphere/pull/7078


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] coveralls commented on pull request #7078: Refactor test case

Posted by GitBox <gi...@apache.org>.
coveralls commented on pull request #7078:
URL: https://github.com/apache/shardingsphere/pull/7078#issuecomment-680729970


   ## Pull Request Test Coverage Report for [Build 14141](https://coveralls.io/builds/33008295)
   
   * **0** of **0**   changed or added relevant lines in **0** files are covered.
   * No unchanged relevant lines lost coverage.
   * Overall coverage remained the same at **35.614%**
   
   ---
   
   
   
   |  Totals | [![Coverage Status](https://coveralls.io/builds/33008295/badge)](https://coveralls.io/builds/33008295) |
   | :-- | --: |
   | Change from base [Build 14138](https://coveralls.io/builds/33004779): |  0.0% |
   | Covered Lines: | 35822 |
   | Relevant Lines: | 100585 |
   
   ---
   ##### 💛  - [Coveralls](https://coveralls.io)
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] menghaoranss commented on a change in pull request #7078: Refactor test case

Posted by GitBox <gi...@apache.org>.
menghaoranss commented on a change in pull request #7078:
URL: https://github.com/apache/shardingsphere/pull/7078#discussion_r477122708



##########
File path: shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/yaml/masterslave-databases.yaml
##########
@@ -0,0 +1,38 @@
+#
+# 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.
+#
+
+ds_master: !!org.apache.shardingsphere.orchestration.core.common.yaml.config.YamlDataSourceConfiguration
+  dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
+  props:
+    url: jdbc:h2:mem:ds_master;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+    maxTotal: 16
+    password:
+    username: sa
+ds_slave_0: !!org.apache.shardingsphere.orchestration.core.common.yaml.config.YamlDataSourceConfiguration
+  dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
+  props:
+    url: jdbc:h2:mem:demo_ds_slave_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+    maxTotal: 16
+    password:
+    username: sa
+ds_slave_1: !!org.apache.shardingsphere.orchestration.core.common.yaml.config.YamlDataSourceConfiguration
+  dataSourceClassName: org.apache.commons.dbcp2.BasicDataSource
+  props:
+    url: jdbc:h2:mem:demo_ds_slave_1;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
+    maxTotal: 16
+    password:
+    username: sa

Review comment:
       Please keep an empty line at end of file.

##########
File path: shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-orchestration-spring/shardingsphere-jdbc-orchestration-spring-boot-starter/src/test/resources/yaml/masterslave-rule.yaml
##########
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+
+rules:
+  - !MASTER_SLAVE
+    loadBalancers:
+      roundRobin:
+        type: ROUND_ROBIN
+    dataSources:
+      ds_ms:
+        loadBalancerName: roundRobin
+        masterDataSourceName: ds_master
+        name: ds_ms
+        slaveDataSourceNames:
+          - ds_slave_0
+          - ds_slave_1

Review comment:
       Please keep an empty line at end of file.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org