makqmlwy5
/
openGauss-server
forked from huawei/openGauss-server
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!1616 修复gs_dump备份后序列值递增问题 

Merge pull request !1616 from 薛蒙恩/gsdump_sequence
This commit is contained in:
opengauss-bot 2022-03-24 12:48:12 +00:00 committed by Gitee
parent 3ac101d466 366d81a8fd
commit 5f0e5f3bcd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/bin/pg_dump/pg_dump.cpp
View File

@ -20836,6 +20836,7 @@ static void dumpSequenceData(Archive* fout, TableDataInfo* tdinfo, bool large)
called = (strcmp(PQgetvalue(res, 0, 4), "t") == 0);
#ifdef PGXC
#ifdef ENABLE_MULTIPLE_NODES
/*
* In Postgres-XC it is possible that the current value of a
* sequence cached on each node is different as several sessions
@ -20897,6 +20898,28 @@ static void dumpSequenceData(Archive* fout, TableDataInfo* tdinfo, bool large)
ExecuteSqlStatement(fout, "ROLLBACK TO SAVEPOINT bfnextval");
ExecuteSqlStatement(fout, "RELEASE bfnextval");
#else
resetPQExpBuffer(query);
PQclear(res);
appendPQExpBuffer(query, "SELECT last_value, is_called FROM %s;", fmtId(tbinfo->dobj.name));
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
if (PQntuples(res) != 1) {
write_msg(NULL,
ngettext("query to get nextval of sequence %s "
"returned %d rows (expected 1)\n",
"query to get nextval of sequence %s "
"returned %d rows (expected 1)\n",
PQntuples(res)),
fmtId(tbinfo->dobj.name),
PQntuples(res));
PQclear(res);
destroyPQExpBuffer(query);
exit_nicely(1);
}
last = PQgetvalue(res, 0, 0);
#endif
#endif
resetPQExpBuffer(query);

1
src/test/regress/input/gs_dump.source
View File

@ -54,5 +54,6 @@ ALTER TABLE rlsrel1 FORCE ROW LEVEL SECURITY;
ALTER TABLE rlsrel2 ENABLE ROW LEVEL SECURITY;
\! @abs_bindir@/gs_dump --help > @abs_bindir@/gs_dump.log 2>&1
\! @abs_bindir@/gs_dump basedb -p @portstring@ --with-encryption=AES128 --with-key=abcdefghigklmnop --include-alter-table -n dumptest -s > @abs_bindir@/dump.sql 2>&1 ; echo $?
SELECT * FROM dumptest."seq$";
\c regression
drop database if exists basedb;

6
src/test/regress/output/gs_dump.source
View File

@ -57,5 +57,11 @@ ALTER TABLE rlsrel2 ENABLE ROW LEVEL SECURITY;
\! @abs_bindir@/gs_dump --help > @abs_bindir@/gs_dump.log 2>&1
\! @abs_bindir@/gs_dump basedb -p @portstring@ --with-encryption=AES128 --with-key=abcdefghigklmnop --include-alter-table -n dumptest -s > @abs_bindir@/dump.sql 2>&1 ; echo $?
0
SELECT * FROM dumptest."seq$";
sequence_name | last_value | start_value | increment_by | max_value | min_value | cache_value | log_cnt | is_cycled | is_called | uuid
---------------+------------+-------------+--------------+---------------------+-----------+-------------+---------+-----------+-----------+------
seq$ | 101 | 101 | 1 | 9223372036854775807 | 1 | 1 | 0 | f | f | 0
(1 row)
\c regression
drop database if exists basedb;