Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 6 additions & 16 deletions matlab/src/matlab/featherwrite.m
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,11 @@ function featherwrite(filename, t)
% specific language governing permissions and limitations
% under the License.

import arrow.util.table2mlarrow;
arguments
filename(1, 1) string {mustBeNonmissing, mustBeNonzeroLengthText}
t table
end

% Validate input arguments.
narginchk(2, 2);
filename = convertStringsToChars(filename);
if ~ischar(filename)
error('MATLAB:arrow:InvalidFilenameDatatype', ...
'Filename must be a character vector or string scalar.');
end
if ~istable(t)
error('MATLAB:arrow:InvalidInputTable', 't must be a table.');
end

[variables, metadata] = table2mlarrow(t);

% Write the table to a Feather file.
arrow.cpp.call('featherwrite', filename, variables, metadata);
writer = arrow.internal.io.feather.Writer(filename);
writer.write(t);
end
11 changes: 5 additions & 6 deletions matlab/test/tfeather.m
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function ErrorIfInvalidFilenameDatatype(testCase)

t = createTable;

testCase.verifyError(@() featherwrite({filename}, t), 'MATLAB:arrow:InvalidFilenameDatatype');
testCase.verifyError(@() featherwrite({table}, t), 'MATLAB:validation:UnableToConvert');
testCase.verifyError(@() featherread({filename}), 'MATLAB:arrow:InvalidFilenameDatatype');
end

Expand All @@ -178,7 +178,7 @@ function ErrorIfTooManyInputs(testCase)
end

function ErrorIfTooFewInputs(testCase)
testCase.verifyError(@() featherwrite(), 'MATLAB:narginchk:notEnoughInputs');
testCase.verifyError(@() featherwrite(), 'MATLAB:minrhs');
testCase.verifyError(@() featherread(), 'MATLAB:narginchk:notEnoughInputs');
end

Expand All @@ -193,7 +193,7 @@ function ErrorIfMultiColVarExist(testCase)

t = table(age, smoker, height, weight, bloodPressure);

testCase.verifyError(@() featherwrite(filename, t), 'MATLAB:arrow:UnsupportedVariableType');
testCase.verifyError(@() featherwrite(filename, t), 'arrow:array:InvalidShape');
end

function UnsupportedMATLABDatatypes(testCase)
Expand All @@ -205,7 +205,7 @@ function UnsupportedMATLABDatatypes(testCase)
calendarDuration(5, 3, 2)];
actualTable = addvars(actualTable, calendarDurationVariable);

testCase.verifyError(@() featherwrite(filename, actualTable) ,'MATLAB:arrow:UnsupportedVariableType');
testCase.verifyError(@() featherwrite(filename, actualTable) ,'arrow:array:UnsupportedMATLABType');
end

function NumericComplexUnsupported(testCase)
Expand All @@ -216,8 +216,7 @@ function NumericComplexUnsupported(testCase)
actualTable.double(2) = exp(9) + 5i;
actualTable.int64(2) = 1.0418e+03;

expectedTable = featherRoundTrip(filename, actualTable);
testCase.verifyNotEqual(actualTable, expectedTable);
testCase.verifyError(@() featherwrite(filename, actualTable) ,'arrow:array:ComplexNumeric');
end
end
end