renamed execute to executeV1 and executeAsyncWait to execute

Author: NRHelmi

CHANGELOG.md

@@ -1,3 +1,10 @@
+# Changelog
+
+## v0.4.0-alpha
+* Renamed:
+  - `execute` to `executeV1`.
+  - `executeAsyncWait` to `execute`.
+
 ## v0.3.0-alpha
 * Added `CancelTransaction` feature.
 

README.md

@@ -86,7 +86,7 @@ In order to use the `rai-sdk-java`, you need add this dependency to your project
     <dependency>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk</artifactId>
-        <version>0.3.0-alpha</version>
+        <version>0.4.0-alpha</version>
     </dependency>
 
 You need also to point maven to the SDK GitHub packages repository in the project's POM:

pom.xml

@@ -21,7 +21,7 @@
     <description>The RelationalAI Software Development Kit (SDK) for Java</description>
     <groupId>com.relationalai</groupId>
     <artifactId>rai-sdk-pom</artifactId>
-    <version>0.3.0-alpha</version>
+    <version>0.4.0-alpha</version>
     <packaging>pom</packaging>
     <url></url>
 

rai-sdk-examples/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk-pom</artifactId>
-        <version>0.3.0-alpha</version>
+        <version>0.4.0-alpha</version>
     </parent>
 
     <name>RelationalAI SDK for Java Examples</name>

rai-sdk-examples/src/main/java/com/relationalai/examples/Execute.java renamed to rai-sdk-examples/src/main/java/com/relationalai/examples/ExecuteV1.java

@@ -24,7 +24,7 @@
 import com.relationalai.HttpError;
 import com.relationalai.Json;
 
-public class Execute implements Runnable {
+public class ExecuteV1 implements Runnable {
     boolean readonly;
     String database, engine, command, filename, profile;
 
@@ -64,7 +64,7 @@ public void run(String[] args) throws HttpError, InterruptedException, IOExcepti
         String source = getCommand();
         if (source == null)
             return; // nothing to execute
-        var rsp = client.execute(database, engine, source, readonly);
+        var rsp = client.executeV1(database, engine, source, readonly);
         Json.print(rsp, 4);
     }
 }

rai-sdk/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.relationalai</groupId>
         <artifactId>rai-sdk-pom</artifactId>
-        <version>0.3.0-alpha</version>
+        <version>0.4.0-alpha</version>
     </parent>
 
     <name>RelationalAI SDK for Java Package</name>

rai-sdk/src/main/java/com/relationalai/Client.java

@@ -672,18 +672,18 @@ String createMode(String source, boolean overwrite) {
             return overwrite ? "CREATE_OVERWRITE" : "CREATE";
     }
 
-    public TransactionResult execute(String database, String engine, String source)
+    public TransactionResult executeV1(String database, String engine, String source)
             throws HttpError, InterruptedException, IOException {
-        return execute(database, engine, source, false, null);
+        return executeV1(database, engine, source, false, null);
     }
 
-    public TransactionResult execute(
+    public TransactionResult executeV1(
             String database, String engine, String source, boolean readonly)
             throws HttpError, InterruptedException, IOException {
-        return execute(database, engine, source, readonly, null);
+        return executeV1(database, engine, source, readonly, null);
     }
 
-    public TransactionResult execute(
+    public TransactionResult executeV1(
             String database, String engine,
             String source, boolean readonly,
             Map<String, String> inputs)
@@ -695,12 +695,12 @@ public TransactionResult execute(
         return Json.deserialize((String) rsp, TransactionResult.class);
     }
 
-    public TransactionAsyncResult executeAsyncWait(
+    public TransactionAsyncResult execute(
             String database, String engine, String source, boolean readonly) throws HttpError, IOException, InterruptedException {
-        return executeAsyncWait(database, engine, source, readonly, new HashMap<>());
+        return execute(database, engine, source, readonly, new HashMap<>());
     }
 
-    public TransactionAsyncResult executeAsyncWait(
+    public TransactionAsyncResult execute(
             String database, String engine,
             String source, boolean readonly,
             Map<String, String> inputs) throws HttpError, IOException, InterruptedException {
@@ -1014,7 +1014,7 @@ public TransactionResult loadCsv(
         var source = genLoadCsv(relation, options);
         var inputs = new HashMap<String, String>();
         inputs.put("data", data);
-        return execute(database, engine, source, false, inputs);
+        return executeV1(database, engine, source, false, inputs);
     }
 
     // Generate the Rel to load JSON data into a relation.
@@ -1038,6 +1038,6 @@ public TransactionResult loadJson(
         var inputs = new HashMap<String, String>();
         inputs.put("data", data);
         var source = genLoadJson(relation);
-        return execute(database, engine, source, false, inputs);
+        return executeV1(database, engine, source, false, inputs);
     }
 }

rai-sdk/src/test/java/com/relationalai/DatabaseTest.java

@@ -160,7 +160,7 @@ void testDatabase() throws HttpError, InterruptedException, IOException {
         assertEquals("CREATED", createRsp.state);
 
         // Make sure the data was cloned 
-        var rsp = client.execute(databaseCloneName, engineName, "test_data", true);
+        var rsp = client.executeV1(databaseCloneName, engineName, "test_data", true);
 
         Relation rel;
 

rai-sdk/src/test/java/com/relationalai/ExecuteAsyncTest.java

@@ -36,7 +36,7 @@ void testExecuteAsync() throws HttpError, InterruptedException, IOException {
 
         var query = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}";
 
-        var rsp = client.executeAsyncWait(databaseName, engineName, query, true);
+        var rsp = client.execute(databaseName, engineName, query, true);
 
         var results = new ArrayList<ArrowRelation> () {
             {

rai-sdk/src/test/java/com/relationalai/ExecuteTest.java

@@ -28,14 +28,14 @@
 // Test transaction execution.
 @TestInstance(Lifecycle.PER_CLASS)
 public class ExecuteTest extends UnitTest {
-    @Test void testExecute() throws HttpError, InterruptedException, IOException {
+    @Test void testExecuteV1() throws HttpError, InterruptedException, IOException {
         var client = createClient();
 
         ensureDatabase(client);
 
         var query = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}";
 
-        var rsp = client.execute(databaseName, engineName, query, true);
+        var rsp = client.executeV1(databaseName, engineName, query, true);
         assertEquals(rsp.aborted, false);
         var output = rsp.output;
         assertEquals(output.length, 1);