[GitHub] [ignite-3] korlov42 commented on a diff in pull request #1479: IGNITE-18360 Migrate storage to new Binary Tuple format

[GitBox <gi...@apache.org>]

korlov42 commented on code in PR #1479:
URL: https://github.com/apache/ignite-3/pull/1479#discussion_r1068293570


##########
modules/storage-api/src/main/java/org/apache/ignite/internal/storage/TableRowAndRowId.java:
##########
@@ -18,31 +18,32 @@
 package org.apache.ignite.internal.storage;
 
 import org.apache.ignite.internal.schema.BinaryRow;
+import org.apache.ignite.internal.schema.TableRow;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Wrapper that holds both {@link BinaryRow} and {@link RowId}. {@link BinaryRow} is null for tombstones.

Review Comment:
   please fix all mentions of BinRow in javadoc



##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -1931,19 +1944,19 @@ private HybridTimestampMessage hybridTimestamp(HybridTimestamp tmstmp) {
      *
      * @param tablePartId {@link TablePartitionId} object to construct {@link UpdateCommand} object with.
      * @param rowUuid Row UUID.
-     * @param rowBuf {@link ByteBuffer} representation of {@link BinaryRow}.
+     * @param row {@link BinaryRow}.

Review Comment:
   something is missed here



##########
modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java:
##########
@@ -370,8 +373,9 @@ private static List<ResponseEntry> createSnapshotMvDataEntries(MvPartitionStorag
         return responseEntries;
     }
 
-    private static BinaryRow createBinaryRow(String key, String value) {
-        return new RowAssembler(SCHEMA_DESCRIPTOR, 1, 1).appendString(key).appendString(value).build();
+    private static TableRow createRow(String key, String value) {
+        BinaryRow binaryRow = new RowAssembler(SCHEMA_DESCRIPTOR, 1, 1).appendString(key).appendString(value).build();

Review Comment:
   again, let's try to avoid unnecessary conversion to BinRow here and other places as well



##########
modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/BaseMvStoragesTest.java:
##########
@@ -102,23 +104,20 @@ static void afterAll() {
         kBinaryConverter = null;
     }
 
-    protected static BinaryRow binaryKey(TestKey key) {
-        try {
-            return kvMarshaller.marshal(key);
-        } catch (MarshallerException e) {
-            throw new IgniteException(e);
-        }
+    protected static TableRow tableRow(TestKey key, TestValue value) {
+        return TableRowConverter.fromBinaryRow(binaryRow(key, value), kvBinaryConverter);

Review Comment:
   is it possible to skip conversion to BinRow? 



##########
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java:
##########
@@ -1931,19 +1944,19 @@ private HybridTimestampMessage hybridTimestamp(HybridTimestamp tmstmp) {
      *
      * @param tablePartId {@link TablePartitionId} object to construct {@link UpdateCommand} object with.
      * @param rowUuid Row UUID.
-     * @param rowBuf {@link ByteBuffer} representation of {@link BinaryRow}.
+     * @param row {@link BinaryRow}.
      * @param txId Transaction ID.
      * @return Constructed {@link UpdateCommand} object.
      */
-    private UpdateCommand updateCommand(TablePartitionId tablePartId, UUID rowUuid, ByteBuffer rowBuf, UUID txId) {
+    private UpdateCommand updateCommand(TablePartitionId tablePartId, UUID rowUuid, TableRow row, UUID txId) {

Review Comment:
   why did you change method's signature?



##########
modules/schema/src/main/java/org/apache/ignite/internal/schema/TableRow.java:
##########
@@ -0,0 +1,105 @@
+/*
+ * 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.schema;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/** Heap byte buffer-based row. */
+public class TableRow {
+    public static final ByteOrder ORDER = ByteOrder.LITTLE_ENDIAN;
+
+    /** Size of schema version length field. */
+    private static final int SCHEMA_VERSION_FLD_LEN = Short.BYTES;
+
+    /** Row schema version field offset. */
+    private static final int SCHEMA_VERSION_OFFSET = 0;
+
+    /** Row binary tuple field offset. */
+    private static final int TUPLE_OFFSET = SCHEMA_VERSION_OFFSET + SCHEMA_VERSION_FLD_LEN;
+
+    /** Row buffer. */
+    private final ByteBuffer buf;
+
+    /**
+     * Constructor.
+     *
+     * @param data Array representation of the row.
+     */
+    public TableRow(byte[] data) {
+        this(ByteBuffer.wrap(data).order(ORDER));
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param buf Buffer representing the row.
+     */
+    public TableRow(ByteBuffer buf) {
+        assert buf.order() == ORDER;
+        assert buf.position() == 0;
+
+        this.buf = buf;
+    }
+
+    /**
+     * Factory method which creates an instance using a schema version and an existing {@link BinaryTuple}.
+     *
+     * @param schemaVersion Schema version.
+     * @param binaryTuple Binary tuple.
+     * @return Created TableRow instance.
+     */
+    public static TableRow createFromTuple(int schemaVersion, BinaryTuple binaryTuple) {
+        ByteBuffer tupleBuffer = binaryTuple.byteBuffer();
+        ByteBuffer buffer = ByteBuffer.allocate(SCHEMA_VERSION_FLD_LEN + tupleBuffer.limit()).order(ORDER);
+        buffer.putShort((short) schemaVersion);
+        buffer.put(tupleBuffer);
+        buffer.position(0);
+        return new TableRow(buffer);
+    }
+
+    /** Get row schema version. */
+    public int schemaVersion() {
+        return Short.toUnsignedInt(buf.getShort(SCHEMA_VERSION_OFFSET));
+    }
+
+    /** Get ByteBuffer slice representing the binary tuple. */
+    public ByteBuffer tupleSlice() {
+        try {
+            return buf.position(TUPLE_OFFSET).slice().order(ORDER);
+        } finally {
+            buf.position(0); // Reset bounds.

Review Comment:
   we have to restore previous position 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: notifications-unsubscribe@ignite.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org