Skip to content

Do not require an end handler on a RowStream #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sharanggupta wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not require an end handler on a RowStream #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ...-mysql-client/src/test/java/io/vertx/tests/mysqlclient/tck/ProxySQLPreparedQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@ public void testStreamQuery(TestContext ctx) {
super.testStreamQuery(ctx);
}

@Test
@Ignore("Fetch command not supported by ProxySQL")
@Override
public void testStreamQueryWithoutEndHandler(TestContext ctx) {
super.testStreamQueryWithoutEndHandler(ctx);
}

@Test
@Ignore("Fetch command not supported by ProxySQL")
@Override
Expand Down
4 changes: 3 additions & 1 deletion vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowStreamImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ private void checkPending() {
cursor.close();
Handler<Void> eh = endHandler;
handler = v -> {
eh.handle(null);
if (eh != null) {
eh.handle(null);
}
synchronized (RowStreamImpl.this) {
cursor = null;
}
Expand Down
19 changes: 19 additions & 0 deletions vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/tck/PreparedQueryTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,25 @@ public void testStreamQuery(TestContext ctx) {
});
}

@Test
public void testStreamQueryWithoutEndHandler(TestContext ctx) {
vertx.exceptionHandler(ctx::fail);
Async async = ctx.async();
testCursor(ctx, conn -> {
conn.prepare("SELECT * FROM immutable").onComplete(ctx.asyncAssertSuccess(ps -> {
RowStream<Row> stream = ps.createStream(4, Tuple.tuple());
AtomicInteger rows = new AtomicInteger();
stream.exceptionHandler(ctx::fail);
stream.handler(row -> {
if (rows.incrementAndGet() == 12) {
// The stream ends after the last row: give it time to do so without an end handler
vertx.setTimer(100, id -> async.complete());
}
});
}));
});
}

@Test
public void testStreamQueryNoResults(TestContext ctx) {
Async async = ctx.async();
Expand Down