stevenzwu commented on code in PR #16160: URL: https://github.com/apache/iceberg/pull/16160#discussion_r3185338676
########## api/src/main/java/org/apache/iceberg/catalog/CatalogObjectIdentifier.java: ########## @@ -0,0 +1,97 @@ +/* + * 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.catalog; + +import java.util.Arrays; +import java.util.function.Predicate; +import java.util.regex.Pattern; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * A reference to a catalog object (table, view, or namespace) as an ordered list of hierarchical + * levels. + * + * <p>The object kind is determined by context (e.g. the endpoint or a companion {@link + * CatalogObjectType} discriminator), not by the identifier structure alone. + */ +public class CatalogObjectIdentifier { + private static final Joiner DOT = Joiner.on('.'); + private static final Predicate<String> CONTAINS_NULL_CHARACTER = + Pattern.compile("\u0000", Pattern.UNICODE_CHARACTER_CLASS).asPredicate(); + + public static CatalogObjectIdentifier of(String... levels) { + Preconditions.checkArgument( + null != levels, "Cannot create CatalogObjectIdentifier from null array"); + Preconditions.checkArgument( + levels.length > 0, "Cannot create CatalogObjectIdentifier with no levels"); + + for (String level : levels) { + Preconditions.checkNotNull( + level, "Cannot create a CatalogObjectIdentifier with a null level"); + Preconditions.checkArgument( + !CONTAINS_NULL_CHARACTER.test(level), + "Cannot create a CatalogObjectIdentifier with the null-byte character"); Review Comment: let me fix the style though as we usually don't put class name in the error msg ########## api/src/main/java/org/apache/iceberg/catalog/CatalogObjectIdentifier.java: ########## @@ -0,0 +1,97 @@ +/* + * 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.catalog; + +import java.util.Arrays; +import java.util.function.Predicate; +import java.util.regex.Pattern; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; + +/** + * A reference to a catalog object (table, view, or namespace) as an ordered list of hierarchical + * levels. + * + * <p>The object kind is determined by context (e.g. the endpoint or a companion {@link + * CatalogObjectType} discriminator), not by the identifier structure alone. + */ +public class CatalogObjectIdentifier { + private static final Joiner DOT = Joiner.on('.'); + private static final Predicate<String> CONTAINS_NULL_CHARACTER = + Pattern.compile("\u0000", Pattern.UNICODE_CHARACTER_CLASS).asPredicate(); + + public static CatalogObjectIdentifier of(String... levels) { + Preconditions.checkArgument( + null != levels, "Cannot create CatalogObjectIdentifier from null array"); + Preconditions.checkArgument( + levels.length > 0, "Cannot create CatalogObjectIdentifier with no levels"); + + for (String level : levels) { + Preconditions.checkNotNull( + level, "Cannot create a CatalogObjectIdentifier with a null level"); + Preconditions.checkArgument( + !CONTAINS_NULL_CHARACTER.test(level), + "Cannot create a CatalogObjectIdentifier with the null-byte character"); Review Comment: This mirrors the same null-byte check on `Namespace` levels (added in #3938). Null bytes are a foot-gun in identifier-level strings — they can corrupt any encoding that uses a control byte as a delimiter, mis-terminate strings in C-based downstream consumers, and slip past path/log normalization. Rejecting them at construction keeps the invariant explicit at the API boundary, the same way `Namespace` does for the same reason. -- 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]
