Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock package pg-repack, it fixes autopkgtest failures.

diff --git a/debian/changelog b/debian/changelog
index 84bd269..86e1726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pg-repack (1.3.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix tablespace testcase to work with latest microrelease (Closes: #854997)
+
+ -- Christian Ehrhardt <christian.ehrha...@canonical.com>  Wed, 15 Feb 2017 
11:59:14 +0100
+
 pg-repack (1.3.4-2) unstable; urgency=medium
 
   * Team upload for PostgreSQL 9.6.
diff --git a/debian/patches/series b/debian/patches/series
index 72c53ff..0fe9787 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 libs
 tablespace
+tablespace-microrelease
diff --git a/debian/patches/tablespace-microrelease 
b/debian/patches/tablespace-microrelease
new file mode 100644
index 0000000..4b1b00c
--- /dev/null
+++ b/debian/patches/tablespace-microrelease
@@ -0,0 +1,245 @@
+Description: Add a variant expected output for the 'tablespace' regression test
+  The latest stable release changed output, but not behavior.
+  Need to add another set of accepted test output.
+Forwarded: yes, https://github.com/reorg/pg_repack/pull/115
+Bug-Debian: http://bugs.debian.org/854997
+Author: Christian Ehrhardt <christian.ehrha...@canonical.com>
+
+--- /dev/null
++++ b/regress/expected/tablespace_2.out
+@@ -0,0 +1,235 @@
++SET client_min_messages = warning;
++--
++-- Tablespace features tests
++--
++-- Note: in order to pass this test you must create a tablespace called 
'testts'
++--
++CREATE TABLESPACE testts LOCATION '/tmp/pg-repack-tablespace';
++SELECT spcname FROM pg_tablespace WHERE spcname = 'testts';
++ spcname 
++---------
++ testts
++(1 row)
++
++-- If the query above failed you must create the 'testts' tablespace;
++CREATE TABLE testts1 (id serial primary key, data text);
++CREATE INDEX testts1_partial_idx on testts1 (id) where (id > 0);
++CREATE INDEX testts1_with_idx on testts1 (id) with (fillfactor=80);
++INSERT INTO testts1 (data) values ('a');
++INSERT INTO testts1 (data) values ('b');
++INSERT INTO testts1 (data) values ('c');
++-- check the indexes definitions
++SELECT regexp_replace(
++    repack.repack_indexdef(indexrelid, 'testts1'::regclass, NULL, false),
++    '_[0-9]+', '_OID', 'g')
++FROM pg_index i join pg_class c ON c.oid = indexrelid
++WHERE indrelid = 'testts1'::regclass ORDER BY relname;
++                                              regexp_replace                  
                            
++----------------------------------------------------------------------------------------------------------
++ CREATE INDEX index_OID ON repack.table_OID USING btree (id) TABLESPACE 
pg_default WHERE (id > 0)
++ CREATE UNIQUE INDEX index_OID ON repack.table_OID USING btree (id) 
TABLESPACE pg_default
++ CREATE INDEX index_OID ON repack.table_OID USING btree (id) WITH 
(fillfactor='80') TABLESPACE pg_default
++(3 rows)
++
++SELECT regexp_replace(
++    repack.repack_indexdef(indexrelid, 'testts1'::regclass, 'foo', false),
++    '_[0-9]+', '_OID', 'g')
++FROM pg_index i join pg_class c ON c.oid = indexrelid
++WHERE indrelid = 'testts1'::regclass ORDER BY relname;
++                                          regexp_replace                      
                     
++---------------------------------------------------------------------------------------------------
++ CREATE INDEX index_OID ON repack.table_OID USING btree (id) TABLESPACE foo 
WHERE (id > 0)
++ CREATE UNIQUE INDEX index_OID ON repack.table_OID USING btree (id) 
TABLESPACE foo
++ CREATE INDEX index_OID ON repack.table_OID USING btree (id) WITH 
(fillfactor='80') TABLESPACE foo
++(3 rows)
++
++SELECT regexp_replace(
++    repack.repack_indexdef(indexrelid, 'testts1'::regclass, NULL, true),
++    '_[0-9]+', '_OID', 'g')
++FROM pg_index i join pg_class c ON c.oid = indexrelid
++WHERE indrelid = 'testts1'::regclass ORDER BY relname;
++                                                regexp_replace                
                                
++--------------------------------------------------------------------------------------------------------------
++ CREATE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) TABLESPACE 
pg_default WHERE (id > 0)
++ CREATE UNIQUE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) 
TABLESPACE pg_default
++ CREATE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) WITH 
(fillfactor='80') TABLESPACE pg_default
++(3 rows)
++
++SELECT regexp_replace(
++    repack.repack_indexdef(indexrelid, 'testts1'::regclass, 'foo', true),
++    '_[0-9]+', '_OID', 'g')
++FROM pg_index i join pg_class c ON c.oid = indexrelid
++WHERE indrelid = 'testts1'::regclass ORDER BY relname;
++                                            regexp_replace                    
                         
