Skip to content
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

Jump to bottom

Added session removing from the pool if client cancelled the stream #314

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Added session removing from the pool if client cancelled the stream #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
026a020
Added removing session from the pool, if client cancelled the stream
alex268 Sep 17, 2024
4f0f5fd
Updated query service tests
alex268 Sep 17, 2024
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
6 changes: 6 additions & 0 deletions query/src/main/java/tech/ydb/query/impl/SessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ abstract class SessionImpl implements QuerySession {
YdbQuery.DeleteSessionResponse::getStatus, YdbQuery.DeleteSessionResponse::getIssuesList
);

private static final Status CANCELLED = Status.of(
StatusCode.CLIENT_CANCELLED,
Issue.of("Stream was cancelled by client, session will be removed", Issue.Severity.WARNING)
);

private final QueryServiceRpc rpc;
private final String sessionId;
private final long nodeID;
Expand Down Expand Up @@ -313,6 +318,7 @@ public CompletableFuture<Result<QueryInfo>> execute(PartsHandler handler) {

@Override
public void cancel() {
updateSessionState(CANCELLED);
grpcStream.cancel();
}
}
Expand Down
1 change: 1 addition & 0 deletions query/src/main/java/tech/ydb/query/impl/SessionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public void updateSessionState(Status status) {
status.getCode() == StatusCode.INTERNAL_ERROR ||
status.getCode() == StatusCode.CLIENT_DEADLINE_EXCEEDED ||
status.getCode() == StatusCode.CLIENT_DEADLINE_EXPIRED ||
status.getCode() == StatusCode.CLIENT_CANCELLED ||
status.getCode() == StatusCode.TRANSPORT_UNAVAILABLE;
if (isStatusBroken) {
logger.warn("QuerySession[{}] broken with status {}", getId(), status);
Expand Down
209 changes: 121 additions & 88 deletions query/src/test/java/tech/ydb/query/impl/QueryIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import tech.ydb.core.StatusCode;
import tech.ydb.query.QueryClient;
import tech.ydb.query.QuerySession;
import tech.ydb.query.QueryStream;
import tech.ydb.query.QueryTransaction;
import tech.ydb.query.result.QueryInfo;
import tech.ydb.query.result.QueryResultPart;
Expand Down Expand Up @@ -70,8 +71,6 @@ public Entity(int id, String name, byte[] payload, boolean isValid) {
@ClassRule
public final static GrpcTransportRule ydbTransport = new GrpcTransportRule();

private static QueryClient queryClient = null;

@BeforeClass
public static void initSchema() {
logger.info("Prepare database...");
Expand All @@ -98,95 +97,128 @@ public static void initSchema() {
retryCtx.supplyStatus(session -> session.createTable(tablePath, tableDescription)).join();
retryCtx.supplyStatus(session -> session.createTable(table2Path, table2Description)).join();
logger.info("Prepare database OK");

queryClient = QueryClient.newClient(ydbTransport).build();
}

@AfterClass
public static void dropAll() {
try {
logger.info("Clean database...");
String tablePath = ydbTransport.getDatabase() + "/" + TEST_TABLE;
String table2Path = ydbTransport.getDatabase() + "/" + TEST_DOUBLE_TABLE;

SimpleTableClient client = SimpleTableClient.newClient(GrpcTableRpc.useTransport(ydbTransport)).build();
SessionRetryContext retryCtx = SessionRetryContext.create(client).build();
retryCtx.supplyStatus(session -> session.dropTable(tablePath)).join().isSuccess();
retryCtx.supplyStatus(session -> session.dropTable(table2Path)).join().isSuccess();
logger.info("Clean database OK");
} finally {
queryClient.close();
}
logger.info("Clean database...");
String tablePath = ydbTransport.getDatabase() + "/" + TEST_TABLE;
String table2Path = ydbTransport.getDatabase() + "/" + TEST_DOUBLE_TABLE;

SimpleTableClient client = SimpleTableClient.newClient(GrpcTableRpc.useTransport(ydbTransport)).build();
SessionRetryContext retryCtx = SessionRetryContext.create(client).build();
retryCtx.supplyStatus(session -> session.dropTable(tablePath)).join().isSuccess();
retryCtx.supplyStatus(session -> session.dropTable(table2Path)).join().isSuccess();
logger.info("Clean database OK");
}

@Test
public void testSimpleSelect() {
try (QuerySession session = queryClient.createSession(Duration.ofSeconds(5)).join().getValue()) {
QueryReader reader = QueryReader.readFrom(
session.createQuery("SELECT 2 + 3;", TxMode.SERIALIZABLE_RW)
).join().getValue();
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
QueryReader reader = QueryReader.readFrom(
session.createQuery("SELECT 2 + 3;", TxMode.SERIALIZABLE_RW)
).join().getValue();


Assert.assertEquals(1, reader.getResultSetCount());
ResultSetReader rs = reader.getResultSet(0);
Assert.assertEquals(1, reader.getResultSetCount());
ResultSetReader rs = reader.getResultSet(0);

Assert.assertTrue(rs.next());
Assert.assertEquals(1, rs.getColumnCount());
Assert.assertEquals("column0", rs.getColumnName(0));
Assert.assertEquals(5, rs.getColumn(0).getInt32());
Assert.assertTrue(rs.next());
Assert.assertEquals(1, rs.getColumnCount());
Assert.assertEquals("column0", rs.getColumnName(0));
Assert.assertEquals(5, rs.getColumn(0).getInt32());

Assert.assertFalse(rs.next());
Assert.assertFalse(rs.next());
}
}
}

@Test
@Ignore
public void testSimplePrepare() {
String query = ""
+ "DECLARE $id AS Int32?;\n"
+ "UPSERT INTO `" + TEST_TABLE + "` (id) "
+ "VALUES ($id)";
try (QuerySession session = queryClient.createSession(Duration.ofSeconds(5)).join().getValue()) {
ExecuteQuerySettings settings = ExecuteQuerySettings.newBuilder()
.withExecMode(QueryExecMode.PARSE)
.build();
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
String query = ""
+ "DECLARE $id AS Int32?;\n"
+ "UPSERT INTO `" + TEST_TABLE + "` (id) "
+ "VALUES ($id)";
try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
ExecuteQuerySettings settings = ExecuteQuerySettings.newBuilder()
.withExecMode(QueryExecMode.PARSE)
.build();

QueryReader reader = QueryReader.readFrom(
session.createQuery(query, TxMode.NONE, Params.empty(), settings)
).join().getValue();
QueryReader reader = QueryReader.readFrom(
session.createQuery(query, TxMode.NONE, Params.empty(), settings)
).join().getValue();


Assert.assertEquals(1, reader.getResultSetCount());
ResultSetReader rs = reader.getResultSet(0);
Assert.assertEquals(1, reader.getResultSetCount());
ResultSetReader rs = reader.getResultSet(0);

Assert.assertTrue(rs.next());
Assert.assertEquals(1, rs.getColumnCount());
Assert.assertEquals("column0", rs.getColumnName(0));
Assert.assertEquals(5, rs.getColumn(0).getInt32());
Assert.assertTrue(rs.next());
Assert.assertEquals(1, rs.getColumnCount());
Assert.assertEquals("column0", rs.getColumnName(0));
Assert.assertEquals(5, rs.getColumn(0).getInt32());

Assert.assertFalse(rs.next());
Assert.assertFalse(rs.next());
}
}
}

@Test
public void testErrors() {
SessionImpl s1 = (SessionImpl)queryClient.createSession(Duration.ofSeconds(5)).join().getValue();
String id = s1.getId();
s1.close();

SessionImpl s2 = (SessionImpl)queryClient.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertEquals(id, s2.getId());
s2.updateSessionState(Status.of(StatusCode.ABORTED));
s2.close();

SessionImpl s3 = (SessionImpl)queryClient.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertEquals(id, s3.getId());
s3.updateSessionState(Status.of(StatusCode.BAD_SESSION));
s3.close();

SessionImpl s4 = (SessionImpl)queryClient.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertNotEquals(id, s4.getId());
s4.close();
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
SessionImpl s1 = (SessionImpl)client.createSession(Duration.ofSeconds(5)).join().getValue();
String id = s1.getId();
s1.close();

SessionImpl s2 = (SessionImpl)client.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertEquals(id, s2.getId());
s2.updateSessionState(Status.of(StatusCode.ABORTED));
s2.close();

SessionImpl s3 = (SessionImpl)client.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertEquals(id, s3.getId());
s3.updateSessionState(Status.of(StatusCode.BAD_SESSION));
s3.close();

SessionImpl s4 = (SessionImpl)client.createSession(Duration.ofSeconds(5)).join().getValue();
Assert.assertNotEquals(id, s4.getId());
s4.close();
}
}

@Test
public void testCancelStream() {
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
QuerySession s1 = client.createSession(Duration.ofSeconds(5)).join().getValue();
String id = s1.getId();
s1.close();

try (QuerySession s2 = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
Assert.assertEquals(id, s2.getId());
s2.createQuery("SELECT 2 + 2;", TxMode.SNAPSHOT_RO).execute(this::printQuerySetPart)
.join().getStatus().expectSuccess("cannot execute query");
}

try (QuerySession s3 = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
Assert.assertEquals(id, s3.getId());
final QueryStream query = s3.createQuery("SELECT 2 + 2;", TxMode.SNAPSHOT_RO);
final CompletableFuture<Void> stop = new CompletableFuture<>();
CompletableFuture<Result<QueryInfo>> future = query.execute(part -> {
stop.join();
printQuerySetPart(part);
});
query.cancel();
stop.complete(null);
Result<QueryInfo> result = future.join();
Assert.assertEquals(StatusCode.CLIENT_CANCELLED, result.getStatus().getCode());
}

try (QuerySession s4 = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
Assert.assertNotEquals(id, s4.getId());
}
}
}

