Skip to content

Commit 26e712d

Browse files
romainfrancoisromainfrancois
committed
Initial work for type metadata, with tests.
1 parent e251299 commit 26e712d

File tree

13 files changed

+1123
-67
lines changed

13 files changed

+1123
-67
lines changed

‎r/NAMESPACE‎

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

33
<<<<<<< HEAD
4+
<<<<<<< HEAD
5+
=======
6+
>>>>>>> Initial work for type metadata, with tests.
47
S3method("!=","arrow::Array")
58
S3method("!=","arrow::DataType")
69
S3method("!=","arrow::Field")
@@ -10,6 +13,16 @@ S3method("==","arrow::DataType")
1013
S3method("==","arrow::Field")
1114
S3method(length,"arrow::Array")
1215
S3method(print,"arrow-enum")
16+
<<<<<<< HEAD
17+
=======
18+
export(DateUnit)
19+
export(Field_initialize)
20+
export(MakeArray)
21+
export(StatusCode)
22+
export(TimeUnit)
23+
export(Type)
24+
export(array_data)
25+
>>>>>>> Initial work for type metadata, with tests.
1326
export(boolean)
1427
export(date32)
1528
export(date64)
@@ -33,6 +46,10 @@ export(uint32)
3346
export(uint64)
3447
export(uint8)
3548
export(utf8)
49+
<<<<<<< HEAD
50+
=======
51+
exportPattern("^.*$")
52+
>>>>>>> Initial work for type metadata, with tests.
3653
importFrom(R6,R6Class)
3754
importFrom(Rcpp,sourceCpp)
3855
importFrom(assertthat,assert_that)
@@ -45,7 +62,10 @@ importFrom(rlang,dots_n)
4562
importFrom(rlang,quo_name)
4663
importFrom(rlang,seq2)
4764
importFrom(rlang,set_names)
65+
<<<<<<< HEAD
4866
=======
4967
importFrom(Rcpp,sourceCpp)
5068
>>>>>>> initial R :package: with travis setup and testthat suite, that links to arrow c++ library and calls arrow::int32()
69+
=======
70+
>>>>>>> Initial work for type metadata, with tests.
5171
useDynLib(arrow, .registration = TRUE)

‎r/R/R6.R‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
# Licensed to the Apache Software Foundation (ASF) under one
23
# or more contributor license agreements. See the NOTICE file
34
# distributed with this work for additional information
@@ -15,12 +16,18 @@
1516
# specific language governing permissions and limitations
1617
# under the License.
1718

19+
=======
20+
>>>>>>> Initial work for type metadata, with tests.
1821
#' @include enums.R
1922
#' @importFrom R6 R6Class
2023
#' @importFrom glue glue
2124
#' @importFrom purrr map map_int map2
2225
#' @importFrom rlang dots_n
2326
#' @importFrom assertthat assert_that
27+
<<<<<<< HEAD
28+
=======
29+
30+
>>>>>>> Initial work for type metadata, with tests.
2431
`arrow::Object` <- R6Class("arrow::Object",
2532
public = list(
2633
`.:xp:.` = NULL,
@@ -290,6 +297,7 @@
290297
)
291298
)
292299

300+
<<<<<<< HEAD
293301
#' Apache Arrow data types
294302
#'
295303
#' Apache Arrow data types
@@ -361,11 +369,59 @@ date32 <- function() `arrow::Date32`$new()
361369
date64 <- function() `arrow::Date64`$new()
362370

363371
#' @rdname DataType
372+
=======
373+
#' @export
374+
int8 <- function() `arrow::Int8`$new()
375+
376+
#' @export
377+
int16 <- function() `arrow::Int16`$new()
378+
379+
#' @export
380+
int32 <- function() `arrow::Int32`$new()
381+
382+
#' @export
383+
int64 <- function() `arrow::Int64`$new()
384+
385+
#' @export
386+
uint8 <- function() `arrow::UInt8`$new()
387+
388+
#' @export
389+
uint16 <- function() `arrow::UInt16`$new()
390+
391+
#' @export
392+
uint32 <- function() `arrow::UInt32`$new()
393+
394+
#' @export
395+
uint64 <- function() `arrow::UInt64`$new()
396+
397+
#' @export
398+
float16 <- function() `arrow::Float16`$new()
399+
400+
#' @export
401+
float32 <- function() `arrow::Float32`$new()
402+
403+
#' @export
404+
float64 <- function() `arrow::Float64`$new()
405+
406+
#' @export
407+
boolean <- function() `arrow::Boolean`$new()
408+
409+
#' @export
410+
utf8 <- function() `arrow::Utf8`$new()
411+
412+
#' @export
413+
date32 <- function() `arrow::Date32`$new()
414+
415+
#' @export
416+
date64 <- function() `arrow::Date64`$new()
417+
418+
>>>>>>> Initial work for type metadata, with tests.
364419
#' @export
365420
time32 <- function(unit) {
366421
`arrow::Time32`$new(unit)
367422
}
368423

424+
<<<<<<< HEAD
369425
#' @rdname DataType
370426
#' @export
371427
time64 <- function(unit) `arrow::Time64`$new(unit)
@@ -379,6 +435,17 @@ null <- function() `arrow::Null`$new()
379435
timestamp <- function(...) `arrow::Timestamp`$new(...)
380436

381437
#' @rdname DataType
438+
=======
439+
#' @export
440+
time64 <- function(unit) `arrow::Time64`$new(unit)
441+
442+
#' @export
443+
null <- function() `arrow::Null`$new()
444+
445+
#' @export
446+
timestamp <- function(...) `arrow::Timestamp`$new(...)
447+
448+
>>>>>>> Initial work for type metadata, with tests.
382449
#' @export
383450
decimal <- function(precision, scale) `arrow::Decimal128Type`$new(precision, scale)
384451

@@ -461,11 +528,17 @@ field <- function(name, type) `arrow::Field`$new(name, type)
461528
)
462529
)
463530

531+
<<<<<<< HEAD
464532
#' @rdname DataType
465533
#' @export
466534
struct <- function(...) `arrow::StructType`$new(...)
467535

468536
#' @rdname DataType
537+
=======
538+
#' @export
539+
struct <- function(...) `arrow::StructType`$new(...)
540+
541+
>>>>>>> Initial work for type metadata, with tests.
469542
#' @export
470543
schema <- function(...) `arrow::Schema`$new(...)
471544

@@ -487,7 +560,12 @@ schema <- function(...) `arrow::Schema`$new(...)
487560
)
488561
)
489562

563+
<<<<<<< HEAD
490564
#' @rdname DataType
491565
#' @export
492566
list_of <- function(type) `arrow::ListType`$new(type)
567+
=======
568+
#' @export
569+
list_of <- function(x) `arrow::ListType`$new(x)
570+
>>>>>>> Initial work for type metadata, with tests.
493571

0 commit comments

Comments
 (0)