[GitHub] [spark] Yikf commented on a diff in pull request #37113: [SPARK-39741][SQL] Support url encode/decode as built-in function and tidy up url-related functions
Yikf commented on code in PR #37113: URL: https://github.com/apache/spark/pull/37113#discussion_r918730197 ## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/urlExpressions.scala: ## @@ -0,0 +1,290 @@ +/* + * 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.catalyst.expressions + +import java.net.{URI, URISyntaxException, URLDecoder, URLEncoder} +import java.util.regex.Pattern + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.analysis.TypeCheckResult +import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback +import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke +import org.apache.spark.sql.catalyst.trees.UnaryLike +import org.apache.spark.sql.errors.QueryExecutionErrors +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.types.{AbstractDataType, DataType, StringType} +import org.apache.spark.unsafe.types.UTF8String + +// scalastyle:off line.size.limit +@ExpressionDescription( + usage = """ +_FUNC_(str) - Translates a string into {@code application/x-www-form-urlencoded} format using a specific encoding scheme. Review Comment: Sorry i misread this meaning, updated -- 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: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] [spark] Yikf commented on a diff in pull request #37113: [SPARK-39741][SQL] Support url encode/decode as built-in function and tidy up url-related functions
Yikf commented on code in PR #37113: URL: https://github.com/apache/spark/pull/37113#discussion_r919041742 ## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/urlExpressions.scala: ## @@ -0,0 +1,290 @@ +/* + * 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.catalyst.expressions + +import java.net.{URI, URISyntaxException, URLDecoder, URLEncoder} +import java.util.regex.Pattern + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.analysis.TypeCheckResult +import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback +import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke +import org.apache.spark.sql.catalyst.trees.UnaryLike +import org.apache.spark.sql.errors.QueryExecutionErrors +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.types.{AbstractDataType, DataType, StringType} +import org.apache.spark.unsafe.types.UTF8String + +// scalastyle:off line.size.limit +@ExpressionDescription( + usage = """ +_FUNC_(str) - Translates a string into 'application/x-www-form-urlencoded' format using a specific encoding scheme. + """, + arguments = """ +Arguments: + str - a string expression to be translated + """, + examples = """ +Examples: + > SELECT _FUNC_('https://spark.apache.org'); + https%3A%2F%2Fspark.apache.org + """, + since = "3.4.0", + group = "url_funcs") +// scalastyle:on line.size.limit +case class UrlEncode(child: Expression) + extends RuntimeReplaceable with UnaryLike[Expression] with ImplicitCastInputTypes { + + override def replacement: Expression = +StaticInvoke( + UrlCodec.getClass, + StringType, + "encode", + Seq(child, Literal("UTF-8")), + Seq(StringType)) + + override protected def withNewChildInternal(newChild: Expression): Expression = { +copy(child = newChild) + } + + override def inputTypes: Seq[AbstractDataType] = Seq(StringType) + + override def prettyName: String = "url_encode" +} + +// scalastyle:off line.size.limit +@ExpressionDescription( + usage = """ +_FUNC_(str) - Decodes a `str` in 'application/x-www-form-urlencoded' format using a specific encoding scheme. + """, + arguments = """ +Arguments: + * str - a string expression to decode + """, + examples = """ +Examples: + > SELECT _FUNC_('https%3A%2F%2Fspark.apache.org'); + https://spark.apache.org + """, + since = "3.4.0", + group = "url_funcs") +// scalastyle:on line.size.limit +case class UrlDecode(child: Expression) + extends RuntimeReplaceable with UnaryLike[Expression] with ImplicitCastInputTypes { + + override def replacement: Expression = +StaticInvoke( + UrlCodec.getClass, + StringType, + "decode", + Seq(child, Literal("UTF-8")), + Seq(StringType)) + + override protected def withNewChildInternal(newChild: Expression): Expression = { +copy(child = newChild) + } + + override def inputTypes: Seq[AbstractDataType] = Seq(StringType) + + override def prettyName: String = "url_decode" +} + +object UrlCodec { + def encode(src: UTF8String, enc: UTF8String): UTF8String = { +UTF8String.fromString(URLEncoder.encode(src.toString, enc.toString)) Review Comment: Thanks @LuciferYang for benchmark test result, Seems like the benchmark did not diff much and for the reason that Spark will bump JDK and avoid any breaking change, `java.net.URLEncoder` is a better fit, what do you think @LuciferYang , @cloud-fan -- 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: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] [spark] Yikf commented on a diff in pull request #37113: [SPARK-39741][SQL] Support url encode/decode as built-in function and tidy up url-related functions
Yikf commented on code in PR #37113: URL: https://github.com/apache/spark/pull/37113#discussion_r918128553 ## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/urlExpressions.scala: ## @@ -0,0 +1,290 @@ +/* + * 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.catalyst.expressions + +import java.net.{URI, URISyntaxException, URLDecoder, URLEncoder} +import java.util.regex.Pattern + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.analysis.TypeCheckResult +import org.apache.spark.sql.catalyst.expressions.codegen.CodegenFallback +import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke +import org.apache.spark.sql.catalyst.trees.UnaryLike +import org.apache.spark.sql.errors.QueryExecutionErrors +import org.apache.spark.sql.internal.SQLConf +import org.apache.spark.sql.types.{AbstractDataType, DataType, StringType} +import org.apache.spark.unsafe.types.UTF8String + +// scalastyle:off line.size.limit +@ExpressionDescription( + usage = """ +_FUNC_(str) - Translates a string into {@code application/x-www-form-urlencoded} format using a specific encoding scheme. Review Comment: Looks it work normally, https://user-images.githubusercontent.com/51110188/178311420-3982ab92-0b71-470a-88b0-cfa27d5862a1.png;> -- 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: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org