Merge pull request #508 from basho/features/lrb/riak-ts-1.5-rts-1425

Riak TS 1.5 support
basho · Dec 9, 2016 · d74824d · d74824d
2 parents 144da4e + f3f63a7
commit d74824d
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ addons:
 install:
   - pip install --upgrade pip setuptools flake8
 before_script:
+  - jdk_switcher use oraclejdk8
   - sudo ./tools/travis-ci/riak-install -d "$RIAK_DOWNLOAD_URL"
   - sudo ./tools/setup-riak -s
 env:

diff --git a/riak/codecs/pbuf.py b/riak/codecs/pbuf.py
@@ -824,6 +824,8 @@ def decode_timeseries_col_type(self, col_type):
             return 'timestamp'
         elif col_type == TsColumnType.Value('BOOLEAN'):
             return 'boolean'
+        elif col_type == TsColumnType.Value('BLOB'):
+            return 'blob'
         else:
             msg = 'could not decode column type: {}'.format(col_type)
             raise RiakError(msg)
@@ -845,8 +847,9 @@ def decode_timeseries_row(self, tsrow, tscols=None,
             if tscols is not None:
                 col = tscols[i]
             if cell.HasField('varchar_value'):
-                if col and col.type != TsColumnType.Value('VARCHAR'):
-                    raise TypeError('expected VARCHAR column')
+                if col and not (col.type == TsColumnType.Value('VARCHAR') or
+                                col.type == TsColumnType.Value('BLOB')):
+                    raise TypeError('expected VARCHAR or BLOB column')
                 else:
                     row.append(cell.varchar_value)
             elif cell.HasField('sint64_value'):

diff --git a/riak/pb/riak_dt_pb2.py b/riak/pb/riak_dt_pb2.py