Skip to content

Commit 339d8f7

Browse files
skyflow-bhartiskyflow-bharti
authored
Merge branch 'v3-release/25.9.11' into SK-2302-multi-table-insert-support-in-v3-sdk
2 parents 24cb613 + 7b83641 commit 339d8f7

6 files changed

Lines changed: 270 additions & 260 deletions

File tree

‎common/pom.xml‎

Lines changed: 8 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -3,130 +3,22 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
6-
<!-- <parent>-->
7-
<!-- <groupId>com.skyflow</groupId>-->
8-
<!-- <artifactId>skyflow</artifactId>-->
9-
<!-- <version>1.0.1</version>-->
10-
<!-- <relativePath>../pom.xml</relativePath>-->
11-
<!-- </parent>-->
12-
<groupId>com.skyflow</groupId>
6+
<parent>
7+
<groupId>com.skyflow</groupId>
8+
<artifactId>skyflow</artifactId>
9+
<version>1.0.0</version>
10+
<relativePath>../pom.xml</relativePath>
11+
</parent>
12+
1313
<artifactId>common</artifactId>
1414
<version>1.0.1</version>
15-
<name>com.skyflow:common</name>
15+
<name>${project.groupId}:${project.artifactId}</name>
1616

1717

1818
<properties>
1919
<maven.deploy.skip>true</maven.deploy.skip>
2020
<maven.compiler.source>8</maven.compiler.source>
2121
<maven.compiler.target>8</maven.compiler.target>
2222
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<okhttp-version>4.12.0</okhttp-version>
24-
<gson-version>2.10.1</gson-version>
25-
<gson-fire-version>1.9.0</gson-fire-version>
26-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
27-
<okhttp-version>4.12.0</okhttp-version>
28-
<junit-version>4.13.2</junit-version>
29-
<javax-xml-bind-version>2.3.1</javax-xml-bind-version>
30-
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
3123
</properties>
32-
33-
<dependencies>
34-
<dependency>
35-
<groupId>com.fasterxml.jackson.core</groupId>
36-
<artifactId>jackson-databind</artifactId>
37-
<version>2.17.2</version>
38-
<scope>compile</scope>
39-
</dependency>
40-
<dependency>
41-
<groupId>com.fasterxml.jackson.datatype</groupId>
42-
<artifactId>jackson-datatype-jdk8</artifactId>
43-
<version>2.17.2</version>
44-
<scope>compile</scope>
45-
</dependency>
46-
<dependency>
47-
<groupId>com.fasterxml.jackson.datatype</groupId>
48-
<artifactId>jackson-datatype-jsr310</artifactId>
49-
<version>2.17.2</version>
50-
<scope>compile</scope>
51-
</dependency>
52-
<!-- newly added v2 dependencies -->
53-
<dependency>
54-
<groupId>io.github.cdimascio</groupId>
55-
<artifactId>dotenv-java</artifactId>
56-
<version>2.2.0</version>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.google.code.findbugs</groupId>
60-
<artifactId>jsr305</artifactId>
61-
<version>3.0.2</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>io.gsonfire</groupId>
65-
<artifactId>gson-fire</artifactId>
66-
<version>${gson-fire-version}</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>com.google.code.gson</groupId>
70-
<artifactId>gson</artifactId>
71-
<version>${gson-version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>com.squareup.okhttp3</groupId>
75-
<artifactId>okhttp</artifactId>
76-
<version>${okhttp-version}</version>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.squareup.okhttp3</groupId>
80-
<artifactId>logging-interceptor</artifactId>
81-
<version>${okhttp-version}</version>
82-
</dependency>
83-
<!-- existing dependencies -->
84-
<dependency>
85-
<groupId>commons-codec</groupId>
86-
<artifactId>commons-codec</artifactId>
87-
<version>1.15</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>io.jsonwebtoken</groupId>
91-
<artifactId>jjwt</artifactId>
92-
<version>0.12.6</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>jakarta.annotation</groupId>
96-
<artifactId>jakarta.annotation-api</artifactId>
97-
<version>${jakarta-annotation-version}</version>
98-
<scope>provided</scope>
99-
</dependency>
100-
<dependency>
101-
<groupId>javax.xml.bind</groupId>
102-
<artifactId>jaxb-api</artifactId>
103-
<version>${javax-xml-bind-version}</version>
104-
</dependency>
105-
<!-- existing test dependencies -->
106-
<dependency>
107-
<groupId>junit</groupId>
108-
<artifactId>junit</artifactId>
109-
<version>${junit-version}</version>
110-
<scope>test</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.powermock</groupId>
114-
<artifactId>powermock-module-junit4</artifactId>
115-
<version>2.0.9</version>
116-
<scope>test</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.powermock</groupId>
120-
<artifactId>powermock-api-mockito2</artifactId>
121-
<version>2.0.9</version>
122-
<scope>test</scope>
123-
</dependency>
124-
<dependency>
125-
<groupId>org.junit.jupiter</groupId>
126-
<artifactId>junit-jupiter</artifactId>
127-
<version>5.13.2</version>
128-
<scope>compile</scope>
129-
</dependency>
130-
</dependencies>
131-
13224
</project>

‎samples/src/main/java/com/example/vault/BulkInsertAsync.java‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
import com.skyflow.config.VaultConfig;
66
import com.skyflow.enums.Env;
77
import com.skyflow.enums.LogLevel;
8+
import com.skyflow.enums.UpdateType;
9+
import com.skyflow.vault.data.InsertRecord;
810
import com.skyflow.vault.data.InsertRequest;
911
import com.skyflow.vault.data.InsertResponse;
1012

1113
import java.util.ArrayList;
1214
import java.util.HashMap;
15+
import java.util.List;
1316
import java.util.concurrent.CompletableFuture;
1417
import java.util.concurrent.CompletionException;
1518

@@ -48,20 +51,34 @@ public static void main(String[] args) {
4851
record1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
4952
record1.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");
5053

54+
InsertRecord recordObj1 = InsertRecord
55+
.builder()
56+
.data(record1)
57+
.build();
58+
5159
// Step 5: Prepare second record for insertion
5260
HashMap<String, Object> record2 = new HashMap<>();
5361
record2.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
5462
record2.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");
5563

56-
// Step 6: Combine records into a single list
57-
ArrayList<HashMap<String, Object>> values = new ArrayList<>();
58-
values.add(record1);
59-
values.add(record2);
64+
InsertRecord recordObj2 = InsertRecord
65+
.builder()
66+
.data(record2)
67+
.build();
68+
69+
// Step 6: Combine records into a Insert record list
70+
ArrayList<InsertRecord> values = new ArrayList<>();
71+
values.add(recordObj1);
72+
values.add(recordObj2);
6073

74+
List<String> upsert = new ArrayList<>();
75+
upsert.add("<YOUR_COLUMN_NAME_1>");
6176
// Step 7: Build the insert request with table name and values
6277
InsertRequest request = InsertRequest.builder()
6378
.table("<YOUR_TABLE_NAME>")
64-
.values(values)
79+
.upsert(upsert)
80+
.upsertType(UpdateType.REPLACE)
81+
.records(values)
6582
.build();
6683

6784
// Step 8: Execute the async bulk insert operation and handle response using callbacks

‎samples/src/main/java/com/example/vault/BulkInsertSync.java‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
import com.skyflow.config.VaultConfig;
66
import com.skyflow.enums.Env;
77
import com.skyflow.enums.LogLevel;
8+
import com.skyflow.enums.UpdateType;
89
import com.skyflow.errors.SkyflowException;
910
import com.skyflow.vault.data.InsertRequest;
1011
import com.skyflow.vault.data.InsertResponse;
1112

1213
import java.util.ArrayList;
1314
import java.util.HashMap;
15+
import java.util.List;
1416

1517
/**
1618
* This sample demonstrates how to perform a synchronous bulk insert operation using the Skyflow Java SDK.
@@ -52,15 +54,24 @@ public static void main(String[] args) {
5254
record2.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
5355
record2.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");
5456

55-
// Step 6: Combine records into a single list
56-
ArrayList<HashMap<String, Object>> values = new ArrayList<>();
57-
values.add(record1);
58-
values.add(record2);
57+
InsertRecord recordObj2 = InsertRecord
58+
.builder()
59+
.data(record2)
60+
.build();
61+
62+
// Step 6: Combine records into a Insert record list
63+
ArrayList<InsertRecord> values = new ArrayList<>();
64+
values.add(recordObj1);
65+
values.add(recordObj2);
5966

67+
List<String> upsert = new ArrayList<>();
68+
upsert.add("<YOUR_COLUMN_NAME_1>");
6069
// Step 7: Build the insert request with table name and values
6170
InsertRequest request = InsertRequest.builder()
6271
.table("<YOUR_TABLE_NAME>")
63-
.values(values)
72+
.upsert(upsert)
73+
.upsertType(UpdateType.REPLACE)
74+
.records(values)
6475
.build();
6576

6677
// Step 8: Execute the bulk insert operation and print the response

‎samples/src/main/java/com/example/vault/BulkMultiTableInsertAsync.java‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
package com.example.vault;
2+
3+
import com.skyflow.Skyflow;
4+
import com.skyflow.config.Credentials;
5+
import com.skyflow.config.VaultConfig;
6+
import com.skyflow.enums.Env;
7+
import com.skyflow.enums.LogLevel;
8+
import com.skyflow.enums.UpdateType;
9+
import com.skyflow.vault.data.InsertRecord;
10+
import com.skyflow.vault.data.InsertRequest;
11+
import com.skyflow.vault.data.InsertResponse;
12+
13+
import java.util.ArrayList;
14+
import java.util.HashMap;
15+
import java.util.List;
16+
import java.util.concurrent.CompletableFuture;
17+
import java.util.concurrent.CompletionException;
18+
19+
/**
20+
* This sample demonstrates how to perform an asynchronous bulk insert operation using the Skyflow Java SDK.
21+
* The process involves:
22+
* 1. Setting up credentials and vault configuration
23+
* 2. Creating multiple records to be inserted
24+
* 3. Building and executing an async bulk insert request
25+
* 4. Handling the insert response or errors using CompletableFuture
26+
*/
27+
public class BulkMultiTableInsertAsync {
28+
29+
public static void main(String[] args) {
30+
try {
31+
// Step 1: Initialize credentials with the path to your service account key file
32+
String filePath = "<YOUR_CREDENTIALS_FILE_PATH>";
33+
Credentials credentials = new Credentials();
34+
credentials.setPath(filePath);
35+
36+
// Step 2: Configure the vault with required parameters
37+
VaultConfig vaultConfig = new VaultConfig();
38+
vaultConfig.setVaultId("<YOUR_VAULT_ID>");
39+
vaultConfig.setClusterId("<YOUR_CLUSTER_ID>");
40+
vaultConfig.setEnv(Env.PROD);
41+
vaultConfig.setCredentials(credentials);
42+
43+
// Step 3: Create Skyflow client instance with error logging
44+
Skyflow skyflowClient = Skyflow.builder()
45+
.setLogLevel(LogLevel.ERROR)
46+
.addVaultConfig(vaultConfig)
47+
.build();
48+
49+
// Step 4: Prepare first record for insertion
50+
HashMap<String, Object> record1 = new HashMap<>();
51+
record1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
52+
record1.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");
53+
54+
List<String> upsert = new ArrayList<>();
55+
upsert.add("<YOUR_COLUMN_NAME_1>");
56+
57+
InsertRecord recordObj1 = InsertRecord
58+
.builder()
59+
.data(record1)
60+
.table("<YOUR_TABLE_NAME>")
61+
.upsert(upsert)
62+
.upsertType(UpdateType.UPDATE)
63+
.build();
64+
65+
// Step 5: Prepare second record for insertion
66+
HashMap<String, Object> record2 = new HashMap<>();
67+
record2.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
68+
record2.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");
69+
70+
InsertRecord recordObj2 = InsertRecord
71+
.builder()
72+
.data(record2)
73+
.table("<YOUR_TABLE_NAME>")
74+
.build();
75+
76+
// Step 6: Combine records into a Insert record list
77+
ArrayList<InsertRecord> values = new ArrayList<>();
78+
values.add(recordObj1);
79+
values.add(recordObj2);
80+
81+
// Step 7: Build the insert request with table name and values
82+
InsertRequest request = InsertRequest.builder()
83+
.records(values)
84+
.build();
85+
86+
// Step 8: Execute the async bulk insert operation and handle response using callbacks
87+
CompletableFuture<InsertResponse> future = skyflowClient.vault().bulkInsertAsync(request);
88+
// Add success and error callbacks
89+
future.thenAccept(response -> {
90+
System.out.println("Async bulk insert resolved with response:\t" + response);
91+
}).exceptionally(throwable -> {
92+
System.err.println("Async bulk insert rejected with error:\t" + throwable.getMessage());
93+
throw new CompletionException(throwable);
94+
});
95+
} catch (Exception e) {
96+
// Step 9: Handle any synchronous errors that occur during setup
97+
System.err.println("Error in Skyflow operations:\t" + e.getMessage());
98+
}
99+
}
100+
}

0 commit comments

Comments
 (0)