You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/07/06 14:22:52 UTC

[ignite-3] branch ignite-19924 created (now c8ddb1e759)

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-19924
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


      at c8ddb1e759 Test shouldn't guess id of newly created catalog object.

This branch includes the following new commits:

     new c8ddb1e759 Test shouldn't guess id of newly created catalog object.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[ignite-3] 01/01: Test shouldn't guess id of newly created catalog object.

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-19924
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit c8ddb1e7597c8b32aa641246779913473aae6d0c
Author: amashenkov <an...@gmail.com>
AuthorDate: Thu Jul 6 15:29:11 2023 +0300

    Test shouldn't guess id of newly created catalog object.
---
 .../internal/catalog/CatalogServiceImpl.java       |   6 +-
 .../internal/catalog/CatalogServiceSelfTest.java   | 207 ++++++++++-----------
 2 files changed, 106 insertions(+), 107 deletions(-)

diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogServiceImpl.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogServiceImpl.java
index 22d3563dc5..6b358d683f 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogServiceImpl.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogServiceImpl.java
@@ -148,18 +148,18 @@ public class CatalogServiceImpl extends Producer<CatalogEvent, CatalogEventParam
 
     @Override
     public void start() {
-        int objectIdGen = 0;
+        int objectIdGen = 1;
 
         // TODO: IGNITE-19082 Move default schema objects initialization to cluster init procedure.
         CatalogSchemaDescriptor schemaPublic = new CatalogSchemaDescriptor(
-                objectIdGen++,
+                0,
                 DEFAULT_SCHEMA_NAME,
                 new CatalogTableDescriptor[0],
                 new CatalogIndexDescriptor[0]
         );
 
         CatalogZoneDescriptor defaultZone = new CatalogZoneDescriptor(
-                objectIdGen++,
+                0,
                 DEFAULT_ZONE_NAME,
                 25,
                 1,
diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogServiceSelfTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogServiceSelfTest.java
index b2326f0142..3b00451bc7 100644
--- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogServiceSelfTest.java
+++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogServiceSelfTest.java
@@ -31,6 +31,7 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -77,6 +78,7 @@ import org.apache.ignite.internal.catalog.commands.DropZoneParams;
 import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
 import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
 import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
@@ -180,26 +182,25 @@ public class CatalogServiceSelfTest {
 
     @Test
     public void testEmptyCatalog() {
-        assertNotNull(service.activeSchema(clock.nowLong()));
-        assertNotNull(service.schema(0));
+        CatalogSchemaDescriptor schema = service.schema(DEFAULT_SCHEMA_NAME, 0);
+
+        assertNotNull(schema);
+        assertSame(schema, service.activeSchema(DEFAULT_SCHEMA_NAME, clock.nowLong()));
+        assertSame(schema, service.schema(0));
+        assertSame(schema, service.activeSchema(clock.nowLong()));
 
         assertNull(service.schema(1));
         assertThrows(IllegalStateException.class, () -> service.activeSchema(-1L));
 
-        assertNull(service.table(0, clock.nowLong()));
-        assertNull(service.index(0, clock.nowLong()));
-
-        CatalogSchemaDescriptor schema = service.schema(0);
-        assertEquals(SCHEMA_NAME, schema.name());
-
+        // Validate default schema.
+        assertEquals(DEFAULT_SCHEMA_NAME, schema.name());
         assertEquals(0, schema.id());
         assertEquals(0, schema.tables().length);
         assertEquals(0, schema.indexes().length);
 
-        CatalogZoneDescriptor zone = service.zone(1, clock.nowLong());
+        // Default distribution zone must exists.
+        CatalogZoneDescriptor zone = service.zone(DEFAULT_ZONE_NAME, clock.nowLong());
         assertEquals(DEFAULT_ZONE_NAME, zone.name());
-
-        assertEquals(1, zone.id());
         assertEquals(CreateZoneParams.DEFAULT_PARTITION_COUNT, zone.partitions());
         assertEquals(CreateZoneParams.DEFAULT_REPLICA_COUNT, zone.replicas());
         assertEquals(CreateZoneParams.DEFAULT_FILTER, zone.filter());
@@ -223,52 +224,42 @@ public class CatalogServiceSelfTest {
                 .colocationColumns(List.of("key2"))
                 .build();
 
-        CompletableFuture<Void> fut = service.createTable(params);
-
-        assertThat(fut, willBe(nullValue()));
+        assertThat(service.createTable(params), willBe(nullValue()));
 
         // Validate catalog version from the past.
         CatalogSchemaDescriptor schema = service.schema(0);
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
         assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(0L));
         assertSame(schema, service.activeSchema(123L));
 
         assertNull(schema.table(TABLE_NAME));
         assertNull(service.table(TABLE_NAME, 123L));
-        assertNull(service.table(1, 123L));
         assertNull(service.index(createPkIndexName(TABLE_NAME), 123L));
-        assertNull(service.index(2, 123L));
 
         // Validate actual catalog
-        schema = service.schema(1);
+        schema = service.schema(SCHEMA_NAME, 1);
+        CatalogTableDescriptor table = schema.table(TABLE_NAME);
+        CatalogHashIndexDescriptor pkIndex = (CatalogHashIndexDescriptor) schema.index(createPkIndexName(TABLE_NAME));
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
         assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(clock.nowLong()));
 
-        assertSame(schema.table(TABLE_NAME), service.table(TABLE_NAME, clock.nowLong()));
-        assertSame(schema.table(TABLE_NAME), service.table(2, clock.nowLong()));
+        assertSame(table, service.table(TABLE_NAME, clock.nowLong()));
+        assertSame(table, service.table(table.id(), clock.nowLong()));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(createPkIndexName(TABLE_NAME), clock.nowLong()));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(3, clock.nowLong()));
+        assertSame(pkIndex, service.index(createPkIndexName(TABLE_NAME), clock.nowLong()));
+        assertSame(pkIndex, service.index(pkIndex.id(), clock.nowLong()));
 
         // Validate newly created table
-        CatalogTableDescriptor table = schema.table(TABLE_NAME);
-
-        assertEquals(2L, table.id());
         assertEquals(TABLE_NAME, table.name());
-        assertEquals(1L, table.zoneId());
+        assertEquals(service.zone(ZONE_NAME, clock.nowLong()).id(), table.zoneId());
 
         // Validate newly created pk index
-        CatalogHashIndexDescriptor pkIndex = (CatalogHashIndexDescriptor) schema.index(createPkIndexName(TABLE_NAME));
-
-        assertEquals(3L, pkIndex.id());
         assertEquals(createPkIndexName(TABLE_NAME), pkIndex.name());
-        assertEquals(2L, pkIndex.tableId());
+        assertEquals(table.id(), pkIndex.tableId());
         assertEquals(table.primaryKeyColumns(), pkIndex.columns());
         assertTrue(pkIndex.unique());
 
@@ -277,26 +268,29 @@ public class CatalogServiceSelfTest {
 
         // Validate actual catalog has both tables.
         schema = service.schema(2);
+        table = schema.table(TABLE_NAME);
+        pkIndex = (CatalogHashIndexDescriptor) schema.index(createPkIndexName(TABLE_NAME));
+        CatalogTableDescriptor table2 = schema.table(TABLE_NAME_2);
+        CatalogHashIndexDescriptor pkIndex2 = (CatalogHashIndexDescriptor) schema.index(createPkIndexName(TABLE_NAME_2));
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
         assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(clock.nowLong()));
 
-        assertSame(schema.table(TABLE_NAME), service.table(TABLE_NAME, clock.nowLong()));
-        assertSame(schema.table(TABLE_NAME), service.table(2, clock.nowLong()));
+        assertSame(table, service.table(TABLE_NAME, clock.nowLong()));
+        assertSame(table, service.table(table.id(), clock.nowLong()));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(createPkIndexName(TABLE_NAME), clock.nowLong()));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(3, clock.nowLong()));
+        assertSame(pkIndex, service.index(createPkIndexName(TABLE_NAME), clock.nowLong()));
+        assertSame(pkIndex, service.index(pkIndex.id(), clock.nowLong()));
 