++-------------------------------------------------------------------------------------------------------
++ CREATE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) TABLESPACE 
foo WHERE (id > 0)
++ CREATE UNIQUE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) 
TABLESPACE foo
++ CREATE INDEX CONCURRENTLY index_OID ON testts1 USING btree (id) WITH 
(fillfactor='80') TABLESPACE foo
++(3 rows)
++
++-- can move the tablespace from default
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1 
--tablespace testts
++INFO: repacking table "testts1"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++ relname | spcname 
++---------+---------
++ testts1 | testts
++(1 row)
++
++SELECT * from testts1 order by id;
++ id | data 
++----+------
++  1 | a
++  2 | b
++  3 | c
++(3 rows)
++
++-- tablespace stays where it is
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1
++INFO: repacking table "testts1"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++ relname | spcname 
++---------+---------
++ testts1 | testts
++(1 row)
++
++-- can move the ts back to default
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1 -s 
pg_default
++INFO: repacking table "testts1"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++ relname | spcname 
++---------+---------
++(0 rows)
++
++-- can move the table together with the indexes
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1 
--tablespace testts --moveidx
++INFO: repacking table "testts1"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++       relname       | spcname 
++---------------------+---------
++ testts1             | testts
++ testts1_partial_idx | testts
++ testts1_pkey        | testts
++ testts1_with_idx    | testts
++(4 rows)
++
++-- can't specify --moveidx without --tablespace
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1 --moveidx
++ERROR: cannot specify --moveidx (-S) without --tablespace (-s)
++\! pg_repack --dbname=contrib_regression --no-order --table=testts1 -S
++ERROR: cannot specify --moveidx (-S) without --tablespace (-s)
++-- not broken with order
++\! pg_repack --dbname=contrib_regression -o id --table=testts1 --tablespace 
pg_default --moveidx
++INFO: repacking table "testts1"
++--move all indexes of the table to a tablespace
++\! pg_repack --dbname=contrib_regression --table=testts1 --only-indexes 
--tablespace=testts
++INFO: repacking indexes of "testts1"
++INFO: repacking index "public"."testts1_partial_idx"
++INFO: repacking index "public"."testts1_pkey"
++INFO: repacking index "public"."testts1_with_idx"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++       relname       | spcname 
++---------------------+---------
++ testts1_partial_idx | testts
++ testts1_pkey        | testts
++ testts1_with_idx    | testts
++(3 rows)
++
++--all indexes of tablespace remain in same tablespace
++\! pg_repack --dbname=contrib_regression --table=testts1 --only-indexes
++INFO: repacking indexes of "testts1"
++INFO: repacking index "public"."testts1_partial_idx"
++INFO: repacking index "public"."testts1_pkey"
++INFO: repacking index "public"."testts1_with_idx"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++       relname       | spcname 
++---------------------+---------
++ testts1_partial_idx | testts
++ testts1_pkey        | testts
++ testts1_with_idx    | testts
++(3 rows)
++
++--move all indexes of the table to pg_default
++\! pg_repack --dbname=contrib_regression --table=testts1 --only-indexes 
--tablespace=pg_default
++INFO: repacking indexes of "testts1"
++INFO: repacking index "public"."testts1_partial_idx"
++INFO: repacking index "public"."testts1_pkey"
++INFO: repacking index "public"."testts1_with_idx"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++ relname | spcname 
++---------+---------
++(0 rows)
++
++--move one index to a tablespace
++\! pg_repack --dbname=contrib_regression --index=testts1_pkey 
--tablespace=testts
++INFO: repacking index "public"."testts1_pkey"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++   relname    | spcname 
++--------------+---------
++ testts1_pkey | testts
++(1 row)
++
++--index tablespace stays as is
++\! pg_repack --dbname=contrib_regression --index=testts1_pkey
++INFO: repacking index "public"."testts1_pkey"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++   relname    | spcname 
++--------------+---------
++ testts1_pkey | testts
++(1 row)
++
++--move index to pg_default
++\! pg_repack --dbname=contrib_regression --index=testts1_pkey 
--tablespace=pg_default
++INFO: repacking index "public"."testts1_pkey"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++ relname | spcname 
++---------+---------
++(0 rows)
++
++--using multiple --index option
++\! pg_repack --dbname=contrib_regression --index=testts1_pkey 
--index=testts1_with_idx --tablespace=testts
++INFO: repacking index "public"."testts1_pkey"
++INFO: repacking index "public"."testts1_with_idx"
++SELECT relname, spcname
++FROM pg_class JOIN pg_tablespace ts ON ts.oid = reltablespace
++WHERE relname ~ '^testts1'
++ORDER BY relname;
++     relname      | spcname 
++------------------+---------
++ testts1_pkey     | testts
++ testts1_with_idx | testts
++(2 rows)
++
++--using --indexes-only and --index option together
++\! pg_repack --dbname=contrib_regression --table=testts1 --only-indexes 
--index=testts1_pkey
++ERROR: cannot specify --index (-i) and --table (-t)

unblock pg-repack/1.3.4-3

Thanks,
Christoph

Reply via email to