@Test
Expand All @@ -198,35 +230,37 @@ public void testSimpleCRUD() {
entities.add(new Entity(3, "dublicate", BYTES_LEN5, true));
entities.add(new Entity(5, "entity 5", BYTES_LEN2, false));

for (Entity entity: entities) {
String query = "UPSERT INTO `" + TEST_TABLE + "` (id, name, payload, is_valid) "
+ "VALUES ($id, $name, $payload, $is_valid)";

Params params = Params.of(
"$id", PrimitiveValue.newInt32(entity.id),
"$name", PrimitiveValue.newText(entity.name),
"$payload", PrimitiveValue.newBytes(entity.payload),
"$is_valid", PrimitiveValue.newBool(entity.isValid)
);
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
for (Entity entity: entities) {
String query = "UPSERT INTO `" + TEST_TABLE + "` (id, name, payload, is_valid) "
+ "VALUES ($id, $name, $payload, $is_valid)";

Params params = Params.of(
"$id", PrimitiveValue.newInt32(entity.id),
"$name", PrimitiveValue.newText(entity.name),
"$payload", PrimitiveValue.newBytes(entity.payload),
"$is_valid", PrimitiveValue.newBool(entity.isValid)
);

try (QuerySession session = client.createSession(SESSION_TIMEOUT).join().getValue()) {
session.createQuery(query, TxMode.SERIALIZABLE_RW, params)
.execute(this::printQuerySetPart)
.join().getStatus().expectSuccess();
}
}

try (QuerySession session = queryClient.createSession(SESSION_TIMEOUT).join().getValue()) {
session.createQuery(query, TxMode.SERIALIZABLE_RW, params)
try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
String query = "SELECT id, name, payload, is_valid FROM " + TEST_TABLE + " ORDER BY id;";
session.createQuery(query, TxMode.SERIALIZABLE_RW)
.execute(this::printQuerySetPart)
.join().getStatus().expectSuccess();
}
}

try (QuerySession session = queryClient.createSession(Duration.ofSeconds(5)).join().getValue()) {
String query = "SELECT id, name, payload, is_valid FROM " + TEST_TABLE + " ORDER BY id;";
session.createQuery(query, TxMode.SERIALIZABLE_RW)
.execute(this::printQuerySetPart)
.join().getStatus().expectSuccess();
}

try (QuerySession session = queryClient.createSession(SESSION_TIMEOUT).join().getValue()) {
session.createQuery("DELETE FROM " + TEST_TABLE, TxMode.SERIALIZABLE_RW)
.execute(this::printQuerySetPart)
.join().getStatus().expectSuccess();
try (QuerySession session = client.createSession(SESSION_TIMEOUT).join().getValue()) {
session.createQuery("DELETE FROM " + TEST_TABLE, TxMode.SERIALIZABLE_RW)
.execute(this::printQuerySetPart)
.join().getStatus().expectSuccess();
}
}
}

Expand All @@ -238,7 +272,6 @@ public void printQuerySetPart(QueryResultPart part) {
}

@Test
@Ignore
public void updateMultipleTablesInOneTransaction() {
try (QueryClient client = QueryClient.newClient(ydbTransport).build()) {
try (QuerySession session = client.createSession(Duration.ofSeconds(5)).join().getValue()) {
Expand Down