release 1.1.1

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.1.1
 commit = True
 tag = False
 

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='twindb_table_compare',
-    version='1.1.0',
+    version='1.1.1',
     description="TwinDB Table Compare reads percona.checksums from the master "
                 "and slave and shows what records are difference "
                 "if there are any inconsistencies.",

twindb_table_compare/__init__.py

@@ -8,7 +8,7 @@
 
 __author__ = 'Aleksandr Kuzminsky'
 __email__ = 'aleks@twindb.com'
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 LOG = logging.getLogger(__name__)
 

twindb_table_compare/compare.py

@@ -196,6 +196,34 @@ def get_fileds(conn, db, tbl):
     return ', '.join(fields)
 
 
+def primary_exists(conn, db, tbl):
+    """
+    Check if PRIMARY index exists in table db.tbl
+
+    :param conn: MySQLdb connection.
+    :type conn: Connection
+    :param db: Database name.
+    :type db: str
+    :param tbl: Table name.
+    :type tbl: str
+    :return: True if index PRIMARY exists in table db.tbl
+    :rtype: bool
+    """
+    query = "SELECT COUNT(*)" \
+            "FROM INFORMATION_SCHEMA.STATISTICS " \
+            "WHERE TABLE_SCHEMA = %s " \
+            "AND TABLE_NAME = %s" \
+            "AND INDEX_NAME = 'PRIMARY'"
+    cursor = conn.cursor()
+    cursor.execute(query, (db, tbl))
+
+    n_fields = cursor.fetchone()[0]
+
+    LOG.debug('Number of fields in PRIMARY index %d', n_fields)
+
+    return bool(n_fields > 0)
+
+
 # pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements
 def build_chunk_query(db,
                       tbl,
@@ -283,8 +311,13 @@ def build_chunk_query(db,
         where += " 1"
 
     fields = get_fileds(conn, db, tbl)
-    query = "SELECT %s FROM `%s`.`%s` USING (PRIMARY) %s" \
-            % (fields, db, tbl, where)
+    if primary_exists(conn, db, tbl):
+        index_hint = "USE INDEX (PRIMARY)"
+    else:
+        index_hint = ""
+
+    query = "SELECT %s FROM `%s`.`%s` %s %s" \
+            % (fields, db, tbl, index_hint, where)
 
     return query