SammyVimes commented on code in PR #787: URL: https://github.com/apache/ignite-3/pull/787#discussion_r852947578
########## modules/storage-api/src/main/java/org/apache/ignite/internal/storage/IgniteRowId.java: ########## @@ -0,0 +1,51 @@ +/* + * 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.internal.storage; + +import java.nio.ByteBuffer; + +/** + * Interface that represents row id in primary index of the table. + * + * @see MvPartitionStorage + */ +public interface IgniteRowId extends Comparable<IgniteRowId> { + /** + * Maximum possible row id size in bytes. If PK columns exceed this size, then UUID-based row id should be used. + */ + final int MAX_ROW_ID_SIZE = 16; + + /** + * Writes row id into a byte buffer. Binary row representation should match natural order defined by {@link #compareTo(Object)} when + * comparing lexicographically. + * + * @param buf Output byte buffer with {@link java.nio.ByteOrder#LITTLE_ENDIAN} byte order. + * @param signedBytesCompare Defines properties of a target binary comparator. {@code true} if bytes are compared as signed values, + * {@code false} if unsigned. + */ + void writeTo(ByteBuffer buf, boolean signedBytesCompare); + + /** + * Compares row id with a byte buffer, previously ritten by a {@link #writeTo(ByteBuffer, boolean)} method. Review Comment: written ########## modules/storage-api/src/main/java/org/apache/ignite/internal/storage/MvPartitionStorage.java: ########## @@ -48,31 +47,30 @@ public interface MvPartitionStorage { * @throws TxIdMismatchException If there's another pending update associated with different transaction id. * @throws StorageException If failed to write data to the storage. */ - void addWrite(BinaryRow row, UUID txId) throws TxIdMismatchException, StorageException; + void addWrite(IgniteRowId rowId, @Nullable BinaryRow row, UUID txId) throws TxIdMismatchException, StorageException; Review Comment: rowId is missing from the javadoc ########## modules/storage-api/src/main/java/org/apache/ignite/internal/storage/UuidIgniteRowId.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.internal.storage; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.UUID; +import org.jetbrains.annotations.NotNull; + +/** + * UUID-based ignite row id implementation. + */ +public class UuidIgniteRowId implements IgniteRowId { + /** Backing uuid value. */ + private final UUID uuid; + + /** + * Constructor. + * + * @param uuid UUID. + */ + public UuidIgniteRowId(UUID uuid) { + this.uuid = uuid; + } + + /** + * Returns {@link UuidIgniteRowId} instance based on {@link UUID#randomUUID()}. + */ + public static IgniteRowId randomRowId() { + return new UuidIgniteRowId(UUID.randomUUID()); + } + + /** {@inheritDoc} */ + @Override + public void writeTo(ByteBuffer buf, boolean signedBytesCompare) { + assert buf.order() == ByteOrder.LITTLE_ENDIAN; + + long mask = signedBytesCompare ? 0x0080808080808080L : 0x8000000000000000L; + + buf.putLong(Long.reverseBytes(mask ^ uuid.getMostSignificantBits())); + buf.putLong(Long.reverseBytes(mask ^ uuid.getLeastSignificantBits())); + } + + /** {@inheritDoc} */ + @Override + public int compare(ByteBuffer buf, boolean signedBytesCompare) { + assert buf.order() == ByteOrder.LITTLE_ENDIAN; Review Comment: Let's go with BIG_ENDIAN since we still write in BIG_ENDIAN to rocks ########## modules/storage-api/src/main/java/org/apache/ignite/internal/storage/UuidIgniteRowId.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.internal.storage; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.UUID; +import org.jetbrains.annotations.NotNull; + +/** + * UUID-based ignite row id implementation. + */ +public class UuidIgniteRowId implements IgniteRowId { + /** Backing uuid value. */ + private final UUID uuid; + + /** + * Constructor. + * + * @param uuid UUID. + */ + public UuidIgniteRowId(UUID uuid) { + this.uuid = uuid; + } + + /** + * Returns {@link UuidIgniteRowId} instance based on {@link UUID#randomUUID()}. + */ + public static IgniteRowId randomRowId() { + return new UuidIgniteRowId(UUID.randomUUID()); + } + + /** {@inheritDoc} */ + @Override + public void writeTo(ByteBuffer buf, boolean signedBytesCompare) { + assert buf.order() == ByteOrder.LITTLE_ENDIAN; + + long mask = signedBytesCompare ? 0x0080808080808080L : 0x8000000000000000L; Review Comment: I think this needs a comment =) ########## modules/storage-api/src/main/java/org/apache/ignite/internal/storage/UuidIgniteRowId.java: ########## @@ -0,0 +1,98 @@ +/* + * 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.internal.storage; + +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.util.UUID; +import org.jetbrains.annotations.NotNull; + +/** + * UUID-based ignite row id implementation. + */ +public class UuidIgniteRowId implements IgniteRowId { + /** Backing uuid value. */ + private final UUID uuid; + + /** + * Constructor. + * + * @param uuid UUID. + */ + public UuidIgniteRowId(UUID uuid) { + this.uuid = uuid; + } + + /** + * Returns {@link UuidIgniteRowId} instance based on {@link UUID#randomUUID()}. + */ + public static IgniteRowId randomRowId() { + return new UuidIgniteRowId(UUID.randomUUID()); + } + + /** {@inheritDoc} */ + @Override + public void writeTo(ByteBuffer buf, boolean signedBytesCompare) { + assert buf.order() == ByteOrder.LITTLE_ENDIAN; + + long mask = signedBytesCompare ? 0x0080808080808080L : 0x8000000000000000L; + + buf.putLong(Long.reverseBytes(mask ^ uuid.getMostSignificantBits())); + buf.putLong(Long.reverseBytes(mask ^ uuid.getLeastSignificantBits())); + } + + /** {@inheritDoc} */ + @Override + public int compare(ByteBuffer buf, boolean signedBytesCompare) { + assert buf.order() == ByteOrder.LITTLE_ENDIAN; + + long mask = signedBytesCompare ? 0x0080808080808080L : 0x8000000000000000L; + + int cmp = Long.compare(uuid.getMostSignificantBits(), mask ^ Long.reverseBytes(buf.getLong())); + + if (cmp != 0) { + return cmp; + } + + return Long.compare(uuid.getLeastSignificantBits(), mask ^ Long.reverseBytes(buf.getLong())); + } + + /** {@inheritDoc} */ + @Override + public int compareTo(@NotNull IgniteRowId o) { + if (!(o instanceof UuidIgniteRowId)) { + throw new IllegalArgumentException(o.getClass().getName()); + } + + UuidIgniteRowId that = (UuidIgniteRowId) o; + + int cmp = Long.compare(uuid.getMostSignificantBits(), that.uuid.getMostSignificantBits()); Review Comment: We use signed comparison here, but compare(ByteBuffer buf, boolean signedBytesCompare) can be signed or unsigned. Is this ok in terms of consistency? -- 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]
