aerospike · juliannguyen4 · Jul 22, 2026 · Jul 15, 2026 · Jul 15, 2026 · Jul 15, 2026
diff --git a/aerospike-client-c b/aerospike-client-c
diff --git a/doc/client.rst b/doc/client.rst
@@ -2141,10 +2141,7 @@ Write Policies
     .. hlist::
         :columns: 1
 
-        * **key**
-            | One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
-            |
-            | Default: :data:`aerospike.POLICY_KEY_DIGEST`
+        * .. include:: ./key_option_with_union_precedence.rst
         * **exists**
             | One of the :ref:`POLICY_EXISTS` values such as :data:`aerospike.POLICY_EXISTS_CREATE`
             |
@@ -2256,10 +2253,7 @@ Operate Policies
     .. hlist::
         :columns: 1
 
-        * **key**
-            | One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
-            |
-            | Default: :data:`aerospike.POLICY_KEY_DIGEST`
+        * .. include:: ./key_option_with_union_precedence.rst
         * **gen**
             | One of the :ref:`POLICY_GEN` values such as :data:`aerospike.POLICY_GEN_IGNORE`
             |
@@ -2343,10 +2337,7 @@ Apply Policies
     .. hlist::
         :columns: 1
 
-        * **key**
-            | One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
-            |
-            | Default: :data:`aerospike.POLICY_KEY_DIGEST`
+        * .. include:: ./key_option_with_union_precedence.rst
         * **replica**
             | One of the :ref:`POLICY_REPLICA` values such as :data:`aerospike.POLICY_REPLICA_MASTER`
             |
@@ -2509,10 +2500,7 @@ Batch Write Policies
     .. hlist::
         :columns: 1
 
-        * **key**
-            | One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
-            |
-            | Default: :data:`aerospike.POLICY_KEY_DIGEST`
+        * .. include:: ./key_option_with_union_precedence.rst
         * **commit_level**
             | One of the :ref:`POLICY_COMMIT_LEVEL` values such as :data:`aerospike.POLICY_COMMIT_LEVEL_ALL`
             |
@@ -2564,10 +2552,7 @@ Batch Apply Policies
     .. hlist::
         :columns: 1
 
-        * **key**
-            | One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
-            |
-            | Default: :data:`aerospike.POLICY_KEY_DIGEST`
+        * .. include:: ./key_option_with_union_precedence.rst
         * **commit_level**
             | One of the :ref:`POLICY_COMMIT_LEVEL` values such as :data:`aerospike.POLICY_COMMIT_LEVEL_ALL`
             |

diff --git a/doc/key_option_with_union_precedence.rst b/doc/key_option_with_union_precedence.rst
@@ -0,0 +1,9 @@
+**key**
+
+One of the :ref:`POLICY_KEY` values such as :data:`aerospike.POLICY_KEY_DIGEST`
+
+This option is unique from other options such that it uses union precedence;
+if this is set to :data:`aerospike.POLICY_KEY_SEND` either in dynamic config, config-level, or command-level,
+:data:`aerospike.POLICY_KEY_SEND` will always be applied.
+
+Default: :data:`aerospike.POLICY_KEY_DIGEST`
diff --git a/test/dyn_config.yml b/test/dyn_config.yml
@@ -4,6 +4,10 @@ dynamic:
     enable: true
   write:
     send_key: true
+  batch_write:
+    send_key: true
+  batch_udf:
+    send_key: true
 static:
   client:
     config_interval: 1000
