Skip to content

Commit

Permalink
Correct the column content with the column header for object_walk (cl…
Browse files Browse the repository at this point in the history
…oses #683) (#684)

* Correct the column content with the column header for object_walk

* Update NEWS, roll micro version, roll license year [ci skip]
  • Loading branch information
eddelbuettel authored Mar 30, 2024
1 parent d796865 commit 63223cc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: tiledb
Type: Package
Version: 0.25.0.4
Version: 0.25.0.5
Title: Modern Database Engine for Complex Data Based on Multi-Dimensional Arrays
Authors@R: c(person("TileDB, Inc.", role = c("aut", "cph")),
person("Dirk", "Eddelbuettel", email = "dirk@tiledb.com", role = "cre"))
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2017-2021
YEAR: 2017-2024
COPYRIGHT HOLDER: TileDB Inc.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

* The Arrow integration has been simplified using [nanoarrow](https://github.com/apache/arrow-nanoarrow) returning a single `nanoarrow` object; an unexported helper function `nanoarrow2list()` is provided to matching the previous interface (#682)

## Bug Fixes

* The column headers now correspond to the column content in the two-column `data.frame` returns by `tiledb_object_walk` (#684 closing #683)

## Build and Test Systems

* The `configure` and `Makevars.in` received a minor update correcting small issues (#680)
Expand Down
4 changes: 2 additions & 2 deletions src/libtiledb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4324,8 +4324,8 @@ DataFrame libtiledb_object_walk(XPtr<tiledb::Context> ctx,
uris.push_back(object.uri());
types.push_back(_object_type_to_string(object.type()));
}
return Rcpp::DataFrame::create(Rcpp::Named("TYPE") = uris,
Rcpp::Named("URI") = types);
return Rcpp::DataFrame::create(Rcpp::Named("TYPE") = types,
Rcpp::Named("URI") = uris);
}

/**
Expand Down

0 comments on commit 63223cc

Please sign in to comment.