Fix as_performance and app_engine build tags

aerospike · May 14, 2024 · 575d8ff · 575d8ff
1 parent d240725
commit 575d8ff
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 2 deletions.
diff --git a/cdt_map_test.go b/cdt_map_test.go
@@ -1,3 +1,6 @@
+//go:build !as_performance && !app_engine
+// +build !as_performance,!app_engine
+
 // Copyright 2014-2022 Aerospike, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/client.go b/client.go
@@ -137,6 +137,11 @@ func (clnt *Client) GetDefaultBatchWritePolicy() *BatchWritePolicy {
 	return clnt.DefaultBatchWritePolicy
 }
 
+// DefaultBatchReadPolicy returns corresponding default policy from the client
+func (clnt *Client) GetDefaultBatchReadPolicy() *BatchReadPolicy {
+	return clnt.DefaultBatchReadPolicy
+}
+
 // DefaultBatchDeletePolicy returns corresponding default policy from the client
 func (clnt *Client) GetDefaultBatchDeletePolicy() *BatchDeletePolicy {
 	return clnt.DefaultBatchDeletePolicy
@@ -187,6 +192,11 @@ func (clnt *Client) SetDefaultBatchWritePolicy(policy *BatchWritePolicy) {
 	clnt.DefaultBatchWritePolicy = policy
 }
 
+// DefaultBatchReadPolicy returns corresponding default policy from the client
+func (clnt *Client) SetDefaultBatchReadPolicy(policy *BatchReadPolicy) {
+	clnt.DefaultBatchReadPolicy = policy
+}
+
 // DefaultBatchDeletePolicy returns corresponding default policy from the client
 func (clnt *Client) SetDefaultBatchDeletePolicy(policy *BatchDeletePolicy) {
 	clnt.DefaultBatchDeletePolicy = policy

diff --git a/client_ifc_app_engine.go b/client_ifc_app_engine.go
@@ -103,8 +103,22 @@ type ClientIfc interface {
 
 	// TODO: Synchronization here for the sake of dynamic config in the future
 
+	getUsablePolicy(*BasePolicy) *BasePolicy
+	getUsableWritePolicy(*WritePolicy) *WritePolicy
+	getUsableScanPolicy(*ScanPolicy) *ScanPolicy
+	getUsableQueryPolicy(*QueryPolicy) *QueryPolicy
+	getUsableAdminPolicy(*AdminPolicy) *AdminPolicy
+	getUsableInfoPolicy(*InfoPolicy) *InfoPolicy
+
+	getUsableBatchPolicy(*BatchPolicy) *BatchPolicy
+	getUsableBatchReadPolicy(*BatchReadPolicy) *BatchReadPolicy
+	getUsableBatchWritePolicy(*BatchWritePolicy) *BatchWritePolicy
+	getUsableBatchDeletePolicy(*BatchDeletePolicy) *BatchDeletePolicy
+	getUsableBatchUDFPolicy(*BatchUDFPolicy) *BatchUDFPolicy
+
 	GetDefaultPolicy() *BasePolicy
 	GetDefaultBatchPolicy() *BatchPolicy
+	GetDefaultBatchReadPolicy() *BatchReadPolicy
 	GetDefaultBatchWritePolicy() *BatchWritePolicy
 	GetDefaultBatchDeletePolicy() *BatchDeletePolicy
 	GetDefaultBatchUDFPolicy() *BatchUDFPolicy
@@ -116,6 +130,7 @@ type ClientIfc interface {
 
 	SetDefaultPolicy(*BasePolicy)
 	SetDefaultBatchPolicy(*BatchPolicy)
+	SetDefaultBatchReadPolicy(*BatchReadPolicy)
 	SetDefaultBatchWritePolicy(*BatchWritePolicy)
 	SetDefaultBatchDeletePolicy(*BatchDeletePolicy)
 	SetDefaultBatchUDFPolicy(*BatchUDFPolicy)

diff --git a/client_ifc_as_performance.go b/client_ifc_as_performance.go
@@ -103,8 +103,22 @@ type ClientIfc interface {
 
 	// TODO: Synchronization here for the sake of dynamic config in the future
 
+	getUsablePolicy(*BasePolicy) *BasePolicy
+	getUsableWritePolicy(*WritePolicy) *WritePolicy
+	getUsableScanPolicy(*ScanPolicy) *ScanPolicy
+	getUsableQueryPolicy(*QueryPolicy) *QueryPolicy
+	getUsableAdminPolicy(*AdminPolicy) *AdminPolicy
+	getUsableInfoPolicy(*InfoPolicy) *InfoPolicy
+
+	getUsableBatchPolicy(*BatchPolicy) *BatchPolicy
+	getUsableBatchReadPolicy(*BatchReadPolicy) *BatchReadPolicy
+	getUsableBatchWritePolicy(*BatchWritePolicy) *BatchWritePolicy
+	getUsableBatchDeletePolicy(*BatchDeletePolicy) *BatchDeletePolicy
+	getUsableBatchUDFPolicy(*BatchUDFPolicy) *BatchUDFPolicy
+
 	GetDefaultPolicy() *BasePolicy
 	GetDefaultBatchPolicy() *BatchPolicy
+	GetDefaultBatchReadPolicy() *BatchReadPolicy
 	GetDefaultBatchWritePolicy() *BatchWritePolicy
 	GetDefaultBatchDeletePolicy() *BatchDeletePolicy
 	GetDefaultBatchUDFPolicy() *BatchUDFPolicy
@@ -116,6 +130,7 @@ type ClientIfc interface {
 
 	SetDefaultPolicy(*BasePolicy)
 	SetDefaultBatchPolicy(*BatchPolicy)
+	SetDefaultBatchReadPolicy(*BatchReadPolicy)
 	SetDefaultBatchWritePolicy(*BatchWritePolicy)
 	SetDefaultBatchDeletePolicy(*BatchDeletePolicy)
 	SetDefaultBatchUDFPolicy(*BatchUDFPolicy)

diff --git a/client_object_test.go b/client_object_test.go
@@ -1,5 +1,5 @@
-//go:build !as_performance
-// +build !as_performance
+//go:build !as_performance && !app_engine
+// +build !as_performance,!app_engine
 
 // Copyright 2014-2022 Aerospike, Inc.
 //

diff --git a/proxy_client.go b/proxy_client.go
@@ -151,6 +151,11 @@ func (clnt *ProxyClient) GetDefaultBatchWritePolicy() *BatchWritePolicy {
 	return clnt.DefaultBatchWritePolicy
 }
 
+// DefaultBatchReadPolicy returns corresponding default policy from the client
+func (clnt *ProxyClient) GetDefaultBatchReadPolicy() *BatchReadPolicy {
+	return clnt.DefaultBatchReadPolicy
+}
+
 // DefaultBatchDeletePolicy returns corresponding default policy from the client
 func (clnt *ProxyClient) GetDefaultBatchDeletePolicy() *BatchDeletePolicy {
 	return clnt.DefaultBatchDeletePolicy
@@ -196,6 +201,11 @@ func (clnt *ProxyClient) SetDefaultBatchPolicy(policy *BatchPolicy) {
 	clnt.DefaultBatchPolicy = policy
 }
 
+// DefaultBatchReadPolicy returns corresponding default policy from the client
+func (clnt *ProxyClient) SetDefaultBatchReadPolicy(policy *BatchReadPolicy) {
+	clnt.DefaultBatchReadPolicy = policy
+}
+
 // DefaultBatchWritePolicy returns corresponding default policy from the client
 func (clnt *ProxyClient) SetDefaultBatchWritePolicy(policy *BatchWritePolicy) {
 	clnt.DefaultBatchWritePolicy = policy

diff --git a/udf_test.go b/udf_test.go
@@ -1,3 +1,6 @@
+//go:build !app_engine
+// +build !app_engine
+
 // Copyright 2014-2022 Aerospike, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");