postgres-xc-committers Mailing List for Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  886f9bbe99120dc751a7d9110521a7cd6cc884d9 (commit)
      from  82c7049c243ba0849d93b6f73e1b4b96a64f4d9c (commit)


- Log -----------------------------------------------------------------
commit 886f9bbe99120dc751a7d9110521a7cd6cc884d9
Author: Michael P <mic...@us...>
Date:   Wed Mar 30 04:36:37 2011 +0900

    Fix for bug 3240318: support for lastval
    
    Last value was simply not saved in cache after nextval and setval.

diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index aceee06..01df64b 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -623,6 +623,8 @@ nextval_internal(Oid relid)
 		elm->last = result;			/* last returned number */
 		elm->cached = result;		/* last fetched number */
 		elm->last_valid = true;
+
+		last_used_seq = elm;
 	}
 	else
 	{
@@ -939,6 +941,15 @@ do_setval(Oid relid, int64 next, bool iscalled)
 		/* Update the on-disk data */
 		seq->last_value = next; /* last fetched number */
 		seq->is_called = iscalled;
+		seq->log_cnt = (iscalled) ? 0 : 1;
+
+		if (iscalled)
+		{
+			elm->last = next;		/* last returned number */
+			elm->last_valid = true;
+		}
+
+		elm->cached = elm->last;
 	}
 	else
 	{

-----------------------------------------------------------------------

Summary of changes:
 src/backend/commands/sequence.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Postgres-XC

Project "Postgres-XC".

The branch, merge_postgres_9_0_3 has been updated
       via  82c7049c243ba0849d93b6f73e1b4b96a64f4d9c (commit)
      from  f61d2df4e202e715877b676bbb194552588b43bd (commit)


- Log -----------------------------------------------------------------
commit 82c7049c243ba0849d93b6f73e1b4b96a64f4d9c
Author: Michael P <mic...@us...>
Date:   Tue Mar 29 21:01:16 2011 +0900

    Fix a cache leak WARNING with system cache
    
    This was happening because of commit 76f1d9cde238be026007d00a6af192b7f7ac4ce5
    because data cached was not released.

diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index ad8c568..3458247 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -22,7 +22,6 @@
 #include "utils/lsyscache.h"
 #ifdef PGXC
 #include "pgxc/pgxc.h"
-#include "parser/parse_type.h"
 #endif
 
 static void printtup_startup(DestReceiver *self, int operation,
@@ -201,7 +200,7 @@ SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, int16 *formats)
 		if (IS_PGXC_DATANODE && IsConnFromCoord())
 		{
 			char	   *typename;
-			typename = typeTypeName(typeidType(atttypid));
+			typename = get_typename(atttypid);
 			pq_sendstring(&buf, typename);
 		}
 #endif
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 8cac03b..3cd7f40 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -2017,6 +2017,30 @@ getBaseTypeAndTypmod(Oid typid, int32 *typmod)
 	return typid;
 }
 
+#ifdef PGXC
+/*
+ * Get type name for given type ID
+ */
+char *
+get_typename(Oid typid)
+{
+	HeapTuple		tuple;
+	Form_pg_type	typeForm;
+	char		   *result;
+
+	tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typid));
+
+	if (!HeapTupleIsValid(tuple))
+			elog(ERROR, "cache lookup failed for type %u", typid);
+
+	typeForm = (Form_pg_type) GETSTRUCT(tuple);
+	result = pstrdup(NameStr(typeForm->typname));
+	ReleaseSysCache(tuple);
+
+	return result;
+}
+#endif
+
 /*
  * get_typavgwidth
  *
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 4c88b59..7f60371 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -127,6 +127,9 @@ extern void getTypeBinaryOutputInfo(Oid type, Oid *typSend, bool *typIsVarlena);
 extern Oid	get_typmodin(Oid typid);
 extern Oid	getBaseType(Oid typid);
 extern Oid	getBaseTypeAndTypmod(Oid typid, int32 *typmod);
+#ifdef PGXC
+extern char *get_typename(Oid typid);
+#endif
 extern int32 get_typavgwidth(Oid typid, int32 typmod);
 extern int32 get_attavgwidth(Oid relid, AttrNumber attnum);
 extern bool get_attstatsslot(HeapTuple statstuple,

-----------------------------------------------------------------------

Summary of changes:
 src/backend/access/common/printtup.c |    3 +--
 src/backend/utils/cache/lsyscache.c  |   24 ++++++++++++++++++++++++
 src/include/utils/lsyscache.h        |    3 +++
 3 files changed, 28 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Postgres-XC