Skip to content

Fix: pg_task / pg_task_run_history column reorder with catversion bump #1817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roseduan wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −15
Open

Fix: pg_task / pg_task_run_history column reorder with catversion bump #1817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/backend/utils/adt/ruleutils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13158,14 +13158,16 @@ flatten_reloptions(Oid relid)
Datum
pg_get_dynamic_table_schedule(PG_FUNCTION_ARGS)
{
Oid relid = PG_GETARG_OID(0);
Relation pg_task;
StringInfoData buf;
char *username;
Oid relid = PG_GETARG_OID(0);
Relation pg_task;
StringInfoData buf;
char *username;
SysScanDesc scanDescriptor = NULL;
ScanKeyData scanKey[2];
ScanKeyData scanKey[2];
HeapTuple heapTuple = NULL;
Form_pg_task task = NULL;
bool isnull;
Datum datum;

if (!get_rel_relisdynamic(relid))
{
Expand Down Expand Up @@ -13209,7 +13211,10 @@ pg_get_dynamic_table_schedule(PG_FUNCTION_ARGS)
task = (Form_pg_task) GETSTRUCT(heapTuple);

resetStringInfo(&buf);
appendStringInfo(&buf, "%s", text_to_cstring(&task->schedule));
datum = heap_getattr(heapTuple, Anum_pg_task_schedule,
RelationGetDescr(pg_task), &isnull);
if (!isnull)
appendStringInfo(&buf, "%s", TextDatumGetCString(datum));

systable_endscan(scanDescriptor);
table_close(pg_task, AccessShareLock);
Expand Down
2 changes: 1 addition & 1 deletion src/include/catalog/catversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
*/

/* 3yyymmddN */
#define CATALOG_VERSION_NO 302512051
#define CATALOG_VERSION_NO 302606111

#endif
8 changes: 5 additions & 3 deletions src/include/catalog/pg_task.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,16 @@
CATALOG(pg_task,9637,TaskRelationId) BKI_SHARED_RELATION
{
Oid jobid;
int32 nodeport;
bool active BKI_DEFAULT(t);
#ifdef CATALOG_VARLEN /* variable-length fields start here */
text schedule;
text command;
text nodename;
int32 nodeport;
text database;
text username;
bool active BKI_DEFAULT(t);
text jobname;
text jobname BKI_FORCE_NULL;
#endif
} FormData_pg_task;

typedef FormData_pg_task *Form_pg_task;
Expand Down
12 changes: 7 additions & 5 deletions src/include/catalog/pg_task_run_history.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,18 @@
*/
CATALOG(pg_task_run_history,9993,TaskRunHistoryRelationId) BKI_SHARED_RELATION
{
Oid runid;
Oid jobid;
Oid runid;
Oid jobid;
int32 job_pid BKI_DEFAULT(0);
timestamptz start_time BKI_FORCE_NULL;
timestamptz end_time BKI_FORCE_NULL;
#ifdef CATALOG_VARLEN /* variable-length fields start here */
text database;
text username;
text command;
text status;
text return_message;
timestamptz start_time;
timestamptz end_time;
text return_message BKI_FORCE_NULL;
#endif
} FormData_pg_task_run_history;

typedef FormData_pg_task_run_history *Form_pg_task_run_history;
Expand Down
Loading