BUG20324089: Fix HASH based sharding with MySQL Fabric

peeyushgupta · Geert Vanderkelen · commit 06aa8608c244 · 2015-03-25T13:45:35.000+01:00
We fix HASH based sharding which was causing the following runtime error: ValueError: Unsupported sharding type HASH A unit test has been added for BUG#20324089. (cherry picked from commit 0f7a8e7)
diff --git a/lib/mysql/connector/fabric/caching.py b/lib/mysql/connector/fabric/caching.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -130,6 +130,8 @@ def add_partition(self, key, group):
                     ))
         elif self.shard_type == 'RANGE_STRING':
             pass
+        elif self.shard_type == "HASH":
+            pass
         else:
             raise ValueError("Unsupported sharding type {0}".format(
                 self.shard_type
diff --git a/tests/test_fabric.py b/tests/test_fabric.py
@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -626,3 +626,39 @@ def test_bug19331658(self):
             )
 
         mysql.connector._CONNECTION_POOLS = {}
+
+    def test_range_hash(self):
+        self.assertTrue(self._check_table(
+            "employees.employees_hash", 'HASH'))
+        tbl_name = "employees_hash"
+
+        tables = ["employees.{0}".format(tbl_name)]
+
+        self.cnx.set_property(tables=tables,
+                              scope=fabric.SCOPE_GLOBAL,
+                              mode=fabric.MODE_READWRITE)
+
+        cur = self.cnx.cursor()
+        gtid_executed = self._truncate(cur, tbl_name)
+        self.cnx.commit()
+
+        insert = ("INSERT INTO {0} "
+                  "VALUES (%s, %s, %s, %s, %s, %s)").format(tbl_name)
+
+        self._populate(self.cnx, gtid_executed, tbl_name, insert,
+                       self.emp_data[1985] + self.emp_data[2000], 3)
+
+        time.sleep(2)
+
+        emp_exp_hash = self.emp_data[1985] + self.emp_data[2000]
+
+        rows = []
+        self.cnx.reset_properties()
+        str_keys = ['group1', 'group2']
+        for str_key in str_keys:
+            self.cnx.set_property(group=str_key, mode=fabric.MODE_READONLY)
+            cur = self.cnx.cursor()
+            cur.execute("SELECT * FROM {0}".format(tbl_name))
+            rows += cur.fetchall()
+
+        self.assertEqual(rows, emp_exp_hash)
