-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-37340: [MATLAB] The
column(index) method of `arrow.tabular.Recor…
…dBatch` errors if `index` refers to an `arrow.array.Time32Array` column (#37347) ### Rationale for this change The `column(index)` method of `arrow.tabular.RecordBatch` errors if `index` refers to an `arrow.array.Time32Array` column. ```matlab >> string = arrow.array(["A", "B", "C"]); >> time32 = arrow.array.Time32Array.fromMATLAB(seconds(1:3)); >> rb = arrow.tabular.RecordBatch.fromArrays(string, time32, ColumnNames=["String", "Time32"]) rb = String: [ "A", "B", "C" ] Time32: [ 00:00:01, 00:00:02, 00:00:03 ] >> time32Column = rb.column(2) Error using . Unsupported DataType: time32[s] Error in arrow.tabular.RecordBatch/column (line 63) [proxyID, typeID] = obj.Proxy.getColumnByIndex(args); ``` `column(index)` is throwing this error because the case for `Time32` was not added to `arrow::matlab::array::proxy::wrap(arrowArray)` in #37315. `column(index)` calls this function to create proxy objects around existing arrow arrays. Adding the case for `Time32` will resolve this bug. ### What changes are included in this PR? 1. Updated `arrow::Result<proxy::Array> wrap(const std::shared_ptr<arrow::Array>& array)` to handle wrapping `arrow::Time32Array` instances within `proxy::Time32Array`s. 2. Added a new test utility called `arrow.internal.test.tabular.createAllSupportedArrayTypes`, which returns two cell arrays: `arrowArrays` and `matlabData`. The `arrowArrays` cell array contains one instance of each concrete subclass of `arrow.array.Array`. The `matlabData` cell array contains the MATLAB arrays used to generate each array in `arrowArrays`. This utility can be used to create an `arrow.array.RecordBatch` that contains all the arrow array types that are supported by the MATLAB interface. ### Are these changes tested? Yes. Updated the `fromArrays` test cases in `tRecordBatch` to verify the `column(index)` method of `arrow.type.RecordBatch` supports extracting columns of any arrow type (supported by the MATLAB Interface). ### Are there any user-facing changes? Yes. Fixed a bug in `arrow.tabular.RecordBatch`. ### Future Directions 1. #37345 * Closes: #37340 Authored-by: Sarah Gilmore <[email protected]> Signed-off-by: Kevin Gurney <[email protected]>
- Loading branch information
1 parent
6837d05
commit 91a4927
Showing
3 changed files
with
125 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
matlab/src/matlab/+arrow/+internal/+test/+tabular/createAllSupportedArrayTypes.m
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| %CREATEALLSUPPORTEDARRAYTYPES Creates a MATLAB cell array containing all | ||
| %the concrete subclasses of arrow.array.Array. Returns a cell array | ||
| %containing the MATLAB data from which the arrow arrays were generated | ||
| %as second output argument. | ||
|
|
||
| % Licensed to the Apache Software Foundation (ASF) under one or more | ||
| % contributor license agreements. See the NOTICE file distributed with | ||
| % this work for additional information regarding copyright ownership. | ||
| % The ASF licenses this file to you under the Apache License, Version | ||
| % 2.0 (the "License"); you may not use this file except in compliance | ||
| % with the License. You may obtain a copy of the License at | ||
| % | ||
| % http://www.apache.org/licenses/LICENSE-2.0 | ||
| % | ||
| % Unless required by applicable law or agreed to in writing, software | ||
| % distributed under the License is distributed on an "AS IS" BASIS, | ||
| % WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| % implied. See the License for the specific language governing | ||
| % permissions and limitations under the License. | ||
|
|
||
| function [arrowArrays, matlabData] = createAllSupportedArrayTypes(opts) | ||
| arguments | ||
| opts.NumRows(1, 1) {mustBeFinite, mustBeNonnegative} = 3; | ||
| end | ||
|
|
||
| import arrow.type.ID | ||
| import arrow.array.* | ||
|
|
||
| classes = getArrayClassNames(); | ||
| numClasses = numel(classes); | ||
| arrowArrays = cell(numClasses, 1); | ||
| matlabData = cell(numClasses, 1); | ||
|
|
||
| numericArrayToMatlabTypeDict = getArrowArrayToMatlabTypeDictionary(); | ||
|
|
||
| for ii = 1:numel(classes) | ||
| name = classes(ii); | ||
| if name == "arrow.array.BooleanArray" | ||
| matlabData{ii} = randomLogicals(opts.NumRows); | ||
| arrowArrays{ii} = BooleanArray.fromMATLAB(matlabData{ii}); | ||
| elseif isKey(numericArrayToMatlabTypeDict, name) | ||
| matlabType = numericArrayToMatlabTypeDict(name); | ||
| matlabData{ii} = randomNumbers(matlabType, opts.NumRows); | ||
| cmd = compose("%s.fromMATLAB(matlabData{ii})", name); | ||
| arrowArrays{ii} = eval(cmd); | ||
| elseif name == "arrow.array.StringArray" | ||
| matlabData{ii} = randomStrings(opts.NumRows); | ||
| arrowArrays{ii} = StringArray.fromMATLAB(matlabData{ii}); | ||
| elseif name == "arrow.array.TimestampArray" | ||
| matlabData{ii} = randomDatetimes(opts.NumRows); | ||
| arrowArrays{ii} = TimestampArray.fromMATLAB(matlabData{ii}); | ||
| elseif name == "arrow.array.Time32Array" | ||
| matlabData{ii} = randomDurations(opts.NumRows); | ||
| arrowArrays{ii} = Time32Array.fromMATLAB(matlabData{ii}); | ||
| else | ||
| error("arrow:test:SupportedArrayCase", ... | ||
| "Missing if-branch for array class " + name); | ||
| end | ||
| end | ||
| end | ||
|
|
||
| function classes = getArrayClassNames() | ||
| metaClass = meta.package.fromName("arrow.array").ClassList; | ||
|
|
||
| % Removes all Abstract classes from the list of all subclasses | ||
| abstract = [metaClass.Abstract]; | ||
| metaClass(abstract) = []; | ||
| classes = string({metaClass.Name}); | ||
| end | ||
|
|
||
| function dict = getArrowArrayToMatlabTypeDictionary() | ||
| pkg = "arrow.array"; | ||
| unsignedTypes = compose("UInt%d", power(2, 3:6)); | ||
| signedTypes = compose("Int%d", power(2, 3:6)); | ||
| floatTypes = compose("Float%d", power(2, 5:6)); | ||
| numericTypes = [unsignedTypes, signedTypes, floatTypes]; | ||
| keys = compose("%s.%sArray", pkg, numericTypes); | ||
|
|
||
| values = [lower([unsignedTypes, signedTypes]) "single" "double"]; | ||
| dict = dictionary(keys, values); | ||
| end | ||
|
|
||
| function number = randomNumbers(numberType, numElements) | ||
| number = cast(randi(255, [numElements 1]), numberType); | ||
| end | ||
|
|
||
| function text = randomStrings(numElements) | ||
| text = string(randi(255, [numElements 1])); | ||
| end | ||
|
|
||
| function tf = randomLogicals(numElements) | ||
| number = randi(2, [numElements 1]) - 1; | ||
| tf = logical(number); | ||
| end | ||
|
|
||
| function times = randomDurations(numElements) | ||
| number = randi(255, [numElements 1]); | ||
| times = seconds(number); | ||
| end | ||
|
|
||
| function dates = randomDatetimes(numElements) | ||
| day = days(randi(255, [numElements 1])); | ||
| dates = datetime(2023, 8, 23) + day; | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters