Repository: spark Updated Branches: refs/heads/master 1a200a3ee -> 195564548
[SQL][minor] Put DataTypes.java in java dir. Author: Reynold Xin <r...@databricks.com> Closes #4097 from rxin/javarename and squashes the following commits: c5ce96a [Reynold Xin] [SQL][minor] Put DataTypes.java in java dir. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/19556454 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/19556454 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/19556454 Branch: refs/heads/master Commit: 19556454881e05a6c2470d406d50f004b88088a2 Parents: 1a200a3 Author: Reynold Xin <r...@databricks.com> Authored: Sun Jan 18 16:35:40 2015 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Sun Jan 18 16:35:40 2015 -0800 ---------------------------------------------------------------------- .../org/apache/spark/sql/types/DataTypes.java | 208 +++++++++++++++++++ .../org/apache/spark/sql/types/DataTypes.java | 208 ------------------- 2 files changed, 208 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/19556454/sql/catalyst/src/main/java/org/apache/spark/sql/types/DataTypes.java ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/types/DataTypes.java b/sql/catalyst/src/main/java/org/apache/spark/sql/types/DataTypes.java new file mode 100644 index 0000000..e457542 --- /dev/null +++ b/sql/catalyst/src/main/java/org/apache/spark/sql/types/DataTypes.java @@ -0,0 +1,208 @@ +/* + * 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. + */ + +package org.apache.spark.sql.types; + +import java.util.*; + +/** + * To get/create specific data type, users should use singleton objects and factory methods + * provided by this class. + */ +public class DataTypes { + /** + * Gets the StringType object. + */ + public static final DataType StringType = StringType$.MODULE$; + + /** + * Gets the BinaryType object. + */ + public static final DataType BinaryType = BinaryType$.MODULE$; + + /** + * Gets the BooleanType object. + */ + public static final DataType BooleanType = BooleanType$.MODULE$; + + /** + * Gets the DateType object. + */ + public static final DataType DateType = DateType$.MODULE$; + + /** + * Gets the TimestampType object. + */ + public static final DataType TimestampType = TimestampType$.MODULE$; + + /** + * Gets the DoubleType object. + */ + public static final DataType DoubleType = DoubleType$.MODULE$; + + /** + * Gets the FloatType object. + */ + public static final DataType FloatType = FloatType$.MODULE$; + + /** + * Gets the ByteType object. + */ + public static final DataType ByteType = ByteType$.MODULE$; + + /** + * Gets the IntegerType object. + */ + public static final DataType IntegerType = IntegerType$.MODULE$; + + /** + * Gets the LongType object. + */ + public static final DataType LongType = LongType$.MODULE$; + + /** + * Gets the ShortType object. + */ + public static final DataType ShortType = ShortType$.MODULE$; + + /** + * Gets the NullType object. + */ + public static final DataType NullType = NullType$.MODULE$; + + /** + * Creates an ArrayType by specifying the data type of elements ({@code elementType}). + * The field of {@code containsNull} is set to {@code true}. + */ + public static ArrayType createArrayType(DataType elementType) { + if (elementType == null) { + throw new IllegalArgumentException("elementType should not be null."); + } + return new ArrayType(elementType, true); + } + + /** + * Creates an ArrayType by specifying the data type of elements ({@code elementType}) and + * whether the array contains null values ({@code containsNull}). + */ + public static ArrayType createArrayType(DataType elementType, boolean containsNull) { + if (elementType == null) { + throw new IllegalArgumentException("elementType should not be null."); + } + return new ArrayType(elementType, containsNull); + } + + public static DecimalType createDecimalType(int precision, int scale) { + return DecimalType$.MODULE$.apply(precision, scale); + } + + public static DecimalType createDecimalType() { + return DecimalType$.MODULE$.Unlimited(); + } + + /** + * Creates a MapType by specifying the data type of keys ({@code keyType}) and values + * ({@code keyType}). The field of {@code valueContainsNull} is set to {@code true}. + */ + public static MapType createMapType(DataType keyType, DataType valueType) { + if (keyType == null) { + throw new IllegalArgumentException("keyType should not be null."); + } + if (valueType == null) { + throw new IllegalArgumentException("valueType should not be null."); + } + return new MapType(keyType, valueType, true); + } + + /** + * Creates a MapType by specifying the data type of keys ({@code keyType}), the data type of + * values ({@code keyType}), and whether values contain any null value + * ({@code valueContainsNull}). + */ + public static MapType createMapType( + DataType keyType, + DataType valueType, + boolean valueContainsNull) { + if (keyType == null) { + throw new IllegalArgumentException("keyType should not be null."); + } + if (valueType == null) { + throw new IllegalArgumentException("valueType should not be null."); + } + return new MapType(keyType, valueType, valueContainsNull); + } + + /** + * Creates a StructField by specifying the name ({@code name}), data type ({@code dataType}) and + * whether values of this field can be null values ({@code nullable}). + */ + public static StructField createStructField( + String name, + DataType dataType, + boolean nullable, + Metadata metadata) { + if (name == null) { + throw new IllegalArgumentException("name should not be null."); + } + if (dataType == null) { + throw new IllegalArgumentException("dataType should not be null."); + } + if (metadata == null) { + throw new IllegalArgumentException("metadata should not be null."); + } + return new StructField(name, dataType, nullable, metadata); + } + + /** + * Creates a StructField with empty metadata. + * + * @see #createStructField(String, DataType, boolean, Metadata) + */ + public static StructField createStructField(String name, DataType dataType, boolean nullable) { + return createStructField(name, dataType, nullable, (new MetadataBuilder()).build()); + } + + /** + * Creates a StructType with the given list of StructFields ({@code fields}). + */ + public static StructType createStructType(List<StructField> fields) { + return createStructType(fields.toArray(new StructField[0])); + } + + /** + * Creates a StructType with the given StructField array ({@code fields}). + */ + public static StructType createStructType(StructField[] fields) { + if (fields == null) { + throw new IllegalArgumentException("fields should not be null."); + } + Set<String> distinctNames = new HashSet<String>(); + for (StructField field : fields) { + if (field == null) { + throw new IllegalArgumentException( + "fields should not contain any null."); + } + + distinctNames.add(field.name()); + } + if (distinctNames.size() != fields.length) { + throw new IllegalArgumentException("fields should have distinct names."); + } + + return StructType$.MODULE$.apply(fields); + } +} http://git-wip-us.apache.org/repos/asf/spark/blob/19556454/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypes.java ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypes.java b/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypes.java deleted file mode 100644 index e457542..0000000 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/types/DataTypes.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * 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. - */ - -package org.apache.spark.sql.types; - -import java.util.*; - -/** - * To get/create specific data type, users should use singleton objects and factory methods - * provided by this class. - */ -public class DataTypes { - /** - * Gets the StringType object. - */ - public static final DataType StringType = StringType$.MODULE$; - - /** - * Gets the BinaryType object. - */ - public static final DataType BinaryType = BinaryType$.MODULE$; - - /** - * Gets the BooleanType object. - */ - public static final DataType BooleanType = BooleanType$.MODULE$; - - /** - * Gets the DateType object. - */ - public static final DataType DateType = DateType$.MODULE$; - - /** - * Gets the TimestampType object. - */ - public static final DataType TimestampType = TimestampType$.MODULE$; - - /** - * Gets the DoubleType object. - */ - public static final DataType DoubleType = DoubleType$.MODULE$; - - /** - * Gets the FloatType object. - */ - public static final DataType FloatType = FloatType$.MODULE$; - - /** - * Gets the ByteType object. - */ - public static final DataType ByteType = ByteType$.MODULE$; - - /** - * Gets the IntegerType object. - */ - public static final DataType IntegerType = IntegerType$.MODULE$; - - /** - * Gets the LongType object. - */ - public static final DataType LongType = LongType$.MODULE$; - - /** - * Gets the ShortType object. - */ - public static final DataType ShortType = ShortType$.MODULE$; - - /** - * Gets the NullType object. - */ - public static final DataType NullType = NullType$.MODULE$; - - /** - * Creates an ArrayType by specifying the data type of elements ({@code elementType}). - * The field of {@code containsNull} is set to {@code true}. - */ - public static ArrayType createArrayType(DataType elementType) { - if (elementType == null) { - throw new IllegalArgumentException("elementType should not be null."); - } - return new ArrayType(elementType, true); - } - - /** - * Creates an ArrayType by specifying the data type of elements ({@code elementType}) and - * whether the array contains null values ({@code containsNull}). - */ - public static ArrayType createArrayType(DataType elementType, boolean containsNull) { - if (elementType == null) { - throw new IllegalArgumentException("elementType should not be null."); - } - return new ArrayType(elementType, containsNull); - } - - public static DecimalType createDecimalType(int precision, int scale) { - return DecimalType$.MODULE$.apply(precision, scale); - } - - public static DecimalType createDecimalType() { - return DecimalType$.MODULE$.Unlimited(); - } - - /** - * Creates a MapType by specifying the data type of keys ({@code keyType}) and values - * ({@code keyType}). The field of {@code valueContainsNull} is set to {@code true}. - */ - public static MapType createMapType(DataType keyType, DataType valueType) { - if (keyType == null) { - throw new IllegalArgumentException("keyType should not be null."); - } - if (valueType == null) { - throw new IllegalArgumentException("valueType should not be null."); - } - return new MapType(keyType, valueType, true); - } - - /** - * Creates a MapType by specifying the data type of keys ({@code keyType}), the data type of - * values ({@code keyType}), and whether values contain any null value - * ({@code valueContainsNull}). - */ - public static MapType createMapType( - DataType keyType, - DataType valueType, - boolean valueContainsNull) { - if (keyType == null) { - throw new IllegalArgumentException("keyType should not be null."); - } - if (valueType == null) { - throw new IllegalArgumentException("valueType should not be null."); - } - return new MapType(keyType, valueType, valueContainsNull); - } - - /** - * Creates a StructField by specifying the name ({@code name}), data type ({@code dataType}) and - * whether values of this field can be null values ({@code nullable}). - */ - public static StructField createStructField( - String name, - DataType dataType, - boolean nullable, - Metadata metadata) { - if (name == null) { - throw new IllegalArgumentException("name should not be null."); - } - if (dataType == null) { - throw new IllegalArgumentException("dataType should not be null."); - } - if (metadata == null) { - throw new IllegalArgumentException("metadata should not be null."); - } - return new StructField(name, dataType, nullable, metadata); - } - - /** - * Creates a StructField with empty metadata. - * - * @see #createStructField(String, DataType, boolean, Metadata) - */ - public static StructField createStructField(String name, DataType dataType, boolean nullable) { - return createStructField(name, dataType, nullable, (new MetadataBuilder()).build()); - } - - /** - * Creates a StructType with the given list of StructFields ({@code fields}). - */ - public static StructType createStructType(List<StructField> fields) { - return createStructType(fields.toArray(new StructField[0])); - } - - /** - * Creates a StructType with the given StructField array ({@code fields}). - */ - public static StructType createStructType(StructField[] fields) { - if (fields == null) { - throw new IllegalArgumentException("fields should not be null."); - } - Set<String> distinctNames = new HashSet<String>(); - for (StructField field : fields) { - if (field == null) { - throw new IllegalArgumentException( - "fields should not contain any null."); - } - - distinctNames.add(field.name()); - } - if (distinctNames.size() != fields.length) { - throw new IllegalArgumentException("fields should have distinct names."); - } - - return StructType$.MODULE$.apply(fields); - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org