Merge pull request #1534 from eclipse-vertx/isolate-command-to-backend

Backend SPI

Author: vietj

pom.xml

@@ -65,6 +65,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+
+      <!-- TMP -->
+      <dependency>
+        <groupId>io.vertx</groupId>
+        <artifactId>vertx-sql-client-codec</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -184,6 +191,7 @@
       </activation>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-pg-client</module>
         <module>vertx-mysql-client</module>
         <module>vertx-mssql-client</module>
@@ -199,6 +207,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-pg-client</module>
       </modules>
     </profile>
@@ -209,6 +218,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-pg-client</module>
       </modules>
     </profile>
@@ -219,6 +229,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-pg-client</module>
       </modules>
     </profile>
@@ -230,6 +241,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mysql-client</module>
       </modules>
     </profile>
@@ -241,6 +253,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mysql-client</module>
       </modules>
     </profile>
@@ -252,6 +265,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mysql-client</module>
       </modules>
     </profile>
@@ -263,6 +277,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mysql-client</module>
       </modules>
     </profile>
@@ -273,6 +288,7 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mssql-client</module>
       </modules>
     </profile>
@@ -283,20 +299,23 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-mssql-client</module>
       </modules>
     </profile>
     <profile>
       <id>DB2-11.5</id>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-db2-client</module>
       </modules>
     </profile>
     <profile>
       <id>SQL-templates</id>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-pg-client</module>
         <module>vertx-mysql-client</module>
         <module>vertx-sql-client-templates</module>
@@ -309,9 +328,10 @@
       </properties>
       <modules>
         <module>vertx-sql-client</module>
+        <module>vertx-sql-client-codec</module>
         <module>vertx-oracle-client</module>
       </modules>
     </profile>
   </profiles>
 
-</project>
+</project>

vertx-db2-client/pom.xml

@@ -47,6 +47,10 @@
       <groupId>io.vertx</groupId>
       <artifactId>vertx-sql-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.vertx</groupId>
+      <artifactId>vertx-sql-client-codec</artifactId>
+    </dependency>
 
     <!-- Testing purposes -->
     <dependency>

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java

@@ -26,8 +26,7 @@
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.core.spi.metrics.VertxMetrics;
 import io.vertx.db2client.DB2ConnectOptions;
-import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.spi.connection.Connection;
 import io.vertx.sqlclient.impl.ConnectionFactoryBase;
 
 import java.util.Map;
@@ -65,15 +64,10 @@ protected Future<Connection> doConnectInternal(DB2ConnectOptions options, Contex
   }
 
   @Override
-  public Future<SqlConnection> connect(Context context, DB2ConnectOptions options) {
+  public Future<Connection> connect(Context context, DB2ConnectOptions options) {
     ContextInternal contextInternal = (ContextInternal) context;
-    Promise<SqlConnection> promise = contextInternal.promise();
-    connect(asEventLoopContext(contextInternal), options)
-      .map(conn -> {
-        DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(contextInternal, this, conn);
-        conn.init(db2Connection);
-        return (SqlConnection)db2Connection;
-      }).onComplete(promise);
+    Promise<Connection> promise = contextInternal.promise();
+    connect(asEventLoopContext(contextInternal), options).onComplete(promise);
     return promise.future();
   }
 }

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java

@@ -23,9 +23,9 @@
 import io.vertx.db2client.DB2Connection;
 import io.vertx.db2client.impl.command.PingCommand;
 import io.vertx.db2client.spi.DB2Driver;
-import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.spi.connection.Connection;
 import io.vertx.sqlclient.internal.SqlConnectionBase;
-import io.vertx.sqlclient.spi.ConnectionFactory;
+import io.vertx.sqlclient.spi.connection.ConnectionFactory;
 
 public class DB2ConnectionImpl extends SqlConnectionBase<DB2ConnectionImpl> implements DB2Connection {
 
@@ -37,7 +37,12 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
     } catch (Exception e) {
       return ctx.failedFuture(e);
     }
