Skip to content

Commit b1c1109

Browse files
romainfrancoisromainfrancois
committed
finished rebasing after initial R patch merged
1 parent 887df48 commit b1c1109

File tree

9 files changed

+16
-39
lines changed

9 files changed

+16
-39
lines changed

‎r/.Rbuildignore‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
^.*\.Rproj$
22
^\.Rproj\.user$
3-
<<<<<<< HEAD
4-
<<<<<<< HEAD
53
^README\.Rmd$
64
src/.clang-format
75
LICENSE.md
8-
=======
9-
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
10-
=======
116
^README\.Rmd$
12-
>>>>>>> + installation instructions

‎r/DESCRIPTION‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ Package: arrow
22
Title: R Integration to 'Apache' 'Arrow'
33
Version: 0.0.0.9000
44
Authors@R: c(
5-
<<<<<<< HEAD
65
person("Romain", "François", email = "[email protected]", role = c("aut", "cre")),
7-
=======
8-
person("Romain", "François", email = "[email protected]", role = c("aut", "cre")),
9-
>>>>>>> follow up from @wesm comments on #2489
106
person("Apache Arrow", email = "[email protected]", role = c("aut", "cph"))
117
)
128
Description: R Integration to 'Apache' 'Arrow'.

‎r/NAMESPACE‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
<<<<<<< HEAD
43
S3method("!=","arrow::Array")
54
S3method("!=","arrow::DataType")
65
S3method("!=","arrow::Field")
@@ -45,7 +44,4 @@ importFrom(rlang,dots_n)
4544
importFrom(rlang,quo_name)
4645
importFrom(rlang,seq2)
4746
importFrom(rlang,set_names)
48-
=======
49-
importFrom(Rcpp,sourceCpp)
50-
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
5147
useDynLib(arrow, .registration = TRUE)

‎r/R/RcppExports.R‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Generated by using Rcpp::compileAttributes() -> do not edit by hand
22
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
33

4-
<<<<<<< HEAD
54
ArrayData_initialize <- function(type, length, null_count, offset) {
65
.Call(`_arrow_ArrayData_initialize`, type, length, null_count, offset)
76
}
@@ -82,6 +81,10 @@ Field_nullable <- function(type) {
8281
.Call(`_arrow_Field_nullable`, type)
8382
}
8483

84+
ping_arrow <- function() {
85+
.Call(`_arrow_ping_arrow`)
86+
}
87+
8588
MemoryPool_default <- function() {
8689
.Call(`_arrow_MemoryPool_default`)
8790
}
@@ -268,9 +271,5 @@ Status_code <- function(status) {
268271

269272
Status_message <- function(status) {
270273
.Call(`_arrow_Status_message`, status)
271-
=======
272-
ping_arrow <- function() {
273-
.Call(`_arrow_ping_arrow`)
274-
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
275274
}
276275

‎r/README.Rmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
git rm ---
22
output: github_document
33
---
44

‎r/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@
33

44
# arrow
55

6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
86
R integration with Apache Arrow.
9-
=======
10-
Low level bindings to the C++ Apache Arrow library
11-
>>>>>>> + installation instructions
12-
=======
13-
R integration with Apache Arrow.
14-
>>>>>>> follow up from @wesm comments on #2489
157

168
## Installation
179

‎r/configure‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818
# under the License.
1919

2020
# Anticonf (tm) script by Jeroen Ooms, Jim Hester (2017)
21-
<<<<<<< HEAD
2221
# License: MIT
2322
#
24-
=======
25-
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
2623
# This script will query 'pkg-config' for the required cflags and ldflags.
2724
# If pkg-config is unavailable or does not find the library, try setting
2825
# INCLUDE_DIR and LIB_DIR manually via e.g:

‎r/src/Makevars.in‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,4 @@
1818
PKG_CPPFLAGS=@cflags@
1919
PKG_CXXFLAGS=$(C_VISIBILITY)
2020
CXX_STD=CXX11
21-
<<<<<<< HEAD
22-
<<<<<<< HEAD
23-
PKG_LIBS=@libs@
24-
=======
2521
PKG_LIBS=@libs@ -Wl,-rpath,/usr/local/lib
26-
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
27-
=======
28-
PKG_LIBS=@libs@
29-
>>>>>>> skip using rpath linker option

‎r/src/RcppExports.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,16 @@ BEGIN_RCPP
235235
return rcpp_result_gen;
236236
END_RCPP
237237
}
238+
// ping_arrow
239+
std::string ping_arrow();
240+
RcppExport SEXP _arrow_ping_arrow() {
241+
BEGIN_RCPP
242+
Rcpp::RObject rcpp_result_gen;
243+
Rcpp::RNGScope rcpp_rngScope_gen;
244+
rcpp_result_gen = Rcpp::wrap(ping_arrow());
245+
return rcpp_result_gen;
246+
END_RCPP
247+
}
238248
// MemoryPool_default
239249
static_ptr<arrow::MemoryPool> MemoryPool_default();
240250
RcppExport SEXP _arrow_MemoryPool_default() {
@@ -760,6 +770,7 @@ static const R_CallMethodDef CallEntries[] = {
760770
{"_arrow_Field_ToString", (DL_FUNC) &_arrow_Field_ToString, 1},
761771
{"_arrow_Field_name", (DL_FUNC) &_arrow_Field_name, 1},
762772
{"_arrow_Field_nullable", (DL_FUNC) &_arrow_Field_nullable, 1},
773+
{"_arrow_ping_arrow", (DL_FUNC) &_arrow_ping_arrow, 0},
763774
{"_arrow_MemoryPool_default", (DL_FUNC) &_arrow_MemoryPool_default, 0},
764775
{"_arrow_MemoryPool_bytes_allocated", (DL_FUNC) &_arrow_MemoryPool_bytes_allocated, 1},
765776
{"_arrow_MemoryPool_max_memory", (DL_FUNC) &_arrow_MemoryPool_max_memory, 1},

0 commit comments

Comments
 (0)