Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B64632004C8 for ; Mon, 9 May 2016 20:21:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B4DA31609A8; Mon, 9 May 2016 18:21:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 09AA116099C for ; Mon, 9 May 2016 20:21:40 +0200 (CEST) Received: (qmail 69107 invoked by uid 500); 9 May 2016 18:21:40 -0000 Mailing-List: contact commits-help@spark.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@spark.apache.org Received: (qmail 69098 invoked by uid 99); 9 May 2016 18:21:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2016 18:21:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6843DFBAB; Mon, 9 May 2016 18:21:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andrewor14@apache.org To: commits@spark.apache.org Message-Id: <1e58422c3f5c4f84a1cb5055ec9f5825@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: spark git commit: [SPARK-15210][SQL] Add missing @DeveloperApi annotation in sql.types Date: Mon, 9 May 2016 18:21:39 +0000 (UTC) archived-at: Mon, 09 May 2016 18:21:41 -0000 Repository: spark Updated Branches: refs/heads/branch-2.0 c6d23b660 -> f81d25139 [SPARK-15210][SQL] Add missing @DeveloperApi annotation in sql.types add DeveloperApi annotation for `AbstractDataType` `MapType` `UserDefinedType` local build Author: Zheng RuiFeng Closes #12982 from zhengruifeng/types_devapi. (cherry picked from commit dfdcab00c7b6200c22883baa3ebc5818be09556f) Signed-off-by: Andrew Or Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f81d2513 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f81d2513 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f81d2513 Branch: refs/heads/branch-2.0 Commit: f81d251393e2263411df8cf8a785b81f1f3d8b56 Parents: c6d23b6 Author: Zheng RuiFeng Authored: Mon May 9 11:20:48 2016 -0700 Committer: Andrew Or Committed: Mon May 9 11:21:32 2016 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/sql/types/AbstractDataType.scala | 2 ++ .../src/main/scala/org/apache/spark/sql/types/MapType.scala | 2 ++ .../main/scala/org/apache/spark/sql/types/UserDefinedType.scala | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f81d2513/sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala index 90af10f..03ea349 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/AbstractDataType.scala @@ -20,6 +20,7 @@ package org.apache.spark.sql.types import scala.reflect.ClassTag import scala.reflect.runtime.universe.{runtimeMirror, TypeTag} +import org.apache.spark.annotation.DeveloperApi import org.apache.spark.sql.catalyst.ScalaReflectionLock import org.apache.spark.sql.catalyst.expressions.Expression import org.apache.spark.util.Utils @@ -141,6 +142,7 @@ protected[sql] abstract class AtomicType extends DataType { * :: DeveloperApi :: * Numeric data types. */ +@DeveloperApi abstract class NumericType extends AtomicType { // Unfortunately we can't get this implicitly as that breaks Spark Serialization. In order for // implicitly[Numeric[JvmType]] to be valid, we have to change JvmType from a type variable to a http://git-wip-us.apache.org/repos/asf/spark/blob/f81d2513/sql/catalyst/src/main/scala/org/apache/spark/sql/types/MapType.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/MapType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/MapType.scala index 5474954..454ea40 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/MapType.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/MapType.scala @@ -20,6 +20,7 @@ package org.apache.spark.sql.types import org.json4s.JsonAST.JValue import org.json4s.JsonDSL._ +import org.apache.spark.annotation.DeveloperApi /** * :: DeveloperApi :: @@ -31,6 +32,7 @@ import org.json4s.JsonDSL._ * @param valueType The data type of map values. * @param valueContainsNull Indicates if map values have `null` values. */ +@DeveloperApi case class MapType( keyType: DataType, valueType: DataType, http://git-wip-us.apache.org/repos/asf/spark/blob/f81d2513/sql/catalyst/src/main/scala/org/apache/spark/sql/types/UserDefinedType.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/UserDefinedType.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/UserDefinedType.scala index aa36121..8946313 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/UserDefinedType.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/UserDefinedType.scala @@ -96,11 +96,12 @@ abstract class UserDefinedType[UserType >: Null] extends DataType with Serializa } /** - * ::DeveloperApi:: + * :: DeveloperApi :: * The user defined type in Python. * * Note: This can only be accessed via Python UDF, or accessed as serialized object. */ +@DeveloperApi private[sql] class PythonUserDefinedType( val sqlType: DataType, override val pyUDT: String, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org For additional commands, e-mail: commits-help@spark.apache.org