diff --git a/R/pkg/R/schema.R b/R/pkg/R/schema.R index 0a758f0cc671c..e442119086b17 100644 --- a/R/pkg/R/schema.R +++ b/R/pkg/R/schema.R @@ -1,3 +1,20 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + # A set of S3 classes and methods that support the SparkSQL `StructType` and `StructField # datatypes. These are used to create and interact with DataFrame schemas. @@ -37,7 +54,7 @@ structType.structField <- function(x, ...) { sfObjList <- lapply(fields, function(field) { field$jobj }) - stObj <- callJStatic("edu.berkeley.cs.amplab.sparkr.SQLUtils", + stObj <- callJStatic("org.apache.spark.sql.api.r.SQLUtils", "createStructType", listToSeq(sfObjList)) structType(stObj) @@ -121,7 +138,7 @@ structField.character <- function(x, type, nullable = TRUE) { } else { stop(paste("Unsupported type for Dataframe:", type)) } - sfObj <- callJStatic("edu.berkeley.cs.amplab.sparkr.SQLUtils", + sfObj <- callJStatic("org.apache.spark.sql.api.r.SQLUtils", "createStructField", x, dataType, diff --git a/README.md b/README.md index b4536f17698b2..c3afc4db9c63c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ and Spark Streaming for stream processing. -*NOTE: As of April 2015, SparkR has been [merged](https://github.com/apache/spark/pull/5096) into Apache Spark and is shipping in an upcoming release (1.4) due early summer 2015. This repo currently targets users using released versions of Spark. __This repo no longer accepts new pull requests, and they should now be submitted to [apache/spark](https://github.com/apache/spark); see [here](https://cwiki.apache.org/confluence/display/SPARK/Contributing+to+Spark) for some instructions.__* ## Online Documentation