Improve unix timestamp -> datetime conversion, update to riak_pb 2.1.3.0

Author: Luke Bakken

riak/codecs/ttb.py

@@ -6,6 +6,7 @@
 
 from riak import RiakError
 from riak.codecs import Codec, Msg
+from riak.pb.messages import MSG_CODE_TS_TTB_MSG
 from riak.ts_object import TsColumns
 from riak.util import bytes_to_str, unix_time_millis, \
     datetime_from_unix_time_millis
@@ -23,9 +24,6 @@
 tsdelreq_a = Atom('tsdelreq')
 timestamp_a = Atom('timestamp')
 
-# TODO RTS-842
-MSG_CODE_TS_TTB = 104
-
 
 class TtbCodec(Codec):
     '''
@@ -36,7 +34,7 @@ def __init__(self, **unused_args):
         super(TtbCodec, self).__init__(**unused_args)
 
     def parse_msg(self, msg_code, data):
-        if msg_code != MSG_CODE_TS_TTB:
+        if msg_code != MSG_CODE_TS_TTB_MSG:
             raise RiakError("TTB can't parse code: {}".format(msg_code))
         if len(data) > 0:
             decoded = decode(data)
@@ -61,6 +59,7 @@ def encode_to_ts_cell(self, cell):
         else:
             if isinstance(cell, datetime.datetime):
                 ts = unix_time_millis(cell)
+                # logging.debug('encoded datetime %s as %s', cell, ts)
                 return ts
             elif isinstance(cell, bool):
                 return cell
@@ -84,19 +83,19 @@ def encode_timeseries_keyreq(self, table, key, is_delete=False):
         else:
             raise ValueError("key must be a list")
 
-        mc = MSG_CODE_TS_TTB
-        rc = MSG_CODE_TS_TTB
+        mc = MSG_CODE_TS_TTB_MSG
+        rc = MSG_CODE_TS_TTB_MSG
         req_atom = tsgetreq_a
         if is_delete:
             req_atom = tsdelreq_a
 
-        # TODO RTS-842 timeout is last
+        # TODO FUTURE add timeout as last param
         req = req_atom, table.name, \
             [self.encode_to_ts_cell(k) for k in key_vals], udef_a
         return Msg(mc, encode(req), rc)
 
     def validate_timeseries_put_resp(self, resp_code, resp):
-        if resp is None and resp_code == MSG_CODE_TS_TTB:
+        if resp is None and resp_code == MSG_CODE_TS_TTB_MSG:
             return True
         if resp is not None:
             return True
@@ -123,8 +122,8 @@ def encode_timeseries_put(self, tsobj):
                     req_r.append(self.encode_to_ts_cell(cell))
                 req_rows.append(tuple(req_r))
             req = tsputreq_a, tsobj.table.name, [], req_rows
-            mc = MSG_CODE_TS_TTB
-            rc = MSG_CODE_TS_TTB
+            mc = MSG_CODE_TS_TTB_MSG
+            rc = MSG_CODE_TS_TTB_MSG
             return Msg(mc, encode(req), rc)
         else:
             raise RiakError("TsObject requires a list of rows")
@@ -135,8 +134,8 @@ def encode_timeseries_query(self, table, query, interpolations=None):
             q = q.format(table=table.name)
         tsi = tsinterpolation_a, q, []
         req = tsqueryreq_a, tsi, False, []
-        mc = MSG_CODE_TS_TTB
-        rc = MSG_CODE_TS_TTB
+        mc = MSG_CODE_TS_TTB_MSG
+        rc = MSG_CODE_TS_TTB_MSG
         return Msg(mc, encode(req), rc)
 
     def decode_timeseries(self, resp_ttb, tsobj):

riak/pb/messages.py

@@ -81,9 +81,7 @@
 MSG_CODE_TS_COVERAGE_RESP = 101
 MSG_CODE_TS_COVERAGE_ENTRY = 102
 MSG_CODE_TS_RANGE = 103
-MSG_CODE_TS_TTB_PUT_REQ = 104
-MSG_CODE_TOGGLE_ENCODING_REQ = 110
-MSG_CODE_TOGGLE_ENCODING_RESP = 111
+MSG_CODE_TS_TTB_MSG = 104
 MSG_CODE_AUTH_REQ = 253
 MSG_CODE_AUTH_RESP = 254
 MSG_CODE_START_TLS = 255
@@ -168,9 +166,7 @@
     MSG_CODE_TS_COVERAGE_RESP: riak.pb.riak_ts_pb2.TsCoverageResp,
     MSG_CODE_TS_COVERAGE_ENTRY: riak.pb.riak_ts_pb2.TsCoverageEntry,
     MSG_CODE_TS_RANGE: riak.pb.riak_ts_pb2.TsRange,
-    MSG_CODE_TS_TTB_PUT_REQ: riak.pb.riak_ts_pb2.TsTtbPutReq,
-    MSG_CODE_TOGGLE_ENCODING_REQ: riak.pb.riak_pb2.RpbToggleEncodingReq,
-    MSG_CODE_TOGGLE_ENCODING_RESP: riak.pb.riak_pb2.RpbToggleEncodingResp,
+    MSG_CODE_TS_TTB_MSG: None,
     MSG_CODE_AUTH_REQ: riak.pb.riak_pb2.RpbAuthReq,
     MSG_CODE_AUTH_RESP: None,
     MSG_CODE_START_TLS: None