remove unused tableManager (#4)

This commit is contained in:
Jia-Xuan Liu
2022-05-17 11:25:08 +08:00
committed by GitHub
parent 1ad3156e15
commit b16af0766e
23 changed files with 44 additions and 170 deletions
@@ -68,26 +68,26 @@ public class PgCatalogTableManager
private Map<String, PgCatalogTable> initTables()
{
return ImmutableMap.<String, PgCatalogTable>builder()
.put(PgAmTable.NAME, new PgAmTable(this))
.put(PgAttrdefTable.NAME, new PgAttrdefTable(this))
.put(PgAttributeTable.NAME, new PgAttributeTable(this))
.put(PgClassTable.NAME, new PgClassTable(this))
.put(PgConstraintTable.NAME, new PgConstraintTable(this))
.put(PgDatabaseTable.NAME, new PgDatabaseTable(this))
.put(PgDescriptionTable.NAME, new PgDescriptionTable(this))
.put(PgEnumTable.NAME, new PgEnumTable(this))
.put(PgIndexTable.NAME, new PgIndexTable(this))
.put(PgNamespaceTable.NAME, new PgNamespaceTable(this))
.put(PgProcTable.NAME, new PgProcTable(this))
.put(PgRangeTable.NAME, new PgRangeTable(this))
.put(PgRolesTable.NAME, new PgRolesTable(this))
.put(PgSettingsTable.NAME, new PgSettingsTable(this))
.put(PgTablespaceTable.NAME, new PgTablespaceTable(this))
.put(PgTypeTable.NAME, new PgTypeTable(this))
.put(CharacterSets.NAME, new CharacterSets(this))
.put(ReferentialConstraints.NAME, new ReferentialConstraints(this))
.put(KeyColumnUsage.NAME, new KeyColumnUsage(this))
.put(TableConstraints.NAME, new TableConstraints(this))
.put(PgAmTable.NAME, new PgAmTable())
.put(PgAttrdefTable.NAME, new PgAttrdefTable())
.put(PgAttributeTable.NAME, new PgAttributeTable())
.put(PgClassTable.NAME, new PgClassTable())
.put(PgConstraintTable.NAME, new PgConstraintTable())
.put(PgDatabaseTable.NAME, new PgDatabaseTable())
.put(PgDescriptionTable.NAME, new PgDescriptionTable())
.put(PgEnumTable.NAME, new PgEnumTable())
.put(PgIndexTable.NAME, new PgIndexTable())
.put(PgNamespaceTable.NAME, new PgNamespaceTable())
.put(PgProcTable.NAME, new PgProcTable())
.put(PgRangeTable.NAME, new PgRangeTable())
.put(PgRolesTable.NAME, new PgRolesTable())
.put(PgSettingsTable.NAME, new PgSettingsTable())
.put(PgTablespaceTable.NAME, new PgTablespaceTable())
.put(PgTypeTable.NAME, new PgTypeTable())
.put(CharacterSets.NAME, new CharacterSets())
.put(ReferentialConstraints.NAME, new ReferentialConstraints())
.put(KeyColumnUsage.NAME, new KeyColumnUsage())
.put(TableConstraints.NAME, new TableConstraints())
.build();
}
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -25,13 +24,8 @@ public class CharacterSets
{
public static final String NAME = "character_sets";
public CharacterSets(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("character_set_catalog", VARCHAR, "null")
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.VarcharType.VARCHAR;
@@ -24,13 +23,8 @@ public class KeyColumnUsage
{
public static final String NAME = "key_column_usage";
public KeyColumnUsage(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return PgCatalogTableUtils.table(NAME)
.column("constraint_catalog", VARCHAR)
@@ -13,7 +13,6 @@
*/
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -31,13 +30,8 @@ public class PgAmTable
{
public static final String NAME = "pg_am";
public PgAmTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -31,13 +30,8 @@ public class PgAttrdefTable
{
public static final String NAME = "pg_attrdef";
public PgAttrdefTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -13,7 +13,6 @@
*/
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -33,13 +32,8 @@ public class PgAttributeTable
{
public static final String NAME = "pg_attribute";
public PgAttributeTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("attrelid", INTEGER, "${hash}(${columnName})")
@@ -14,23 +14,18 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static java.util.Objects.requireNonNull;
public abstract class PgCatalogTable
{
protected final TableMetadata tableMetadata;
protected final PgCatalogTableManager pgCatalogTableManager;
public PgCatalogTable(PgCatalogTableManager pgCatalogTableManager)
public PgCatalogTable()
{
this.pgCatalogTableManager = requireNonNull(pgCatalogTableManager, "pgCatalogTableManager is null");
tableMetadata = createMetadata(pgCatalogTableManager);
tableMetadata = createMetadata();
}
protected abstract TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager);
protected abstract TableMetadata createMetadata();
public TableMetadata getTableMetadata()
{
@@ -24,7 +24,7 @@ public final class PgCatalogTableUtils
public static final String PG_CATALOG = "pg_catalog";
public static final String DEFAULT_SCHEMA = "default";
public static final String INFORMATION_SCHEMA = "information_schema";
public static final String DEFAULT_AUTH = "cannerflow";
public static final String DEFAULT_AUTH = "cml";
private PgCatalogTableUtils() {}
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import io.cml.type.BooleanType;
@@ -33,13 +32,8 @@ public class PgClassTable
{
public static final String NAME = "pg_class";
public PgClassTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER, "${hash}(${tableName})")
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -34,13 +33,8 @@ public class PgConstraintTable
{
public static final String NAME = "pg_constraint";
public PgConstraintTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
@@ -30,13 +29,8 @@ public class PgDatabaseTable
{
public static final String NAME = "pg_database";
public PgDatabaseTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return PgCatalogTableUtils.table(NAME)
.column("oid", INTEGER, "0")
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -31,13 +30,8 @@ public class PgDescriptionTable
{
public static final String NAME = "pg_description";
public PgDescriptionTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table("pg_description")
.column("objoid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -32,13 +31,8 @@ public class PgEnumTable
{
public static final String NAME = "pg_enum";
public PgEnumTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -33,13 +32,8 @@ public class PgIndexTable
{
public static final String NAME = "pg_index";
public PgIndexTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("indexrelid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -30,13 +29,8 @@ public class PgNamespaceTable
{
public static final String NAME = "pg_namespace";
public PgNamespaceTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER, "${hash}(${schemaName})")
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -35,15 +34,9 @@ public class PgProcTable
extends PgCatalogTable
{
public static final String NAME = "pg_proc";
private static final String INTERNAL = "internal";
public PgProcTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -13,7 +13,6 @@
*/
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -30,13 +29,8 @@ public class PgRangeTable
{
public static final String NAME = "pg_range";
public PgRangeTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("rngtypid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
@@ -33,13 +32,8 @@ public class PgRolesTable
{
public static final String NAME = "pg_roles";
public PgRolesTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return PgCatalogTableUtils.table(NAME)
.column("rolname", VARCHAR)
@@ -13,7 +13,6 @@
*/
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.type.BooleanType.BOOLEAN;
@@ -31,13 +30,8 @@ public class PgSettingsTable
{
public static final String NAME = "pg_settings";
public PgSettingsTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return PgCatalogTableUtils.table(NAME)
.column("name", VARCHAR)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -32,13 +31,8 @@ public class PgTablespaceTable
{
public static final String NAME = "pg_tablespace";
public PgTablespaceTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -13,7 +13,6 @@
*/
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -31,13 +30,8 @@ public class PgTypeTable
{
public static final String NAME = "pg_type";
public PgTypeTable(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("oid", INTEGER)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -25,13 +24,8 @@ public class ReferentialConstraints
{
public static final String NAME = "referential_constraints";
public ReferentialConstraints(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("constraint_catalog", VARCHAR)
@@ -14,7 +14,6 @@
package io.cml.pgcatalog.table;
import io.cml.pgcatalog.PgCatalogTableManager;
import io.cml.spi.metadata.TableMetadata;
import static io.cml.pgcatalog.table.PgCatalogTableUtils.table;
@@ -25,13 +24,8 @@ public class TableConstraints
{
public static final String NAME = "table_constraints";
public TableConstraints(PgCatalogTableManager pgCatalogTableManager)
{
super(pgCatalogTableManager);
}
@Override
protected TableMetadata createMetadata(PgCatalogTableManager pgCatalogTableManager)
protected TableMetadata createMetadata()
{
return table(NAME)
.column("constraint_catalog", VARCHAR)