Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Commit 866a17e

Browse files
committed
updates for arrow 0.15.0
1 parent c48e340 commit 866a17e

File tree

161 files changed

+6617
-2353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+6617
-2353
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Apache Arrow 0.14.1
1+
# Apache Arrow 0.15.0
22

33
Backports for the R legacy toolchain [lib-4.9.3](lib-4.9.3) built with [rtools-backports](https://github.com/r-windows/rtools-backports/blob/master/mingw-w64-arrow/PKGBUILD).
44

@@ -18,10 +18,10 @@ PKG_LIBS = \
1818
-ldouble-conversion -lsnappy -lz -lws2_32
1919
```
2020

21-
The easiest way to test this is using the R package from the [arrow-r-dev](https://github.com/jeroen/arrow-r-dev) repository:
21+
To test this make sure you install the arrow package from a release tag:
2222

2323
```r
24-
remotes::install_github("jeroen/arrow-r-dev")
24+
remotes::install_github("apache/arrow/[email protected]")
2525
```
2626

27-
The upstream R bindings require the libarrow verion from the master branch so it is typically broken.
27+
To install R package from the arrow master branch you also would need to rebuild the master branch arrow C++ library from source.

include/arrow/allocator.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <algorithm>
2222
#include <cstddef>
2323
#include <memory>
24+
#include <string>
2425
#include <utility>
2526

2627
#include "arrow/memory_pool.h"
@@ -131,6 +132,8 @@ class STLMemoryPool : public MemoryPool {
131132

132133
int64_t max_memory() const override { return stats_.max_memory(); }
133134

135+
std::string backend_name() const override { return "stl"; }
136+
134137
private:
135138
Allocator alloc_;
136139
internal::MemoryPoolStats stats_;

include/arrow/api.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
#define ARROW_API_H
2222

2323
#include "arrow/array.h" // IYWU pragma: export
24+
#include "arrow/array/concatenate.h" // IYWU pragma: export
2425
#include "arrow/buffer.h" // IYWU pragma: export
2526
#include "arrow/builder.h" // IYWU pragma: export
2627
#include "arrow/compare.h" // IYWU pragma: export
2728
#include "arrow/extension_type.h" // IYWU pragma: export
2829
#include "arrow/memory_pool.h" // IYWU pragma: export
2930
#include "arrow/pretty_print.h" // IYWU pragma: export
3031
#include "arrow/record_batch.h" // IYWU pragma: export
32+
#include "arrow/result.h" // IYWU pragma: export
3133
#include "arrow/status.h" // IYWU pragma: export
3234
#include "arrow/table.h" // IYWU pragma: export
3335
#include "arrow/table_builder.h" // IYWU pragma: export

0 commit comments

Comments
 (0)