diff --git a/example/src/test/java/io/mycat/hint/HintTest.java b/example/src/test/java/io/mycat/hint/HintTest.java index d8929f0e2..c2f4c843e 100644 --- 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 index 3fd249fa2..6ce99fc86 100644 --- 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 execute(ExplainDetail detail) { .map(row -> new MysqlRow(row))); } } - return sendResultSet(Observable.merge(outputs)); + return sendResultSet(Observable.concat(outputs)); } case UPDATE: case INSERT: