Skip to content

Commit

Permalink
Add readcubedata(dataset)
Browse files Browse the repository at this point in the history
  • Loading branch information
felixcremer committed Oct 16, 2024
1 parent b80b509 commit 6d6dec9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/DatasetAPI/Datasets.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Datasets
#import ..Cubes.Axes: axsym, axname, CubeAxis, findAxis, CategoricalAxis, RangeAxis, caxes
import ..Cubes: Cubes, YAXArray, concatenatecubes, CleanMe, subsetcube, copy_diskarray, setchunks, caxes
import ..Cubes: Cubes, YAXArray, concatenatecubes, CleanMe, subsetcube, copy_diskarray, setchunks, caxes, readcubedata
using ...YAXArrays: YAXArrays, YAXDefaults, findAxis
using DataStructures: OrderedDict, counter
using Dates: Day, Hour, Minute, Second, Month, Year, Date, DateTime, TimeType, AbstractDateTime
Expand Down Expand Up @@ -178,6 +178,12 @@ function Base.getproperty(x::Dataset, k::Symbol)
x[k]
end
end

function readcubedata(ds::Dataset)
inmemcubes = OrderedDict(key=> readcubedata(val) for (key, val) in pairs(ds.cubes))
Dataset(inmemcubes, ds.axes, ds.properties)
end

Base.getindex(x::Dataset, i::Symbol) =
haskey(x.cubes, i) ? x.cubes[i] :
haskey(x.axes, i) ? x.axes[i] : throw(ArgumentError("$i not found in Dataset"))
Expand Down
5 changes: 5 additions & 0 deletions test/Datasets/datasets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,11 @@ end
@test ds.b.data == y
@test ds.b.chunks == b.chunks

@test ds.b.data isa AbstractDiskArray
inmemds = readcubedata(ds)
@test !isa(inmemds.b.data, AbstractDiskArray)


ds2 = Dataset(c=c)
savedataset(ds2, path=f, backend=:zarr, append=true)
ds = open_dataset(f, driver=:zarr)
Expand Down

0 comments on commit 6d6dec9

Please sign in to comment.