-        assertSame(schema.table(TABLE_NAME_2), service.table(TABLE_NAME_2, clock.nowLong()));
-        assertSame(schema.table(TABLE_NAME_2), service.table(4, clock.nowLong()));
+        assertSame(table2, service.table(TABLE_NAME_2, clock.nowLong()));
+        assertSame(table2, service.table(table2.id(), clock.nowLong()));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(createPkIndexName(TABLE_NAME_2), clock.nowLong()));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(5, clock.nowLong()));
+        assertSame(pkIndex2, service.index(createPkIndexName(TABLE_NAME_2), clock.nowLong()));
+        assertSame(pkIndex2, service.index(pkIndex2.id(), clock.nowLong()));
 
-        assertNotSame(schema.table(TABLE_NAME), schema.table(TABLE_NAME_2));
-        assertNotSame(schema.index(createPkIndexName(TABLE_NAME)), schema.index(createPkIndexName(TABLE_NAME_2)));
+        assertNotSame(table, table2);
+        assertNotSame(pkIndex, pkIndex2);
 
         // Try to create another table with same name.
         assertThat(service.createTable(simpleTable(TABLE_NAME_2)), willThrowFast(TableAlreadyExistsException.class));
@@ -336,45 +330,50 @@ public class CatalogServiceSelfTest {
 
         // Validate catalog version from the past.
         CatalogSchemaDescriptor schema = service.schema(2);
+        CatalogTableDescriptor table1 = schema.table(TABLE_NAME);
+        CatalogTableDescriptor table2 = schema.table(TABLE_NAME_2);
+        CatalogIndexDescriptor pkIndex1 = schema.index(createPkIndexName(TABLE_NAME));
+        CatalogIndexDescriptor pkIndex2 = schema.index(createPkIndexName(TABLE_NAME_2));
+
+        assertNotEquals(table1.id(), table2.id());
+        assertNotEquals(pkIndex1.id(), pkIndex2.id());
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
         assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(beforeDropTimestamp));
 
