MaxGekk commented on code in PR #44968: URL: https://github.com/apache/spark/pull/44968#discussion_r1476285238
########## common/unsafe/src/test/scala/org/apache/spark/unsafe/types/CollationFactorySuite.scala: ########## @@ -0,0 +1,114 @@ +/* + * 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.unsafe.types + +import org.apache.spark.SparkException +// scalastyle:off +import org.scalatest.funsuite.AnyFunSuite +import org.scalatest.matchers.must.Matchers + +import org.apache.spark.sql.catalyst.util.CollationFactory._ +import org.apache.spark.unsafe.types.UTF8String.{fromString => toUTF8} + +class CollationFactorySuite extends AnyFunSuite with Matchers { // scalastyle:ignore funsuite + test("collationId stability") { + val ucsBasic = fetchCollation(0) + assert(ucsBasic.collationName == "UCS_BASIC") + assert(ucsBasic.isBinaryCollation) + + val ucsBasicLcase = fetchCollation(1) + assert(ucsBasicLcase.collationName == "UCS_BASIC_LCASE") + assert(!ucsBasicLcase.isBinaryCollation) + + val unicode = fetchCollation(2) + assert(unicode.collationName == "UNICODE") + assert(unicode.isBinaryCollation); + + val unicodeCi = fetchCollation(3) + assert(unicodeCi.collationName == "UNICODE_CI") + assert(!unicodeCi.isBinaryCollation) + } + + test("fetch invalid collation name") { + val error = intercept[SparkException] { + fetchCollation("UCS_BASIS") + } + + assert(error.getMessage.contains( + "The value UCS_BASIS does not represent a correct collation name.")) + assert(error.getMessage.contains("Suggested valid collation name: [UCS_BASIC]")) Review Comment: Could you use `checkError`, please. This will allow to translate error messages to other languages in the future without modifying Spark's internal tests. ########## common/unsafe/src/main/java/org/apache/spark/sql/catalyst/util/CollationFactory.java: ########## @@ -0,0 +1,174 @@ +/* + * 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.util; + +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.ToLongFunction; + +import com.ibm.icu.util.ULocale; +import com.ibm.icu.text.Collator; + +import org.apache.spark.SparkException; +import org.apache.spark.unsafe.types.UTF8String; + +/** + * Static entry point for collation aware string functions. + * Provides functionality to the UTF8String object which respects defined collation settings. + */ +public final class CollationFactory { + /** + * Entry encapsulating all information about a collation. + */ + public static class Collation { + public final String collationName; + public final Collator collator; + public final Comparator<UTF8String> comparator; + + /** + * Version of the collation. This is the version of the ICU library Collator. + * For non-ICU collations (e.g. UTF8 Binary) the version is set to "1.0". + * When using ICU Collator this version is exposed through collator.getVersion(). + * Whenever the collation is updated, the version should be updated as well or kept + * for backwards compatibility. + */ + public final String version; + + /** + * Collation sensitive hash function. Output for two UTF8Strings will be the same if they are + * equal according to the collation. + */ + public final ToLongFunction<UTF8String> hashFunction; + + /** + * Potentially faster way than using comparator to compare two UTF8Strings for equality. + * Falls back to binary comparison if the collation is binary. + */ + public final BiFunction<UTF8String, UTF8String, Boolean> equalsFunction; + + /** + * Binary collation implies that UTF8Strings are considered equal only if they are + * byte for byte equal. All accent or case-insensitive collations are considered non-binary. + */ + public final boolean isBinaryCollation; + + public Collation( + String collationName, + Collator collator, + Comparator<UTF8String> comparator, + String version, + ToLongFunction<UTF8String> hashFunction, + boolean isBinaryCollation) { + this.collationName = collationName; + this.collator = collator; + this.comparator = comparator; + this.version = version; + this.hashFunction = hashFunction; + this.isBinaryCollation = isBinaryCollation; + + if (isBinaryCollation) { + this.equalsFunction = UTF8String::equals; + } else { + this.equalsFunction = (s1, s2) -> this.comparator.compare(s1, s2) == 0; + } + } + + /** + * Constructor with comparators that are inherited from the given collator. + */ + public Collation( + String collationName, Collator collator, String version, boolean isBinaryCollation) { + this( + collationName, + collator, + (s1, s2) -> collator.compare(s1.toString(), s2.toString()), + version, + s -> (long)collator.getCollationKey(s.toString()).hashCode(), + isBinaryCollation); + } + } + + private static final Collation[] collationTable = new Collation[4]; + private static final HashMap<String, Integer> collationNameToIdMap = new HashMap<>(); + + static { + // Binary comparison. This is the default collation. + // No custom comparators will be used for this collation. + // Instead, we rely on byte for byte comparison. + collationTable[0] = new Collation( + "UCS_BASIC", + null, + UTF8String::compareTo, + "1.0", + s -> (long)s.hashCode(), + true); + + // Case-insensitive UTF8 binary collation. + // TODO: Do in place comparisons instead of creating new strings. + collationTable[1] = new Collation( + "UCS_BASIC_LCASE", + null, + Comparator.comparing(UTF8String::toLowerCase), "1.0", Review Comment: Could you fix indentation here. -- 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]
