Skip to content

Commit

Permalink
Remove unused functions and structs (#882)
Browse files Browse the repository at this point in the history 
* Remove unused functions and structs

Co-authored-by: Hanefi Onaldi <[email protected]>

* Reintroduce one declaration that should not be removed

---------

Co-authored-by: Cem Eliguzel <[email protected]>
  • Loading branch information
@hanefi @rimbi
hanefi and rimbi authored Sep 18, 2024
1 parent 38b2c8f commit 0f79684
Show file tree
Hide file tree
Showing 26 changed files with 1 addition and 1,431 deletions.
187 changes: 0 additions & 187 deletions src/bin/pgcopydb/catalog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1119,16 +1119,6 @@ catalog_commit(DatabaseCatalog *catalog)
}


/*
* catalog_rollback explicitely rollbacks a SQLite transaction.
*/
bool
catalog_rollback(DatabaseCatalog *catalog)
{
return catalog_execute(catalog, "ROLLBACK");
}


/*
* catalog_register_setup registers the setup metadata for this catalog.
*/
Expand Down Expand Up @@ -2777,57 +2767,6 @@ catalog_lookup_s_attr_by_name(DatabaseCatalog *catalog,
}


/*
* catalog_delete_s_table deletes an s_table entry for the given oid.
*/
bool
catalog_delete_s_table(DatabaseCatalog *catalog,
const char *nspname,
const char *relname)
{
sqlite3 *db = catalog->db;

if (db == NULL)
{
log_error("BUG: Failed to initialize s_table iterator: db is NULL");
return false;
}

char *sql = "delete from s_table where nspname = $1 and relname = $2";

SQLiteQuery query = { 0 };

if (!catalog_sql_prepare(db, sql, &query))
{
/* errors have already been logged */
return false;
}

/* bind our parameters now */
BindParam params[] = {
{ BIND_PARAMETER_TYPE_TEXT, "nspname", 0, (char *) nspname },
{ BIND_PARAMETER_TYPE_TEXT, "relname", 0, (char *) relname }
};

int count = sizeof(params) / sizeof(params[0]);

if (!catalog_sql_bind(&query, params, count))
{
/* errors have already been logged */
return false;
}

/* now execute the query, which does not return any row */
if (!catalog_sql_execute_once(&query))
{
/* errors have already been logged */
return false;
}

return true;
}


/*
* catalog_iter_s_table iterates over the list of tables in our catalogs.
*/
Expand Down Expand Up @@ -3692,73 +3631,6 @@ catalog_s_attr_fetch(SQLiteQuery *query)
}


/*
* catalog_s_table_fetch_attrs fetches the table SourceTableAttribute array
* from our s_attr catalog.
*/
bool
catalog_s_table_count_attrs(DatabaseCatalog *catalog, SourceTable *table)
{
sqlite3 *db = catalog->db;

if (db == NULL)
{
log_error("BUG: catalog_s_table_count_attrs: db is NULL");
return false;
}

char *sql = "select count(1) from s_attr where oid = $1";

SQLiteQuery query = {
.context = table,
.fetchFunction = &catalog_s_table_count_attrs_fetch
};

if (!catalog_sql_prepare(db, sql, &query))
{
/* errors have already been logged */
return false;
}

/* bind our parameters now */
BindParam params[1] = {
{ BIND_PARAMETER_TYPE_INT64, "oid", table->oid, NULL }
};

if (!catalog_sql_bind(&query, params, 1))
{
/* errors have already been logged */
return false;
}

/* now execute the query, which return exactly one row */
if (!catalog_sql_execute_once(&query))
{
/* errors have already been logged */
return false;
}

return true;
}


/*
* catalog_s_table_count_attrs_fetch is a SQLiteQuery callback.
*/
bool
catalog_s_table_count_attrs_fetch(SQLiteQuery *query)
{
SourceTable *table = (SourceTable *) query->context;

int count = sqlite3_column_int(query->ppStmt, 0);

table->attributes.count = count;
table->attributes.array = NULL;

return true;
}


/*
* catalog_add_s_index INSERTs a SourceIndex to our internal catalogs database.
*/
Expand Down Expand Up @@ -4560,65 +4432,6 @@ catalog_delete_s_index_all(DatabaseCatalog *catalog)
}


/*
* catalog_delete_s_index_table DELETE all the indexes registered in the given
* database catalog for the given table.
*/
bool
catalog_delete_s_index_table(DatabaseCatalog *catalog,
const char *nspname,
const char *relname)
{
sqlite3 *db = catalog->db;

if (db == NULL)
{
log_error("BUG: Failed to initialize s_index iterator: db is NULL");
return false;
}

char *sql =
"delete from s_index "
" where tableoid = "
" ("
" select oid "
" from s_table "
" where nspname = $1 and relname = $2"
" )";

SQLiteQuery query = { 0 };

if (!catalog_sql_prepare(db, sql, &query))
{
/* errors have already been logged */
return false;
}

/* bind our parameters now */
BindParam params[] = {
{ BIND_PARAMETER_TYPE_TEXT, "nspname", 0, (char *) nspname },
{ BIND_PARAMETER_TYPE_TEXT, "relname", 0, (char *) relname }
};

int count = sizeof(params) / sizeof(params[0]);

if (!catalog_sql_bind(&query, params, count))
{
/* errors have already been logged */
return false;
}

/* now execute the query, which does not return any row */
if (!catalog_sql_execute_once(&query))
{
/* errors have already been logged */
return false;
}

return true;
}


