Skip to content

CLIENT-3106 Refactor config-level policies code by reusing code from policy.c (2nd attempt) #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: dev
Choose a base branch
from
Draft

CLIENT-3106 Refactor config-level policies code by reusing code from policy.c (2nd attempt) #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9733eed
reuse transaction level read policy
juliannguyen4 Jan 14, 2025
569274c
policy.h requires types.h
juliannguyen4 Jan 14, 2025
27cebab
initialize?
juliannguyen4 Jan 14, 2025
c85eccd
Merge remote-tracking branch 'origin/dev' into CLIENT-3106-global-con…
juliannguyen4 Apr 24, 2025
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: 2 additions & 0 deletions src/include/policy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
#include <aerospike/as_partition_filter.h>
#include <aerospike/as_metrics.h>

#include "types.h"

enum Aerospike_serializer_values {
SERIALIZER_NONE, /* default handler for serializer type */
SERIALIZER_PYTHON,
Expand Down
8 changes: 6 additions & 2 deletions src/main/policy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,9 @@ as_status pyobject_to_policy_read(AerospikeClient *self, as_error *err,
}

//Initialize policy with global defaults
as_policy_read_copy(config_read_policy, policy);
if (config_read_policy) {
as_policy_read_copy(config_read_policy, policy);
}

if (py_policy && py_policy != Py_None) {
// Set policy fields
Expand All @@ -473,7 +475,9 @@ as_status pyobject_to_policy_read(AerospikeClient *self, as_error *err,
}

// Update the policy
POLICY_UPDATE();
if (policy_p) {
POLICY_UPDATE();
}

return err->code;
}
Expand Down
63 changes: 8 additions & 55 deletions src/main/policy_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

#include "policy_config.h"

#include "policy.h"

as_status set_optional_key(as_policy_key *target_ptr, PyObject *py_policy,
const char *name);
as_status set_optional_replica(as_policy_replica *target_ptr,
Expand All @@ -42,9 +44,14 @@ as_status set_subpolicies(as_config *config, PyObject *py_policies)
{

as_status set_policy_status = AEROSPIKE_OK;
as_error err;
as_error_init(&err);

PyObject *read_policy = PyDict_GetItemString(py_policies, "read");
set_policy_status = set_read_policy(&config->policies.read, read_policy);
set_policy_status =
pyobject_to_policy_read(NULL, &err, read_policy, &config->policies.read,
NULL, NULL, NULL, NULL);
as_error_reset(&err);
if (set_policy_status != AEROSPIKE_OK) {
return set_policy_status;
}
Expand Down Expand Up @@ -154,60 +161,6 @@ as_status set_subpolicies(as_config *config, PyObject *py_policies)
return AEROSPIKE_OK;
}

as_status set_read_policy(as_policy_read *read_policy, PyObject *py_policy)
{

as_status status = AEROSPIKE_OK;
if (!py_policy) {
return AEROSPIKE_OK;
}

if (!PyDict_Check(py_policy)) {
return AEROSPIKE_ERR_PARAM;
}

status = set_base_policy(&read_policy->base, py_policy);
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_key(&read_policy->key, py_policy, "key");
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_replica(&read_policy->replica, py_policy, "replica");
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_bool_property(&read_policy->deserialize, py_policy,
"deserialize");
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_ap_read_mode(&read_policy->read_mode_ap, py_policy,
"read_mode_ap");
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_sc_read_mode(&read_policy->read_mode_sc, py_policy,
"read_mode_sc");
if (status != AEROSPIKE_OK) {
return status;
}

status = set_optional_int_property(&read_policy->read_touch_ttl_percent,
py_policy, "read_touch_ttl_percent");
if (status != AEROSPIKE_OK) {
return status;
}

return AEROSPIKE_OK;
}

as_status set_write_policy(as_policy_write *write_policy, PyObject *py_policy)
{

Expand Down