From 51171ccc412768e1b78dac8f7cfdfa99313b0ba8 Mon Sep 17 00:00:00 2001 From: Tom Kooij Date: Mon, 4 Apr 2016 22:18:48 +0200 Subject: [PATCH 1/2] Make sure nrowsinbuf (buffersize) is multiple of chunksize --- tables/tests/test_indexvalues.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tables/tests/test_indexvalues.py b/tables/tests/test_indexvalues.py index d95ef7f5f..ca9b2ea68 100644 --- a/tables/tests/test_indexvalues.py +++ b/tables/tests/test_indexvalues.py @@ -102,6 +102,8 @@ def populateFile(self): if self.buffersize: # Change the buffersize by default table1.nrowsinbuf = self.buffersize + # Make sure nrowsinbuf is a multiple of chunkshape + table1.nrowsinbuf -= table1.nrowsinbuf % self.chunkshape # Index all entries: for col in table1.colinstances.itervalues(): indexrows = col.create_index( From 330e2c3f737cfa21e3ff9f15836e211759442f8b Mon Sep 17 00:00:00 2001 From: Tom Kooij Date: Sun, 26 Jun 2016 20:54:32 +0200 Subject: [PATCH 2/2] Add forgotten line from merge-conflict Add func_bounds to condvars --- tables/tests/test_queries.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tables/tests/test_queries.py b/tables/tests/test_queries.py index 3518bef43..443fe9e75 100644 --- a/tables/tests/test_queries.py +++ b/tables/tests/test_queries.py @@ -353,7 +353,8 @@ def create_test_method(type_, op, extracond, func=None): # Compute the value of bounds. condvars = {'bound': right_bound, 'lbound': left_bound, - 'rbound': right_bound} + 'rbound': right_bound, + 'func_bound': func_bound} for (bname, bvalue) in condvars.iteritems(): if type_ == 'string': bvalue = str_format % bvalue