Skip to content

Riak TS 1.5 support #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Dec 9, 2016
Merged

Riak TS 1.5 support #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21039a5
Update riak_pb and add encode / decode tests for BLOB column
Dec 6, 2016
e66ec0d
Use jdk_switcher to fix Travis CI issues
Dec 7, 2016
a72eb5c
fix mapreduce test
Dec 7, 2016
1ef5935
fix another m/r test
Dec 7, 2016
aba3c49
Add some blob columns to the tests
alexmoore Dec 8, 2016
116da1a
fix test to use HasField to detect a null value
Dec 8, 2016
72b5538
Check value in TS PBuf test
alexmoore Dec 8, 2016
f3f63a7
Fix some formatting errors
alexmoore Dec 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions riak/codecs/pbuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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'):
Expand Down
109 changes: 85 additions & 24 deletions riak/pb/riak_dt_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading