xtern commented on code in PR #5364: URL: https://github.com/apache/ignite-3/pull/5364#discussion_r1985178149
########## modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogStorageSerializationTest.java: ########## @@ -0,0 +1,431 @@ +/* + * 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.catalog.storage; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.ignite.internal.catalog.Catalog; +import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor; +import org.apache.ignite.internal.catalog.storage.serialization.UpdateLogMarshallerImpl; +import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; +import org.assertj.core.api.BDDAssertions; +import org.junit.jupiter.api.Test; + +/** + * Tests for catalog storage objects. + */ +public class CatalogStorageSerializationTest extends BaseIgniteAbstractTest { Review Comment: Maybe we should add the word "compatibility" so that people understand that they are breaking compatibility, for example `CatalogStorageCompatibilityTest` or `CatalogSerializationCompatibilityTest`? ########## modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogStorageSerializationTest.java: ########## @@ -0,0 +1,431 @@ +/* + * 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.catalog.storage; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; +import org.apache.ignite.internal.catalog.Catalog; +import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor; +import org.apache.ignite.internal.catalog.storage.serialization.UpdateLogMarshallerImpl; +import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest; +import org.assertj.core.api.BDDAssertions; +import org.junit.jupiter.api.Test; + +/** + * Tests for catalog storage objects. + */ +public class CatalogStorageSerializationTest extends BaseIgniteAbstractTest { + + private final TestDescriptorState state = new TestDescriptorState(42); + + @Test + public void snapshotEntry() { + List<CatalogZoneDescriptor> zones = TestCatalogObjectDescriptors.zones(state); + Catalog catalog1 = new Catalog( + 2367, + 5675344L, + 100, + zones, + TestCatalogObjectDescriptors.schemas(state), + zones.get(0).id() + ); + + SnapshotEntry expectedEntry = new SnapshotEntry(catalog1); + SnapshotEntry actualEntry = checkEntry(SnapshotEntry.class, "SnapshotEntry.bin"); + + assertEquals(expectedEntry.typeId(), actualEntry.typeId()); + BDDAssertions.assertThat(expectedEntry.snapshot()).usingRecursiveComparison().isEqualTo(actualEntry.snapshot()); + } + + @Test + public void snapshotEntryNoDefaultZone() { + Catalog catalog1 = new Catalog( + 789879, + 23432L, + 2343, + TestCatalogObjectDescriptors.zones(state), + TestCatalogObjectDescriptors.schemas(state), + null + ); + + SnapshotEntry expectedEntry = new SnapshotEntry(catalog1); + SnapshotEntry actualEntry = checkEntry(SnapshotEntry.class, "SnapshotEntryNoDefaultZone.bin"); + + assertEquals(expectedEntry.typeId(), actualEntry.typeId()); + BDDAssertions.assertThat(expectedEntry.snapshot()).usingRecursiveComparison().isEqualTo(actualEntry.snapshot()); + } + + @Test + public void objectIdUpdate() { + List<UpdateEntry> entries = List.of(new ObjectIdGenUpdateEntry(23431), new ObjectIdGenUpdateEntry(1204)); + List<UpdateEntry> actual = checkEntries(entries, "ObjectIdGenUpdateEntry.bin"); + + assertEquals(entries.size(), actual.size()); + for (int i = 0; i < entries.size(); i++) { + ObjectIdGenUpdateEntry expectedEntry = (ObjectIdGenUpdateEntry) entries.get(i); + ObjectIdGenUpdateEntry actualEntry = (ObjectIdGenUpdateEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + // Zones + + @Test + public void newZone() { + List<CatalogZoneDescriptor> zones = TestCatalogObjectDescriptors.zones(state); + List<UpdateEntry> entries = zones.stream().map(NewZoneEntry::new).collect(Collectors.toList()); + List<UpdateEntry> actual = checkEntries(entries, "NewZoneEntry.bin"); + + assertEquals(entries.size(), actual.size()); + for (int i = 0; i < entries.size(); i++) { + NewZoneEntry expectedEntry = (NewZoneEntry) entries.get(i); + NewZoneEntry actualEntry = (NewZoneEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void alterZone() { + List<CatalogZoneDescriptor> zones = TestCatalogObjectDescriptors.zones(state); + List<UpdateEntry> entries = List.of( + new AlterZoneEntry(zones.get(1)), + new AlterZoneEntry(zones.get(2)) + ); + + List<UpdateEntry> actual = checkEntries(entries, "AlterZoneEntry.bin"); + assertEquals(entries.size(), actual.size()); + for (int i = 0; i < entries.size(); i++) { + AlterZoneEntry expectedEntry = (AlterZoneEntry) entries.get(i); + AlterZoneEntry actualEntry = (AlterZoneEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void setDefaultZone() { + List<UpdateEntry> entries = List.of( + new SetDefaultZoneEntry(state.id()), + new SetDefaultZoneEntry(state.id()) + ); + List<UpdateEntry> actual = checkEntries(entries, "SetDefaultZoneEntry.bin"); + + assertEquals(entries.size(), actual.size()); + for (int i = 0; i < entries.size(); i++) { + SetDefaultZoneEntry expectedEntry = (SetDefaultZoneEntry) entries.get(i); + SetDefaultZoneEntry actualEntry = (SetDefaultZoneEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void dropZone() { + List<UpdateEntry> entries = List.of( + new DropZoneEntry(state.id()), + new DropZoneEntry(state.id()) + ); + + List<UpdateEntry> actual = checkEntries(entries, "DropZoneEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + DropZoneEntry expectedEntry = (DropZoneEntry) entries.get(i); + DropZoneEntry actualEntry = (DropZoneEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + // Schemas + + @Test + public void newSchema() { + List<UpdateEntry> entries = TestCatalogObjectDescriptors.schemas(state) + .stream() + .map(NewSchemaEntry::new) + .collect(Collectors.toList()); + + List<UpdateEntry> actual = checkEntries(entries, "NewSchemaEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + NewSchemaEntry expectedEntry = (NewSchemaEntry) entries.get(i); + NewSchemaEntry actualEntry = (NewSchemaEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void dropSchema() { + List<UpdateEntry> entries = List.of( + new DropSchemaEntry(state.id()), + new DropSchemaEntry(state.id()) + ); + + List<UpdateEntry> actual = checkEntries(entries, "DropSchemaEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + DropSchemaEntry expectedEntry = (DropSchemaEntry) entries.get(i); + DropSchemaEntry actualEntry = (DropSchemaEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + // Tables + + @Test + public void newTable() { + List<UpdateEntry> entries = TestCatalogObjectDescriptors.tables(state) + .stream() + .map(NewTableEntry::new) + .collect(Collectors.toList()); + + List<UpdateEntry> actual = checkEntries(entries, "NewTableEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + NewTableEntry expectedEntry = (NewTableEntry) entries.get(i); + NewTableEntry actualEntry = (NewTableEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void renameTable() { + List<UpdateEntry> entries = List.of( + new RenameTableEntry(state.id(), "NEW_NAME1"), + new RenameTableEntry(state.id(), "NEW_NAME2") + ); + + List<UpdateEntry> actual = checkEntries(entries, "RenameTableEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + RenameTableEntry expectedEntry = (RenameTableEntry) entries.get(i); + RenameTableEntry actualEntry = (RenameTableEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + @Test + public void dropTable() { + List<UpdateEntry> entries = List.of( + new DropTableEntry(state.id()), + new DropTableEntry(state.id()) + ); + + List<UpdateEntry> actual = checkEntries(entries, "DropTableEntry.bin"); + assertEquals(entries.size(), actual.size()); + + for (int i = 0; i < entries.size(); i++) { + DropTableEntry expectedEntry = (DropTableEntry) entries.get(i); + DropTableEntry actualEntry = (DropTableEntry) actual.get(i); + + BDDAssertions.assertThat(actualEntry).as("entry#" + i).usingRecursiveComparison().isEqualTo(expectedEntry); + } + } + + // Columns + + // Indexes Review Comment: Not sure that we need such comments (they all looks redundant) -- 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-unsubscr...@ignite.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
