Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Public release
on:
push:
tags: '*.*.*'
tags: '[0-9]+.[0-9]+.[0-9]+'
jobs:
build-and-deploy:
uses: ./.github/workflows/shared-build-and-deploy.yml
Expand Down
2 changes: 1 addition & 1 deletion samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dependency>
<groupId>com.skyflow</groupId>
<artifactId>skyflow-java</artifactId>
<version>3.0.0-beta.3</version>
<version>3.0.0-beta.6</version>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions samples/src/main/java/com/example/vault/BulkInsertAsync.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.Env;
import com.skyflow.enums.LogLevel;
import com.skyflow.enums.UpdateType;
import com.skyflow.enums.UpsertType;
import com.skyflow.vault.data.InsertRecord;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.InsertResponse;
Expand Down Expand Up @@ -77,7 +77,7 @@ public static void main(String[] args) {
InsertRequest request = InsertRequest.builder()
.table("<YOUR_TABLE_NAME>")
.upsert(upsertColumns)
.upsertType(UpdateType.REPLACE)
.upsertType(UpsertType.REPLACE)
.records(insertRecords)
.build();

Expand Down
5 changes: 3 additions & 2 deletions samples/src/main/java/com/example/vault/BulkInsertSync.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.Env;
import com.skyflow.enums.LogLevel;
import com.skyflow.enums.UpdateType;
import com.skyflow.enums.UpsertType;
import com.skyflow.errors.SkyflowException;
import com.skyflow.vault.data.InsertRecord;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.InsertResponse;

Expand Down Expand Up @@ -76,7 +77,7 @@ public static void main(String[] args) {
InsertRequest request = InsertRequest.builder()
.table("<YOUR_TABLE_NAME>")
.upsert(upsertColumns)
.upsertType(UpdateType.REPLACE)
.upsertType(UpsertType.REPLACE)
.records(insertRecords)
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.Env;
import com.skyflow.enums.LogLevel;
import com.skyflow.enums.UpdateType;
import com.skyflow.enums.UpsertType;
import com.skyflow.vault.data.InsertRecord;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.InsertResponse;
Expand Down Expand Up @@ -48,7 +48,7 @@ public static void main(String[] args) {

// Step 4: Prepare first record for insertion
HashMap<String, Object> recordData1 = new HashMap<>();
rerecordData1cord1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
recordData1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
recordData1.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");

List<String> upsertColumns = new ArrayList<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import com.skyflow.config.VaultConfig;
import com.skyflow.enums.Env;
import com.skyflow.enums.LogLevel;
import com.skyflow.enums.UpdateType;
import com.skyflow.enums.UpsertType;
import com.skyflow.errors.SkyflowException;
import com.skyflow.vault.data.InsertRecord;
import com.skyflow.vault.data.InsertRequest;
import com.skyflow.vault.data.InsertResponse;

Expand Down Expand Up @@ -46,7 +47,7 @@ public static void main(String[] args) {

// Step 4: Prepare first record for insertion
HashMap<String, Object> recordData1 = new HashMap<>();
rerecordData1cord1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
recordData1.put("<YOUR_COLUMN_NAME_1>", "<YOUR_VALUE_1>");
recordData1.put("<YOUR_COLUMN_NAME_2>", "<YOUR_VALUE_1>");

List<String> upsertColumns = new ArrayList<>();
Expand Down
9 changes: 8 additions & 1 deletion v3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>

<artifactId>skyflow-java</artifactId>
<version>3.0.0-beta.6</version>
<version>3.0.0-beta.6-dev.4dec765</version>
<packaging>jar</packaging>
<name>${project.groupId}:${project.artifactId}</name>
<description>Skyflow V3 SDK for the Java programming language</description>
Expand All @@ -35,6 +35,7 @@
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.deploy.skip>false</maven.deploy.skip>
<sdk.version>${project.version}</sdk.version>
</properties>


Expand All @@ -48,6 +49,12 @@
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
27 changes: 25 additions & 2 deletions v3/src/main/java/com/skyflow/utils/Constants.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
package com.skyflow.utils;

import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;

public final class Constants extends BaseConstants {
public static final String SDK_NAME = "Skyflow Java SDK ";
public static final String SDK_VERSION = "3.0.0-beta.6";
public static final String SDK_VERSION;
public static final String VAULT_DOMAIN = ".skyvault.";
public static final String SDK_PREFIX = SDK_NAME + SDK_VERSION;
public static final String SDK_PREFIX;
public static final Integer INSERT_BATCH_SIZE = 50;
public static final Integer MAX_INSERT_BATCH_SIZE = 1000;
public static final Integer INSERT_CONCURRENCY_LIMIT = 1;
Expand All @@ -13,5 +17,24 @@ public final class Constants extends BaseConstants {
public static final Integer DETOKENIZE_CONCURRENCY_LIMIT = 1;
public static final Integer MAX_DETOKENIZE_BATCH_SIZE = 1000;
public static final Integer MAX_DETOKENIZE_CONCURRENCY_LIMIT = 10;
public static final String DEFAULT_SDK_VERSION = "v3";

static {
String sdkVersion;
// Use a static initializer block to read the properties file
Properties properties = new Properties();
try (InputStream input = Constants.class.getClassLoader().getResourceAsStream("sdk.properties")) {
if (input == null) {
sdkVersion = DEFAULT_SDK_VERSION;
} else {
properties.load(input);
sdkVersion = properties.getProperty("sdk.version", DEFAULT_SDK_VERSION);
}
} catch (IOException ex) {
sdkVersion = DEFAULT_SDK_VERSION;
}
SDK_VERSION = sdkVersion;
SDK_PREFIX = SDK_NAME + " " + SDK_VERSION;
}

}
1 change: 1 addition & 0 deletions v3/src/main/resources/sdk.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sdk.version=${sdk.version}