dont init policies if global defaults used

aerospike · Sep 20, 2024 · 723e315 · 723e315
1 parent bc56090
commit 723e315
Showing 1 changed file with 2 additions and 38 deletions.
diff --git a/src/main/policy.c b/src/main/policy.c
@@ -579,11 +579,6 @@ as_status pyobject_to_policy_admin(AerospikeClient *self, as_error *err,
                                    as_policy_admin **policy_p,
                                    as_policy_admin *config_admin_policy)
 {
-
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_admin);
-    }
     //Initialize policy with global defaults
     as_policy_admin_copy(config_admin_policy, policy);
 
@@ -609,10 +604,6 @@ as_status pyobject_to_policy_apply(AerospikeClient *self, as_error *err,
                                    as_policy_apply *config_apply_policy,
                                    as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_apply);
-    }
     //Initialize policy with global defaults
     as_policy_apply_copy(config_apply_policy, policy);
 
@@ -652,10 +643,6 @@ as_status pyobject_to_policy_info(as_error *err, PyObject *py_policy,
                                   as_policy_info **policy_p,
                                   as_policy_info *config_info_policy)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_info);
-    }
     //Initialize policy with global defaults
     as_policy_info_copy(config_info_policy, policy);
 
@@ -684,10 +671,6 @@ as_status pyobject_to_policy_query(AerospikeClient *self, as_error *err,
                                    as_policy_query *config_query_policy,
                                    as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_query);
-    }
     //Initialize policy with global defaults
     as_policy_query_copy(config_query_policy, policy);
 
@@ -738,7 +721,7 @@ static struct policy_field base_policy_fields[] = {
     POLICY_FIELD_DEF(as_policy_base, uint32_t, max_retries),
     POLICY_FIELD_DEF(as_policy_base, uint32_t, sleep_between_retries),
     POLICY_FIELD_DEF(as_policy_base, bool, compress),
-    POLICY_FIELD_DEF(as_policy_base, as_exp*, filter_exp, "expressions"),
+    POLICY_FIELD_DEF(as_policy_base, as_exp *, filter_exp, "expressions"),
     // Sentinel value: type name is NULL
     {0}};
 
@@ -892,10 +875,6 @@ as_status pyobject_to_policy_remove(AerospikeClient *self, as_error *err,
                                     as_policy_remove *config_remove_policy,
                                     as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_remove);
-    }
     //Initialize policy with global defaults
     as_policy_remove_copy(config_remove_policy, policy);
 
@@ -937,10 +916,6 @@ as_status pyobject_to_policy_scan(AerospikeClient *self, as_error *err,
                                   as_policy_scan *config_scan_policy,
                                   as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_scan);
-    }
     //Initialize policy with global defaults
     as_policy_scan_copy(config_scan_policy, policy);
 
@@ -979,10 +954,6 @@ as_status pyobject_to_policy_write(AerospikeClient *self, as_error *err,
                                    as_policy_write *config_write_policy,
                                    as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_write);
-    }
     //Initialize policy with global defaults
     as_policy_write_copy(config_write_policy, policy);
 
@@ -1026,10 +997,6 @@ as_status pyobject_to_policy_operate(AerospikeClient *self, as_error *err,
                                      as_policy_operate *config_operate_policy,
                                      as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_operate);
-    }
     //Initialize policy with global defaults
     as_policy_operate_copy(config_operate_policy, policy);
 
@@ -1076,10 +1043,6 @@ as_status pyobject_to_policy_batch(AerospikeClient *self, as_error *err,
                                    as_policy_batch *config_batch_policy,
                                    as_exp *exp_list, as_exp **exp_list_p)
 {
-    if (py_policy && py_policy != Py_None) {
-        // Initialize Policy
-        TRANSACTION_POLICY_INIT(as_policy_batch);
-    }
     //Initialize policy with global defaults
     as_policy_batch_copy(config_batch_policy, policy);
 
@@ -1115,6 +1078,7 @@ as_status pyobject_to_policy_batch(AerospikeClient *self, as_error *err,
     return err->code;
 }
 
+// TODO: the below policies need to be initialized with global defaults
 // New with server 6.0, C client 5.2.0 (batch writes)
 as_status pyobject_to_batch_write_policy(AerospikeClient *self, as_error *err,
                                          PyObject *py_policy,