Merge pull request #29 from sharding-sphere/dev

update from origin

Author: beckhampu

sharding-core/src/main/java/io/shardingsphere/core/event/merger/MergeEvent.java renamed to sharding-core/src/main/java/io/shardingsphere/core/event/connection/ConnectionCloseEvent.java

@@ -15,14 +15,22 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.merger;
+package io.shardingsphere.core.event.connection;
 
 import io.shardingsphere.core.event.ShardingEvent;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 
 /**
- * Merge event.
- * 
- * @author chenqingyang
+ * Connection close event.
+ *
+ * @author zhangyonglun
  */
-public final class MergeEvent extends ShardingEvent {
+@RequiredArgsConstructor
+@Getter
+public final class ConnectionCloseEvent extends ShardingEvent {
+    
+    private final String dataSource;
+    
+    private final String url;
 }

sharding-core/src/main/java/io/shardingsphere/core/event/connection/GetConnectionEvent.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-2018 shardingsphere.io.
+ * <p>
+ * Licensed 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.
+ * </p>
+ */
+
+package io.shardingsphere.core.event.connection;
+
+import io.shardingsphere.core.event.ShardingEvent;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Get connection event.
+ *
+ * @author zhangyonglun
+ */
+@RequiredArgsConstructor
+@Getter
+public final class GetConnectionEvent extends ShardingEvent {
+    
+    private final String dataSource;
+    
+    @Setter
+    private String url = "";
+}

sharding-core/src/main/java/io/shardingsphere/core/event/executor/sql/DMLExecutionEvent.java

@@ -29,7 +29,7 @@
  */
 public final class DMLExecutionEvent extends SQLExecutionEvent {
 
-    public DMLExecutionEvent(final RouteUnit routeUnit, final List<Object> parameters) {
-        super(routeUnit, parameters);
+    public DMLExecutionEvent(final RouteUnit routeUnit, final List<Object> parameters, final String url) {
+        super(routeUnit, parameters, url);
     }
 }

sharding-core/src/main/java/io/shardingsphere/core/event/executor/sql/DQLExecutionEvent.java

@@ -29,7 +29,7 @@
  */
 public final class DQLExecutionEvent extends SQLExecutionEvent {
 
-    public DQLExecutionEvent(final RouteUnit routeUnit, final List<Object> parameters) {
-        super(routeUnit, parameters);
+    public DQLExecutionEvent(final RouteUnit routeUnit, final List<Object> parameters, final String url) {
+        super(routeUnit, parameters, url);
     }
 }

sharding-core/src/main/java/io/shardingsphere/core/event/executor/sql/SQLExecutionEvent.java

@@ -37,4 +37,6 @@ public class SQLExecutionEvent extends ShardingEvent {
     private final RouteUnit routeUnit;
 
     private final List<Object> parameters;
+    
+    private final String url;
 }

sharding-core/src/main/java/io/shardingsphere/core/event/executor/sql/SQLExecutionEventFactory.java

@@ -26,7 +26,7 @@
 
 /**
  * SQL execution event.
- * 
+ *
  * @author gaohongtao
  * @author maxiaoguang
  */
@@ -35,19 +35,20 @@ public final class SQLExecutionEventFactory {
 
     /**
      * Create SQL execution event.
-     * 
-     * @param sqlType SQL type
+     *
+     * @param sqlType        SQL type
      * @param sqlExecuteUnit SQL execute unit
-     * @param parameters parameters
+     * @param parameters     parameters
+     * @param url            url
      * @return SQL execution event
      */
-    public static SQLExecutionEvent createEvent(final SQLType sqlType, final SQLExecuteUnit sqlExecuteUnit, final List<Object> parameters) {
+    public static SQLExecutionEvent createEvent(final SQLType sqlType, final SQLExecuteUnit sqlExecuteUnit, final List<Object> parameters, final String url) {
         if (SQLType.DQL == sqlType) {
-            return new DQLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters);
+            return new DQLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters, url);
         }
         if (SQLType.DML == sqlType) {
-            return new DMLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters);
+            return new DMLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters, url);
         }
-        return new SQLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters);
+        return new SQLExecutionEvent(sqlExecuteUnit.getRouteUnit(), parameters, url);
     }
 }

sharding-core/src/main/java/io/shardingsphere/core/event/routing/RoutingEvent.java renamed to sharding-core/src/main/java/io/shardingsphere/core/event/parsing/ParsingEvent.java

@@ -15,20 +15,20 @@
  * </p>
  */
 
