Skip to content

Commit f1bfcdd

Browse files
NRHelmiNRHelmi
committed
renamed execute to executeV1 and executeAsyncWait to execute
1 parent 1801e26 commit f1bfcdd

File tree

12 files changed

+32
-25
lines changed

12 files changed

+32
-25
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# Changelog
2+
3+
## v0.4.0-alpha
4+
* Renamed:
5+
- `execute` to `executeV1`.
6+
- `executeAsyncWait` to `execute`.
7+
18
## v0.3.0-alpha
29
* Added `CancelTransaction` feature.
310

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ In order to use the `rai-sdk-java`, you need add this dependency to your project
8686
<dependency>
8787
<groupId>com.relationalai</groupId>
8888
<artifactId>rai-sdk</artifactId>
89-
<version>0.3.0-alpha</version>
89+
<version>0.4.0-alpha</version>
9090
</dependency>
9191

9292
You need also to point maven to the SDK GitHub packages repository in the project's POM:

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<description>The RelationalAI Software Development Kit (SDK) for Java</description>
2222
<groupId>com.relationalai</groupId>
2323
<artifactId>rai-sdk-pom</artifactId>
24-
<version>0.3.0-alpha</version>
24+
<version>0.4.0-alpha</version>
2525
<packaging>pom</packaging>
2626
<url></url>
2727

‎rai-sdk-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.relationalai</groupId>
2222
<artifactId>rai-sdk-pom</artifactId>
23-
<version>0.3.0-alpha</version>
23+
<version>0.4.0-alpha</version>
2424
</parent>
2525

2626
<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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.relationalai.HttpError;
2525
import com.relationalai.Json;
2626

27-
public class Execute implements Runnable {
27+
public class ExecuteV1 implements Runnable {
2828
boolean readonly;
2929
String database, engine, command, filename, profile;
3030

@@ -64,7 +64,7 @@ public void run(String[] args) throws HttpError, InterruptedException, IOExcepti
6464
String source = getCommand();
6565
if (source == null)
6666
return; // nothing to execute
67-
var rsp = client.execute(database, engine, source, readonly);
67+
var rsp = client.executeV1(database, engine, source, readonly);
6868
Json.print(rsp, 4);
6969
}
7070
}

‎rai-sdk/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.relationalai</groupId>
2222
<artifactId>rai-sdk-pom</artifactId>
23-
<version>0.3.0-alpha</version>
23+
<version>0.4.0-alpha</version>
2424
</parent>
2525

2626
<name>RelationalAI SDK for Java Package</name>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -672,18 +672,18 @@ String createMode(String source, boolean overwrite) {
672672
return overwrite ? "CREATE_OVERWRITE" : "CREATE";
673673
}
674674

675-
public TransactionResult execute(String database, String engine, String source)
675+
public TransactionResult executeV1(String database, String engine, String source)
676676
throws HttpError, InterruptedException, IOException {
677-
return execute(database, engine, source, false, null);
677+
return executeV1(database, engine, source, false, null);
678678
}
679679

