You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by GitBox <gi...@apache.org> on 2022/11/18 08:52:10 UTC
[GitHub] [iceberg] nastra commented on a diff in pull request #6207: Spark 3.3: Add years transform function
nastra commented on code in PR #6207:
URL: https://github.com/apache/iceberg/pull/6207#discussion_r1026166812
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/functions/YearsFunction.java:
##########
@@ -0,0 +1,129 @@
+/*
+ * 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.iceberg.spark.functions;
+
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.connector.catalog.functions.BoundFunction;
+import org.apache.spark.sql.connector.catalog.functions.ScalarFunction;
+import org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
+import org.apache.spark.sql.types.DataType;
+import org.apache.spark.sql.types.DataTypes;
+import org.apache.spark.sql.types.DateType;
+import org.apache.spark.sql.types.StructField;
+import org.apache.spark.sql.types.StructType;
+import org.apache.spark.sql.types.TimestampType;
+
+/**
+ * A Spark function implementation for the Iceberg year transform.
+ *
+ * <p>Example usage: {@code SELECT system.years('source_col')}.
+ */
+public class YearsFunction implements UnboundFunction {
+
+ @Override
+ public BoundFunction bind(StructType inputType) {
+ if (inputType.size() != 1) {
+ throw new UnsupportedOperationException("Wrong number of inputs (expected value)");
+ }
+
+ StructField valueField = inputType.fields()[0];
+ DataType valueType = valueField.dataType();
+
+ if (valueType instanceof DateType) {
+ return new DateToYearsFunction();
+ } else if (valueType instanceof TimestampType) {
+ return new TimestampToYearsFunction();
+ } else {
+ throw new UnsupportedOperationException("Expected value to be date or timestamp");
Review Comment:
nit: should we print what the underlying type of `inputType` was?
##########
spark/v3.3/spark/src/main/java/org/apache/iceberg/spark/functions/YearsFunction.java:
##########
@@ -0,0 +1,129 @@
+/*
+ * 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.iceberg.spark.functions;
+
+import org.apache.iceberg.util.DateTimeUtil;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.connector.catalog.functions.BoundFunction;
+import org.apache.spark.sql.connector.catalog.functions.ScalarFunction;
+import org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
+import org.apache.spark.sql.types.DataType;
+import org.apache.spark.sql.types.DataTypes;
+import org.apache.spark.sql.types.DateType;
+import org.apache.spark.sql.types.StructField;
+import org.apache.spark.sql.types.StructType;
+import org.apache.spark.sql.types.TimestampType;
+
+/**
+ * A Spark function implementation for the Iceberg year transform.
+ *
+ * <p>Example usage: {@code SELECT system.years('source_col')}.
+ */
+public class YearsFunction implements UnboundFunction {
+
+ @Override
+ public BoundFunction bind(StructType inputType) {
+ if (inputType.size() != 1) {
+ throw new UnsupportedOperationException("Wrong number of inputs (expected value)");
+ }
+
+ StructField valueField = inputType.fields()[0];
+ DataType valueType = valueField.dataType();
+
+ if (valueType instanceof DateType) {
+ return new DateToYearsFunction();
+ } else if (valueType instanceof TimestampType) {
+ return new TimestampToYearsFunction();
+ } else {
+ throw new UnsupportedOperationException("Expected value to be date or timestamp");
+ }
+ }
+
+ @Override
+ public String description() {
+ return name()
+ + "(col) - Call Iceberg's year transform\n"
+ + " col :: source column (must be date or timestamp)";
+ }
+
+ @Override
+ public String name() {
+ return "years";
+ }
+
+ private abstract static class BaseToYearsFunction implements ScalarFunction<Integer> {
+ @Override
+ public String name() {
+ return "years";
+ }
+
+ @Override
+ public DataType resultType() {
+ return DataTypes.IntegerType;
+ }
+ }
+
+ public static class DateToYearsFunction extends BaseToYearsFunction {
+
+ // magic method used in codegen
+ public static int invoke(int days) {
+ return DateTimeUtil.daysToYears(days);
+ }
+
+ @Override
+ public DataType[] inputTypes() {
+ return new DataType[] {DataTypes.DateType};
+ }
+
+ @Override
+ public String canonicalName() {
+ return "iceberg.years(date)";
+ }
+
+ @Override
+ public Integer produceResult(InternalRow input) {
+ // return null for null input to match what Spark does in codegen
+ return input.isNullAt(0) ? null : invoke(input.getInt(0));
+ }
+ }
+
+ public static class TimestampToYearsFunction extends BaseToYearsFunction {
+
+ // magic method used in codegen
+ public static int invoke(long micros) {
+ return DateTimeUtil.microsToYears(micros);
+ }
+
+ @Override
+ public DataType[] inputTypes() {
+ return new DataType[] {DataTypes.TimestampType};
+ }
+
+ @Override
+ public String canonicalName() {
+ return "iceberg.years(timestamp)";
+ }
+
+ @Override
+ public Integer produceResult(InternalRow input) {
Review Comment:
nit: this method appears to be the same for TimestampToYearsFunction + DateToYearsFunction, should we maybe move it to BaseToYearsFunction?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org