Merge pull request #204 from aerospike/3.0.1-in-progress

3.0.1 in progress

VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

doc/client.rst

@@ -2238,8 +2238,7 @@ a cluster-tending thread.
 
     .. method:: truncate(namespace, set, nanos[, policy])
 
-        Remove records in specified namespace/set efficiently.  This method is many orders of magnitude
-        faster than deleting records one at a time.  Works with Aerospike Server versions >= 3.12.
+        Remove records in specified namespace/set efficiently. This method is many orders of magnitude faster than deleting records one at a time. Works with Aerospike Server versions >= 3.12. See `Truncate command reference <https://www.aerospike.com/docs/reference/info#truncate>`_.
  
         This asynchronous server call may return before the truncation is complete.  The user can still
         write new records after the server returns because new records will have last update times

setup.py

@@ -72,7 +72,7 @@ def run(self):
 os.environ['ARCHFLAGS'] = '-arch x86_64'
 AEROSPIKE_C_VERSION = os.getenv('AEROSPIKE_C_VERSION')
 if not AEROSPIKE_C_VERSION:
-    AEROSPIKE_C_VERSION = '4.3.1'
+    AEROSPIKE_C_VERSION = '4.3.3'
 DOWNLOAD_C_CLIENT = os.getenv('DOWNLOAD_C_CLIENT')
 AEROSPIKE_C_HOME = os.getenv('AEROSPIKE_C_HOME')
 PREFIX = None

src/main/aerospike.c

@@ -93,7 +93,7 @@ AerospikeConstants operator_constants[] = {
 MOD_INIT(aerospike)
 {
 
-	const char version[8] = "3.0.0";
+	const char version[8] = "3.0.1";
 	// Makes things "thread-safe"
 	PyEval_InitThreads();
 	int i = 0;

src/main/client/get_many.c

@@ -93,7 +93,6 @@ static PyObject * batch_get_aerospike_batch_read(as_error *err, AerospikeClient
 	if (py_keys && PyList_Check(py_keys)) {
 		Py_ssize_t size = PyList_Size(py_keys);
 
-		py_recs = PyList_New(size);
 		if (size > MAX_STACK_ALLOCATION) {
 			as_batch_read_init(&records, size);
 		} else {

src/main/client/operate_list.c

@@ -860,7 +860,9 @@ PyObject * AerospikeClient_ListTrim(AerospikeClient * self, PyObject * args, PyO
 
 CLEANUP:
 	as_operations_destroy(&ops);
-
+	if (rec) {
+		as_record_destroy(rec);
+	}
 	EXCEPTION_ON_ERROR();
 
 	return PyLong_FromLong(0);

src/main/client/select_many.c

@@ -101,7 +101,6 @@ static PyObject * batch_select_aerospike_batch_read(as_error *err, AerospikeClie
 	if (py_keys && PyList_Check(py_keys)) {
 		Py_ssize_t size = PyList_Size(py_keys);
 
-		py_recs = PyList_New(size);
 		as_batch_read_inita(&records, size);
 
 		// Batch object initialised
@@ -133,7 +132,6 @@ static PyObject * batch_select_aerospike_batch_read(as_error *err, AerospikeClie
 	else if (py_keys && PyTuple_Check(py_keys)) {
 		Py_ssize_t size = PyTuple_Size(py_keys);
 
-		py_recs = PyList_New(size);
 		as_batch_read_inita(&records, size);
 		// Batch object initialised
 		batch_initialised = true;

src/main/exception.c

@@ -413,6 +413,8 @@ PyObject* raise_exception(as_error *err) {
 					PyObject_SetAttrString(py_value, "line", Py_None);
 				}
 
+				PyObject_SetAttrString(py_value, "in_doubt", PyBool_FromLong(err->in_doubt));
+
 				break;
 			}
 			Py_DECREF(py_code);

src/main/query/type.c

@@ -167,7 +167,7 @@ static void AerospikeQuery_Type_Dealloc(AerospikeQuery * self)
 	for (i = 0; i < self->query.where.size; i++) {
 		as_predicate * p = &self->query.where.entries[i];
 		if (p) {
-			if (p->dtype == AS_INDEX_STRING) {
+			if (p->dtype == AS_INDEX_STRING || p->dtype == AS_INDEX_GEO2DSPHERE) {
 				free(p->value.string);
 			}
 		}

test/new_tests/test_udf_put.py

@@ -25,7 +25,7 @@ def teardown_method(self, method):
         """
         Teardown method
         """
-        udf_list = self.as_connection.udf_list({'timeout': 100})
+        udf_list = self.as_connection.udf_list()
         for udf in udf_list:
             if udf['name'] == self.udf_name:
                 self.as_connection.udf_remove(self.udf_name)