ueshin commented on code in PR #49055: URL: https://github.com/apache/spark/pull/49055#discussion_r1900621567
########## sql/core/src/main/scala/org/apache/spark/sql/TableArg.scala: ########## @@ -0,0 +1,71 @@ +/* + * 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 + +import org.apache.spark.sql.catalyst.expressions.{Ascending, Expression, FunctionTableSubqueryArgumentExpression, SortOrder} + +class TableArg( + val expression: FunctionTableSubqueryArgumentExpression, + sparkSession: SparkSession) + extends TableValuedFunctionArgument { + import sparkSession.toRichColumn + + @scala.annotation.varargs + def partitionBy(cols: Column*): TableArg = { + if (expression.partitionByExpressions.nonEmpty || expression.withSinglePartition) { Review Comment: ```suggestion private def isPartitioned: Boolean = expression.partitionByExpressions.nonEmpty || expression.withSinglePartition @scala.annotation.varargs def partitionBy(cols: Column*): TableArg = { if (isPartitioned) { ``` ########## sql/core/src/main/scala/org/apache/spark/sql/TableArg.scala: ########## @@ -0,0 +1,71 @@ +/* + * 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 + +import org.apache.spark.sql.catalyst.expressions.{Ascending, Expression, FunctionTableSubqueryArgumentExpression, SortOrder} + +class TableArg( + val expression: FunctionTableSubqueryArgumentExpression, + sparkSession: SparkSession) + extends TableValuedFunctionArgument { + import sparkSession.toRichColumn + + @scala.annotation.varargs + def partitionBy(cols: Column*): TableArg = { + if (expression.partitionByExpressions.nonEmpty || expression.withSinglePartition) { + throw new IllegalArgumentException( + "Cannot call partitionBy() after partitionBy() or withSinglePartition() has been called." + ) + } + val partitionByExpressions = cols.map(_.expr) + new TableArg( + expression.copy( + partitionByExpressions = partitionByExpressions), + sparkSession) + } + + @scala.annotation.varargs + def orderBy(cols: Column*): TableArg = { + if (expression.partitionByExpressions.isEmpty && !expression.withSinglePartition) { Review Comment: ```suggestion if (!isPartitioned) { ``` ########## sql/core/src/main/scala/org/apache/spark/sql/TableArg.scala: ########## @@ -0,0 +1,71 @@ +/* + * 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 + +import org.apache.spark.sql.catalyst.expressions.{Ascending, Expression, FunctionTableSubqueryArgumentExpression, SortOrder} + +class TableArg( + val expression: FunctionTableSubqueryArgumentExpression, + sparkSession: SparkSession) + extends TableValuedFunctionArgument { + import sparkSession.toRichColumn + + @scala.annotation.varargs + def partitionBy(cols: Column*): TableArg = { + if (expression.partitionByExpressions.nonEmpty || expression.withSinglePartition) { + throw new IllegalArgumentException( + "Cannot call partitionBy() after partitionBy() or withSinglePartition() has been called." + ) + } + val partitionByExpressions = cols.map(_.expr) + new TableArg( + expression.copy( + partitionByExpressions = partitionByExpressions), + sparkSession) + } + + @scala.annotation.varargs + def orderBy(cols: Column*): TableArg = { + if (expression.partitionByExpressions.isEmpty && !expression.withSinglePartition) { + throw new IllegalArgumentException( + "Please call partitionBy() or withSinglePartition() before orderBy()." + ) + } + val orderByExpressions = cols.map { col => + col.expr match { + case sortOrder: SortOrder => sortOrder + case expr: Expression => SortOrder(expr, Ascending) + } + } + new TableArg( + expression.copy(orderByExpressions = orderByExpressions), + sparkSession) + } + + def withSinglePartition(): TableArg = { + if (expression.partitionByExpressions.nonEmpty || expression.withSinglePartition) { Review Comment: ```suggestion if (isPartitioned) { ``` -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
