fix TARGET HINT

MyCATApache · Jun 17, 2021 · e716c69 · e716c69
1 parent 248ba8d
commit e716c69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/example/src/test/java/io/mycat/hint/HintTest.java b/example/src/test/java/io/mycat/hint/HintTest.java
@@ -79,9 +79,9 @@ public void testMasterSlave() throws Exception {
             hasData = !JdbcUtils.executeQuery(mycatConnection, "/*+MYCAT:TARGET(dw1)*/ select 1 from db1.m limit 1", Collections.emptyList()).isEmpty();
             Assert.assertTrue(hasData);
 
-//bug
-//            hasData = !JdbcUtils.executeQuery(mycatConnection, "/*+MYCAT:TARGET(dw1,dr1)*/ select 1 from db1.m limit 1", Collections.emptyList()).isEmpty();
-//            Assert.assertTrue(hasData);
+
+            hasData = !JdbcUtils.executeQuery(mycatConnection, "/*+MYCAT:TARGET(dw1,dr1)*/ select 1 from db1.m limit 1", Collections.emptyList()).isEmpty();
+            Assert.assertTrue(hasData);
 
 
             System.out.println();

diff --git a/mycat2/src/main/java/io/mycat/commands/ReceiverImpl.java b/mycat2/src/main/java/io/mycat/commands/ReceiverImpl.java
@@ -152,7 +152,7 @@ public Future<Void> execute(ExplainDetail detail) {
                                 .map(row -> new MysqlRow(row)));
                     }
                 }
-                return sendResultSet(Observable.merge(outputs));
+                return sendResultSet(Observable.concat(outputs));
             }
             case UPDATE:
             case INSERT: