Skip to content

Commit 81e059a

Browse files
romainfrancoisromainfrancois
committed
rebasing
1 parent 421e471 commit 81e059a

File tree

7 files changed

+10
-776
lines changed

7 files changed

+10
-776
lines changed

‎r/R/R6.R‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
# Licensed to the Apache Software Foundation (ASF) under one
32
# or more contributor license agreements. See the NOTICE file
43
# distributed with this work for additional information
@@ -16,18 +15,13 @@
1615
# specific language governing permissions and limitations
1716
# under the License.
1817

19-
=======
20-
>>>>>>> Initial work for type metadata, with tests.
2118
#' @include enums.R
2219
#' @importFrom R6 R6Class
2320
#' @importFrom glue glue
2421
#' @importFrom purrr map map_int map2
2522
#' @importFrom rlang dots_n
2623
#' @importFrom assertthat assert_that
27-
<<<<<<< HEAD
28-
=======
2924

30-
>>>>>>> Initial work for type metadata, with tests.
3125
`arrow::Object` <- R6Class("arrow::Object",
3226
public = list(
3327
`.:xp:.` = NULL,
@@ -297,7 +291,6 @@
297291
)
298292
)
299293

300-
<<<<<<< HEAD
301294
#' Apache Arrow data types
302295
#'
303296
#' Apache Arrow data types
@@ -369,7 +362,7 @@ date32 <- function() `arrow::Date32`$new()
369362
date64 <- function() `arrow::Date64`$new()
370363

371364
#' @rdname DataType
372-
=======
365+
373366
#' @export
374367
int8 <- function() `arrow::Int8`$new()
375368

@@ -415,13 +408,11 @@ date32 <- function() `arrow::Date32`$new()
415408
#' @export
416409
date64 <- function() `arrow::Date64`$new()
417410

418-
>>>>>>> Initial work for type metadata, with tests.
419411
#' @export
420412
time32 <- function(unit) {
421413
`arrow::Time32`$new(unit)
422414
}
423415

424-
<<<<<<< HEAD
425416
#' @rdname DataType
426417
#' @export
427418
time64 <- function(unit) `arrow::Time64`$new(unit)
@@ -435,7 +426,7 @@ null <- function() `arrow::Null`$new()
435426
timestamp <- function(...) `arrow::Timestamp`$new(...)
436427

437428
#' @rdname DataType
438-
=======
429+
439430
#' @export
440431
time64 <- function(unit) `arrow::Time64`$new(unit)
441432

@@ -445,7 +436,6 @@ null <- function() `arrow::Null`$new()
445436
#' @export
446437
timestamp <- function(...) `arrow::Timestamp`$new(...)
447438

448-
>>>>>>> Initial work for type metadata, with tests.
449439
#' @export
450440
decimal <- function(precision, scale) `arrow::Decimal128Type`$new(precision, scale)
451441

@@ -532,17 +522,11 @@ field <- function(name, type) `arrow::Field`$new(name, type)
532522
)
533523
)
534524

535-
<<<<<<< HEAD
536525
#' @rdname DataType
537526
#' @export
538527
struct <- function(...) `arrow::StructType`$new(...)
539528

540529
#' @rdname DataType
541-
=======
542-
#' @export
543-
struct <- function(...) `arrow::StructType`$new(...)
544-
545-
>>>>>>> Initial work for type metadata, with tests.
546530
#' @export
547531
schema <- function(...) `arrow::Schema`$new(...)
548532

@@ -564,12 +548,6 @@ schema <- function(...) `arrow::Schema`$new(...)
564548
)
565549
)
566550

567-
<<<<<<< HEAD
568551
#' @rdname DataType
569552
#' @export
570553
list_of <- function(type) `arrow::ListType`$new(type)
571-
=======
572-
#' @export
573-
list_of <- function(x) `arrow::ListType`$new(x)
574-
>>>>>>> Initial work for type metadata, with tests.
575-

‎r/R/RcppExports.R‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ Field_nullable <- function(type) {
121121
.Call(`_arrow_Field_nullable`, type)
122122
}
123123

124+
ping_arrow <- function() {
125+
.Call(`_arrow_ping_arrow`)
126+
}
127+
124128
MemoryPool_default <- function() {
125129
.Call(`_arrow_MemoryPool_default`)
126130
}
@@ -308,3 +312,4 @@ Status_code <- function(status) {
308312
Status_message <- function(status) {
309313
.Call(`_arrow_Status_message`, status)
310314
}
315+

‎r/R/array.R‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
# Licensed to the Apache Software Foundation (ASF) under one
32
# or more contributor license agreements. See the NOTICE file
43
# distributed with this work for additional information
@@ -16,8 +15,6 @@
1615
# specific language governing permissions and limitations
1716
# under the License.
1817

19-
=======
20-
>>>>>>> Initial work for type metadata, with tests.
2118
#' @include R6.R
2219

2320
`arrow::ArrayData` <- R6Class("arrow::ArrayData",
@@ -36,10 +33,7 @@
3633
)
3734
)
3835

39-
<<<<<<< HEAD
40-
=======
4136
#' @export
42-
>>>>>>> Initial work for type metadata, with tests.
4337
array_data <- function(...){
4438
`arrow::ArrayData`$new(...)
4539
}
@@ -72,10 +66,7 @@ array_data <- function(...){
7266
#' @export
7367
`!=.arrow::Array` <- function(x, y) !x$Equals(y)
7468

75-
<<<<<<< HEAD
76-
=======
7769
#' @export
78-
>>>>>>> Initial work for type metadata, with tests.
7970
MakeArray <- function(data){
8071
assert_that(inherits(data, "arrow::ArrayData"))
8172
`arrow::Array`$new(data)

‎r/R/enums.R‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,20 @@ enum <- function(class, ...){
3838
}
3939

4040

41-
<<<<<<< HEAD
42-
TimeUnit <- enum("arrow::TimeUnit::type", SECOND, MILLI, MICRO, NANO)
43-
DateUnit <- enum("arrow::DateUnit", DAY, MILLI)
44-
=======
4541
#' @export
4642
TimeUnit <- enum("arrow::TimeUnit::type", SECOND, MILLI, MICRO, NANO)
4743

4844
#' @export
4945
DateUnit <- enum("arrow::DateUnit", DAY, MILLI)
5046

5147
#' @export
52-
>>>>>>> Initial work for type metadata, with tests.
5348
Type <- enum("arrow::Type::type",
5449
NA, BOOL, UINT8, INT8, UINT16, INT16, UINT32, INT32, UINT64, INT64,
5550
HALF_FLOAT, FLOAT, DOUBLE, STRING, BINARY, DATE32, DATE64, TIMESTAMP,
5651
INTERVAL, DECIMAL, LIST, STRUCT, UNION, DICTIONARY, MAP
5752
)
58-
<<<<<<< HEAD
59-
=======
6053

6154
#' @export
62-
>>>>>>> Initial work for type metadata, with tests.
6355
StatusCode <- enum("arrow::StatusCode",
6456
OK, OutOfMemory, KeyError, TypeError, Invalid, IOError,
6557
CapacityError, UnknownError, NotImplemented, SerializationError,

‎r/R/memory_pool.R‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
# Licensed to the Apache Software Foundation (ASF) under one
32
# or more contributor license agreements. See the NOTICE file
43
# distributed with this work for additional information
@@ -16,8 +15,6 @@
1615
# specific language governing permissions and limitations
1716
# under the License.
1817

19-
=======
20-
>>>>>>> Initial work for type metadata, with tests.
2118
#' @include R6.R
2219

2320
`arrow::MemoryPool` <- R6Class("arrow::MemoryPool",

‎r/configure‎

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

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

0 commit comments

Comments
 (0)