Skip to content
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.

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

ARROW-1325: [R] Initial R package that builds against the arrow C++ library #2489

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
follow up from @wesm comments on #2489
  • Loading branch information
romainfrancois committed Sep 7, 2018
commit 79c50011db18db95c7cbee396d77a764e5c4b96d
7 changes: 4 additions & 3 deletions r/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
Package: arrow
Title: Bindings to 'Apache' 'Arrow'
Title: R Integration to 'Apache' 'Arrow'
Version: 0.0.0.9000
Authors@R: c(
person("Romain", "François", email = "[email protected]", role = c("aut", "cre"))
person("Romain", "François", email = "[email protected]", role = c("aut", "cre")),
person("Apache Arrow", email = "[email protected]", role = c("aut", "cph"))
)
Description: R bindings to Apache Arrow.
Description: R Integration to 'Apache' 'Arrow'.
Depends: R (>= 3.5)
License: Apache License (>= 2.0)
Encoding: UTF-8
Expand Down
194 changes: 0 additions & 194 deletions r/LICENSE.md

This file was deleted.

2 changes: 1 addition & 1 deletion r/README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ knitr::opts_chunk$set(
```
# arrow

Low level bindings to the C++ Apache Arrow library
R integration with Apache Arrow.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion r/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# arrow

Low level bindings to the C++ Apache Arrow library
R integration with Apache Arrow.

## Installation

Expand Down
3 changes: 1 addition & 2 deletions r/src/hello.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include <Rcpp.h>
#include "rrrow_types.h"
#include "r_arrow_types.h"

using namespace Rcpp ;
using namespace arrow ;
Expand Down
2 changes: 1 addition & 1 deletion r/src/rrrow_types.h → r/src/r_arrow_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

#pragma once

#define STRICT_R_HEADERS
#include <Rcpp.h>
#undef Free
#include <arrow/api.h>