fix test case

Author: beckhampu

sharding-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java

@@ -168,18 +168,20 @@ public final void close() throws SQLException {
             @Override
             public void execute(final Map.Entry<String, Connection> cachedConnectionsEntrySet) throws SQLException {
                 Connection connection = cachedConnectionsEntrySet.getValue();
-                ConnectionCloseEvent event = new ConnectionCloseEvent(cachedConnectionsEntrySet.getKey(), connection.getMetaData().getURL());
-                ShardingEventBusInstance.getInstance().post(event);
-                try {
-                    connection.close();
-                    event.setExecuteSuccess();
-                    // CHECKSTYLE:OFF
-                } catch (final Exception ex) {
-                    // CHECKSTYLE:ON
-                    event.setExecuteFailure(ex);
-                    throw ex;
-                } finally {
+                if (!connection.isClosed()) {
+                    ConnectionCloseEvent event = new ConnectionCloseEvent(cachedConnectionsEntrySet.getKey(), connection.getMetaData().getURL());
                     ShardingEventBusInstance.getInstance().post(event);
+                    try {
+                        connection.close();
+                        event.setExecuteSuccess();
+                        // CHECKSTYLE:OFF
+                    } catch (final Exception ex) {
+                        // CHECKSTYLE:ON
+                        event.setExecuteFailure(ex);
+                        throw ex;
+                    } finally {
+                        ShardingEventBusInstance.getInstance().post(event);
+                    }
                 }
             }
         });

sharding-opentracing/src/test/java/io/shardingsphere/opentracing/listener/ExecuteEventListenerTest.java

@@ -32,6 +32,7 @@
 import org.junit.Test;
 
 import java.sql.Connection;
+import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -48,6 +49,8 @@
 
 public final class ExecuteEventListenerTest extends BaseEventListenerTest {
 
+    private static final String HOST_URL = "jdbc:mysql://127.0.0.1:3306/ds_0";
+    
     private ShardingExecuteEngine executeEngine = new ShardingExecuteEngine(5);
 
     private final SQLExecuteTemplate sqlExecuteTemplate = new SQLExecuteTemplate(executeEngine);
@@ -61,6 +64,8 @@ public void tearDown() {
     public void assertSingleStatement() throws SQLException {
         Statement statement = mock(Statement.class);
         when(statement.getConnection()).thenReturn(mock(Connection.class));
+        when(statement.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(statement.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
         final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         SQLExecuteCallback<Integer> executeCallback = new SQLExecuteCallback<Integer>(SQLType.DML, isExceptionThrown, dataMap) {
@@ -80,9 +85,13 @@ public void assertMultiStatement() throws SQLException {
         List<StatementExecuteUnit> statementExecuteUnits = new ArrayList<>(2);
         Statement stm1 = mock(Statement.class);
         when(stm1.getConnection()).thenReturn(mock(Connection.class));
+        when(stm1.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(stm1.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         statementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit("insert into ...", Collections.singletonList(Collections.<Object>singletonList(1)))), stm1));
         Statement stm2 = mock(Statement.class);
         when(stm2.getConnection()).thenReturn(mock(Connection.class));
+        when(stm2.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(stm2.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         statementExecuteUnits.add(new StatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit("insert into ...", Collections.singletonList(Collections.<Object>singletonList(1)))), stm2));
         final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
         final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
@@ -103,9 +112,13 @@ public void assertBatchPreparedStatement() throws SQLException {
         List<List<Object>> parameterSets = Arrays.asList(Arrays.<Object>asList(1, 2), Arrays.<Object>asList(3, 4));
         PreparedStatement preparedStatement1 = mock(PreparedStatement.class);
         when(preparedStatement1.getConnection()).thenReturn(mock(Connection.class));
+        when(preparedStatement1.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(preparedStatement1.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         batchPreparedStatementExecuteUnits.add(new BatchPreparedStatementExecuteUnit(new RouteUnit("ds_0", new SQLUnit("insert into ...", parameterSets)), preparedStatement1));
         PreparedStatement preparedStatement2 = mock(PreparedStatement.class);
         when(preparedStatement2.getConnection()).thenReturn(mock(Connection.class));
+        when(preparedStatement2.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(preparedStatement2.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         batchPreparedStatementExecuteUnits.add(new BatchPreparedStatementExecuteUnit(new RouteUnit("ds_1", new SQLUnit("insert into ...", parameterSets)), preparedStatement2));
         final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
         final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
@@ -124,6 +137,8 @@ protected Integer executeSQL(final SQLExecuteUnit sqlExecuteUnit) {
     public void assertSQLException() throws SQLException {
         Statement statement = mock(Statement.class);
         when(statement.getConnection()).thenReturn(mock(Connection.class));
+        when(statement.getConnection().getMetaData()).thenReturn(mock(DatabaseMetaData.class));
+        when(statement.getConnection().getMetaData().getURL()).thenReturn(HOST_URL);
         final boolean isExceptionThrown = ExecutorExceptionHandler.isExceptionThrown();
         final Map<String, Object> dataMap = ExecutorDataMap.getDataMap();
         SQLExecuteCallback<Integer> executeCallback = new SQLExecuteCallback<Integer>(SQLType.DQL, isExceptionThrown, dataMap) {

sharding-proxy/src/main/resources/conf/config_master_slave.yaml

@@ -3,7 +3,7 @@
 #
 # We provide two kinds of configurations for example. This one is the configuration of Master slave rule,
 # If you only want to use master-slave, please refer to this one, and if you want to use Sharding,
-# please refer to the config.yaml.
+# please refer to the config-sharding_db.yaml.
 #
 ##################      ##################
 
@@ -36,24 +36,4 @@
 #  masterDataSourceName: ds_0
 #  slaveDataSourceNames:
 #    - ds_1
-#  props:
-#    # MEMORY_STRICTLY: Proxy holds as many connections as the count of actual tables routed in a database.
-#    #                  The benefit of this approach is saving memory for Proxy by Stream ResultSet.
-#    # CONNECTION_STRICTLY: Proxy will release connections after get the overall rows from the ResultSet.
-#    #                      Meanwhile, the cost of the memory will be increased.
-#    connection.mode: MEMORY_STRICTLY
-#    acceptor.size: 16  # The default value is available processors count * 2.
-#    executor.size: 16  # Infinite by default.
-#    sql.show: false
 
-#orchestration:
-#  name: orchestration_ds
-#  type: SHARDING
-#  overwrite: true
-#  zookeeper:
-#    namespace: orchestration
-#    serverLists: localhost:2181
-
-#proxyAuthority:
-#  username: root
-#  password: root