WIP: Fetch list of nodes in a cluster client

pom.xml

@@ -5,10 +5,15 @@
     <artifactId>connector</artifactId>
     <version>1.9.1-SNAPSHOT</version>
     <packaging>jar</packaging>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.jupiter.version>5.3.1</junit.jupiter.version>
+
+        <jmh.version>1.21</jmh.version>
+        <maven-assembly-plugin.version>2.6</maven-assembly-plugin.version>
     </properties>
+
     <name>Tarantool Connector for Java</name>
     <url>https://github.com/tarantool/tarantool-java</url>
     <description>Tarantool client for java</description>
@@ -40,11 +45,28 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
+                <version>3.6.1</version> <!--incresed from 3.2 due to lack of annotation processing support-->
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+
+                        <configuration>
+                            <annotationProcessorPaths>
+                                <path>
+                                    <groupId>org.openjdk.jmh</groupId>
+                                    <artifactId>jmh-generator-annprocess</artifactId>
+                                    <version>${jmh.version}</version>
+                                </path>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <!--
                 Set parsedVersion.majorVersion and parsedVersion.minorVersion
@@ -61,6 +83,18 @@
                             <goal>parse-version</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/perf</source>
+                            </sources>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <!-- Process src/main/java-templates directory. -->
@@ -124,6 +158,31 @@
                     </dependency>
                 </dependencies>
             </plugin>
+
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>${maven-assembly-plugin.version}</version>
+                <configuration>
+                    <descriptor>src/main/assembly/perf-tests.xml</descriptor>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <attach>true</attach>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.openjdk.jmh.Main</mainClass>
+                                </manifest>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -134,6 +193,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
@@ -146,6 +211,12 @@
             <version>1.23</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openjdk.jmh</groupId>
