AMashenkov commented on code in PR #4971: URL: https://github.com/apache/ignite-3/pull/4971#discussion_r1898433982
########## modules/api/src/main/java/org/apache/ignite/table/QualifiedName.java: ########## @@ -0,0 +1,159 @@ +/* + * 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.ignite.table; + +import java.util.Objects; +import org.apache.ignite.lang.util.IgniteNameUtils; +import org.apache.ignite.lang.util.IgniteNameUtils.Tokenizer; +import org.jetbrains.annotations.Nullable; + +/** + * Class represents a catalog object name (table, index and etc.) and provides factory methods. + * + * <p>Qualified name is a pair of schema name and object name. Schema name is optional, when not set, then + * default schema name "PUBLIC" is used. + * + * <p>Both schema name and object name can be case sensitive or insensitive respecting SQL-parser style quotation. + * Unquoted name will be cast to upper case. E.g. "tbl0" - is equivalent to "TBL0", "\"Tbl0\"" - "Tbl0", etc. + */ +public class QualifiedName { + static final String DEFAULT_SCHEMA_NAME = "PUBLIC"; + + /** + * Parses given simple or canonical name, and returns the object qualified name. + */ + public static QualifiedName parse(String simpleOrCanonicalName) { + verifyObjectIdentifier(simpleOrCanonicalName); + + Tokenizer tokenizer = new Tokenizer(simpleOrCanonicalName); + + String schemaName = DEFAULT_SCHEMA_NAME; + String objectName = tokenizer.nextToken(); + + if (tokenizer.hasNext()) { + // Canonical name + schemaName = objectName; + objectName = tokenizer.nextToken(); + } + + if (tokenizer.hasNext()) { + throw new IllegalArgumentException("Canonical name format mismatch: " + simpleOrCanonicalName); + } + + verifySchemaIdentifier(schemaName); + verifyObjectIdentifier(objectName); + + return new QualifiedName(schemaName, objectName); + } + + /** + * Resolves given simple name against default schema. + */ + public static QualifiedName fromSimple(String simpleName) { + return of(null, simpleName); + } + + /** + * Normalize schemaName and objectName, and returns the object qualified name. + * + * @param schemaName Schema name or {@code null} for default schema. + * @param objectName Object name. + */ + public static QualifiedName of(@Nullable String schemaName, String objectName) { + String schemaIdentifier = schemaName == null ? DEFAULT_SCHEMA_NAME : IgniteNameUtils.parseSimpleName(schemaName); + String objectIdentifier = IgniteNameUtils.parseSimpleName(objectName); + + verifySchemaIdentifier(schemaIdentifier); + verifyObjectIdentifier(objectIdentifier); + + return new QualifiedName(schemaIdentifier, objectIdentifier); + } + + private static void verifyObjectIdentifier(@Nullable String identifier) { + Objects.requireNonNull(identifier); + + if (identifier.isEmpty()) { + throw new IllegalArgumentException("Object identifier can't be empty."); + } + } + + private static void verifySchemaIdentifier(@Nullable String identifier) { + if (identifier != null && identifier.isEmpty()) { + throw new IllegalArgumentException("Schema identifier can't be empty."); + } + } + + /** Normalized schema name. */ + private final String schemaIdentifier; Review Comment: done. ########## modules/api/src/main/java/org/apache/ignite/lang/util/IgniteNameUtils.java: ########## @@ -150,26 +170,43 @@ public Tokenizer(String source) { /** Returns {@code true} if at least one token is available. */ public boolean hasNext() { - return currentPosition < source.length(); + return foundDot || !isEol(); } /** Returns next token. */ - public @Nullable String nextToken() { + public String nextToken() { if (!hasNext()) { - return null; + throw new NoSuchElementException("No more tokens available."); + } else if (isEol()) { + if (foundDot) { + foundDot = false; + return ""; + } + throw new NoSuchElementException("No more tokens available."); Review Comment: done -- 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: notifications-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