-    return prepareForClose(ctx, client.connect((Context)ctx, options)).map(DB2Connection::cast);
+    return client.connect((Context)ctx, options).map(conn -> {
+      DB2ConnectionImpl impl = new DB2ConnectionImpl(ctx, client, conn);
+      conn.init(impl);
+      prepareForClose(ctx, impl);
+      return impl;
+    });
   }
 
   public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn) {

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2RowImpl.java renamed to vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2Row.java

@@ -23,22 +23,18 @@
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 import java.time.temporal.Temporal;
-import java.util.List;
 import java.util.UUID;
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.db2client.impl.drda.DB2RowId;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.RowBase;
-import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
-public class DB2RowImpl extends RowBase {
+public class DB2Row extends RowBase {
 
-  private final RowDesc rowDesc;
-
-  public DB2RowImpl(RowDesc rowDesc) {
-    super(rowDesc.columnNames().size());
-    this.rowDesc = rowDesc;
+  public DB2Row(RowDescriptorBase rowDescriptor) {
+    super(rowDescriptor);
   }
 
   @Override
@@ -82,23 +78,14 @@ public <T> T get(Class<T> type, int position) {
     }
   }
 
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = rowDesc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
-  }
-
   @Override
   public int getColumnIndex(String name) {
-    if (name == null) {
-      throw new NullPointerException();
-    }
-    int idx = rowDesc.columnIndex(name);
+    int idx = super.getColumnIndex(name);
     if (idx >= 0) {
       return idx;
     }
     // Unless the column is renamed in the SQL query, the column name will be uppercase
-    return rowDesc.columnIndex(name.toUpperCase());
+    return super.getColumnIndex(name.toUpperCase());
   }
 
   @Override

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java

@@ -16,23 +16,31 @@
 package io.vertx.db2client.impl;
 
 import io.netty.channel.ChannelPipeline;
-import io.vertx.core.AsyncResult;
 import io.vertx.core.Completable;
 import io.vertx.core.Handler;
 import io.vertx.core.Promise;
 import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.net.NetSocketInternal;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.db2client.DB2ConnectOptions;
+import io.vertx.db2client.impl.codec.CommandCodec;
 import io.vertx.db2client.impl.codec.DB2Codec;
+import io.vertx.db2client.impl.codec.DB2PreparedStatement;
+import io.vertx.db2client.impl.codec.ExtendedBatchQueryCommandCodec;
+import io.vertx.db2client.impl.codec.ExtendedQueryCommandCodec;
 import io.vertx.db2client.impl.command.InitialHandshakeCommand;
 import io.vertx.db2client.impl.drda.ConnectionMetaData;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.codec.CommandMessage;
+import io.vertx.sqlclient.spi.connection.Connection;
+import io.vertx.sqlclient.internal.PreparedStatement;
 import io.vertx.sqlclient.internal.QueryResultHandler;
-import io.vertx.sqlclient.impl.SocketConnectionBase;
-import io.vertx.sqlclient.internal.command.*;
+import io.vertx.sqlclient.codec.SocketConnectionBase;
 import io.vertx.sqlclient.spi.DatabaseMetadata;
+import io.vertx.sqlclient.spi.protocol.CommandBase;
+import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
+import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
+import io.vertx.sqlclient.spi.protocol.TxCommand;
 
 import java.util.Map;
 import java.util.function.Predicate;
@@ -79,19 +87,32 @@ public void init() {
     super.init();
   }
 
+  @Override
+  protected CommandMessage<?, ?> toMessage(ExtendedQueryCommand<?> command, PreparedStatement preparedStatement) {
+    if (command.isBatch()) {
+      return new ExtendedBatchQueryCommandCodec<>(command, (DB2PreparedStatement) preparedStatement);
+    } else {
+      return new ExtendedQueryCommandCodec(command, (DB2PreparedStatement) preparedStatement);
+    }
+  }
+
+  @Override
+  protected CommandMessage<?, ?> toMessage(CommandBase<?> command) {
+    return CommandCodec.wrap(command);
+  }
+
   @Override
   protected <R> void doSchedule(CommandBase<R> cmd, Completable<R> handler) {
     if (cmd instanceof TxCommand) {
       TxCommand<R> txCmd = (TxCommand<R>) cmd;
-      if (txCmd.kind == TxCommand.Kind.BEGIN) {
+      if (txCmd.kind() == TxCommand.Kind.BEGIN) {
         // DB2 always implicitly starts a transaction with each query, and does
         // not support the 'BEGIN' keyword. Instead we can no-op BEGIN commands
-        cmd.handler = handler;
-        cmd.complete(CommandResponse.success(txCmd.result).toAsyncResult());
+        handler.succeed(txCmd.result());
       } else {
-        SimpleQueryCommand<Void> cmd2 = new SimpleQueryCommand<>(txCmd.kind.sql, false, false,
-            QueryCommandBase.NULL_COLLECTOR, QueryResultHandler.NOOP_HANDLER);
-        super.doSchedule(cmd2, (res, err) -> handler.complete(txCmd.result, err));
+        SimpleQueryCommand<Void> cmd2 = new SimpleQueryCommand<>(txCmd.kind().sql(), false, false,
+            SocketConnectionBase.NULL_COLLECTOR, QueryResultHandler.NOOP_HANDLER);
+        super.doSchedule(cmd2, (res, err) -> handler.complete(txCmd.result(), err));
 
       }
     } else {
@@ -111,7 +132,7 @@ public String system() {
   }
 
   @Override
-  public DatabaseMetadata getDatabaseMetaData() {
+  public DatabaseMetadata databaseMetadata() {
     return connMetadata.getDbMetadata();
   }
 

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseConnectionCommandCodec.java

@@ -18,7 +18,7 @@
 import io.netty.buffer.ByteBuf;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
-import io.vertx.sqlclient.internal.command.CloseConnectionCommand;
+import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
 
 class CloseConnectionCommandCodec extends CommandCodec<Void, CloseConnectionCommand> {
 

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseCursorCommandCodec.java

@@ -21,8 +21,8 @@
 import io.vertx.db2client.impl.codec.DB2PreparedStatement.QueryInstance;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
-import io.vertx.sqlclient.internal.command.CloseCursorCommand;
-import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
+import io.vertx.sqlclient.codec.CommandResponse;
 
 class CloseCursorCommandCodec extends CommandCodec<Void, CloseCursorCommand> {
 

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseStatementCommandCodec.java

@@ -16,8 +16,8 @@
 package io.vertx.db2client.impl.codec;
 
 import io.netty.buffer.ByteBuf;
-import io.vertx.sqlclient.internal.command.CloseStatementCommand;
-import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
+import io.vertx.sqlclient.codec.CommandResponse;
 
 class CloseStatementCommandCodec extends CommandCodec<Void, CloseStatementCommand> {