Skip to content

Commit

Permalink
Remove dead code
Browse files Browse the repository at this point in the history
  • Loading branch information
fabriziomello committed May 20, 2024
1 parent c0b6b4b commit 693e54e
Show file tree
Hide file tree
Showing 21 changed files with 70 additions and 1,093 deletions.
70 changes: 22 additions & 48 deletions src/bgw/job.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,52 @@
* LICENSE-APACHE for a copy of the license.
*/
#include <postgres.h>
#include <miscadmin.h>
#include <pgstat.h>

#include <access/xact.h>
#include <catalog/pg_authid.h>
#include <executor/execdebug.h>
#include <executor/instrument.h>
#include <miscadmin.h>
#include <nodes/makefuncs.h>
#include <parser/parse_func.h>
#include <parser/parser.h>
#include <pgstat.h>
#include <postmaster/bgworker.h>
#include <storage/ipc.h>
#include <tcop/tcopprot.h>
#include <utils/builtins.h>
#include <utils/memutils.h>
#include <utils/syscache.h>
#include <utils/timestamp.h>
#include <storage/lock.h>
#include <storage/proc.h>
#include <storage/procarray.h>
#include <storage/sinvaladt.h>
#include <tcop/tcopprot.h>
#include <unistd.h>
#include <utils/acl.h>
#include <utils/builtins.h>
#include <utils/elog.h>
#include <executor/execdebug.h>
#include <executor/instrument.h>
#include <utils/jsonb.h>
#include <utils/memutils.h>
#include <utils/snapmgr.h>
#include <unistd.h>
#include <utils/syscache.h>
#include <utils/timestamp.h>

#include "job.h"
#include "bgw_policy/chunk_stats.h"
#include "bgw_policy/policy.h"
#include "bgw/scheduler.h"
#include "compat/compat.h"
#include "config.h"
#include "scanner.h"
#include "cross_module_fn.h"
#include "debug_assert.h"
#include "extension.h"
#include "compat/compat.h"
#include "job_stat.h"
#include "job.h"
#include "jsonb_utils.h"
#include "license_guc.h"
#include "scan_iterator.h"
#include "scanner.h"
#include "utils.h"

#ifdef USE_TELEMETRY
#include "telemetry/telemetry.h"
#endif
#include "bgw_policy/chunk_stats.h"
#include "bgw_policy/policy.h"
#include "scan_iterator.h"
#include "bgw/scheduler.h"

#include <cross_module_fn.h>
#include "jsonb_utils.h"
#include "debug_assert.h"

static scheduler_test_hook_type scheduler_test_hook = NULL;
static char *job_entrypoint_function_name = "ts_bgw_job_entrypoint";
Expand Down Expand Up @@ -504,33 +505,6 @@ ts_bgw_job_find_by_proc_and_hypertable_id(const char *proc_name, const char *pro
return list_data.list;
}

List *
ts_bgw_job_find_by_proc(const char *proc_name, const char *proc_schema)
{
Catalog *catalog = ts_catalog_get();
ScanKeyData scankey[2];
AccumData list_data = {
.list = NIL,
.alloc_size = sizeof(BgwJob),
};
ScannerCtx scanctx = {
.table = catalog_get_table_id(catalog, BGW_JOB),
.index = catalog_get_index(ts_catalog_get(), BGW_JOB, BGW_JOB_PROC_HYPERTABLE_ID_IDX),
.data = &list_data,
.scankey = scankey,
.nkeys = sizeof(scankey) / sizeof(*scankey),
.tuple_found = bgw_job_accum_tuple_found,
.lockmode = AccessShareLock,
.scandirection = ForwardScanDirection,
};

init_scan_by_proc_schema(&scankey[0], proc_schema);
init_scan_by_proc_name(&scankey[1], proc_name);

ts_scanner_scan(&scanctx);
return list_data.list;
}

List *
ts_bgw_job_find_by_hypertable_id(int32 hypertable_id)
{
Expand Down
1 change: 0 additions & 1 deletion src/bgw/job.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ extern BackgroundWorkerHandle *ts_bgw_job_start(BgwJob *job, Oid user_oid);
extern List *ts_bgw_job_get_all(size_t alloc_size, MemoryContext mctx);
extern List *ts_bgw_job_get_scheduled(size_t alloc_size, MemoryContext mctx);

extern TSDLLEXPORT List *ts_bgw_job_find_by_proc(const char *proc_name, const char *proc_schema);
extern TSDLLEXPORT List *ts_bgw_job_find_by_hypertable_id(int32 hypertable_id);
extern TSDLLEXPORT List *ts_bgw_job_find_by_proc_and_hypertable_id(const char *proc_name,
const char *proc_schema,
Expand Down
51 changes: 4 additions & 47 deletions src/chunk.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*/
#include <postgres.h>

#include <access/htup.h>
#include <access/htup_details.h>
#include <access/htup.h>
#include <access/reloptions.h>
#include <access/tupdesc.h>
#include <access/xact.h>
Expand Down Expand Up @@ -47,17 +47,17 @@
#include "chunk_scan.h"
#include "compat/compat.h"
#include "cross_module_fn.h"
#include "debug_point.h"
#include "debug_assert.h"
#include "dimension.h"
#include "debug_point.h"
#include "dimension_slice.h"
#include "dimension_vector.h"
#include "dimension.h"
#include "errors.h"
#include "export.h"
#include "extension.h"
#include "hypercube.h"
#include "hypertable.h"
#include "hypertable_cache.h"
#include "hypertable.h"
#include "osm_callbacks.h"
#include "partitioning.h"
#include "process_utility.h"
Expand Down Expand Up @@ -2533,36 +2533,6 @@ ts_chunk_get_by_id(int32 id, bool fail_if_not_found)
displaykey);
}

