This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 395c1b96cae Format code (#28097)
395c1b96cae is described below
commit 395c1b96cae2f2dba15cb5e7d746a976ab5aa868
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 15 20:26:27 2023 +0800
Format code (#28097)
* For code format
* For code format
---
.../conf/import/config-database-discovery.yaml | 67 ----------------------
.../src/main/resources/conf/config-sharding.yaml | 4 +-
2 files changed, 2 insertions(+), 69 deletions(-)
diff --git
a/proxy/backend/core/src/test/resources/conf/import/config-database-discovery.yaml
b/proxy/backend/core/src/test/resources/conf/import/config-database-discovery.yaml
deleted file mode 100644
index 1c0857a645d..00000000000
---
a/proxy/backend/core/src/test/resources/conf/import/config-database-discovery.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# 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.
-#
-
-databaseName: database_discovery_db
-
-dataSources:
- ds_0:
- url:
jdbc:mysql://127.0.0.1:3306/demo_primary_ds?serverTimezone=UTC&useSSL=false
- username: root
- password:
- connectionTimeoutMilliseconds: 3000
- idleTimeoutMilliseconds: 60000
- maxLifetimeMilliseconds: 1800000
- maxPoolSize: 50
- minPoolSize: 1
- ds_1:
- url:
jdbc:mysql://127.0.0.1:3306/demo_replica_ds_0?serverTimezone=UTC&useSSL=false
- username: root
- password:
- connectionTimeoutMilliseconds: 3000
- idleTimeoutMilliseconds: 60000
- maxLifetimeMilliseconds: 1800000
- maxPoolSize: 50
- minPoolSize: 1
- ds_2:
- url:
jdbc:mysql://127.0.0.1:3306/demo_replica_ds_1?serverTimezone=UTC&useSSL=false
- username: root
- password:
- connectionTimeoutMilliseconds: 3000
- idleTimeoutMilliseconds: 60000
- maxLifetimeMilliseconds: 1800000
- maxPoolSize: 50
- minPoolSize: 1
-
-rules:
-- !DB_DISCOVERY
- dataSources:
- readwrite_ds:
- dataSourceNames:
- - ds_0
- - ds_1
- - ds_2
- discoveryHeartbeatName: mgr-heartbeat
- discoveryTypeName: mgr
- discoveryHeartbeats:
- mgr-heartbeat:
- props:
- keep-alive-cron: '0/5 * * * * ?'
- discoveryTypes:
- mgr:
- type: MySQL.MGR
- props:
- group-name: 92504d5b-6dec-11e8-91ea-246e9612aaf1
diff --git a/proxy/bootstrap/src/main/resources/conf/config-sharding.yaml
b/proxy/bootstrap/src/main/resources/conf/config-sharding.yaml
index d6f325af70e..24285d21617 100644
--- a/proxy/bootstrap/src/main/resources/conf/config-sharding.yaml
+++ b/proxy/bootstrap/src/main/resources/conf/config-sharding.yaml
@@ -16,10 +16,10 @@
#
######################################################################################################
-#
+#
# Here you can configure the rules for the proxy.
# This example is configuration of sharding rule.
-#
+#
######################################################################################################
#
#databaseName: sharding_db
