Skip to content

Commit 942180c

Browse files
ItGackyItGacky
committed
workaround with 8.2.
1 parent aab19c7 commit 942180c

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

‎bin/expected/reorg.out

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ Indexes:
9090
Indexes:
9191
"tbl_only_pkey_pkey" PRIMARY KEY, btree (col1)
9292

93-
SET synchronize_seqscans = off;
9493
SELECT col1, to_char(col2, 'YYYY-MM-DD HH24:MI:SS'), ":-)" FROM tbl_cluster;
9594
col1 | to_char | :-)
9695
------+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -122,7 +121,6 @@ SELECT * FROM tbl_gistkey ORDER BY 1;
122121
2 | <(4,5),6>
123122
(2 rows)
124123

125-
RESET synchronize_seqscans;
126124
--
127125
-- clean up
128126
--

‎bin/pg_reorg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
581581
command("BEGIN ISOLATION LEVEL SERIALIZABLE", 0, NULL);
582582
/* SET work_mem = maintenance_work_mem */
583583
command("SELECT set_config('work_mem', current_setting('maintenance_work_mem'), true)", 0, NULL);
584-
if (orderby && !orderby[0])
584+
if (PQserverVersion(current_conn) >= 80300 && orderby && !orderby[0])
585585
command("SET LOCAL synchronize_seqscans = off", 0, NULL);
586586
res = execute(SQL_XID_SNAPSHOT, 0, NULL);
587587
vxid = strdup(PQgetvalue(res, 0, 0));

‎bin/sql/reorg.sql

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,10 @@ INSERT INTO tbl_gistkey VALUES(2, '<(4,5),6>');
7070
\d tbl_only_ckey
7171
\d tbl_only_pkey
7272

73-
SET synchronize_seqscans = off;
7473
SELECT col1, to_char(col2, 'YYYY-MM-DD HH24:MI:SS'), ":-)" FROM tbl_cluster;
7574
SELECT * FROM tbl_only_ckey ORDER BY 1;
7675
SELECT * FROM tbl_only_pkey ORDER BY 1;
7776
SELECT * FROM tbl_gistkey ORDER BY 1;
78-
RESET synchronize_seqscans;
7977

8078
--
8179
-- clean up

‎lib/pg_reorg.sql.in

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ CREATE AGGREGATE reorg.array_accum (
1818
initcond = '{}'
1919
);
2020

21+
CREATE FUNCTION reorg.oid2text(oid) RETURNS text AS
22+
$$
23+
SELECT textin(regclassout($1));
24+
$$
25+
LANGUAGE sql STABLE STRICT;
26+
2127
CREATE FUNCTION reorg.get_index_columns(oid, text) RETURNS text AS
2228
$$
2329
SELECT array_to_string(reorg.array_accum(quote_ident(attname)), $2)
@@ -58,7 +64,7 @@ CREATE FUNCTION reorg.get_create_trigger(relid oid, pkid oid)
5864
RETURNS text AS
5965
$$
6066
SELECT 'CREATE TRIGGER z_reorg_trigger' ||
61-
' BEFORE INSERT OR DELETE OR UPDATE ON ' || $1::regclass ||
67+
' BEFORE INSERT OR DELETE OR UPDATE ON ' || reorg.oid2text($1) ||
6268
' FOR EACH ROW EXECUTE PROCEDURE reorg.reorg_trigger(' ||
6369
'''INSERT INTO reorg.log_' || $1 || '(pk, row) VALUES(' ||
6470
' CASE WHEN $1 IS NULL THEN NULL ELSE (ROW($1.' ||
@@ -104,11 +110,11 @@ CREATE VIEW reorg.tables AS
104110
PK.indexrelid AS pkid,
105111
CK.indexrelid AS ckid,
106112
reorg.get_create_index_type(PK.indexrelid, 'reorg.pk_' || R.oid) AS create_pktype,
107-
'CREATE TABLE reorg.log_' || R.oid || ' (id bigserial PRIMARY KEY, pk reorg.pk_' || R.oid || ', row ' || R.oid::regclass || ')' AS create_log,
113+
'CREATE TABLE reorg.log_' || R.oid || ' (id bigserial PRIMARY KEY, pk reorg.pk_' || R.oid || ', row ' || reorg.oid2text(R.oid) || ')' AS create_log,
108114
reorg.get_create_trigger(R.oid, PK.indexrelid) AS create_trigger,
109-
'CREATE TABLE reorg.table_' || R.oid || ' WITH (' || array_to_string(array_append(R.reloptions, 'oids=' || R.relhasoids), ',') || ') TABLESPACE ' || coalesce(quote_ident(S.spcname), 'pg_default') || ' AS SELECT * FROM ONLY ' || R.oid::regclass AS create_table,
115+
'CREATE TABLE reorg.table_' || R.oid || ' WITH (' || array_to_string(array_append(R.reloptions, 'oids=' || CASE WHEN R.relhasoids THEN 'true' ELSE 'false' END), ',') || ') TABLESPACE ' || coalesce(quote_ident(S.spcname), 'pg_default') || ' AS SELECT * FROM ONLY ' || reorg.oid2text(R.oid) AS create_table,
110116
'DELETE FROM reorg.log_' || R.oid AS delete_log,
111-
'LOCK TABLE ' || R.oid::regclass || ' IN ACCESS EXCLUSIVE MODE' AS lock_table,
117+
'LOCK TABLE ' || reorg.oid2text(R.oid) || ' IN ACCESS EXCLUSIVE MODE' AS lock_table,
112118
reorg.get_index_keys(CK.indexrelid, R.oid) AS ckey,
113119
'SELECT * FROM reorg.log_' || R.oid || ' ORDER BY id LIMIT $1' AS sql_peek,
114120
'INSERT INTO reorg.table_' || R.oid || ' VALUES ($1.*)' AS sql_insert,

‎lib/reorg.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ PG_MODULE_MAGIC;
2929

3030
#if PG_VERSION_NUM < 80300
3131
#define SET_VARSIZE(PTR, len) (VARATT_SIZEP((PTR)) = (len))
32+
#define PGDLLIMPORT DLLIMPORT
3233
typedef void *SPIPlanPtr;
3334
#endif
3435

35-
3636
Datum reorg_trigger(PG_FUNCTION_ARGS);
3737
Datum reorg_apply(PG_FUNCTION_ARGS);
3838
Datum reorg_get_index_keys(PG_FUNCTION_ARGS);
@@ -931,7 +931,11 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
931931
allowSystemTableMods = true;
932932
PG_TRY();
933933
{
934-
renamerel(myrelid, newrelname, OBJECT_TABLE);
934+
renamerel(myrelid, newrelname
935+
#if PG_VERSION_NUM >= 80300
936+
, OBJECT_TABLE
937+
#endif
938+
);
935939
allowSystemTableMods = save_allowSystemTableMods;
936940
}
937941
PG_CATCH();

0 commit comments

Comments
 (0)