Tests fix #1

src/main/java/com/mfvanek/pg/index/maintenance/IndexMaintenanceImpl.java

@@ -71,8 +71,8 @@ public class IndexMaintenanceImpl implements IndexMaintenance {
                     "             join pg_catalog.pg_index i on i.indrelid = c.conrelid and (c.conkey::int[] <@ i.indkey::int[])\n" +
                     "    where c.contype = 'f'\n" +
                     ")\n" +
-                    "select psui.relname as table_name,\n" +
-                    "    psui.indexrelname as index_name,\n" +
+                    "select psui.relid::regclass::text as table_name,\n" +
+                    "    psui.indexrelid::regclass::text as index_name,\n" +
                     "    pg_relation_size(i.indexrelid) as index_size,\n" +
                     "    psui.idx_scan as index_scans\n" +
                     "from pg_catalog.pg_stat_user_indexes psui\n" +

src/main/java/com/mfvanek/pg/utils/QueryExecutor.java

@@ -52,7 +52,7 @@ public static <T> List<T> executeQuery(@Nonnull final PgConnection pgConnection,
                                            @Nonnull final PgContext pgContext,
                                            @Nonnull final String sqlQuery,
                                            @Nonnull final ResultSetExtractor<T> rse) {
-        LOGGER.debug("Executing query: {}", sqlQuery);
+        LOGGER.debug("Executing query with context {}: {}", pgContext, sqlQuery);
         try (Connection connection = pgConnection.getDataSource().getConnection();
              PreparedStatement statement = connection.prepareStatement(Objects.requireNonNull(sqlQuery))) {
             statement.setString(1, pgContext.getSchemaName());

src/main/resources/sql/unused_indexes.sql

@@ -5,8 +5,8 @@ with foreign_key_indexes as (
              join pg_catalog.pg_index i on i.indrelid = c.conrelid and (c.conkey::int[] <@ i.indkey::int[])
     where c.contype = 'f'
 )
-select psui.relname as table_name,
-    psui.indexrelname as index_name,
+select psui.relid::regclass::text as table_name,
+    psui.indexrelid::regclass::text as index_name,
     pg_relation_size(i.indexrelid) as index_size,
     psui.idx_scan as index_scans
 from pg_catalog.pg_stat_user_indexes psui

src/test/java/com/mfvanek/pg/index/health/IndexesHealthImplTestBase.java

@@ -275,7 +275,7 @@ void getTablesWithMissingIndexesOnDatabaseWithThem(final String schemaName) {
         executeTestOnDatabase(schemaName,
                 dbp -> dbp.withReferences().withData(),
                 ctx -> {
-                    tryToFindAccountByClientId(schemaName, AMOUNT_OF_TRIES);
+                    tryToFindAccountByClientId(schemaName);
                     final var tables = indexesHealth.getTablesWithMissingIndexes(ctx);
                     assertNotNull(tables);
                     assertThat(tables, hasSize(1));
@@ -356,8 +356,7 @@ void shouldResetCounters(final String schemaName) {
         executeTestOnDatabase(schemaName,
                 dbp -> dbp.withReferences().withData(),
                 ctx -> {
-                    tryToFindAccountByClientId(schemaName, AMOUNT_OF_TRIES);
-                    waitForStatisticsCollector();
+                    tryToFindAccountByClientId(schemaName);
                     assertThat(getSeqScansForAccounts(ctx), greaterThanOrEqualTo(AMOUNT_OF_TRIES));
                     indexesHealth.resetStatistics();
                     waitForStatisticsCollector();

src/test/java/com/mfvanek/pg/index/maintenance/IndexMaintenanceImplTestBase.java

@@ -318,10 +318,10 @@ void getTablesWithMissingIndexesOnDatabaseWithThem(final String schemaName) {
         executeTestOnDatabase(schemaName,
                 dbp -> dbp.withReferences().withData(),
                 ctx -> {
-                    tryToFindAccountByClientId(schemaName, AMOUNT_OF_TRIES);
+                    tryToFindAccountByClientId(schemaName);
                     var tables = indexMaintenance.getTablesWithMissingIndexes(ctx);
                     assertNotNull(tables);
-                    assertEquals(1, tables.size());
+                    assertThat(tables, hasSize(1));
                     var table = tables.get(0);
                     if (isDefaultSchema(schemaName)) {
                         assertEquals("accounts", table.getTableName());

src/test/java/com/mfvanek/pg/index/maintenance/StatisticsMaintenanceImplTestBase.java

@@ -42,7 +42,7 @@ void shouldResetCounters(final String schemaName) {
         executeTestOnDatabase(schemaName,
                 dbp -> dbp.withReferences().withData(),
                 ctx -> {
-                    tryToFindAccountByClientId(schemaName, AMOUNT_OF_TRIES);
+                    tryToFindAccountByClientId(schemaName);
                     final PgContext pgContext = PgContext.of(schemaName);
                     assertThat(getSeqScansForAccounts(pgContext), greaterThanOrEqualTo(AMOUNT_OF_TRIES));
                     statisticsMaintenance.resetStatistics();

src/test/java/com/mfvanek/pg/utils/DatabaseAwareTestBase.java

@@ -97,14 +97,14 @@ protected boolean isDefaultSchema(@Nonnull final String schemaName) {
         return "public".equals(schemaName);
     }
 
-    protected void tryToFindAccountByClientId(@Nonnull final String schemaName,
-                                              final long amountOfTries) {
+    protected void tryToFindAccountByClientId(@Nonnull final String schemaName) {
         try (Connection connection = dataSource.getConnection();
              Statement statement = connection.createStatement()) {
-            for (int counter = 0; counter < amountOfTries; ++counter) {
+            for (int counter = 0; counter < AMOUNT_OF_TRIES; ++counter) {
                 statement.execute(String.format(
                         "select count(*) from %s.accounts where client_id = 1::bigint", schemaName));
             }
+            waitForStatisticsCollector();
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }