fixed apache#201 Batch execution event sending misses pre-execution e…

…vent send
xydonne · Dec 2, 2016 · d1b5abd · d1b5abd
1 parent 95a61b2
commit d1b5abd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/...ding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/EventPostman.java b/...ding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/EventPostman.java
@@ -43,14 +43,22 @@ class EventPostman {
 
     void postExecutionEvents() {
         for (AbstractExecutorWrapper each : statementExecutorWrappers) {
-            if (each.getDMLExecutionEvent().isPresent()) {
+            if (each instanceof BatchPreparedStatementExecutorWrapper) {
+                postBatchExecutionEvent((BatchPreparedStatementExecutorWrapper) each);
+            } else if (each.getDMLExecutionEvent().isPresent()) {
                 DMLExecutionEventBus.post(each.getDMLExecutionEvent().get());
             } else if (each.getDQLExecutionEvent().isPresent()) {
                 DQLExecutionEventBus.post(each.getDQLExecutionEvent().get());
             }
         }
     }
 
+    private void postBatchExecutionEvent(final BatchPreparedStatementExecutorWrapper batchPreparedStatementExecutorWrapper) {
+        for (DMLExecutionEvent each : batchPreparedStatementExecutorWrapper.getDmlExecutionEvents()) {
+            DMLExecutionEventBus.post(each);
+        }
+    }
+
     void postExecutionEventsAfterExecution(final AbstractExecutorWrapper statementExecutorWrapper) {
         postExecutionEventsAfterExecution(statementExecutorWrapper, EventExecutionType.EXECUTE_SUCCESS, Optional.<SQLException>absent());
     }

diff --git a/...e/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java b/...e/src/test/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingPreparedStatementTest.java
@@ -18,6 +18,12 @@
 package com.dangdang.ddframe.rdb.sharding.jdbc;
 
 import com.dangdang.ddframe.rdb.integrate.db.AbstractShardingDataBasesOnlyDBUnitTest;
+import com.dangdang.ddframe.rdb.sharding.executor.event.DMLExecutionEvent;
+import com.dangdang.ddframe.rdb.sharding.executor.event.DMLExecutionEventBus;
+import com.dangdang.ddframe.rdb.sharding.executor.event.DMLExecutionEventListener;
+import com.dangdang.ddframe.rdb.sharding.executor.event.EventExecutionType;
+import com.google.common.eventbus.AllowConcurrentEvents;
+import com.google.common.eventbus.Subscribe;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -26,6 +32,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
@@ -221,6 +228,24 @@ public void assertExecuteQueryWithColumnNames() throws SQLException {
 
     @Test
     public void assertAddBatch() throws SQLException {
+        final AtomicInteger beforeEventSum = new AtomicInteger();
+        final AtomicInteger successEventSum = new AtomicInteger();
+        DMLExecutionEventBus.register(new DMLExecutionEventListener() {
+            @Override
+            public String getName() {
+                return "test";
+            }
+
+            @Subscribe
+            @AllowConcurrentEvents
+            public void subscribe(final DMLExecutionEvent event) {
+                if (event.getEventExecutionType().equals(EventExecutionType.BEFORE_EXECUTE)) {
+                    beforeEventSum.incrementAndGet();
+                } else if (event.getEventExecutionType().equals(EventExecutionType.EXECUTE_SUCCESS)) {
+                    successEventSum.incrementAndGet();
+                }
+            }
+        });
         String sql = "INSERT INTO `t_order`(`order_id`, `user_id`, `status`) VALUES (?,?,?)";
         try (
                 Connection connection = shardingDataSource.getConnection();
@@ -246,6 +271,9 @@ public void assertAddBatch() throws SQLException {
                 assertThat(each, is(1));
             }
         }
+        assertThat(beforeEventSum.get(), is(4));
+        assertThat(successEventSum.get(), is(4));
+        DMLExecutionEventBus.clearListener();
     }
 
     @Test

diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
@@ -12,6 +12,7 @@ weight = 1
 
 1. [ISSUE #194](https://github.com/dangdangdotcom/sharding-jdbc/issues/194) jdbc接口中资源释放错误
 1. [ISSUE #199](https://github.com/dangdangdotcom/sharding-jdbc/issues/199) 分表且复用PreparedStatement对象造成数据路由错误
+1. [ISSUE #201](https://github.com/dangdangdotcom/sharding-jdbc/issues/201) 批量操作执行前事件发送缺失
 
 ## 1.4.0