/*
* Number of chunks created after given chunk.
* If chunk2.id > chunk1.id then chunk2 is created after chunk1
*/
int
ts_chunk_num_of_chunks_created_after(const Chunk *chunk)
{
ScanKeyData scankey[1];

/*
* Try to find chunks with a greater Id then a given chunk
*/
ScanKeyInit(&scankey[0],
Anum_chunk_idx_id,
BTGreaterStrategyNumber,
F_INT4GT,
Int32GetDatum(chunk->fd.id));

return chunk_scan_internal(CHUNK_ID_INDEX,
scankey,
1,
NULL,
NULL,
NULL,
0,
ForwardScanDirection,
AccessShareLock,
CurrentMemoryContext);
}

/*
* Simple scans provide lightweight ways to access chunk information without the
* overhead of getting a full chunk (i.e., no extra metadata, like constraints,
Expand Down Expand Up @@ -2710,19 +2680,6 @@ ts_chunk_get_hypertable_id_by_reloid(Oid reloid)
return 0;
}

/*
* Returns the compressed chunk id. The original chunk must exist.
*/
int32
ts_chunk_get_compressed_chunk_id(int32 chunk_id)
{
FormData_chunk form;
PG_USED_FOR_ASSERTS_ONLY bool result =
chunk_simple_scan_by_id(chunk_id, &form, /* missing_ok = */ false);
Assert(result);
return form.compressed_chunk_id;
}

FormData_chunk
ts_chunk_get_formdata(int32 chunk_id)
{
Expand Down
2 changes: 0 additions & 2 deletions src/chunk.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,12 @@ extern TSDLLEXPORT Chunk *ts_chunk_get_by_relid(Oid relid, bool fail_if_not_foun
extern TSDLLEXPORT void ts_chunk_free(Chunk *chunk);
extern bool ts_chunk_exists(const char *schema_name, const char *table_name);
extern TSDLLEXPORT int32 ts_chunk_get_hypertable_id_by_reloid(Oid reloid);
extern TSDLLEXPORT int32 ts_chunk_get_compressed_chunk_id(int32 chunk_id);
extern TSDLLEXPORT FormData_chunk ts_chunk_get_formdata(int32 chunk_id);
extern TSDLLEXPORT Oid ts_chunk_get_relid(int32 chunk_id, bool missing_ok);
extern Oid ts_chunk_get_schema_id(int32 chunk_id, bool missing_ok);
extern bool ts_chunk_get_id(const char *schema, const char *table, int32 *chunk_id,
bool missing_ok);
extern bool ts_chunk_exists_relid(Oid relid);
extern TSDLLEXPORT int ts_chunk_num_of_chunks_created_after(const Chunk *chunk);
extern TSDLLEXPORT bool ts_chunk_exists_with_compression(int32 hypertable_id);
extern void ts_chunk_recreate_all_constraints_for_dimension(Hypertable *ht, int32 dimension_id);
extern int ts_chunk_delete_by_hypertable_id(int32 hypertable_id);
Expand Down
23 changes: 0 additions & 23 deletions src/dimension_vector.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@ cmp_slices(const void *left, const void *right)
return ts_dimension_slice_cmp(left_slice, right_slice);
}

/*
* identical to cmp_slices except for reversed arguments to ts_dimension_slice_cmp
*/
static int
cmp_slices_reverse(const void *left, const void *right)
{
const DimensionSlice *left_slice = *((DimensionSlice **) left);
const DimensionSlice *right_slice = *((DimensionSlice **) right);

return -ts_dimension_slice_cmp(left_slice, right_slice);
}

static int
cmp_coordinate_and_slice(const void *left, const void *right)
{
Expand Down Expand Up @@ -73,17 +61,6 @@ ts_dimension_vec_sort(DimensionVec **vecptr)
return vec;
}

DimensionVec *
ts_dimension_vec_sort_reverse(DimensionVec **vecptr)
{
DimensionVec *vec = *vecptr;

if (vec->num_slices > 1)
qsort(vec->slices, vec->num_slices, sizeof(DimensionSlice *), cmp_slices_reverse);

return vec;
}

DimensionVec *
ts_dimension_vec_add_slice(DimensionVec **vecptr, DimensionSlice *slice)
{
Expand Down
1 change: 0 additions & 1 deletion src/dimension_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ typedef struct DimensionVec

extern DimensionVec *ts_dimension_vec_create(int32 initial_num_slices);
extern DimensionVec *ts_dimension_vec_sort(DimensionVec **vec);
extern DimensionVec *ts_dimension_vec_sort_reverse(DimensionVec **vec);
extern DimensionVec *ts_dimension_vec_add_slice_sort(DimensionVec **vec, DimensionSlice *slice);
extern DimensionVec *ts_dimension_vec_add_slice(DimensionVec **vecptr, DimensionSlice *slice);
extern DimensionVec *ts_dimension_vec_add_unique_slice(DimensionVec **vecptr,
Expand Down
Loading

0 comments on commit 693e54e

Please sign in to comment.