Skip to content

jdbc: metadata: support prepared statements #249

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/main/java/org/tarantool/Code.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ public enum Code {
UPSERT(9),
CALL(10),
EXECUTE(11),
PREPARE(13),
DEALLOCATE(13),
PING(64),
SUBSCRIBE(66);

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/tarantool/Key.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@ public enum Key implements Callable<Integer> {
SQL_FIELD_TYPE(0x1),

SQL_METADATA(0x32),
SQL_BIND_METADATA(0x33),
SQL_BIND_COUNT(0x34),
SQL_TEXT(0x40),
SQL_BIND(0x41),
SQL_OPTIONS(0x42),
SQL_INFO(0x42),
SQL_STATEMENT_ID(0x43),
SQL_ROW_COUNT(0x00),
SQL_INFO_AUTOINCREMENT_IDS(0x01);

Expand Down
15 changes: 14 additions & 1 deletion src/main/java/org/tarantool/SqlProtoUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,17 @@ public static List<List<Object>> getSQLData(TarantoolPacket pack) {
return (List<List<Object>>) pack.getBody().get(Key.DATA.getId());
}

public static List<SQLMetaData> getSQLBindMetadata(TarantoolPacket pack) {
return getMetadata(pack, Key.SQL_BIND_METADATA);
}

public static List<SQLMetaData> getSQLMetadata(TarantoolPacket pack) {
List<Map<Integer, Object>> meta = (List<Map<Integer, Object>>) pack.getBody().get(Key.SQL_METADATA.getId());
return getMetadata(pack, Key.SQL_METADATA);
}

private static List<SQLMetaData> getMetadata(TarantoolPacket pack, Key targetKey) {
List<Map<Integer, Object>> meta = (List<Map<Integer, Object>>) pack.getBody()
.getOrDefault(targetKey.getId(), Collections.emptyList());
List<SQLMetaData> values = new ArrayList<>(meta.size());
for (Map<Integer, Object> item : meta) {
values.add(new SQLMetaData(
Expand All @@ -42,6 +51,10 @@ public static List<SQLMetaData> getSQLMetadata(TarantoolPacket pack) {
return values;
}

public static Long getStatementId(TarantoolPacket pack) {
return ((Number) pack.getBody().get(Key.SQL_STATEMENT_ID.getId())).longValue();
}

public static Long getSQLRowCount(TarantoolPacket pack) {
Map<Key, Object> info = (Map<Key, Object>) pack.getBody().get(Key.SQL_INFO.getId());
Number rowCount;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/tarantool/TarantoolClientImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ protected void complete(TarantoolPacket packet, TarantoolOperation operation) {
} catch (TarantoolSchemaException cause) {
fail(target, cause);
}
} else if (operation.getCode() == Code.EXECUTE) {
} else if (operation.isSqlRelated()) {
completeSql(operation, packet);
} else {
((CompletableFuture) result).complete(packet.getData());
Expand Down Expand Up @@ -763,7 +763,7 @@ public TarantoolClientOps<Integer, List<?>, Object, TupleTwo<List<?>, Long>> uns
return unsafeSchemaOps;
}

protected TarantoolRequest makeSqlRequest(String sql, List<Object> bind) {
private TarantoolRequest makeSqlRequest(String sql, List<Object> bind) {
return new TarantoolRequest(
Code.EXECUTE,
TarantoolRequestArgumentFactory.value(Key.SQL_TEXT),
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/org/tarantool/TarantoolOperation.java
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ public Code getCode() {
return code;
}

public boolean isSqlRelated() {
return code == Code.EXECUTE || code == Code.PREPARE;
}

public TarantoolOperation getDependedOperation() {
return dependedOperation;
}
Expand Down
Loading