-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure that content IDs are unique in a Nessie repository (#7757)
Nessie content IDs are random IDs, but we do not guarantee that those are actually really unique. This change adds a new object type to ensure that a generated ID is unique by leveraging existing functionality of the `Persist` framework that already provides "`INSERT IF NOT EXIST`" guarantees. New content IDs from this change on are now verified. This change does not include functionality to automatically add already existing content-IDs. IMHO it is probably okay for now given the practically non-existing probability of content-ID conflicts.
- Loading branch information
Showing
18 changed files
with
452 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
...java/org/projectnessie/versioned/storage/cassandra/serializers/UniqueIdObjSerializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright (C) 2023 Dremio | ||
| * | ||
| * Licensed 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.projectnessie.versioned.storage.cassandra.serializers; | ||
|
|
||
| import static org.projectnessie.versioned.storage.cassandra.CassandraConstants.INSERT_OBJ_PREFIX; | ||
| import static org.projectnessie.versioned.storage.cassandra.CassandraConstants.INSERT_OBJ_VALUES; | ||
| import static org.projectnessie.versioned.storage.cassandra.CassandraConstants.STORE_OBJ_SUFFIX; | ||
| import static org.projectnessie.versioned.storage.common.objtypes.UniqueIdObj.uniqueId; | ||
|
|
||
| import com.datastax.oss.driver.api.core.cql.BoundStatementBuilder; | ||
| import com.datastax.oss.driver.api.core.cql.Row; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import org.projectnessie.versioned.storage.cassandra.CassandraSerde; | ||
| import org.projectnessie.versioned.storage.cassandra.CqlColumn; | ||
| import org.projectnessie.versioned.storage.cassandra.CqlColumnType; | ||
| import org.projectnessie.versioned.storage.common.exceptions.ObjTooLargeException; | ||
| import org.projectnessie.versioned.storage.common.objtypes.UniqueIdObj; | ||
| import org.projectnessie.versioned.storage.common.persist.ObjId; | ||
|
|
||
| public class UniqueIdObjSerializer implements ObjSerializer<UniqueIdObj> { | ||
|
|
||
| public static final ObjSerializer<UniqueIdObj> INSTANCE = new UniqueIdObjSerializer(); | ||
|
|
||
| private static final CqlColumn COL_UNIQUE_SPACE = new CqlColumn("u_space", CqlColumnType.VARCHAR); | ||
| private static final CqlColumn COL_UNIQUE_VALUE = | ||
| new CqlColumn("u_value", CqlColumnType.VARBINARY); | ||
|
|
||
| private static final Set<CqlColumn> COLS = ImmutableSet.of(COL_UNIQUE_SPACE, COL_UNIQUE_VALUE); | ||
|
|
||
| private static final String INSERT_CQL = | ||
| INSERT_OBJ_PREFIX | ||
| + COLS.stream().map(CqlColumn::name).collect(Collectors.joining(",")) | ||
| + INSERT_OBJ_VALUES | ||
| + COLS.stream().map(c -> ":" + c.name()).collect(Collectors.joining(",")) | ||
| + ")"; | ||
|
|
||
| private static final String STORE_CQL = INSERT_CQL + STORE_OBJ_SUFFIX; | ||
|
|
||
| private UniqueIdObjSerializer() {} | ||
|
|
||
| @Override | ||
| public Set<CqlColumn> columns() { | ||
| return COLS; | ||
| } | ||
|
|
||
| @Override | ||
| public String insertCql(boolean upsert) { | ||
| return upsert ? INSERT_CQL : STORE_CQL; | ||
| } | ||
|
|
||
| @SuppressWarnings("ResultOfMethodCallIgnored") | ||
| @Override | ||
| public void serialize( | ||
| UniqueIdObj obj, | ||
| BoundStatementBuilder stmt, | ||
| int incrementalIndexLimit, | ||
| int maxSerializedIndexSize) | ||
| throws ObjTooLargeException { | ||
| stmt.setString(COL_UNIQUE_SPACE.name(), obj.space()); | ||
| stmt.setByteBuffer(COL_UNIQUE_VALUE.name(), obj.value().asReadOnlyByteBuffer()); | ||
| } | ||
|
|
||
| @Override | ||
| public UniqueIdObj deserialize(Row row, ObjId id) { | ||
| return uniqueId( | ||
| id, | ||
| row.getString(COL_UNIQUE_SPACE.name()), | ||
| CassandraSerde.deserializeBytes(row, COL_UNIQUE_VALUE.name())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...common/src/main/java/org/projectnessie/versioned/storage/common/objtypes/UniqueIdObj.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright (C) 2022 Dremio | ||
| * | ||
| * Licensed 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.projectnessie.versioned.storage.common.objtypes; | ||
|
|
||
| import static org.projectnessie.versioned.storage.common.objtypes.Hashes.uniqueIdHash; | ||
|
|
||
| import java.nio.ByteBuffer; | ||
| import java.util.UUID; | ||
| import javax.annotation.Nullable; | ||
| import org.immutables.value.Value; | ||
| import org.projectnessie.nessie.relocated.protobuf.ByteString; | ||
| import org.projectnessie.nessie.relocated.protobuf.UnsafeByteOperations; | ||
| import org.projectnessie.versioned.storage.common.persist.Obj; | ||
| import org.projectnessie.versioned.storage.common.persist.ObjId; | ||
| import org.projectnessie.versioned.storage.common.persist.ObjType; | ||
|
|
||
| /** | ||
| * Describes a unique ID, used to ensure that an ID defined in some {@linkplain #space()} is unique | ||
| * within a Nessie repository. | ||
| */ | ||
| @Value.Immutable | ||
| public interface UniqueIdObj extends Obj { | ||
|
|
||
| @Override | ||
| default ObjType type() { | ||
| return StandardObjType.UNIQUE; | ||
| } | ||
|
|
||
| @Override | ||
| @Value.Parameter(order = 1) | ||
| @Nullable | ||
| @jakarta.annotation.Nullable | ||
| ObjId id(); | ||
|
|
||
| /** The "ID space", for example {@code content-id}. */ | ||
| @Value.Parameter(order = 2) | ||
| String space(); | ||
|
|
||
| /** The value of the ID within the {@link #space()}. */ | ||
| @Value.Parameter(order = 3) | ||
| ByteString value(); | ||
|
|
||
| @Value.NonAttribute | ||
| default UUID valueAsUUID() { | ||
| ByteBuffer buffer = value().asReadOnlyByteBuffer(); | ||
| long msb = buffer.getLong(); | ||
| long lsb = buffer.getLong(); | ||
| return new UUID(msb, lsb); | ||
| } | ||
|
|
||
| static UniqueIdObj uniqueId(ObjId id, String space, ByteString value) { | ||
| return ImmutableUniqueIdObj.of(id, space, value); | ||
| } | ||
|
|
||
| static UniqueIdObj uniqueId(String space, ByteString value) { | ||
| return uniqueId(uniqueIdHash(space, value), space, value); | ||
| } | ||
|
|
||
| static UniqueIdObj uniqueId(String space, UUID value) { | ||
| return uniqueId(space, uuidToBytes(value)); | ||
| } | ||
|
|
||
| static ByteString uuidToBytes(UUID value) { | ||
| ByteBuffer buffer = ByteBuffer.allocate(16); | ||
| buffer.putLong(value.getMostSignificantBits()); | ||
| buffer.putLong(value.getLeastSignificantBits()); | ||
| buffer.flip(); | ||
| return UnsafeByteOperations.unsafeWrap(buffer); | ||
| } | ||
| } |
Oops, something went wrong.