-package io.shardingsphere.core.event.routing;
+package io.shardingsphere.core.event.parsing;
 
 import io.shardingsphere.core.event.ShardingEvent;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * Routing event.
+ * Parsing event.
  *
- * @author chenqingyang
+ * @author zhangyonglun
  */
 @RequiredArgsConstructor
 @Getter
-public final class RoutingEvent extends ShardingEvent {
+public final class ParsingEvent extends ShardingEvent {
 
     private final String sql;
 }

sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java

@@ -73,7 +73,7 @@ private T execute0(final SQLExecuteUnit sqlExecuteUnit) throws SQLException {
         ExecutorDataMap.setDataMap(dataMap);
         List<SQLExecutionEvent> events = new LinkedList<>();
         for (List<Object> each : sqlExecuteUnit.getRouteUnit().getSqlUnit().getParameterSets()) {
-            SQLExecutionEvent event = SQLExecutionEventFactory.createEvent(sqlType, sqlExecuteUnit, each);
+            SQLExecutionEvent event = SQLExecutionEventFactory.createEvent(sqlType, sqlExecuteUnit, each, sqlExecuteUnit.getStatement().getConnection().getMetaData().getURL());
             events.add(event);
             shardingEventBus.post(event);
         }
@@ -88,8 +88,8 @@ private T execute0(final SQLExecuteUnit sqlExecuteUnit) throws SQLException {
             for (SQLExecutionEvent each : events) {
                 each.setExecuteFailure(ex);
                 shardingEventBus.post(each);
-                ExecutorExceptionHandler.handleException(ex);
             }
+            ExecutorExceptionHandler.handleException(ex);
             return null;
         }
     } 

sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteTemplate.java

@@ -17,8 +17,6 @@
 
 package io.shardingsphere.core.executor.sql.execute;
 
-import io.shardingsphere.core.event.ShardingEventBusInstance;
-import io.shardingsphere.core.event.executor.overall.OverallExecutionEvent;
 import io.shardingsphere.core.executor.ShardingExecuteEngine;
 import io.shardingsphere.core.executor.ShardingExecuteGroup;
 import io.shardingsphere.core.executor.sql.SQLExecuteUnit;
@@ -32,7 +30,7 @@
 
 /**
  * SQL execute template.
- * 
+ *
  * @author gaohongtao
  * @author zhangliang
  * @author maxiaoguang
@@ -47,8 +45,8 @@ public final class SQLExecuteTemplate {
      * Execute.
      *
      * @param sqlExecuteUnits SQL execute units
-     * @param callback SQL execute callback
-     * @param <T> class type of return value
+     * @param callback        SQL execute callback
+     * @param <T>             class type of return value
      * @return execute result
      * @throws SQLException SQL exception
      */
@@ -59,39 +57,30 @@ public <T> List<T> execute(final Collection<? extends SQLExecuteUnit> sqlExecute
     /**
      * Execute.
      *
-     * @param sqlExecuteUnits SQL execute units
+     * @param sqlExecuteUnits      SQL execute units
      * @param firstExecuteCallback first SQL execute callback
-     * @param callback SQL execute callback
-     * @param <T> class type of return value
+     * @param callback             SQL execute callback
+     * @param <T>                  class type of return value
      * @return execute result
      * @throws SQLException SQL exception
      */
     @SuppressWarnings("unchecked")
     public <T> List<T> execute(final Collection<? extends SQLExecuteUnit> sqlExecuteUnits,
                                final SQLExecuteCallback<T> firstExecuteCallback, final SQLExecuteCallback<T> callback) throws SQLException {
-        OverallExecutionEvent event = new OverallExecutionEvent(sqlExecuteUnits.size() > 1);
-        ShardingEventBusInstance.getInstance().post(event);
         try {
-            List<T> result = executeEngine.execute((Collection) sqlExecuteUnits, firstExecuteCallback, callback);
-            event.setExecuteSuccess();
-            return result;
-            // CHECKSTYLE:OFF
-        } catch (final Exception ex) {
-            // CHECKSTYLE:ON
-            event.setExecuteFailure(ex);
+            return executeEngine.execute((Collection) sqlExecuteUnits, firstExecuteCallback, callback);
+        } catch (final SQLException ex) {
             ExecutorExceptionHandler.handleException(ex);
             return Collections.emptyList();
-        } finally {
-            ShardingEventBusInstance.getInstance().post(event);
         }
     }
 
     /**
      * Execute group.
      *
      * @param sqlExecuteGroups SQL execute groups
-     * @param callback SQL execute callback
-     * @param <T> class type of return value
+     * @param callback         SQL execute callback
+     * @param <T>              class type of return value
      * @return execute result
      * @throws SQLException SQL exception
      */
@@ -103,29 +92,20 @@ public <T> List<T> executeGroup(final Collection<ShardingExecuteGroup<? extends
      * Execute group.
      *
      * @param sqlExecuteGroups SQL execute groups
-     * @param firstCallback first SQL execute callback
-     * @param callback SQL execute callback
-     * @param <T> class type of return value
+     * @param firstCallback    first SQL execute callback
+     * @param callback         SQL execute callback
+     * @param <T>              class type of return value
      * @return execute result
      * @throws SQLException SQL exception
      */
     @SuppressWarnings("unchecked")
-    public <T> List<T> executeGroup(final Collection<ShardingExecuteGroup<? extends SQLExecuteUnit>> sqlExecuteGroups, 
-                               final SQLExecuteCallback<T> firstCallback, final SQLExecuteCallback<T> callback) throws SQLException {
-        OverallExecutionEvent event = new OverallExecutionEvent(sqlExecuteGroups.size() > 1);
-        ShardingEventBusInstance.getInstance().post(event);
+    public <T> List<T> executeGroup(final Collection<ShardingExecuteGroup<? extends SQLExecuteUnit>> sqlExecuteGroups,
+                                    final SQLExecuteCallback<T> firstCallback, final SQLExecuteCallback<T> callback) throws SQLException {
         try {
-            List<T> result = executeEngine.groupExecute((Collection) sqlExecuteGroups, firstCallback, callback);
-            event.setExecuteSuccess();
-            return result;
-            // CHECKSTYLE:OFF
-        } catch (final Exception ex) {
-            // CHECKSTYLE:ON
-            event.setExecuteFailure(ex);
+            return executeEngine.groupExecute((Collection) sqlExecuteGroups, firstCallback, callback);
+        } catch (final SQLException ex) {
             ExecutorExceptionHandler.handleException(ex);
             return Collections.emptyList();
-        } finally {
-            ShardingEventBusInstance.getInstance().post(event);
         }
     }
 }

sharding-core/src/main/java/io/shardingsphere/core/routing/router/sharding/ParsingSQLRouter.java

@@ -19,6 +19,9 @@
 
 import com.google.common.base.Optional;
 import io.shardingsphere.core.constant.DatabaseType;
+import io.shardingsphere.core.event.ShardingEventBusInstance;
+import io.shardingsphere.core.event.parsing.ParsingEvent;
+import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData;
 import io.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import io.shardingsphere.core.optimizer.OptimizeEngineFactory;
 import io.shardingsphere.core.optimizer.condition.ShardingConditions;
@@ -34,7 +37,6 @@
 import io.shardingsphere.core.parsing.parser.sql.ddl.DDLStatement;
 import io.shardingsphere.core.parsing.parser.sql.dml.insert.InsertStatement;
 import io.shardingsphere.core.parsing.parser.sql.dql.select.SelectStatement;
-import io.shardingsphere.core.metadata.datasource.ShardingDataSourceMetaData;
 import io.shardingsphere.core.rewrite.SQLBuilder;
 import io.shardingsphere.core.rewrite.SQLRewriteEngine;
 import io.shardingsphere.core.routing.RouteUnit;
@@ -60,7 +62,7 @@
 
 /**
  * Sharding router with parse.
- * 
+ *
  * @author zhangiang
  * @author maxiaoguang
  * @author panjuan
@@ -82,7 +84,20 @@ public final class ParsingSQLRouter implements ShardingRouter {
 
     @Override
     public SQLStatement parse(final String logicSQL, final boolean useCache) {
-        return new SQLParsingEngine(databaseType, logicSQL, shardingRule, shardingTableMetaData).parse(useCache);
+        ParsingEvent event = new ParsingEvent(logicSQL);
+        ShardingEventBusInstance.getInstance().post(event);
+        try {
+            SQLStatement sqlStatement = new SQLParsingEngine(databaseType, logicSQL, shardingRule, shardingTableMetaData).parse(useCache);
+            event.setExecuteSuccess();
+            return sqlStatement;
+            // CHECKSTYLE:OFF
+        } catch (final Exception ex) {
+            // CHECKSTYLE:ON
+            event.setExecuteFailure(ex);
+            throw ex;
+        } finally {
+            ShardingEventBusInstance.getInstance().post(event);
+        }
     }
 
     @Override