-        assertSame(schema.table(TABLE_NAME), service.table(TABLE_NAME, beforeDropTimestamp));
-        assertSame(schema.table(TABLE_NAME), service.table(2, beforeDropTimestamp));
+        assertSame(table1, service.table(TABLE_NAME, beforeDropTimestamp));
+        assertSame(table1, service.table(table1.id(), beforeDropTimestamp));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(createPkIndexName(TABLE_NAME), beforeDropTimestamp));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME)), service.index(3, beforeDropTimestamp));
+        assertSame(pkIndex1, service.index(createPkIndexName(TABLE_NAME), beforeDropTimestamp));
+        assertSame(pkIndex1, service.index(pkIndex1.id(), beforeDropTimestamp));
 
-        assertSame(schema.table(TABLE_NAME_2), service.table(TABLE_NAME_2, beforeDropTimestamp));
-        assertSame(schema.table(TABLE_NAME_2), service.table(4, beforeDropTimestamp));
+        assertSame(table2, service.table(TABLE_NAME_2, beforeDropTimestamp));
+        assertSame(table2, service.table(table2.id(), beforeDropTimestamp));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(createPkIndexName(TABLE_NAME_2), beforeDropTimestamp));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(5, beforeDropTimestamp));
+        assertSame(pkIndex2, service.index(createPkIndexName(TABLE_NAME_2), beforeDropTimestamp));
+        assertSame(pkIndex2, service.index(pkIndex2.id(), beforeDropTimestamp));
 
         // Validate actual catalog
         schema = service.schema(3);
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
         assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(clock.nowLong()));
 
         assertNull(schema.table(TABLE_NAME));
         assertNull(service.table(TABLE_NAME, clock.nowLong()));
-        assertNull(service.table(2, clock.nowLong()));
+        assertNull(service.table(table1.id(), clock.nowLong()));
 
         assertNull(schema.index(createPkIndexName(TABLE_NAME)));
         assertNull(service.index(createPkIndexName(TABLE_NAME), clock.nowLong()));
-        assertNull(service.index(3, clock.nowLong()));
+        assertNull(service.index(pkIndex1.id(), clock.nowLong()));
 
-        assertSame(schema.table(TABLE_NAME_2), service.table(TABLE_NAME_2, clock.nowLong()));
-        assertSame(schema.table(TABLE_NAME_2), service.table(4, clock.nowLong()));
+        assertSame(table2, service.table(TABLE_NAME_2, clock.nowLong()));
+        assertSame(table2, service.table(table2.id(), clock.nowLong()));
 
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(createPkIndexName(TABLE_NAME_2), clock.nowLong()));
-        assertSame(schema.index(createPkIndexName(TABLE_NAME_2)), service.index(5, clock.nowLong()));
+        assertSame(pkIndex2, service.index(createPkIndexName(TABLE_NAME_2), clock.nowLong()));
+        assertSame(pkIndex2, service.index(pkIndex2.id(), clock.nowLong()));
 
         // Try to drop table once again.
         assertThat(service.dropTable(dropTableParams), willThrowFast(TableNotFoundException.class));
