Skip to content
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.

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

To support PostgreSQL v16 #155

Merged
merged 4 commits into from
Jan 16, 2024
Merged

To support PostgreSQL v16 #155

merged 4 commits into from
Jan 16, 2024

Conversation

zwyan0
Copy link
Contributor

@zwyan0 zwyan0 commented Dec 21, 2023

No description provided.

Copy link
Contributor

@mikecaat mikecaat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank!

lib/pg_btree.c Outdated
@@ -529,6 +531,9 @@ _bt_mergeload(Spooler *self, BTWriteState *wstate, BTSpool *btspool, BTReader *b
/* the preparation of merge */
itup = BTSpoolGetNextItem(btspool, NULL, &should_free);
itup2 = BTReaderGetNextItem(btspool2);
// #if PG_VERSION_NUM >= 160000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this line.

bin/recovery.c Outdated

static void GetSegmentPath(char path[MAXPGPATH],
#if PG_VERSION_NUM >= 160000
RelFileLocator relNumber,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since relNumber is a member of RelFileLocator, is it better s/relNumber/rlocator/g? Be careful that relNumber exists in other codes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed relNumber to rLocator

bin/recovery.c Show resolved Hide resolved
lib/pg_strutil.c Show resolved Hide resolved
lib/pgut/pgut-ipc.c Show resolved Hide resolved
lib/reader.c Show resolved Hide resolved
lib/reader.c Outdated
/* This API is published only from 9.1.
* This is used for permission check, but currently pg_bulkload
* is called only from super user and so the below code maybe
* is not essential. */
ExecCheckRTPerms(range_table, true);
#endif

#if PG_VERSION_NUM >= 160000
ExecInitRangeTable(checker->estate, range_table, perminfos);
checker->slot = MakeSingleTupleTableSlot(desc, &TTSOpsHeapTuple);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the line same as Line:480?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this line.

lib/writer_buffered.c Show resolved Hide resolved
lib/writer_direct.c Show resolved Hide resolved
Copy link
Contributor

@mikecaat mikecaat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! It looks good to me.

@zwyan0 zwyan0 merged commit 8734300 into ossc-db:master Jan 16, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants