tkalkirill commented on code in PR #1706: URL: https://github.com/apache/ignite-3/pull/1706#discussion_r1115264726
########## modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexGcTest.java: ########## @@ -0,0 +1,340 @@ +/* + * 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.table.distributed; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.ignite.distributed.TestPartitionDataStorage; +import org.apache.ignite.internal.hlc.HybridClock; +import org.apache.ignite.internal.hlc.HybridClockImpl; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.schema.BinaryRow; +import org.apache.ignite.internal.schema.BinaryRowConverter; +import org.apache.ignite.internal.schema.BinaryTuple; +import org.apache.ignite.internal.schema.BinaryTupleSchema; +import org.apache.ignite.internal.schema.Column; +import org.apache.ignite.internal.schema.NativeTypes; +import org.apache.ignite.internal.schema.SchemaDescriptor; +import org.apache.ignite.internal.schema.marshaller.KvMarshaller; +import org.apache.ignite.internal.schema.marshaller.MarshallerException; +import org.apache.ignite.internal.schema.marshaller.MarshallerFactory; +import org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory; +import org.apache.ignite.internal.storage.ReadResult; +import org.apache.ignite.internal.storage.RowId; +import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor.HashIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor.SortedIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage; +import org.apache.ignite.internal.storage.index.impl.TestSortedIndexStorage; +import org.apache.ignite.internal.table.distributed.replicator.TablePartitionId; +import org.apache.ignite.internal.util.Cursor; +import org.jetbrains.annotations.Nullable; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** Tests indexes cleaning up on garbage collection. */ +public class IndexGcTest { + /** Default reflection marshaller factory. */ + private static final MarshallerFactory MARSHALLER_FACTORY = new ReflectionMarshallerFactory(); + + private static final SchemaDescriptor SCHEMA_DESCRIPTOR = new SchemaDescriptor(1, new Column[]{ + new Column("INTKEY", NativeTypes.INT32, false), + new Column("STRKEY", NativeTypes.STRING, false), + }, new Column[]{ + new Column("INTVAL", NativeTypes.INT32, false), + new Column("STRVAL", NativeTypes.STRING, false), + }); + + private static final BinaryTupleSchema TUPLE_SCHEMA = BinaryTupleSchema.createRowSchema(SCHEMA_DESCRIPTOR); + + private static final BinaryTupleSchema PK_INDEX_SCHEMA = BinaryTupleSchema.createKeySchema(SCHEMA_DESCRIPTOR); + + private static final BinaryRowConverter PK_INDEX_BINARY_TUPLE_CONVERTER = new BinaryRowConverter(TUPLE_SCHEMA, PK_INDEX_SCHEMA); + + private static final int[] USER_INDEX_COLS = { + SCHEMA_DESCRIPTOR.column("INTVAL").schemaIndex(), + SCHEMA_DESCRIPTOR.column("STRVAL").schemaIndex() + }; + + private static final BinaryTupleSchema USER_INDEX_SCHEMA = BinaryTupleSchema.createSchema(SCHEMA_DESCRIPTOR, USER_INDEX_COLS); + + private static final BinaryRowConverter USER_INDEX_BINARY_TUPLE_CONVERTER = new BinaryRowConverter(TUPLE_SCHEMA, USER_INDEX_SCHEMA); + + /** Key-value marshaller for tests. */ + private static final KvMarshaller<TestKey, TestValue> KV_MARSHALLER + = MARSHALLER_FACTORY.create(SCHEMA_DESCRIPTOR, TestKey.class, TestValue.class); + + private static final UUID TX_ID = UUID.randomUUID(); + + private static final HybridClock CLOCK = new HybridClockImpl(); + + private TestHashIndexStorage pkInnerStorage; + private TestSortedIndexStorage sortedInnerStorage; + private TestHashIndexStorage hashInnerStorage; + private TestMvPartitionStorage storage; + private StorageUpdateHandler storageUpdateHandler; + + @BeforeEach + void setUp() { + UUID pkIndexId = UUID.randomUUID(); + UUID sortedIndexId = UUID.randomUUID(); + UUID hashIndexId = UUID.randomUUID(); + + pkInnerStorage = new TestHashIndexStorage(null); + + TableSchemaAwareIndexStorage pkStorage = new TableSchemaAwareIndexStorage( + pkIndexId, + pkInnerStorage, + PK_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + sortedInnerStorage = new TestSortedIndexStorage(new SortedIndexDescriptor(sortedIndexId, List.of( + new SortedIndexColumnDescriptor("INTVAL", NativeTypes.INT32, false, true), + new SortedIndexColumnDescriptor("STRVAL", NativeTypes.STRING, false, true) + ))); + + TableSchemaAwareIndexStorage sortedIndexStorage = new TableSchemaAwareIndexStorage( + sortedIndexId, + sortedInnerStorage, + USER_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + hashInnerStorage = new TestHashIndexStorage(new HashIndexDescriptor(hashIndexId, List.of( + new HashIndexColumnDescriptor("INTVAL", NativeTypes.INT32, false), + new HashIndexColumnDescriptor("STRVAL", NativeTypes.STRING, false) + ))); + + TableSchemaAwareIndexStorage hashIndexStorage = new TableSchemaAwareIndexStorage( + hashIndexId, + hashInnerStorage, + USER_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + storage = new TestMvPartitionStorage(1); + + storageUpdateHandler = new StorageUpdateHandler(1, new TestPartitionDataStorage(storage), + () -> Map.of( + pkIndexId, pkStorage, + sortedIndexId, sortedIndexStorage, + hashIndexId, hashIndexStorage + ) + ); + } + + @Test + void testRemoveStaleEntryWithSameIndex() { + UUID rowUuid = UUID.randomUUID(); + RowId rowId = new RowId(1, rowUuid); + + var key = new TestKey(1, "foo"); + var value = new TestValue(2, "bar"); + BinaryRow tableRow = binaryRow(key, value); + + addWrite(storageUpdateHandler, rowUuid, tableRow); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow); + commitWrite(rowId); + + assertEquals(2, getRowVersions(rowId).size()); + assertThat(pkInnerStorage.allRowsIds(), contains(rowId)); + assertThat(sortedInnerStorage.allRowsIds(), contains(rowId)); + assertThat(hashInnerStorage.allRowsIds(), contains(rowId)); + + assertTrue(storageUpdateHandler.vacuum(CLOCK.now())); + + assertEquals(1, getRowVersions(rowId).size()); + // Newer entry has the same index value, so it should not be removed. + assertTrue(inIndex(tableRow)); + } + + @Test + void testRemoveStaleEntriesWithDifferentIndexes() { + UUID rowUuid = UUID.randomUUID(); + RowId rowId = new RowId(1, rowUuid); + + var key1 = new TestKey(1, "foo"); + var value1 = new TestValue(2, "bar"); + BinaryRow tableRow1 = binaryRow(key1, value1); + + var key2 = new TestKey(1, "foo"); + var value2 = new TestValue(5, "baz"); + BinaryRow tableRow2 = binaryRow(key2, value2); + + addWrite(storageUpdateHandler, rowUuid, tableRow1); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow1); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow2); + commitWrite(rowId); + + assertEquals(3, getRowVersions(rowId).size()); + assertThat(pkInnerStorage.allRowsIds(), contains(rowId)); + assertThat(sortedInnerStorage.allRowsIds(), contains(rowId)); + assertThat(hashInnerStorage.allRowsIds(), contains(rowId)); + + HybridTimestamp afterCommits = CLOCK.now(); + + assertTrue(storageUpdateHandler.vacuum(afterCommits)); + assertTrue(storageUpdateHandler.vacuum(afterCommits)); Review Comment: Let's add an intermediate check that we only removed one version. ########## modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexGcTest.java: ########## @@ -0,0 +1,340 @@ +/* + * 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.table.distributed; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.ignite.distributed.TestPartitionDataStorage; +import org.apache.ignite.internal.hlc.HybridClock; +import org.apache.ignite.internal.hlc.HybridClockImpl; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.schema.BinaryRow; +import org.apache.ignite.internal.schema.BinaryRowConverter; +import org.apache.ignite.internal.schema.BinaryTuple; +import org.apache.ignite.internal.schema.BinaryTupleSchema; +import org.apache.ignite.internal.schema.Column; +import org.apache.ignite.internal.schema.NativeTypes; +import org.apache.ignite.internal.schema.SchemaDescriptor; +import org.apache.ignite.internal.schema.marshaller.KvMarshaller; +import org.apache.ignite.internal.schema.marshaller.MarshallerException; +import org.apache.ignite.internal.schema.marshaller.MarshallerFactory; +import org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory; +import org.apache.ignite.internal.storage.ReadResult; +import org.apache.ignite.internal.storage.RowId; +import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor.HashIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor.SortedIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage; +import org.apache.ignite.internal.storage.index.impl.TestSortedIndexStorage; +import org.apache.ignite.internal.table.distributed.replicator.TablePartitionId; +import org.apache.ignite.internal.util.Cursor; +import org.jetbrains.annotations.Nullable; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** Tests indexes cleaning up on garbage collection. */ +public class IndexGcTest { + /** Default reflection marshaller factory. */ + private static final MarshallerFactory MARSHALLER_FACTORY = new ReflectionMarshallerFactory(); + + private static final SchemaDescriptor SCHEMA_DESCRIPTOR = new SchemaDescriptor(1, new Column[]{ + new Column("INTKEY", NativeTypes.INT32, false), + new Column("STRKEY", NativeTypes.STRING, false), + }, new Column[]{ + new Column("INTVAL", NativeTypes.INT32, false), + new Column("STRVAL", NativeTypes.STRING, false), + }); + + private static final BinaryTupleSchema TUPLE_SCHEMA = BinaryTupleSchema.createRowSchema(SCHEMA_DESCRIPTOR); + + private static final BinaryTupleSchema PK_INDEX_SCHEMA = BinaryTupleSchema.createKeySchema(SCHEMA_DESCRIPTOR); + + private static final BinaryRowConverter PK_INDEX_BINARY_TUPLE_CONVERTER = new BinaryRowConverter(TUPLE_SCHEMA, PK_INDEX_SCHEMA); + + private static final int[] USER_INDEX_COLS = { + SCHEMA_DESCRIPTOR.column("INTVAL").schemaIndex(), + SCHEMA_DESCRIPTOR.column("STRVAL").schemaIndex() + }; + + private static final BinaryTupleSchema USER_INDEX_SCHEMA = BinaryTupleSchema.createSchema(SCHEMA_DESCRIPTOR, USER_INDEX_COLS); + + private static final BinaryRowConverter USER_INDEX_BINARY_TUPLE_CONVERTER = new BinaryRowConverter(TUPLE_SCHEMA, USER_INDEX_SCHEMA); + + /** Key-value marshaller for tests. */ + private static final KvMarshaller<TestKey, TestValue> KV_MARSHALLER + = MARSHALLER_FACTORY.create(SCHEMA_DESCRIPTOR, TestKey.class, TestValue.class); + + private static final UUID TX_ID = UUID.randomUUID(); + + private static final HybridClock CLOCK = new HybridClockImpl(); + + private TestHashIndexStorage pkInnerStorage; + private TestSortedIndexStorage sortedInnerStorage; + private TestHashIndexStorage hashInnerStorage; + private TestMvPartitionStorage storage; + private StorageUpdateHandler storageUpdateHandler; + + @BeforeEach + void setUp() { + UUID pkIndexId = UUID.randomUUID(); + UUID sortedIndexId = UUID.randomUUID(); + UUID hashIndexId = UUID.randomUUID(); + + pkInnerStorage = new TestHashIndexStorage(null); + + TableSchemaAwareIndexStorage pkStorage = new TableSchemaAwareIndexStorage( + pkIndexId, + pkInnerStorage, + PK_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + sortedInnerStorage = new TestSortedIndexStorage(new SortedIndexDescriptor(sortedIndexId, List.of( + new SortedIndexColumnDescriptor("INTVAL", NativeTypes.INT32, false, true), + new SortedIndexColumnDescriptor("STRVAL", NativeTypes.STRING, false, true) + ))); + + TableSchemaAwareIndexStorage sortedIndexStorage = new TableSchemaAwareIndexStorage( + sortedIndexId, + sortedInnerStorage, + USER_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + hashInnerStorage = new TestHashIndexStorage(new HashIndexDescriptor(hashIndexId, List.of( + new HashIndexColumnDescriptor("INTVAL", NativeTypes.INT32, false), + new HashIndexColumnDescriptor("STRVAL", NativeTypes.STRING, false) + ))); + + TableSchemaAwareIndexStorage hashIndexStorage = new TableSchemaAwareIndexStorage( + hashIndexId, + hashInnerStorage, + USER_INDEX_BINARY_TUPLE_CONVERTER::toTuple + ); + + storage = new TestMvPartitionStorage(1); + + storageUpdateHandler = new StorageUpdateHandler(1, new TestPartitionDataStorage(storage), + () -> Map.of( + pkIndexId, pkStorage, + sortedIndexId, sortedIndexStorage, + hashIndexId, hashIndexStorage + ) + ); + } + + @Test + void testRemoveStaleEntryWithSameIndex() { + UUID rowUuid = UUID.randomUUID(); + RowId rowId = new RowId(1, rowUuid); + + var key = new TestKey(1, "foo"); + var value = new TestValue(2, "bar"); + BinaryRow tableRow = binaryRow(key, value); + + addWrite(storageUpdateHandler, rowUuid, tableRow); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow); + commitWrite(rowId); + + assertEquals(2, getRowVersions(rowId).size()); + assertThat(pkInnerStorage.allRowsIds(), contains(rowId)); + assertThat(sortedInnerStorage.allRowsIds(), contains(rowId)); + assertThat(hashInnerStorage.allRowsIds(), contains(rowId)); + + assertTrue(storageUpdateHandler.vacuum(CLOCK.now())); + + assertEquals(1, getRowVersions(rowId).size()); + // Newer entry has the same index value, so it should not be removed. + assertTrue(inIndex(tableRow)); + } + + @Test + void testRemoveStaleEntriesWithDifferentIndexes() { + UUID rowUuid = UUID.randomUUID(); + RowId rowId = new RowId(1, rowUuid); + + var key1 = new TestKey(1, "foo"); + var value1 = new TestValue(2, "bar"); + BinaryRow tableRow1 = binaryRow(key1, value1); + + var key2 = new TestKey(1, "foo"); + var value2 = new TestValue(5, "baz"); + BinaryRow tableRow2 = binaryRow(key2, value2); + + addWrite(storageUpdateHandler, rowUuid, tableRow1); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow1); + commitWrite(rowId); + + addWrite(storageUpdateHandler, rowUuid, tableRow2); + commitWrite(rowId); + + assertEquals(3, getRowVersions(rowId).size()); + assertThat(pkInnerStorage.allRowsIds(), contains(rowId)); + assertThat(sortedInnerStorage.allRowsIds(), contains(rowId)); + assertThat(hashInnerStorage.allRowsIds(), contains(rowId)); + + HybridTimestamp afterCommits = CLOCK.now(); + + assertTrue(storageUpdateHandler.vacuum(afterCommits)); + assertTrue(storageUpdateHandler.vacuum(afterCommits)); + assertFalse(storageUpdateHandler.vacuum(afterCommits)); + + assertEquals(1, getRowVersions(rowId).size()); + // Older entries have different indexes, should be removed. + assertFalse(inIndex(tableRow1)); + assertTrue(inIndex(tableRow2)); + } + + @Test + void testRemoveTombstones() { Review Comment: I think you need to test the following scenarios: - null row row - row null row - row row null - current implementation ########## modules/table/src/test/java/org/apache/ignite/internal/table/distributed/IndexGcTest.java: ########## @@ -0,0 +1,340 @@ +/* + * 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.table.distributed; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.ignite.distributed.TestPartitionDataStorage; +import org.apache.ignite.internal.hlc.HybridClock; +import org.apache.ignite.internal.hlc.HybridClockImpl; +import org.apache.ignite.internal.hlc.HybridTimestamp; +import org.apache.ignite.internal.schema.BinaryRow; +import org.apache.ignite.internal.schema.BinaryRowConverter; +import org.apache.ignite.internal.schema.BinaryTuple; +import org.apache.ignite.internal.schema.BinaryTupleSchema; +import org.apache.ignite.internal.schema.Column; +import org.apache.ignite.internal.schema.NativeTypes; +import org.apache.ignite.internal.schema.SchemaDescriptor; +import org.apache.ignite.internal.schema.marshaller.KvMarshaller; +import org.apache.ignite.internal.schema.marshaller.MarshallerException; +import org.apache.ignite.internal.schema.marshaller.MarshallerFactory; +import org.apache.ignite.internal.schema.marshaller.reflection.ReflectionMarshallerFactory; +import org.apache.ignite.internal.storage.ReadResult; +import org.apache.ignite.internal.storage.RowId; +import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor; +import org.apache.ignite.internal.storage.index.HashIndexDescriptor.HashIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor; +import org.apache.ignite.internal.storage.index.SortedIndexDescriptor.SortedIndexColumnDescriptor; +import org.apache.ignite.internal.storage.index.impl.TestHashIndexStorage; +import org.apache.ignite.internal.storage.index.impl.TestSortedIndexStorage; +import org.apache.ignite.internal.table.distributed.replicator.TablePartitionId; +import org.apache.ignite.internal.util.Cursor; +import org.jetbrains.annotations.Nullable; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** Tests indexes cleaning up on garbage collection. */ +public class IndexGcTest { Review Comment: In this and `org.apache.ignite.internal.table.distributed.IndexCleanupTest` (which, by the way, you wrote) there are a lot of similar things, they should be combined, for example, to highlight an abstract class. -- 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]