@@ -972,6 +971,7 @@ public class CatalogServiceSelfTest {
     @Test
     public void testDropTableWithIndex() {
         CreateHashIndexParams params = CreateHashIndexParams.builder()
+                .schemaName(SCHEMA_NAME)
                 .indexName(INDEX_NAME)
                 .tableName(TABLE_NAME)
                 .columns(List.of("VAL"))
@@ -982,39 +982,39 @@ public class CatalogServiceSelfTest {
 
         long beforeDropTimestamp = clock.nowLong();
 
-        DropTableParams dropTableParams = DropTableParams.builder().schemaName("PUBLIC").tableName(TABLE_NAME).build();
+        DropTableParams dropTableParams = DropTableParams.builder().schemaName(SCHEMA_NAME).tableName(TABLE_NAME).build();
 
         assertThat(service.dropTable(dropTableParams), willBe(nullValue()));
 
         // Validate catalog version from the past.
         CatalogSchemaDescriptor schema = service.schema(2);
+        CatalogTableDescriptor table = schema.table(TABLE_NAME);
+        CatalogIndexDescriptor index = schema.index(INDEX_NAME);
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
-        assertEquals(DEFAULT_SCHEMA_NAME, schema.name());
+        assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(beforeDropTimestamp));
 
-        assertSame(schema.table(TABLE_NAME), service.table(TABLE_NAME, beforeDropTimestamp));
-        assertSame(schema.table(TABLE_NAME), service.table(2, beforeDropTimestamp));
+        assertSame(table, service.table(TABLE_NAME, beforeDropTimestamp));
+        assertSame(table, service.table(table.id(), beforeDropTimestamp));
 
-        assertSame(schema.index(INDEX_NAME), service.index(INDEX_NAME, beforeDropTimestamp));
-        assertSame(schema.index(INDEX_NAME), service.index(4, beforeDropTimestamp));
+        assertSame(index, service.index(INDEX_NAME, beforeDropTimestamp));
+        assertSame(index, service.index(index.id(), beforeDropTimestamp));
 
         // Validate actual catalog
         schema = service.schema(3);
 
         assertNotNull(schema);
-        assertEquals(0, schema.id());
-        assertEquals(DEFAULT_SCHEMA_NAME, schema.name());
+        assertEquals(SCHEMA_NAME, schema.name());
         assertSame(schema, service.activeSchema(clock.nowLong()));
 
         assertNull(schema.table(TABLE_NAME));
         assertNull(service.table(TABLE_NAME, clock.nowLong()));
-        assertNull(service.table(2, clock.nowLong()));
+        assertNull(service.table(table.id(), clock.nowLong()));
 
         assertNull(schema.index(INDEX_NAME));
         assertNull(service.index(INDEX_NAME, clock.nowLong()));
-        assertNull(service.index(3, clock.nowLong()));
+        assertNull(service.index(index.id(), clock.nowLong()));
     }
 
     @Test
@@ -1022,6 +1022,7 @@ public class CatalogServiceSelfTest {
         assertThat(service.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
         CreateHashIndexParams params = CreateHashIndexParams.builder()
+                .schemaName(SCHEMA_NAME)
                 .indexName(INDEX_NAME)
                 .tableName(TABLE_NAME)
                 .columns(List.of("VAL", "ID"))
@@ -1035,20 +1036,17 @@ public class CatalogServiceSelfTest {
         assertNotNull(schema);
         assertNull(schema.index(INDEX_NAME));
         assertNull(service.index(INDEX_NAME, 123L));
-        assertNull(service.index(4, 123L));
 
         // Validate actual catalog
         schema = service.schema(2);
 
+        CatalogHashIndexDescriptor index = (CatalogHashIndexDescriptor) schema.index(INDEX_NAME);
+
         assertNotNull(schema);
-        assertNull(service.index(1, clock.nowLong()));
-        assertSame(schema.index(INDEX_NAME), service.index(INDEX_NAME, clock.nowLong()));
-        assertSame(schema.index(INDEX_NAME), service.index(4, clock.nowLong()));
+        assertSame(index, service.index(INDEX_NAME, clock.nowLong()));
+        assertSame(index, service.index(index.id(), clock.nowLong()));
 
         // Validate newly created hash index
-        CatalogHashIndexDescriptor index = (CatalogHashIndexDescriptor) schema.index(INDEX_NAME);
-
-        assertEquals(4L, index.id());
         assertEquals(INDEX_NAME, index.name());
         assertEquals(schema.table(TABLE_NAME).id(), index.tableId());
         assertEquals(List.of("VAL", "ID"), index.columns());
@@ -1061,6 +1059,7 @@ public class CatalogServiceSelfTest {
         assertThat(service.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
         CreateSortedIndexParams params = CreateSortedIndexParams.builder()
+                .schemaName(SCHEMA_NAME)
                 .indexName(INDEX_NAME)
                 .tableName(TABLE_NAME)
                 .unique()
@@ -1081,15 +1080,13 @@ public class CatalogServiceSelfTest {
         // Validate actual catalog
         schema = service.schema(2);
 
+        CatalogSortedIndexDescriptor index = (CatalogSortedIndexDescriptor) schema.index(INDEX_NAME);
+
         assertNotNull(schema);
-        assertNull(service.index(1, clock.nowLong()));
-        assertSame(schema.index(INDEX_NAME), service.index(INDEX_NAME, clock.nowLong()));
-        assertSame(schema.index(INDEX_NAME), service.index(4, clock.nowLong()));
+        assertSame(index, service.index(INDEX_NAME, clock.nowLong()));
+        assertSame(index, service.index(index.id(), clock.nowLong()));
 
         // Validate newly created sorted index
-        CatalogSortedIndexDescriptor index = (CatalogSortedIndexDescriptor) schema.index(INDEX_NAME);
-
-        assertEquals(4L, index.id());
         assertEquals(INDEX_NAME, index.name());
         assertEquals(schema.table(TABLE_NAME).id(), index.tableId());
         assertEquals("VAL", index.columns().get(0).name());
@@ -1253,7 +1250,7 @@ public class CatalogServiceSelfTest {
     @Test
     public void testCreateIndexEvents() {
         CreateTableParams createTableParams = CreateTableParams.builder()
-                .schemaName(DEFAULT_SCHEMA_NAME)
+                .schemaName(SCHEMA_NAME)
                 .tableName(TABLE_NAME)
                 .zone(ZONE_NAME)
                 .columns(List.of(
@@ -1268,7 +1265,7 @@ public class CatalogServiceSelfTest {
         DropTableParams dropTableparams = DropTableParams.builder().tableName(TABLE_NAME).build();
 
         CreateHashIndexParams createIndexParams = CreateHashIndexParams.builder()
-                .schemaName(DEFAULT_SCHEMA_NAME)
+                .schemaName(SCHEMA_NAME)
                 .indexName(INDEX_NAME)
                 .tableName(TABLE_NAME)
                 .columns(List.of("key2"))
@@ -1337,10 +1334,9 @@ public class CatalogServiceSelfTest {
         CatalogZoneDescriptor zone = service.zone(zoneName, clock.nowLong());
 
         assertNotNull(zone);
-        assertSame(zone, service.zone(2, clock.nowLong()));
+        assertSame(zone, service.zone(zone.id(), clock.nowLong()));
 
         // Validate newly created zone
-        assertEquals(2L, zone.id());
         assertEquals(zoneName, zone.name());
         assertEquals(42, zone.partitions());
         assertEquals(15, zone.replicas());
@@ -1375,13 +1371,12 @@ public class CatalogServiceSelfTest {
 
         assertNotNull(zone);
         assertEquals(zoneName, zone.name());
-        assertEquals(2, zone.id());
 
-        assertSame(zone, service.zone(2, beforeDropTimestamp));
+        assertSame(zone, service.zone(zone.id(), beforeDropTimestamp));
 
         // Validate actual catalog
         assertNull(service.zone(zoneName, clock.nowLong()));
-        assertNull(service.zone(2, clock.nowLong()));
+        assertNull(service.zone(zone.id(), clock.nowLong()));
 
         // Try to drop non-existing zone.
         assertThat(service.dropDistributionZone(params), willThrow(DistributionZoneNotFoundException.class));
@@ -1417,9 +1412,8 @@ public class CatalogServiceSelfTest {
 
         assertNotNull(zone);
         assertEquals(zoneName, zone.name());
-        assertEquals(2, zone.id());
 
-        assertSame(zone, service.zone(2, beforeDropTimestamp));
+        assertSame(zone, service.zone(zone.id(), beforeDropTimestamp));
 
         // Validate actual catalog
         zone = service.zone(newZoneName, clock.nowLong());
@@ -1427,9 +1421,8 @@ public class CatalogServiceSelfTest {
         assertNotNull(zone);
         assertNull(service.zone(zoneName, clock.nowLong()));
         assertEquals(newZoneName, zone.name());
-        assertEquals(2, zone.id());
 
-        assertSame(zone, service.zone(2, clock.nowLong()));
+        assertSame(zone, service.zone(zone.id(), clock.nowLong()));
     }
 
     @Test
@@ -1497,10 +1490,9 @@ public class CatalogServiceSelfTest {
         // Validate actual catalog
         CatalogZoneDescriptor zone = service.zone(zoneName, clock.nowLong());
         assertNotNull(zone);
-        assertSame(zone, service.zone(2, clock.nowLong()));
+        assertSame(zone, service.zone(zone.id(), clock.nowLong()));
 
         assertEquals(zoneName, zone.name());
-        assertEquals(2, zone.id());
         assertEquals(10, zone.partitions());
         assertEquals(2, zone.replicas());
         assertEquals(Integer.MAX_VALUE, zone.dataNodesAutoAdjust());
@@ -1534,10 +1526,9 @@ public class CatalogServiceSelfTest {
         CatalogZoneDescriptor zone = service.zone(zoneName, clock.nowLong());
 
         assertNotNull(zone);
-        assertSame(zone, service.zone(2, clock.nowLong()));
-        assertNull(service.zone(3, clock.nowLong()));
+        assertSame(zone, service.zone(zoneName, clock.nowLong()));
+        assertSame(zone, service.zone(zone.id(), clock.nowLong()));
 
-        assertEquals(2L, zone.id());
         assertEquals(zoneName, zone.name());
         assertEquals(42, zone.partitions());
         assertEquals(15, zone.replicas());
@@ -1685,8 +1676,10 @@ public class CatalogServiceSelfTest {
     void testGetTableByIdAndCatalogVersion() {
         assertThat(service.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
-        assertNull(service.table(2, 0));
-        assertNotNull(service.table(2, 1));
+        CatalogTableDescriptor table = service.table(TABLE_NAME, clock.nowLong());
+
+        assertNull(service.table(table.id(), 0));
+        assertSame(table, service.table(table.id(), 1));
     }
 
     @Test
@@ -1705,6 +1698,12 @@ public class CatalogServiceSelfTest {
                 willBe(nullValue())
         );
 
+        int tableId = service.table(TABLE_NAME, clock.nowLong()).id();
+        int pkIndexId = service.index(createPkIndexName(TABLE_NAME), clock.nowLong()).id();
+        int indexId = service.index(INDEX_NAME, clock.nowLong()).id();
+
+        assertNotEquals(tableId, indexId);
+
         EventListener<CatalogEventParameters> eventListener = mock(EventListener.class);
 
         ArgumentCaptor<DropIndexEventParameters> captor = ArgumentCaptor.forClass(DropIndexEventParameters.class);
@@ -1721,8 +1720,8 @@ public class CatalogServiceSelfTest {
 
         DropIndexEventParameters eventParameters = captor.getValue();
 
-        assertEquals(4L, eventParameters.indexId());
-        assertEquals(2L, eventParameters.tableId());
+        assertEquals(indexId, eventParameters.indexId());
+        assertEquals(tableId, eventParameters.tableId());
 
         // Let's delete the table.
         assertThat(
@@ -1733,8 +1732,8 @@ public class CatalogServiceSelfTest {
         // Let's make sure that the PK index has been deleted.
         eventParameters = captor.getValue();
 
-        assertEquals(3L, eventParameters.indexId());
-        assertEquals(2L, eventParameters.tableId());
+        assertEquals(pkIndexId, eventParameters.indexId());
+        assertEquals(tableId, eventParameters.tableId());
     }
 
     @Test