Skip to content

Commit

Permalink
Merge pull request #204 from aerospike/3.0.1-in-progress
Browse files Browse the repository at this point in the history
3.0.1 in progress
  • Loading branch information
aerospikerobertmarks authored Jan 24, 2018
2 parents bd6c4d0 + e225516 commit 4340e42
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0
3.0.1
3 changes: 1 addition & 2 deletions doc/client.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/aerospike.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/main/client/get_many.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion src/main/client/operate_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/main/client/select_many.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/main/exception.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/query/type.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/new_tests/test_udf_put.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4340e42

Please sign in to comment.