Skip to content

GH-44967: [MATLAB] Add ReadTable method to RecordBatchFileReader #44965

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

Closed
samuelpwlim wants to merge 1 commit into from
Closed

GH-44967: [MATLAB] Add ReadTable method to RecordBatchFileReader #44965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 matlab/src/cpp/arrow/matlab/error/error.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,5 +249,6 @@ static const char* IPC_RECORD_BATCH_READER_OPEN_FAILED =
"arrow:io:ipc:FailedToOpenRecordBatchReader";
static const char* IPC_RECORD_BATCH_READ_INVALID_INDEX = "arrow:io:ipc:InvalidIndex";
static const char* IPC_RECORD_BATCH_READ_FAILED = "arrow:io:ipc:ReadFailed";
static const char* IPC_TABLE_READ_FAILED = "arrow:io:ipc:TableReadFailed";

} // namespace arrow::matlab::error
18 changes: 18 additions & 0 deletions matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ RecordBatchFileReader::RecordBatchFileReader(
REGISTER_METHOD(RecordBatchFileReader, getNumRecordBatches);
REGISTER_METHOD(RecordBatchFileReader, getSchema);
REGISTER_METHOD(RecordBatchFileReader, readRecordBatchAtIndex);
REGISTER_METHOD(RecordBatchFileReader, readTable);
}

libmexclass::proxy::MakeResult RecordBatchFileReader::make(
Expand Down Expand Up @@ -125,4 +126,21 @@ void RecordBatchFileReader::readRecordBatchAtIndex(
context.outputs[0] = record_batch_proxyy_id_mda;
}

void RecordBatchFileReader::readTable(
libmexclass::proxy::method::Context& context) {
namespace mda = ::matlab::data;
using TableProxy = arrow::matlab::tabular::proxy::Table;

MATLAB_ASSIGN_OR_ERROR_WITH_CONTEXT(auto table,
reader->ToTable(), context,
error::IPC_TABLE_READ_FAILED);
auto table_proxy = std::make_shared<TableProxy>(std::move(table));
const auto table_proxy_id =
libmexclass::proxy::ProxyManager::manageProxy(table_proxy);

mda::ArrayFactory factory;
const auto table_proxy_id_mda = factory.createScalar(table_proxy_id);
context.outputs[0] = table_proxy_id_mda;
}

} // namespace arrow::matlab::io::ipc::proxy
2 changes: 2 additions & 0 deletions matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class RecordBatchFileReader : public libmexclass::proxy::Proxy {
void getSchema(libmexclass::proxy::method::Context& context);

void readRecordBatchAtIndex(libmexclass::proxy::method::Context& context);

void readTable(libmexclass::proxy::method::Context& context);
};

} // namespace arrow::matlab::io::ipc::proxy
15 changes: 15 additions & 0 deletions matlab/test/arrow/io/ipc/tRecordBatchFileReader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,5 +180,20 @@ function readAtIndex(testCase)
expected2 = arrow.recordBatch(t2);
testCase.verifyEqual(actual2, expected2);
end

function readTable(testCase)
% Verify readTable returns the expected table for the given
% file
// t1 = table(["Row1"; "Row2"], single([1; 2]), VariableNames=["A", "B"]);
// t2 = table(["Row3"; "Row4"], single([3; 4]), VariableNames=["A", "B"]);
expectedTable = [t1];

reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
actualTable = reader.readTable();

testCase.verifyEqual(actualTable, expectedTable);
testCase.verifyClass(actualTable, "table");
testCase.verifySize(actualTable, [4, 2]);
end
end
end
Loading