jdbc: fix NPE in update

Updated constants to be in sync with tarantool IPROTO.
Added integration tests for the working JDBC functionality.
Fixed travis script to use tarantool 2.0 which is required for SQL.
Fixed failing user permission calls in tarantool initialization script.

Closes #39

----

Rebase fixes (Alexander Turenko):

* Perform cleanup of the test directory once before all tests (move it
  from the TarantoolControl constructor).
* Start tarantool from the Java code in JDBC tests (use
  TarantoolControl).
* Wait for the instance to be started / stopped in setupEnv() /
  cleanupEnv(); add waiting into startTarantool() / stopTarantool() also
  should fix races in testLongParallelCloseReconnects when an instance
  tried to be started against an instance that is already run.

Author: ztarvos

src/main/java/org/tarantool/Key.java

@@ -18,13 +18,13 @@ public enum Key implements Callable<Integer> {
     UPSERT_OPS(0x28),
     DATA(0x30), ERROR(0x31),
 
-    SQL_FIELD_NAME(0x29),
+    SQL_FIELD_NAME(0),
     SQL_METADATA(0x32),
     SQL_TEXT(0x40),
     SQL_BIND(0x41),
     SQL_OPTIONS(0x42),
-    SQL_INFO(0x43),
-    SQL_ROW_COUNT(0x44);
+    SQL_INFO(0x42),
+    SQL_ROW_COUNT(0);
 
     int id;
 

src/test/java/org/tarantool/AbstractTarantoolConnectorIT.java

@@ -82,7 +82,7 @@ public abstract class AbstractTarantoolConnectorIT {
     @BeforeAll
     public static void setupEnv() {
         control = new TarantoolControl();
-        control.start("jdk-testing");
+        startTarantool("jdk-testing");
 
         console = openConsole();
 
@@ -104,7 +104,7 @@ public static void cleanupEnv() {
 
             console.close();
         } finally {
-            control.stop("jdk-testing");
+            stopTarantool("jdk-testing");
         }
     }
 
@@ -189,12 +189,14 @@ protected List<?> consoleSelect(String spaceName, Object key) {
         return console.eval(sb.toString());
     }
 
-    protected void stopTarantool(String instance) {
+    protected static void stopTarantool(String instance) {
         control.stop(instance);
+        control.waitStopped("jdk-testing");
     }
 
-    protected void startTarantool(String instance) {
+    protected static void startTarantool(String instance) {
         control.start(instance);
+        control.waitStarted("jdk-testing");
     }
 
     /**

src/test/java/org/tarantool/TarantoolControl.java

@@ -16,30 +16,66 @@
  * Wrapper around tarantoolctl utility.
  */
 public class TarantoolControl {
+    public class TarantoolControlException extends RuntimeException {
+        int code;
+        String stdout;
+        String stderr;
+
+        TarantoolControlException(int code, String stdout, String stderr) {
+            super("returned exitcode " + code + "\n" +
+                "[stdout]\n" + stdout + "\n[stderr]\n" + stderr);
+            this.code = code;
+            this.stdout = stdout;
+            this.stderr = stderr;
+        }
+    }
+
     protected static final String tntCtlWorkDir = System.getProperty("tntCtlWorkDir",
         new File("testroot").getAbsolutePath());
     protected static final String instanceDir = new File("src/test").getAbsolutePath();
     protected static final String tarantoolCtlConfig = new File("src/test/.tarantoolctl").getAbsolutePath();
     protected static final int RESTART_TIMEOUT = 2000;
 
+    static {
+        try {
+            setupWorkDirectory();
+        } catch (IOException e) {
+            throw new RuntimeException("Can't setup test root directory!", e);
+        }
+    }
+
+    protected static void setupWorkDirectory() throws IOException {
+        try {
+            rmdir(tntCtlWorkDir);
+        } catch (IOException ignored) {
+            /* No-op. */
+        }
+
+        mkdir(tntCtlWorkDir);
+        for (File c : new File(instanceDir).listFiles())
+            if (c.getName().endsWith(".lua"))
+                copyFile(c, tntCtlWorkDir);
+        copyFile(tarantoolCtlConfig, tntCtlWorkDir);
+    }
+
     // Based on https://stackoverflow.com/a/779529
-    private void rmdir(File f) throws IOException {
+    private static void rmdir(File f) throws IOException {
         if (f.isDirectory()) {
             for (File c : f.listFiles())
                 rmdir(c);
         }
         f.delete();
     }
 
-    private void rmdir(String f) throws IOException {
+    private static void rmdir(String f) throws IOException {
         rmdir(new File(f));
     }
 
-    private void mkdir(File f) throws IOException {
+    private static void mkdir(File f) throws IOException {
         f.mkdirs();
     }
 
-    private void mkdir(String f) throws IOException {
+    private static void mkdir(String f) throws IOException {
         mkdir(new File(f));
     }
 
@@ -79,23 +115,6 @@ private static String loadStream(InputStream s) throws IOException {
         return sb.toString();
     }
 
-    protected void setupWorkDirectory() throws IOException {
-        rmdir(tntCtlWorkDir);
-        mkdir(tntCtlWorkDir);
-        for (File c : new File(instanceDir).listFiles())
-            if (c.getName().endsWith(".lua"))
-                copyFile(c, tntCtlWorkDir);
-        copyFile(tarantoolCtlConfig, tntCtlWorkDir);
-    }
-
-    TarantoolControl() {
-        try {
-            setupWorkDirectory();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
     /**
      * Control the given tarantool instance via tarantoolctl utility.
      *
@@ -158,16 +177,85 @@ public void run() {
             } catch (IOException e) {
                 /* No-op. */
             }
-            throw new RuntimeException("returned exitcode " + code + "\n" +
-                "[stdout]\n" + stdout + "\n[stderr]\n" + stderr);
+            throw new TarantoolControlException(code, stdout, stderr);
+        }
+    }
+
+    /**
+     * Wait until the instance will be started.
+     *
+     * Use tarantoolctl status instanceName.
+     *
+     * Then test connection using text console (TarantoolTcpConsole) to ensure
+     * the instance was entirely started or fallback to binary port
+     * (TarantoolLocalConsole) when the test console was not opened.
+     */
+    public void waitStarted(String instanceName) {
+        while (status(instanceName) != 0)
+            sleep();
+
+        while (true) {
+            try {
+                openConsole(instanceName).close();
+                break;
+            } catch (Exception ignored) {
+                /* No-op. */
+            }
+            sleep();
         }
     }
 
+    /**
+     * Wait until the instance will be stopped.
+     *
+     * Use tarantoolctl status instanceName.
+     */
+    public void waitStopped(String instanceName) {
+        while (status(instanceName) != 1)
+            sleep();
+    }
+
     public void start(String instanceName) {
         executeCommand("start", instanceName);
     }
 
     public void stop(String instanceName) {
         executeCommand("stop", instanceName);
     }
+
+    /**
+     * Wrapper for `tarantoolctl status instanceName`.
+     *
+     * Return exit code of the command:
+     *
+     * * 0 -- started;
+     * * 1 -- stopped;
+     * * 2 -- pid file exists, control socket inaccessible.
+     */
+    public int status(String instanceName) {
+        try {
+            executeCommand("status", instanceName);
+        } catch (TarantoolControlException e) {
+            return e.code;
+        }
+
+        return 0;
+    }
+
+    /*
+     * XXX: This function is planned to use text console (from ADMIN
+     * environment variable) when it is availiable for the instance and
+     * fallback to TarantoolLocalConsole.
+     */
+    public TarantoolConsole openConsole(String instanceName) {
+        return TarantoolConsole.open(tntCtlWorkDir, instanceName);
+    }
+
+    public static void sleep() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }