Merge pull request #87 from citrusleaf/dev

7.0.2 Patch Release

VERSION

@@ -1 +1 @@
-7.0.1
+7.0.2

aerospike_helpers/batch/records.py

@@ -382,7 +382,7 @@ class BatchRecords:
             non 0 if an error occured. The most common error being -16 (One or more batch sub transactions failed).
     """
 
-    def __init__(self, batch_records: TypeBatchRecordList = []) -> None:
+    def __init__(self, batch_records: TypeBatchRecordList = None) -> None:
         """
             Example::
 
@@ -424,5 +424,9 @@ def __init__(self, batch_records: TypeBatchRecordList = []) -> None:
                 # Note this call will mutate brs and set results in it.
                 client.batch_write(brs)
         """
+
+        if batch_records is None:
+            batch_records = []
+
         self.batch_records = batch_records
         self.result = 0

doc/client.rst

@@ -855,6 +855,14 @@ Batch Operations
             config = { 'hosts': [('127.0.0.1', 3000)] }
             client = aerospike.client(config).connect()
 
+            namespace = "test"
+            set = "demo"
+
+            keys = [(namespace, set, i) for i in range(150)]
+            records = [{"id": i, "balance": i * 10} for i in range(150)]
+            for key, rec in zip(keys, records):
+                client.put(key, rec)
+
             # Batch add 10 to the bin "balance" and read it if it's over
             # 1000 NOTE: batch_operate ops must include a write op
             # get_batch_ops or get_many can be used for all read ops use cases.
@@ -899,6 +907,9 @@ Batch Operations
                 # Some batch sub transaction failed.
                 print("res result: {result}".format(result=res.result))
 
+            for key in keys:
+                client.remove(key)
+
             client.close()
 
     .. method:: batch_apply(keys: list, module: str, function: str, args: list, [policy_batch: dict], [policy_batch_apply: dict]) -> BatchRecords

src/main/aerospike.c

@@ -154,7 +154,7 @@ static int Aerospike_Clear(PyObject *aerospike)
 MOD_INIT(aerospike)
 {
 
-	const char version[8] = "7.0.1";
+	const char version[8] = "7.0.2";
 	// Makes things "thread-safe"
 	PyEval_InitThreads();
 	int i = 0;

src/main/client/batch_apply.c

@@ -84,10 +84,9 @@ static bool batch_apply_cb(const as_batch_result *results, uint32_t n,
 		}
 
 		PyList_Append(data->py_results, py_batch_record);
+		Py_DECREF(py_batch_record);
 	}
 
-	Py_XDECREF(py_batch_record);
-
 	PyGILState_Release(gstate);
 	return success;
 }
@@ -259,6 +258,7 @@ static PyObject *AerospikeClient_Batch_Apply_Invoke(
 
 	PyObject *py_bw_res = PyLong_FromLong((long)batch_apply_err.code);
 	PyObject_SetAttrString(br_instance, FIELD_NAME_BATCH_RESULT, py_bw_res);
+	Py_DECREF(py_bw_res);
 
 	as_error_reset(err);
 

src/main/client/batch_operate.c

@@ -85,10 +85,9 @@ static bool batch_operate_cb(const as_batch_result *results, uint32_t n,
 		}
 
 		PyList_Append(data->py_results, py_batch_record);
+		Py_DECREF(py_batch_record);
 	}
 
-	Py_XDECREF(py_batch_record);
-
 	PyGILState_Release(gstate);
 	return success;
 }
@@ -275,6 +274,7 @@ static PyObject *AerospikeClient_Batch_Operate_Invoke(
 
 PyObject *py_bw_res = PyLong_FromLong((long)batch_apply_err.code);
 	PyObject_SetAttrString(br_instance, FIELD_NAME_BATCH_RESULT, py_bw_res);
+	Py_DECREF(py_bw_res);
 
 	as_error_reset(err);
 

src/main/client/batch_remove.c

@@ -84,10 +84,9 @@ static bool batch_remove_cb(const as_batch_result *results, uint32_t n,
 		}
 
 		PyList_Append(data->py_results, py_batch_record);
+		Py_DECREF(py_batch_record);
 	}
 
-	Py_XDECREF(py_batch_record);
-
 	PyGILState_Release(gstate);
 	return success;
 }
@@ -244,6 +243,7 @@ static PyObject *AerospikeClient_Batch_Remove_Invoke(
 
 	PyObject *py_bw_res = PyLong_FromLong((long)batch_apply_err.code);
 	PyObject_SetAttrString(br_instance, FIELD_NAME_BATCH_RESULT, py_bw_res);
+	Py_DECREF(py_bw_res);
 
 	as_error_reset(err);