Update NAMESPACE and tests

Updated `NAMESPACE`, `DESCRIPTION`, and unit tests for new schema functions. Deleted `SQLTypes.R` since everything has been moved to `schema.R`.
apache · Apr 14, 2015 · 275deb4 · 275deb4
1 parent 1a3b63d
commit 275deb4
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 85 deletions.
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
@@ -17,11 +17,11 @@ License: Apache License (== 2.0)
 Collate:
     'generics.R'
     'jobj.R'
-    'SQLTypes.R'
     'RDD.R'
     'pairRDD.R'
     'column.R'
     'group.R'
+    'schema.R'
     'DataFrame.R'
     'SQLContext.R'
     'broadcast.R'

diff --git a/R/pkg/NAMESPACE b/R/pkg/NAMESPACE
@@ -175,16 +175,21 @@ export("cacheTable",
        "jsonRDD",
        "loadDF",
        "parquetFile",
-       "buildSchema",
-       "field",
        "sql",
        "table",
        "tableNames",
        "tables",
        "toDF",
        "uncacheTable")
 
-export("print.structType",
+export("sparkRSQL.init",
+       "sparkRHive.init")
+
+export("structField",
+       "structField.jobj",
+       "structField.character",
        "print.structField",
-       "print.struct",
-       "print.field")
+       "structType",
+       "structType.jobj",
+       "structType.structField",
+       "print.structField")
diff --git a/R/pkg/R/SQLTypes.R b/R/pkg/R/SQLTypes.R
diff --git a/R/pkg/inst/tests/test_sparkSQL.R b/R/pkg/inst/tests/test_sparkSQL.R
@@ -44,25 +44,25 @@ test_that("infer types", {
   expect_equal(infer_type(list(1L, 2L)),
                list(type = 'array', elementType = "integer", containsNull = TRUE))
   expect_equal(infer_type(list(a = 1L, b = "2")),
-               buildSchema(field(name = "a", type = "integer", nullable = TRUE),
-                           field(name = "b", type = "string", nullable = TRUE)))
+               structType(structField(x = "a", type = "integer", nullable = TRUE),
+                          structField(x = "b", type = "string", nullable = TRUE)))
   e <- new.env()
   assign("a", 1L, envir = e)
   expect_equal(infer_type(e),
                list(type = "map", keyType = "string", valueType = "integer",
                     valueContainsNull = TRUE))
 })
 
-test_that("buildSchema and field", {
-  testField <- field("a", "string")
-  expect_true(inherits(testField, "field"))
-  expect_true(testField$name == "a")
-  expect_true(testField$nullable)
+test_that("structType and structField", {
+  testField <- structField("a", "string")
+  expect_true(inherits(testField, "structField"))
+  expect_true(testField$name() == "a")
+  expect_true(testField$nullable())
 
-  testSchema <- buildSchema(testField, field("b", "integer"))
-  expect_true(inherits(testSchema, "struct"))
-  expect_true(inherits(testSchema[[2]], "field"))
-  expect_true(testSchema[[1]]$type == "string")
+  testSchema <- structType(testField, structField("b", "integer"))
+  expect_true(inherits(testSchema, "structType"))
+  expect_true(inherits(testSchema$fields()[[2]], "structField"))
+  expect_true(testSchema$fields()[[1]]$dataType.toString() == "StringType")
 })
 
 test_that("create DataFrame from RDD", {
@@ -77,8 +77,8 @@ test_that("create DataFrame from RDD", {
   expect_true(inherits(df, "DataFrame"))
   expect_equal(columns(df), c("_1", "_2"))
 
-  schema <- buildSchema(field(name = "a", type = "integer", nullable = TRUE),
-                        field(name = "b", type = "string", nullable = TRUE))
+  schema <- structType(structField(x = "a", type = "integer", nullable = TRUE),
+                        structField(x = "b", type = "string", nullable = TRUE))
   df <- createDataFrame(sqlCtx, rdd, schema)
   expect_true(inherits(df, "DataFrame"))
   expect_equal(columns(df), c("a", "b"))
@@ -104,8 +104,8 @@ test_that("toDF", {
   expect_true(inherits(df, "DataFrame"))
   expect_equal(columns(df), c("_1", "_2"))
 
-  schema <- buildSchema(field(name = "a", type = "integer", nullable = TRUE),
-                        field(name = "b", type = "string", nullable = TRUE))
+  schema <- structType(structField(x = "a", type = "integer", nullable = TRUE),
+                        structField(x = "b", type = "string", nullable = TRUE))
   df <- toDF(rdd, schema)
   expect_true(inherits(df, "DataFrame"))
   expect_equal(columns(df), c("a", "b"))