Skip to content

ExternalStorage: Add check for sparse blobs #243

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
eywalker merged 7 commits into from
May 19, 2020
Merged

ExternalStorage: Add check for sparse blobs #243

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
178fc5b
Add temporary check to prevent sparse blob insert/update.
guzman-raphael May 19, 2020
856487c
Update error message.
guzman-raphael May 19, 2020
d9fff17
Merge branch 'external-storage' of github.com:datajoint/datajoint-mat…
guzman-raphael May 19, 2020
f59df0e
Update error message2.
guzman-raphael May 19, 2020
abfad64
Merge pull request #242 from guzman-raphael/fix-238-ext
guzman-raphael May 19, 2020
da7632f
Update error message3.
guzman-raphael May 19, 2020
52045d2
Merge pull request #244 from guzman-raphael/fix-238-ext
guzman-raphael May 19, 2020
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
18 changes: 13 additions & 5 deletions +dj/Relvar.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,14 @@ function insert(self, tuples, command)
assert(header.attributes(attr_idx).isnullable, ...
'DataJoint:DataType:NotNullable', ...
'attribute `%s` is not nullable.', ...
header.attributes(attr_idx).name)
header.attributes(attr_idx).name);
placeholder = 'NULL';
value = [];
elseif header.attributes(attr_idx).isString
assert(dj.lib.isString(value), ...
'DataJoint:DataType:Mismatch', ...
'The field %s must be a character string', ...
header.attributes(attr_idx).name)
'The field `%s` must be a character string', ...
header.attributes(attr_idx).name);
placeholder = '"{S}"';
value = char(value);
elseif header.attributes(attr_idx).isUuid
Expand All @@ -240,6 +240,10 @@ function insert(self, tuples, command)
placeholder = '"{B}"';
value = uint8(decMtx);
elseif header.attributes(attr_idx).isBlob
assert(~issparse(value), ...
'DataJoint:DataType:Mismatch', ...
'Sparse matrix in blob field `%s` is currently not supported', ...
header.attributes(attr_idx).name);
if ~header.attributes(attr_idx).isExternal
placeholder = '"{M}"';
else
Expand All @@ -256,8 +260,8 @@ function insert(self, tuples, command)
assert((isnumeric(value) || islogical(value)) && (isscalar( ...
value) || isempty(value)),...
'DataJoint:DataType:Mismatch', ...
'The field %s must be a numeric scalar value', ...
header.attributes(attr_idx).name)
'The field `%s` must be a numeric scalar value', ...
header.attributes(attr_idx).name);
% empty numeric values and nans are passed as nulls
if isinf(value)
error 'Infinite values are not allowed in numeric fields'
Expand Down Expand Up @@ -417,6 +421,10 @@ function update(self, attrname, value)
valueStr = '"{S}"';
value = {char(value)};
case header.attributes(ix).isBlob
assert(~issparse(value), ...
'DataJoint:DataType:Mismatch', ...
'Sparse matrix in blob field `%s` is currently not supported', ...
attrname);
if isempty(value) && header.attributes(ix).isnullable
valueStr = 'NULL';
value = {};
Expand Down