/*
* catalog_add_s_seq INSERTs a SourceSequence to our internal catalogs database.
*/
Expand Down
14 changes: 0 additions & 14 deletions src/bin/pgcopydb/catalog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ bool catalog_set_wal_mode(DatabaseCatalog *catalog);

bool catalog_begin(DatabaseCatalog *catalog, bool immediate);
bool catalog_commit(DatabaseCatalog *catalog);
bool catalog_rollback(DatabaseCatalog *catalog);

bool catalog_register_setup(DatabaseCatalog *catalog,
const char *source_pg_uri,
Expand Down Expand Up @@ -206,9 +205,6 @@ bool catalog_add_s_table_chksum(DatabaseCatalog *catalog,

bool catalog_add_s_table_size(DatabaseCatalog *catalog,
SourceTableSize *tableSize);
bool catalog_delete_s_table(DatabaseCatalog *catalog,
const char *nspname,
const char *relname);

bool catalog_delete_s_table_chksum_all(DatabaseCatalog *catalog);

Expand Down Expand Up @@ -299,12 +295,6 @@ bool catalog_iter_s_table_attrs_finish(SourceTableAttrsIterator *iter);

bool catalog_s_table_attrs_fetch(SQLiteQuery *query);

bool catalog_s_table_count_attrs(DatabaseCatalog *catalog,
SourceTable *table);

bool catalog_s_table_count_attrs_fetch(SQLiteQuery *query);


bool catalog_lookup_s_attr_by_name(DatabaseCatalog *catalog,
uint32_t reloid,
const char *attname,
Expand All @@ -327,10 +317,6 @@ bool catalog_lookup_s_index_by_name(DatabaseCatalog *catalog,
const char *relname,
SourceIndex *index);

bool catalog_delete_s_index_table(DatabaseCatalog *catalog,
const char *nspname,
const char *relname);

bool catalog_delete_s_index_all(DatabaseCatalog *catalog);


Expand Down
89 changes: 0 additions & 89 deletions src/bin/pgcopydb/compare.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,92 +1029,3 @@ compare_fetch_schemas(CopyDataSpec *copySpecs,

return true;
}


/*
* compare_write_checksum writes the checksum to file.
*/
bool
compare_write_checksum(SourceTable *table, const char *filename)
{
JSON_Value *js = json_value_init_object();
JSON_Object *jsObj = json_value_get_object(js);

json_object_dotset_number(jsObj, "table.oid", table->oid);
json_object_dotset_string(jsObj, "table.nspname", table->nspname);
json_object_dotset_string(jsObj, "table.relname", table->relname);

json_object_dotset_number(jsObj,
"source.rowcount",
table->sourceChecksum.rowcount);

json_object_dotset_string(jsObj,
"source.checksum",
table->sourceChecksum.checksum);

json_object_dotset_number(jsObj,
"target.rowcount",
table->targetChecksum.rowcount);

json_object_dotset_string(jsObj,
"target.checksum",
table->targetChecksum.checksum);

char *serialized_string = json_serialize_to_string_pretty(js);
size_t len = strlen(serialized_string);

bool success = write_file(serialized_string, len, filename);

json_free_serialized_string(serialized_string);

if (!success)
{
log_error("Failed to write table checksum file \"%s\"", filename);
return false;
}

return true;
}


/*
* compare_read_checksum reads the checksum file.
*/
bool
compare_read_checksum(SourceTable *table, const char *filename)
{
JSON_Value *json = json_parse_file(filename);

if (json == NULL)
{
log_error("Failed to parse table checksum file \"%s\"", filename);
return false;
}

JSON_Object *jsObj = json_value_get_object(json);

if (table->oid != json_object_dotget_number(jsObj, "table.oid"))
{
log_error("Failed to match table oid %u (%s) in file \"%s\"",
table->oid,
table->qname,
filename);
return false;
}

table->sourceChecksum.rowcount =
json_object_dotget_number(jsObj, "source.rowcount");

strlcpy(table->sourceChecksum.checksum,
json_object_dotget_string(jsObj, "source.checksum"),
sizeof(table->sourceChecksum.checksum));

table->targetChecksum.rowcount =
json_object_dotget_number(jsObj, "target.rowcount");

strlcpy(table->targetChecksum.checksum,
json_object_dotget_string(jsObj, "target.checksum"),
sizeof(table->targetChecksum.checksum));

return true;
}
Loading

0 comments on commit 0f79684

Please sign in to comment.