[CLIENT-2219] Remove docs for deprecated aerospike operator constants

* aerospike_helpers.operations should be used instead
* Update some tests to use aerospike_helpers instead of aerospike operator constants

Author: juliannguyen4

doc/aerospike.rst

@@ -679,19 +679,6 @@ Only the `hosts` key is required; the rest of the keys are optional.
 Constants
 =========
 
-.. _aerospike_operators:
-
-Operators
----------
-
-Operators for the single-record, multi-operation transaction method :py:meth:`Client.operate`.
-
-.. note::
-
-    Starting version 3.4.0, it is highly recommended to use the :ref:`aerospike_operation_helpers.operations` \
-    to create the arguments for :py:meth:`Client.operate` and :py:meth:`Client.operate_ordered`
-    Old style operators are deprecated. The docs for old style operators were removed in client 6.0.0.
-
 Policy Options
 --------------
 

test/new_tests/test_compress.py

@@ -85,9 +85,9 @@ def test_operate_with_compress_policy(self):
         }
 
         llist = [
-            {"op": aerospike.OPERATOR_APPEND, "bin": "name", "val": "aa"},
-            {"op": aerospike.OPERATOR_INCR, "bin": "age", "val": 3},
-            {"op": aerospike.OPERATOR_READ, "bin": "name"},
+            operations.append("name", "aa"),
+            operations.increment("age", 3),
+            operations.read("name")
         ]
 
         key, _, bins = self.as_connection.operate(key, llist, {}, policy)

test/new_tests/test_geospatial.py

@@ -5,6 +5,7 @@
 from .as_status_codes import AerospikeStatus
 from aerospike import exception as e
 from aerospike import predicates as p
+from aerospike_helpers.operations import operations
 import time
 
 import aerospike
@@ -472,8 +473,8 @@ def test_geospatial_operate_positive(self):
         geo_object_operate = aerospike.GeoJSON({"type": "Point", "coordinates": [43.45, 56.75]})
         key = ("test", "demo", "single_geo_operate")
         llist = [
-            {"op": aerospike.OPERATOR_WRITE, "bin": "write_bin", "val": {"no": geo_object_operate}},
-            {"op": aerospike.OPERATOR_READ, "bin": "write_bin"},
+            operations.write("write_bin", {"no": geo_object_operate}),
+            operations.read("write_bin")
         ]
 
         key, _, bins = self.as_connection.operate(key, llist)

test/new_tests/test_operate_map.py

@@ -6,7 +6,8 @@
 
 import aerospike
 from aerospike import exception as e
-from aerospike_helpers.operations import map_operations as map_ops
+from aerospike_helpers.operations import operations
+from aerospike_helpers.operations import map_operations
 
 # aerospike.OP_MAP_SET_POLICY
 # aerospike.OP_MAP_PUT
@@ -58,8 +59,8 @@ def setup(self, request, as_connection):
         self.test_map_bin = "test_map"
         key_order_policy = {"map_order": aerospike.MAP_KEY_ORDERED}
         ops = [
-            map_ops.map_put_items(bin_name="test_map", item_dict=test_map, map_policy=key_order_policy),
-            map_ops.map_put_items(bin_name="test_map2", item_dict=test_map, map_policy=key_order_policy)
+            map_operations.map_put_items(bin_name="test_map", item_dict=test_map, map_policy=key_order_policy),
+            map_operations.map_put_items(bin_name="test_map2", item_dict=test_map, map_policy=key_order_policy)
         ]
         as_connection.operate(key, ops)
 
@@ -436,13 +437,8 @@ def test_map_remove_by_key_ret_key_val_test_with_list_read_odd(self):
         self.test_map.copy()
         self.as_connection.put(self.test_map_key, {"cool_list": [1, 2, 3]})
         ops = [
-            {"op": aerospike.OPERATOR_READ, "bin": "cool_list"},
-            {
-                "op": aerospike.OP_MAP_REMOVE_BY_KEY,
-                "bin": self.test_map_bin,
-                "key": "c",
-                "return_type": aerospike.MAP_RETURN_KEY_VALUE,
-            },
+            operations.read("cool_list"),
+            map_operations.map_remove_by_key(self.test_map_bin, "c", aerospike.MAP_RETURN_KEY_VALUE)
         ]
 
         _, _, bins = self.as_connection.operate(self.test_map_key, ops)
@@ -452,26 +448,16 @@ def test_map_remove_by_key_ret_key_val_test_with_list_read_even(self):
         self.test_map.copy()
         self.as_connection.put(self.test_map_key, {"cool_list": [1, 2, 3, 4]})
         ops = [
-            {"op": aerospike.OPERATOR_READ, "bin": "cool_list"},
-            {
-                "op": aerospike.OP_MAP_REMOVE_BY_KEY,
-                "bin": self.test_map_bin,
-                "key": "c",
-                "return_type": aerospike.MAP_RETURN_KEY_VALUE,
-            },
+            operations.read("cool_list"),
+            map_operations.map_remove_by_key(self.test_map_bin, "c", aerospike.MAP_RETURN_KEY_VALUE)
         ]
 
         _, _, bins = self.as_connection.operate(self.test_map_key, ops)
         assert bins["cool_list"] == [1, 2, 3, 4]
 
     @pytest.mark.parametrize("entry", ("bin", "key"))
     def test_map_remove_by_key_missing_required_entries(self, entry):
-        op = {
-            "op": aerospike.OP_MAP_REMOVE_BY_KEY,
-            "bin": self.test_map_bin,
-            "key": "c",
-            "return_type": aerospike.MAP_RETURN_KEY_VALUE,
-        }
+        op = map_operations.map_remove_by_key(self.test_map_bin, "c", aerospike.MAP_RETURN_KEY_VALUE)
 
         del op[entry]
         ops = [op]

test/new_tests/test_operate_ordered.py

@@ -4,6 +4,7 @@
 
 import aerospike
 from aerospike import exception as e
+from aerospike_helpers.operations import operations
 
 
 class TestOperateOrdered(object):
@@ -75,17 +76,17 @@ def teardown():
             (
                 ("test", "demo", 1),
                 [
-                    {"op": aerospike.OPERATOR_PREPEND, "bin": "name", "val": "ram"},
-                    {"op": aerospike.OPERATOR_INCR, "bin": "age", "val": 3},
-                    {"op": aerospike.OPERATOR_READ, "bin": "name"},
+                    operations.prepend("name", "ram"),
+                    operations.increment("age", 3),
+                    operations.read("name")
                 ],
                 [("name", "ramname1")],
             ),
             (
                 ("test", "demo", 1),  # with_write_float_value
                 [
-                    {"op": aerospike.OPERATOR_WRITE, "bin": "write_bin", "val": {"no": 89.8}},
-                    {"op": aerospike.OPERATOR_READ, "bin": "write_bin"},
+                    operations.write("write_bin", {"no": 89.8}),
+                    operations.read("write_bin")
                 ],
                 [("write_bin", {"no": 89.8})],
             ),