680-
public TransactionResult execute(
680+
public TransactionResult executeV1(
681681
String database, String engine, String source, boolean readonly)
682682
throws HttpError, InterruptedException, IOException {
683-
return execute(database, engine, source, readonly, null);
683+
return executeV1(database, engine, source, readonly, null);
684684
}
685685

686-
public TransactionResult execute(
686+
public TransactionResult executeV1(
687687
String database, String engine,
688688
String source, boolean readonly,
689689
Map<String, String> inputs)
@@ -695,12 +695,12 @@ public TransactionResult execute(
695695
return Json.deserialize((String) rsp, TransactionResult.class);
696696
}
697697

698-
public TransactionAsyncResult executeAsyncWait(
698+
public TransactionAsyncResult execute(
699699
String database, String engine, String source, boolean readonly) throws HttpError, IOException, InterruptedException {
700-
return executeAsyncWait(database, engine, source, readonly, new HashMap<>());
700+
return execute(database, engine, source, readonly, new HashMap<>());
701701
}
702702

703-
public TransactionAsyncResult executeAsyncWait(
703+
public TransactionAsyncResult execute(
704704
String database, String engine,
705705
String source, boolean readonly,
706706
Map<String, String> inputs) throws HttpError, IOException, InterruptedException {
@@ -1014,7 +1014,7 @@ public TransactionResult loadCsv(
10141014
var source = genLoadCsv(relation, options);
10151015
var inputs = new HashMap<String, String>();
10161016
inputs.put("data", data);
1017-
return execute(database, engine, source, false, inputs);
1017+
return executeV1(database, engine, source, false, inputs);
10181018
}
10191019

10201020
// Generate the Rel to load JSON data into a relation.
@@ -1038,6 +1038,6 @@ public TransactionResult loadJson(
10381038
var inputs = new HashMap<String, String>();
10391039
inputs.put("data", data);
10401040
var source = genLoadJson(relation);
1041-
return execute(database, engine, source, false, inputs);
1041+
return executeV1(database, engine, source, false, inputs);
10421042
}
10431043
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void testDatabase() throws HttpError, InterruptedException, IOException {
160160
assertEquals("CREATED", createRsp.state);
161161

162162
// Make sure the data was cloned
163-
var rsp = client.execute(databaseCloneName, engineName, "test_data", true);
163+
var rsp = client.executeV1(databaseCloneName, engineName, "test_data", true);
164164

165165
Relation rel;
166166

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void testExecuteAsync() throws HttpError, InterruptedException, IOException {
3636

3737
var query = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}";
3838

39-
var rsp = client.executeAsyncWait(databaseName, engineName, query, true);
39+
var rsp = client.execute(databaseName, engineName, query, true);
4040

4141
var results = new ArrayList<ArrowRelation> () {
4242
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
// Test transaction execution.
2929
@TestInstance(Lifecycle.PER_CLASS)
3030
public class ExecuteTest extends UnitTest {
31-
@Test void testExecute() throws HttpError, InterruptedException, IOException {
31+
@Test void testExecuteV1() throws HttpError, InterruptedException, IOException {
3232
var client = createClient();
3333

3434
ensureDatabase(client);
3535

3636
var query = "x, x^2, x^3, x^4 from x in {1; 2; 3; 4; 5}";
3737

38-
var rsp = client.execute(databaseName, engineName, query, true);
38+
var rsp = client.executeV1(databaseName, engineName, query, true);
3939
assertEquals(rsp.aborted, false);
4040
var output = rsp.output;
4141
assertEquals(output.length, 1);

‎rai-sdk/src/test/java/com/relationalai/LoadCsvTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class LoadCsvTest extends UnitTest {
4747
assertEquals(0, loadRsp.output.length);
4848
assertEquals(0, loadRsp.problems.length);
4949

50-
var rsp = client.execute(databaseName, engineName, "def output = sample");
50+
var rsp = client.executeV1(databaseName, engineName, "def output = sample");
5151

5252
Relation rel;
5353

@@ -103,7 +103,7 @@ public class LoadCsvTest extends UnitTest {
103103
assertEquals(0, loadRsp.output.length);
104104
assertEquals(0, loadRsp.problems.length);
105105

106-
var rsp = client.execute(databaseName, engineName, "def output = sample_no_header");
106+
var rsp = client.executeV1(databaseName, engineName, "def output = sample_no_header");
107107

108108
Relation rel;
109109

@@ -160,7 +160,7 @@ public class LoadCsvTest extends UnitTest {
160160
assertEquals(0, loadRsp.output.length);
161161
assertEquals(0, loadRsp.problems.length);
162162

163-
var rsp = client.execute(databaseName, engineName, "def output = sample_alt_syntax");
163+
var rsp = client.executeV1(databaseName, engineName, "def output = sample_alt_syntax");
164164

165165
Relation rel;
166166

@@ -214,7 +214,7 @@ public class LoadCsvTest extends UnitTest {
214214
assertEquals(0, loadRsp.output.length);
215215
assertEquals(0, loadRsp.problems.length);
216216

217-
var rsp = client.execute(databaseName, engineName, "def output = sample");
217+
var rsp = client.executeV1(databaseName, engineName, "def output = sample");
218218

219219
Relation rel;
220220

‎rai-sdk/src/test/java/com/relationalai/LoadJsonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class LoadJsonTest extends UnitTest {
4545
assertEquals(0, loadRsp.output.length);
4646
assertEquals(0, loadRsp.problems.length);
4747

48-
var rsp = client.execute(databaseName, engineName, "def output = sample");
48+
var rsp = client.executeV1(databaseName, engineName, "def output = sample");
4949

5050
Relation rel;
5151

0 commit comments

Comments
 (0)