Attachment 206286 Details for Bug 239652 – skytools.diff

[patch] skytools.diff

skytools.diff (text/plain), 9.45 KB, created by Tobias Kortkamp on 2019-08-05 05:13:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-08-05 05:13:19 UTC

Size: 9.45 KB

patch

obsolete

>Index: databases/skytools/Makefile
>===================================================================
>--- databases/skytools/Makefile	(revision 508050)
>+++ databases/skytools/Makefile	(working copy)
>@@ -10,6 +10,9 @@
> MAINTAINER=	sam@cassiba.com
> COMMENT=	PostgreSQL tools from Skype: walshipping, queueing, replication
> 
>+DEPRECATED=	Abandonware
>+EXPIRATION_DATE=	2019-09-15
>+
> GNU_CONFIGURE=	yes
> USES=		gmake python:2.7 shebangfix pgsql
> LLD_UNSAFE=	yes
>Index: databases/skytools/files/patch-sql_pgq_triggers_common.c
>===================================================================
>--- databases/skytools/files/patch-sql_pgq_triggers_common.c	(nonexistent)
>+++ databases/skytools/files/patch-sql_pgq_triggers_common.c	(working copy)
>@@ -0,0 +1,62 @@
>+--- sql/pgq/triggers/common.c.orig	2019-08-05 04:40:08 UTC
>++++ sql/pgq/triggers/common.c
>+@@ -125,9 +125,15 @@ static void fill_magic_columns(PgqTriggerEvent *ev)
>+ 
>+ 	for (i = 0; i < tupdesc->natts; i++) {
>+ 		/* Skip dropped columns */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>+ 			continue;
>+ 		col_name = NameStr(tupdesc->attrs[i]->attname);
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++			continue;
>++		col_name = NameStr(TupleDescAttr(tupdesc, i)->attname);
>++#endif
>+ 		if (!is_magic_field(col_name))
>+ 			continue;
>+ 		if (strcmp(col_name, "_pgq_ev_type") == 0)
>+@@ -481,7 +487,11 @@ static void parse_oldstyle_args(PgqTriggerEvent *ev, T
>+ 	 */
>+ 	tupdesc = tg->tg_relation->rd_att;
>+ 	for (i = 0, attcnt = 0; i < tupdesc->natts; i++) {
>++#if PG_VERSION_NUM < 110000
>+ 		if (!tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (!TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			attcnt++;
>+ 	}
>+ 
>+@@ -598,9 +608,15 @@ bool pgqtriga_skip_col(PgqTriggerEvent *ev, int i, int
>+ 	const char *name;
>+ 
>+ 	tupdesc = tg->tg_relation->rd_att;
>++#if PG_VERSION_NUM < 110000
>+ 	if (tupdesc->attrs[i]->attisdropped)
>+ 		return true;
>+ 	name = NameStr(tupdesc->attrs[i]->attname);
>++#else
>++	if (TupleDescAttr(tupdesc, i)->attisdropped)
>++		return true;
>++	name = NameStr(TupleDescAttr(tupdesc, i)->attname);
>++#endif
>+ 
>+ 	if (is_magic_field(name)) {
>+ 		ev->tgargs->custom_fields = 1;
>+@@ -632,9 +648,15 @@ bool pgqtriga_is_pkey(PgqTriggerEvent *ev, int i, int 
>+ 		return ev->attkind[attkind_idx] == 'k';
>+ 	} else if (ev->pkey_list) {
>+ 		tupdesc = tg->tg_relation->rd_att;
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>+ 			return false;
>+ 		name = NameStr(tupdesc->attrs[i]->attname);
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++			return false;
>++		name = NameStr(TupleDescAttr(tupdesc, i)->attname);
>++#endif
>+ 		if (is_magic_field(name)) {
>+ 			ev->tgargs->custom_fields = 1;
>+ 			return false;
>
>Property changes on: databases/skytools/files/patch-sql_pgq_triggers_common.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/skytools/files/patch-sql_pgq_triggers_logutriga.c
>===================================================================
>--- databases/skytools/files/patch-sql_pgq_triggers_logutriga.c	(nonexistent)
>+++ databases/skytools/files/patch-sql_pgq_triggers_logutriga.c	(working copy)
>@@ -0,0 +1,26 @@
>+--- sql/pgq/triggers/logutriga.c.orig	2019-08-05 04:38:03 UTC
>++++ sql/pgq/triggers/logutriga.c
>+@@ -54,7 +54,11 @@ static int is_interesting_change(PgqTriggerEvent *ev, 
>+ 		/*
>+ 		 * Ignore dropped columns
>+ 		 */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 		attkind_idx++;
>+ 
>+@@ -145,7 +149,11 @@ void pgq_urlenc_row(PgqTriggerEvent *ev, HeapTuple row
>+ 
>+ 	for (i = 0; i < tg->tg_relation->rd_att->natts; i++) {
>+ 		/* Skip dropped columns */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		attkind_idx++;
>
>Property changes on: databases/skytools/files/patch-sql_pgq_triggers_logutriga.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/skytools/files/patch-sql_pgq_triggers_makesql.c
>===================================================================
>--- databases/skytools/files/patch-sql_pgq_triggers_makesql.c	(nonexistent)
>+++ databases/skytools/files/patch-sql_pgq_triggers_makesql.c	(working copy)
>@@ -0,0 +1,86 @@
>+--- sql/pgq/triggers/makesql.c.orig	2019-08-05 04:44:33 UTC
>++++ sql/pgq/triggers/makesql.c
>+@@ -71,7 +71,11 @@ static void process_insert(PgqTriggerEvent *ev, String
>+ 		char *col_ident;
>+ 
>+ 		/* Skip dropped columns */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		/* Check if allowed by colstring */
>+@@ -103,7 +107,11 @@ static void process_insert(PgqTriggerEvent *ev, String
>+ 		char *col_value;
>+ 
>+ 		/* Skip dropped columns */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		/* Check if allowed by colstring */
>+@@ -154,7 +162,11 @@ static int process_update(PgqTriggerEvent *ev, StringI
>+ 		/*
>+ 		 * Ignore dropped columns
>+ 		 */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		attkind_idx++;
>+@@ -240,7 +252,11 @@ static int process_update(PgqTriggerEvent *ev, StringI
>+ 			return 0;
>+ 
>+ 		for (i = 0, attkind_idx = -1; i < tupdesc->natts; i++) {
>++#if PG_VERSION_NUM < 110000
>+ 			if (tupdesc->attrs[i]->attisdropped)
>++#else
>++			if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 				continue;
>+ 
>+ 			attkind_idx++;
>+@@ -259,7 +275,11 @@ static int process_update(PgqTriggerEvent *ev, StringI
>+ 		/*
>+ 		 * Ignore dropped columns
>+ 		 */
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		attkind_idx++;
>+@@ -291,7 +311,11 @@ static void process_delete(PgqTriggerEvent *ev, String
>+ 	int attkind_idx;
>+ 
>+ 	for (i = 0, attkind_idx = -1; i < tupdesc->natts; i++) {
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 
>+ 		attkind_idx++;
>+@@ -323,7 +347,11 @@ int pgqtriga_make_sql(PgqTriggerEvent *ev, StringInfo 
>+ 	 * Count number of active columns
>+ 	 */
>+ 	for (i = 0, attcnt = 0; i < tupdesc->natts; i++) {
>++#if PG_VERSION_NUM < 110000
>+ 		if (tupdesc->attrs[i]->attisdropped)
>++#else
>++		if (TupleDescAttr(tupdesc, i)->attisdropped)
>++#endif
>+ 			continue;
>+ 		attcnt++;
>+ 	}
>
>Property changes on: databases/skytools/files/patch-sql_pgq_triggers_makesql.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/skytools/files/patch-sql_pgq_triggers_stringutil.c
>===================================================================
>--- databases/skytools/files/patch-sql_pgq_triggers_stringutil.c	(nonexistent)
>+++ databases/skytools/files/patch-sql_pgq_triggers_stringutil.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- sql/pgq/triggers/stringutil.c.orig	2019-08-05 04:48:30 UTC
>++++ sql/pgq/triggers/stringutil.c
>+@@ -19,7 +19,11 @@
>+ #include <postgres.h>
>+ #include <lib/stringinfo.h>
>+ #include <mb/pg_wchar.h>
>++#if PG_VERSION_NUM < 110000
>+ #include <parser/keywords.h>
>++#else
>++#include <common/keywords.h>
>++#endif
>+ #include <utils/memutils.h>
>+ 
>+ #include "stringutil.h"
>
>Property changes on: databases/skytools/files/patch-sql_pgq_triggers_stringutil.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: databases/skytools/files/patch-sql_txid_Makefile
>===================================================================
>--- databases/skytools/files/patch-sql_txid_Makefile	(nonexistent)
>+++ databases/skytools/files/patch-sql_txid_Makefile	(working copy)
>@@ -0,0 +1,11 @@
>+--- sql/txid/Makefile.orig	2013-07-29 08:14:55 UTC
>++++ sql/txid/Makefile
>+@@ -12,7 +12,7 @@ pg83 = $(shell test $(PGVER) "<" "8.3" && echo "false"
>+ pg82 = $(shell test $(PGVER) "<" "8.2" && echo "false" || echo "true")
>+ endif
>+ 
>+-ifeq ($(pg83),true)  # we have 8.3 with internal txid
>++ifeq (1,1) # we always have >= 9.4 with internal txid
>+ 
>+ # install empty txid.sql
>+ DATA_built = txid.sql
>
>Property changes on: databases/skytools/files/patch-sql_txid_Makefile
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

tobik: maintainer-approval?

Actions: View | Diff

Attachments on bug 239652: 206286