diff --git a/test/new_tests/conftest.py b/test/new_tests/conftest.py
@@ -270,26 +270,55 @@ def wait_for_job_completion(as_connection, job_id, job_module: int = aerospike.J
 BIN_NAME = "number"
 MAP_BIN_NAME = "map"
 
-# TODO: scale down tests maybe
-KEYS = [(TEST_NS, TEST_SET, i) for i in range(500)]
 expected_number_bin_values = set()
 
 # Add records around the test
 @pytest.fixture(scope="function")
-def clean_test_background(as_connection):
+def insert_records(request, as_connection):
+
+    # - Some tests don't make use of unique sets,
+    # so we leave them alone for backwards compatibility
+    # - make_set_unique ensures that if a test case's cleanup stage fails to run
+    # e.g when the test case's setup fixture fails out,
+    # that test case's records does not interfere with future test cases that need to perform a query
+    num_keys, make_set_unique = request.param
+
+    if make_set_unique:
+        set_name = f"{TEST_SET}-{time.time_ns()}"
+    else:
+        set_name = TEST_SET
+
+    request.cls.set_name = set_name
+    keys = [(TEST_NS, set_name, i) for i in range(num_keys)]
+    request.cls.keys = keys
+
     batch_records = []
     brs = BatchRecords(batch_records=batch_records)
-    for i, key in enumerate(KEYS):
+
+    for i, key in enumerate(keys):
         ops = [
             operations.write(BIN_NAME, i),
             operations.write(MAP_BIN_NAME, {"a": i})
         ]
         br = Write(key, ops=ops)
         batch_records.append(br)
         expected_number_bin_values.add(i)
+
     as_connection.batch_write(brs)
+
     yield
-    as_connection.batch_remove(KEYS)
+
+    if make_set_unique is False:
+        as_connection.batch_remove(keys)
+
+def expect_records_to_have_user_key_stored(client: aerospike.Client, set_name: str):
+    query = client.query(TEST_NS, set_name)
+    recs = query.results()
+
+    # Check that record key tuple has the user key
+    for record in recs:
+        pk = record[0]
+        assert pk[2] is not None
 
 BASIC_READ_BIN_OPS = [
     operations.read(BIN_NAME)
@@ -307,7 +336,7 @@ def clean_test_background(as_connection):
 NON_EXISTENT_BIN_NAME = "asdf"
 
 @pytest.fixture()
-def query(request, clean_test_background, as_connection):
+def query(request, insert_records, as_connection):
     if not hasattr(request, "param"):
         query = as_connection.query(TEST_NS, TEST_SET)
     else:
@@ -413,3 +442,6 @@ def hydrate_partitions_1000_to_1003(request, as_connection):
     yield
 
     as_connection.batch_remove(keys)
+
+AEROSPIKE_CLIENT_CONFIG_URL = "AEROSPIKE_CLIENT_CONFIG_URL"
+DYN_CONFIG_PATH = "./dyn_config.yml"
diff --git a/test/new_tests/string_helpers.py b/test/new_tests/string_helpers.py
@@ -1,11 +1,8 @@
-from .conftest import KEYS
 import unicodedata
 import pytest
 from aerospike_helpers.string_helpers import StringPolicy
 
 
-KEY = KEYS[0]
-
 NON_STR_BIN_NAME = INT_BIN_NAME = "nonstr"
 STR_BIN_NAME = "str"
 DOUBLE_BIN_NAME = "double"

diff --git a/test/new_tests/test_command_level_policies.py b/test/new_tests/test_command_level_policies.py
@@ -6,10 +6,10 @@
 from aerospike_helpers.batch import records as br
 from .test_base_class import TestBaseClass
 from aerospike_helpers.operations import operations
-from .conftest import verify_record_ttl
+from .conftest import verify_record_ttl, TEST_NS, TEST_SET
 
 SKIP_MSG = "read_touch_ttl_percent only supported on server 7.1 or higher"
-KEY = ("test", "demo", 1)
+KEY = (TEST_NS, TEST_SET, 1)
 
 
 @pytest.mark.usefixtures("as_connection")

diff --git a/test/new_tests/test_dynamic_config.py b/test/new_tests/test_dynamic_config.py
@@ -1,11 +1,11 @@
 import aerospike
 from aerospike import exception as e
+from .conftest import expect_records_to_have_user_key_stored, AEROSPIKE_CLIENT_CONFIG_URL, DYN_CONFIG_PATH
 from .test_base_class import TestBaseClass
 import pytest
 import os
 import glob
 
-DYN_CONFIG_PATH = "./dyn_config.yml"
 METRICS_LOG_FILES = "./metrics-*.log"
 
 
@@ -52,8 +52,6 @@ def cleanup_metrics_logs(self):
         for item in metrics_log_filenames:
             os.remove(item)
 
-    AEROSPIKE_CLIENT_CONFIG_URL = "AEROSPIKE_CLIENT_CONFIG_URL"
-
     @pytest.fixture
     def functional_test_setup(self, request, show_more_logs, cleanup_metrics_logs):
         config = TestBaseClass.get_connection_config()
@@ -73,7 +71,7 @@ def functional_test_setup(self, request, show_more_logs, cleanup_metrics_logs):
         setup_client.close()
 
         if request.param is True:
-            del os.environ[self.AEROSPIKE_CLIENT_CONFIG_URL]
+            del os.environ[AEROSPIKE_CLIENT_CONFIG_URL]
 
     # Decide whether env var should be used or not to read dynamic config file.
     # If not using env var, use the config provider instead
@@ -82,7 +80,7 @@ def functional_test_setup(self, request, show_more_logs, cleanup_metrics_logs):
     def test_dyn_config_file_works(self, functional_test_setup):
         config = TestBaseClass.get_connection_config()
         if functional_test_setup is True:
-            os.environ[self.AEROSPIKE_CLIENT_CONFIG_URL] = DYN_CONFIG_PATH
+            os.environ[AEROSPIKE_CLIENT_CONFIG_URL] = DYN_CONFIG_PATH
         else:
             provider = aerospike.ConfigProvider(DYN_CONFIG_PATH)
             config["config_provider"] = provider
@@ -93,13 +91,7 @@ def test_dyn_config_file_works(self, functional_test_setup):
 
         # "Send key" is enabled in dynamic config
         # The key should be returned here
-        query = self.client.query("test", "demo")
-        recs = query.results()
-        assert len(recs) == 1
-        # Check that record key tuple has the primary key
-        first_record = recs[0]
-        first_record_key = first_record[0]
-        assert first_record_key[2] is self.key[2]
+        expect_records_to_have_user_key_stored(self.client, set_name="demo")
 
     def test_enable_metrics_cannot_override_dyn_config(self, show_more_logs):
         config = TestBaseClass.get_connection_config()

diff --git a/test/new_tests/test_exception_subcode.py b/test/new_tests/test_exception_subcode.py
@@ -1,13 +1,13 @@
 import pytest
-from .conftest import KEYS, BIN_NAME
+from .conftest import TEST_NS, TEST_SET, BIN_NAME
 import aerospike
 from aerospike import exception as e
 from aerospike_helpers.operations import list_operations as list_ops
 from .test_base_class import TestBaseClass
 from . import as_errors
 
 
-KEY = KEYS[0]
+KEY = (TEST_NS, TEST_SET, 1)
 OPS = [
     list_ops.list_get_by_index(BIN_NAME, index=99, return_type=aerospike.LIST_RETURN_VALUE)
 ]
@@ -49,7 +49,7 @@ def test_error_verbosity_levels(self, policy_w_verbosity_setting: dict, set_in_c
             if not set_in_client_config:
                 cmd_policy |= policy_w_verbosity_setting
 
-            self.as_connection.operate(KEYS[0], OPS, policy=cmd_policy)
+            self.as_connection.operate(KEY, OPS, policy=cmd_policy)
 
         # Make sure there's no regression with the parent error code
         assert excinfo.value.code == as_errors.AEROSPIKE_ERR_OP_NOT_APPLICABLE
@@ -83,4 +83,4 @@ def test_invalid_verbosity(self):
             ERROR_DETAIL_VERBOSITY_SETTING: 3
         }
         with pytest.raises(e.ServerError):
-            self.as_connection.operate(KEYS[0], OPS, policy=policy)
+            self.as_connection.operate(KEY, OPS, policy=policy)
diff --git a/test/new_tests/test_expressions_string.py b/test/new_tests/test_expressions_string.py
@@ -9,7 +9,8 @@
 
 from .test_base_class import TestBaseClass
 from .string_helpers import *
-from .conftest import expect_server_version_earlier_than_8_1_3_to_fail
+from .conftest import expect_server_version_earlier_than_8_1_3_to_fail, TEST_NS, TEST_SET
+KEY = (TEST_NS, TEST_SET, 1)
 
 
 class TestExpressions:

diff --git a/test/new_tests/test_query_bin_projection.py b/test/new_tests/test_query_bin_projection.py
@@ -17,6 +17,13 @@ class TestQueryBinProjection:
                 aerospike.Client.query
             ],
             indirect=True
+        ),
+        pytest.mark.parametrize(
+            "insert_records",
+            [
+                [500, False]
+            ],
+            indirect=True
         )
     ]
+13 −0		src/include/aerospike/as_policy.h
+93 −78		src/main/aerospike/aerospike_batch.c
+94 −72		src/main/aerospike/aerospike_key.c
+5 −2		src/main/aerospike/aerospike_query.c
+67 −1		src/test/aerospike_batch/batch.c
+44 −26		src/test/aerospike_key/error_detail_integration.c
+45 −2		src/test/aerospike_key/key_basics.c
+76 −2		src/test/aerospike_key/key_operate.c