PYTHON-1369 Extend driver vector support to arbitrary subtypes and fix handling of variable length types (OSS C* 5.0) #1217
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| import logging | ||
| import unittest | ||
|
|
||
| from cassandra.cluster import Cluster, Session | ||
|
|
||
| class Python1369Test(unittest.TestCase): | ||
|
|
||
| def setUp(self): | ||
| #log = logging.getLogger() | ||
| #log.setLevel('DEBUG') | ||
|
|
||
| #handler = logging.StreamHandler() | ||
| #handler.setFormatter(logging.Formatter("%(asctime)s [%(levelname)s] %(name)s: %(message)s")) | ||
| #log.addHandler(handler) | ||
|
|
||
| self.cluster = Cluster(['127.0.0.1']) | ||
| self.session = self.cluster.connect() | ||
| self.session.execute("drop keyspace if exists test") | ||
| ks_stmt = """CREATE KEYSPACE test | ||
| WITH REPLICATION = { | ||
| 'class' : 'SimpleStrategy', | ||
| 'replication_factor' : 1 | ||
| }""" | ||
| self.session.execute(ks_stmt) | ||
|
|
||
| def _create_table(self, subtype): | ||
| table_stmt = """CREATE TABLE test.foo ( | ||
| i int PRIMARY KEY, | ||
| j vector<%s, 3> | ||
| )""" % (subtype,) | ||
| self.session.execute(table_stmt) | ||
|
|
||
| def _populate_table(self, data): | ||
| for k,v in data.items(): | ||
| self.session.execute("insert into test.foo (i,j) values (%d,%s)" % (k,v)) | ||
|
|
||
| def _populate_table_prepared(self, data): | ||
| ps = self.session.prepare("insert into test.foo (i,j) values (?,?)") | ||
| for k,v in data.items(): | ||
| self.session.execute(ps, [k,v]) | ||
|
|
||
| def _create_and_populate_table(self, subtype="float", data={}): | ||
| self._create_table(subtype) | ||
| self._populate_table(data) | ||
|
|
||
| def _create_and_populate_table_preapred(self, subtype="float", data={}): | ||
| self._create_table(subtype) | ||
| self._populate_table_prepared(data) | ||
|
|
||
| def _execute_test(self, expected, test_fn): | ||
| rs = self.session.execute("select j from test.foo where i = 2") | ||
| rows = rs.all() | ||
| self.assertEqual(len(rows), 1) | ||
| observed = rows[0].j | ||
| for idx in range(0, 3): | ||
| test_fn(observed[idx], expected[idx]) | ||
|
|
||
| def test_float_vector(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertAlmostEqual(observed, expected, places=5) | ||
| expected = [1.2, 3.4, 5.6] | ||
| data = {1:[8, 2.3, 58], 2:expected, 5:[23, 18, 3.9]} | ||
| self._create_and_populate_table(subtype="float", data=data) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_float_vector_prepared(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertAlmostEqual(observed, expected, places=5) | ||
| expected = [1.2, 3.4, 5.6] | ||
| data = {1:[8, 2.3, 58], 2:expected, 5:[23, 18, 3.9]} | ||
| self._create_and_populate_table_preapred(subtype="float", data=data) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_varint_vector(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertEqual(observed, expected) | ||
| expected=[1, 3, 5] | ||
| data = {1:[8, 2, 58], 2:expected, 5:[23, 18, 3]} | ||
| self._create_and_populate_table(subtype="varint", data=data) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_varint_vector_prepared(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertEqual(observed, expected) | ||
| expected=[1, 3, 5] | ||
| data = {1:[8, 2, 58], 2:expected, 5:[23, 18, 3]} | ||
| self._create_and_populate_table_preapred(subtype="varint", data=data) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_string_vector(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertEqual(observed, expected) | ||
| expected=["foo", "bar", "baz"] | ||
| data = {1:["a","b","c"], 2:expected, 5:["x","y","z"]} | ||
| self._create_and_populate_table(subtype="text", data=data) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_map_vector(self): | ||
| self.session.execute("drop table if exists test.foo") | ||
| def test_fn(observed, expected): | ||
| self.assertEqual(observed, expected) | ||
| expected=[{"foo":1}, {"bar":2}, {"baz":3}] | ||
| data = {1:[{"a":1},{"b":2},{"c":3}], 2:expected, 5:[{"x":1},{"y":2},{"z":3}]} | ||
| self._create_table("map<text,int>") | ||
| for k,v in data.items(): | ||
| self.session.execute("insert into test.foo (i,j) values (%s,%s)", (k,v)) | ||
| self._execute_test(expected, test_fn) | ||
|
|
||
| def test_vector_of_vector(self): | ||
| def test_fn(observed, expected): | ||
| self.assertEqual(observed, expected) | ||
| expected=[[1,2], [4,5], [7,8]] | ||
| data = {1:[[10,20], [40,50], [70,80]], 2:expected, 5:[[100,200], [400,500], [700,800]]} | ||
| self._create_table("vector<int,2>") | ||
| for k,v in data.items(): | ||
| self.session.execute("insert into test.foo (i,j) values (%s,%s)", (k,v)) | ||
| self._execute_test(expected, test_fn) | ||
| #self.session.execute("drop table test.foo") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to throw an error when the length of elements in the
bytsdoes not match the vector dimension definition? Same forserialize.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually happening (at least for deserialize) with the changes above. I've also recently added support for similar tests in serliaze() (along with tests for all the cases).