+            <artifactId>jmh-core</artifactId>
+            <version>${jmh.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <parent>

src/it/java/org/tarantool/TestTarantoolClient.java

@@ -1,9 +1,9 @@
 package org.tarantool;
 
+import org.tarantool.server.TarantoolBinaryPacket;
+
 import java.io.IOException;
-import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.concurrent.CompletableFuture;
@@ -33,8 +33,8 @@ public static class TarantoolClientTestImpl extends TarantoolClientImpl {
         final Semaphore s = new Semaphore(0);
         long latency = 1L;
 
-        public TarantoolClientTestImpl(SocketChannelProvider socketProvider, TarantoolClientConfig options) {
-            super(socketProvider, options);
+        public TarantoolClientTestImpl(InstanceConnectionProvider nodeComm, TarantoolClientConfig options) {
+            super(nodeComm, options);
             Thread t = new Thread(new Runnable() {
                 @Override
                 public void run() {
@@ -55,16 +55,6 @@ public void run() {
             t.start();
         }
 
-        @Override
-        protected void writeFully(SocketChannel channel, ByteBuffer buffer) throws IOException {
-            try {
-                Thread.sleep(1L);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-            super.writeFully(channel, buffer);
-        }
-
         @Override
         protected void configureThreads(String threadName) {
             super.configureThreads(threadName);
@@ -81,14 +71,14 @@ protected void reconnect(int retry, Throwable lastError) {
         }
 
         @Override
-        protected void complete(long code, CompletableFuture<?> q) {
-            super.complete(code, q);
+        protected void complete(TarantoolBinaryPacket pack, CompletableFuture<?> q) {
+            super.complete(pack, q);
+            Long code = pack.getCode();
             if (code != 0) {
                 System.out.println(code);
             }
             s.release();
         }
-
     }
 
     public static void main(String[] args) throws IOException, InterruptedException, ExecutionException, SQLException {
@@ -102,21 +92,12 @@ public static void main(String[] args) throws IOException, InterruptedException,
         config.sharedBufferSize = 128;
 
         //config.sharedBufferSize = 0;
-        SocketChannelProvider socketChannelProvider = new SocketChannelProvider() {
-            @Override
-            public SocketChannel get(int retryNumber, Throwable lastError) {
-                if (lastError != null) {
-                    lastError.printStackTrace(System.out);
-                }
-                System.out.println("reconnect");
-                try {
-                    return SocketChannel.open(new InetSocketAddress("localhost", 3301));
-                } catch (IOException e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-        };
-        final TarantoolClientTestImpl client = new TarantoolClientTestImpl(socketChannelProvider, config);
+
+        InstanceConnectionProvider nodeComm =
+                new SingleInstanceConnectionProvider("localhost:3301", config.username, config.password);
+
+
+        final TarantoolClientTestImpl client = new TarantoolClientTestImpl(nodeComm, config);
         config.writeTimeoutMillis = 2;
         client.latency = 1;
         client.syncOps.ping();

src/main/assembly/perf-tests.xml

@@ -0,0 +1,28 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>perf-tests</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>test</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/test-classes</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>

src/main/java-templates/org/tarantool/Version.java

@@ -2,6 +2,6 @@
 
 public final class Version {
     public static final String version = "${project.version}";
-    public static final int majorVersion = ${parsedVersion.majorVersion};
-    public static final int minorVersion = ${parsedVersion.minorVersion};
+    public static final int majorVersion = Integer.parseInt("${parsedVersion.majorVersion}");
+    public static final int minorVersion = Integer.parseInt("${parsedVersion.minorVersion}");
 }

src/main/java/org/tarantool/CountInputStream.java

@@ -3,5 +3,5 @@
 import java.io.InputStream;
 
 public abstract class CountInputStream extends InputStream {
-    abstract long getBytesRead();
+    public abstract long getBytesRead();
 }

src/main/java/org/tarantool/InstanceConnectionProvider.java

@@ -0,0 +1,13 @@
+package org.tarantool;
+
+import org.tarantool.server.*;
+
+import java.io.*;
+import java.nio.*;
+
+public interface InstanceConnectionProvider {
+
+    TarantoolInstanceConnection connect() throws IOException;
+
+    String getDescription();
+}

src/main/java/org/tarantool/JDBCBridge.java

@@ -1,23 +1,24 @@
 package org.tarantool;
 
+import org.tarantool.jdbc.SQLResultSet;
+import org.tarantool.server.TarantoolBinaryPacket;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.tarantool.jdbc.SQLResultSet;
-
 public class JDBCBridge {
     public static final JDBCBridge EMPTY = new JDBCBridge(Collections.<TarantoolBase.SQLMetaData>emptyList(), Collections.<List<Object>>emptyList());
 
     final List<TarantoolBase.SQLMetaData> sqlMetadata;
     final Map<String,Integer> columnsByName;
     final List<List<Object>> rows;
 
-    protected JDBCBridge(TarantoolConnection connection) {
-        this(connection.getSQLMetadata(),connection.getSQLData());
+    protected JDBCBridge(TarantoolBinaryPacket pack) {
+        this(SqlProtoUtils.getSQLMetadata(pack), SqlProtoUtils.getSQLData(pack));
     }
 
     protected JDBCBridge(List<TarantoolBase.SQLMetaData> sqlMetadata, List<List<Object>> rows) {
@@ -30,8 +31,8 @@ protected JDBCBridge(List<TarantoolBase.SQLMetaData> sqlMetadata, List<List<Obje
     }
 
     public static JDBCBridge query(TarantoolConnection connection, String sql, Object ... params) {
-        connection.sql(sql, params);
-        return new JDBCBridge(connection);
+        TarantoolBinaryPacket pack = connection.sql(sql, params);
+        return new JDBCBridge(pack);
     }
 
     public static int update(TarantoolConnection connection, String sql, Object ... params) {
@@ -47,10 +48,10 @@ public static JDBCBridge mock(List<String> fields, List<List<Object>> values)  {
     }
 
     public static Object execute(TarantoolConnection connection, String sql, Object ... params) {
-        connection.sql(sql, params);
-        Long rowCount = connection.getSqlRowCount();
+        TarantoolBinaryPacket pack = connection.sql(sql, params);
+        Long rowCount = SqlProtoUtils.getSqlRowCount(pack);
         if(rowCount == null) {
-            return new SQLResultSet(new JDBCBridge(connection));
+            return new SQLResultSet(new JDBCBridge(pack));
         }
         return rowCount.intValue();
     }