IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

rename to simply spanner,added check for service account file

Browse Source
This commit is contained in:
Mark Wolters
2024-10-01 13:29:42 -04:00
parent eb33818ce0
commit bad242f577
7 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/GCPSpannerAdapterUtils.java
View File

@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class GCPSpannerAdapterUtils { public class GCPSpannerAdapterUtils {
public static final String SPANNER = "gcp_spanner"; public static final String SPANNER = "spanner";
public static int[] getKeyArrayFromResultSet(ResultSet rs) { public static int[] getKeyArrayFromResultSet(ResultSet rs) {
List<Integer> values = new ArrayList<>(); List<Integer> values = new ArrayList<>();

9
nb-adapters/adapter-gcp-spanner/src/main/java/io/nosqlbench/adapter/gcpspanner/GCPSpannerSpace.java
View File

@@ -33,9 +33,6 @@ import org.apache.logging.log4j.Logger;
* @see <a href="https://cloud.google.com/spanner/docs/reference/standard-sql/dml-syntax">DML Syntax</a> * @see <a href="https://cloud.google.com/spanner/docs/reference/standard-sql/dml-syntax">DML Syntax</a>
* @see <a href="https://cloud.google.com/spanner/docs/reference/rpc">spanner rpc api calls</a> * @see <a href="https://cloud.google.com/spanner/docs/reference/rpc">spanner rpc api calls</a>
* @see <a href="https://cloud.google.com/spanner/docs/reference/standard-sql/data-definition-language#vector_index_statements">SQL functionality related to vector indices</a> * @see <a href="https://cloud.google.com/spanner/docs/reference/standard-sql/data-definition-language#vector_index_statements">SQL functionality related to vector indices</a>
* @see <a href=""></a>
* @see <a href=""></a>
* @see <a href=""></a>
*/ */
public class GCPSpannerSpace implements AutoCloseable { public class GCPSpannerSpace implements AutoCloseable {
private final static Logger logger = LogManager.getLogger(GCPSpannerSpace.class); private final static Logger logger = LogManager.getLogger(GCPSpannerSpace.class);
@@ -89,8 +86,10 @@ public class GCPSpannerSpace implements AutoCloseable {
if ( if (
cfg.getOptional("database_id").isEmpty() || cfg.getOptional("database_id").isEmpty() ||
cfg.getOptional("project_id").isEmpty() || cfg.getOptional("project_id").isEmpty() ||
cfg.getOptional("instance_id").isEmpty()) { cfg.getOptional("instance_id").isEmpty() ||
throw new RuntimeException("You must provide all 'service_account_file', 'project_id', 'instance_id' & 'database_id' to configure a Google Spanner client"); cfg.getOptional("service_account_file").isEmpty()) {
throw new RuntimeException("You must provide all 'service_account_file', 'project_id', 'instance_id' &" +
" 'database_id' to configure a Google Spanner client");
} }
String projectId = cfg.get("project_id"); String projectId = cfg.get("project_id");
String instanceId = cfg.get("instance_id"); String instanceId = cfg.get("instance_id");

2
nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_index_ddl.yaml
View File

@@ -1,6 +1,6 @@
scenarios: scenarios:
default: default:
execute_ddl: run driver=gcp_spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file) execute_ddl: run driver=spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file)
project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1 project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1
# https://cloud.google.com/spanner/docs/reference/standard-sql/data-definition-language#vector_index_option_list # https://cloud.google.com/spanner/docs/reference/standard-sql/data-definition-language#vector_index_option_list

2
nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_queryvector_dml.yaml
View File

@@ -1,6 +1,6 @@
scenarios: scenarios:
default: default:
execute_dml: run driver=gcp_spanner tags==blocks:execute_dml service_account_file=TEMPLATE(service_account_file) execute_dml: run driver=spanner tags==blocks:execute_dml service_account_file=TEMPLATE(service_account_file)
project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles) project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles)
bindings: bindings:

2
nb-adapters/adapter-gcp-spanner/src/main/resources/activities/execute_table_ddl.yaml
View File

@@ -1,6 +1,6 @@
scenarios: scenarios:
default: default:
execute_ddl: run driver=gcp_spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file) execute_ddl: run driver=spanner tags==blocks:execute_ddl service_account_file=TEMPLATE(service_account_file)
project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1 project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=1
blocks: blocks:

2
nb-adapters/adapter-gcp-spanner/src/main/resources/activities/insert_vector.yaml
View File

@@ -1,7 +1,7 @@
scenarios: scenarios:
default: default:
insert_vector: >- insert_vector: >-
run driver=gcp_spanner tags==blocks:insert_vector service_account_file=TEMPLATE(service_account_file) run driver=spanner tags==blocks:insert_vector service_account_file=TEMPLATE(service_account_file)
project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles) project_id=TEMPLATE(project_id) instance_id=TEMPLATE(instance_id) database_id=TEMPLATE(database_id) cycles=TEMPLATE(cycles)
bindings: bindings:

0
nb-adapters/adapter-gcp-spanner/src/main/resources/gcp-spanner.md → nb-adapters/adapter-gcp-spanner/src/main/resources/spanner.md
View File