Merge remote-tracking branch 'origin/master' into t

* origin/master:
  neoctl: make 'print ids' command display time of TIDs
  mysql: force _getNextTID() to use appropriate/whole index

neo/lib/util.py

@@ -81,6 +81,16 @@ def unpackTID(ptid):
     higher.reverse()
     return (tuple(higher), lower)
 
+def timeStringFromTID(ptid):
+    """
+    Return a string in the format "yyyy-mm-dd hh:mm:ss.ssssss" from a TID
+    """
+    higher, lower = unpackTID(ptid)
+    seconds = lower * SECOND_PER_TID_LOW
+
+    return '%04d-%02d-%02d %02d:%02d:%09.6f' % (higher[0], higher[1], higher[2],
+                                                higher[3], higher[4], seconds)
+
 def addTID(ptid, offset):
     """
     Offset given packed TID.

neo/neoctl/app.py

@@ -16,7 +16,7 @@
 
 from operator import itemgetter
 from .neoctl import NeoCTL, NotReadyException
-from neo.lib.util import p64, u64, tidFromTime
+from neo.lib.util import p64, u64, tidFromTime, timeStringFromTID
 from neo.lib.protocol import uuid_str, ClusterStates, NodeTypes, \
     UUID_NAMESPACES, ZERO_TID
 
@@ -89,11 +89,13 @@ class TerminalNeoCTL(object):
         ptid, backup_tid, truncate_tid = self.neoctl.getRecovery()
         if backup_tid:
             ltid = self.neoctl.getLastTransaction()
-            r = "backup_tid = 0x%x" % u64(backup_tid)
+            r = "backup_tid = 0x%x (%s)" % (u64(backup_tid),
+                                            timeStringFromTID(backup_tid))
         else:
             loid, ltid = self.neoctl.getLastIds()
-            r = "last_oid = 0x%x" % u64(loid)
-        return r + "\nlast_tid = 0x%x\nlast_ptid = %u" % (u64(ltid), ptid)
+            r = "last_oid = 0x%x" % (u64(loid))
+        return r + "\nlast_tid = 0x%x (%s)\nlast_ptid = %u" % \
+                                    (u64(ltid), timeStringFromTID(ltid), ptid)
 
     def getPartitionRowList(self, params):
         """
@@ -311,4 +313,3 @@ class Application(object):
             " e.g. '257684787499560686', '0x3937af2eeeeeeee' or '1325421296.'"
             " for 2012-01-01 12:34:56 UTC")
         return '\n'.join(output_list)
-

neo/storage/database/mysqldb.py

@@ -335,7 +335,7 @@ class MySQLDatabaseManager(DatabaseManager):
                        # ANSWER -> index name is SHOW INDEX FROM tbl; -> Key_name
                        # " FORCE INDEX(`partition`)"
         r = self.query("SELECT tid FROM obj"
-                       " USE INDEX(`partition`)"
+                       " FORCE INDEX(`partition`)"
                        " WHERE `partition`=%d AND oid=%d AND tid>%d"
                        " ORDER BY tid LIMIT 1" % args)
         return r[0][0] if r else None