openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Added tests with Batch statements with prepared statement after ALTER

Browse Source
This commit is contained in:
bjmb
2017-05-17 08:57:04 -04:00
parent c32dfcbfc4
commit 45689d08ef
2 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/standard/test_prepared_statements.py
View File

@@ -390,7 +390,7 @@ class PreparedStatementTests(unittest.TestCase):
with self.assertRaises(InvalidRequest):
self.session.execute(prepared, [0])
# TODO revisit this test
# TODO revisit this test, it on hold now due to CASSANDRA-10786
@unittest.skip
def test_invalidated_result_metadata(self):
"""

55
tests/integration/standard/test_query.py
View File

@@ -494,19 +494,70 @@ class PreparedStatementArgTest(unittest.TestCase):
reprepare_on_up=False)
self.addCleanup(clus.shutdown)
table = "test3rf.%s" % self._testMethodName.lower()
session = clus.connect(wait_for_all_pools=True)
insert_statement = session.prepare("INSERT INTO test3rf.test (k, v) VALUES (?, ?)")
session.execute("DROP TABLE IF EXISTS %s" % table)
session.execute("CREATE TABLE %s (k int PRIMARY KEY, v int )" % table)
insert_statement = session.prepare("INSERT INTO %s (k, v) VALUES (?, ?)" % table)
# This is going to query a host where the query
# is not prepared
batch_statement = BatchStatement(consistency_level=ConsistencyLevel.ONE)
batch_statement.add(insert_statement, (1, 2))
session.execute(batch_statement)
select_results = session.execute("SELECT * FROM test3rf.test WHERE k = 1")
select_results = session.execute("SELECT * FROM %s WHERE k = 1" % table)
first_row = select_results[0][:2]
self.assertEqual((1, 2), first_row)
def test_prepare_batch_statement_after_alter(self):
"""
Test to validate a prepared statement used inside a batch statement is correctly handled
by the driver. The metadata might be updated when a table is altered. This tests combines
queries not being prepared and an update of the prepared statement metadata
@since 3.10
@jira_ticket PYTHON-706
@expected_result queries will have to re-prepared on hosts that aren't the control connection
and the batch statement will be sent.
"""
white_list = ForcedHostSwitchPolicy()
clus = Cluster(
load_balancing_policy=white_list,
protocol_version=PROTOCOL_VERSION, prepare_on_all_hosts=False,
reprepare_on_up=False)
self.addCleanup(clus.shutdown)
table = "test3rf.%s" % self._testMethodName.lower()
session = clus.connect(wait_for_all_pools=True)
session.execute("DROP TABLE IF EXISTS %s" % table)
session.execute("CREATE TABLE %s (k int PRIMARY KEY, a int, b int, d int)" % table)
insert_statement = session.prepare("INSERT INTO %s (k, b, d) VALUES (?, ?, ?)" % table)
# Altering the table might trigger an update in the insert metadata
session.execute("ALTER TABLE %s ADD c int" % table)
values_to_insert = [(1, 2, 3), (2, 3, 4), (3, 4, 5), (4, 5, 6)]
# We query the three hosts in order (due to the ForcedHostSwitchPolicy)
# the first three queries will have to be repreapred and the rest should
# work as normal batch prepared statements
for i in range(10):
value_to_insert = values_to_insert[i % len(values_to_insert)]
batch_statement = BatchStatement(consistency_level=ConsistencyLevel.ONE)
batch_statement.add(insert_statement, value_to_insert)
session.execute(batch_statement)
select_results = session.execute("SELECT * FROM %s" % table)
expected_results = [(1, None, 2, None, 3), (2, None, 3, None, 4),
(3, None, 4, None, 5), (4, None, 5, None, 6)]
self.assertEqual(set(expected_results), set(select_results._current_rows))
class PrintStatementTests(unittest.TestCase):
"""