You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by sh...@apache.org on 2016/02/10 23:49:49 UTC
incubator-hawq git commit: HAWQ-405. CF Fixes
Repository: incubator-hawq
Updated Branches:
refs/heads/HAWQ-405 d431585ec -> 7af430a43
HAWQ-405. CF Fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/7af430a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/7af430a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/7af430a4
Branch: refs/heads/HAWQ-405
Commit: 7af430a431cffe4162280952c9d80ff92cd1f479
Parents: d431585
Author: Shivram Mani <sh...@gmail.com>
Authored: Wed Feb 10 14:49:45 2016 -0800
Committer: Shivram Mani <sh...@gmail.com>
Committed: Wed Feb 10 14:49:45 2016 -0800
----------------------------------------------------------------------
src/backend/catalog/namespace.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/7af430a4/src/backend/catalog/namespace.c
----------------------------------------------------------------------
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index 3ca640c..5056327 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -1496,18 +1496,18 @@ Oid
LookupNamespaceId(const char *nspname, Oid dboid)
{
- /* check for pg_temp alias */
- if (NSPDBOID_CURRENT == dboid && strcmp(nspname, "pg_temp") == 0)
- {
- if (TempNamespaceValid(true))
- return myTempNamespace;
- /*
- * Since this is used only for looking up existing objects, there
- * is no point in trying to initialize the temp namespace here;
- * and doing so might create problems for some callers.
- * Just fall through and give the "does not exist" error.
- */
- }
+ /* check for pg_temp alias */
+ if (NSPDBOID_CURRENT == dboid && strcmp(nspname, "pg_temp") == 0)
+ {
+ if (TempNamespaceValid(true))
+ return myTempNamespace;
+ /*
+ * Since this is used only for looking up existing objects, there
+ * is no point in trying to initialize the temp namespace here;
+ * and doing so might create problems for some callers.
+ * Just fall through and give the "does not exist" error.
+ */
+ }
if(gp_upgrade_mode)
{
@@ -1522,7 +1522,7 @@ LookupNamespaceId(const char *nspname, Oid dboid)
CStringGetDatum((char *) nspname)));
}
else
- elog(ERROR, "Upgrade cann't process the namespace: %s in dbid: %i", nspname, dboid);
+ elog(ERROR, "Upgrade cannot process the namespace: %s in dbid: %i", nspname, dboid);
}
return caql_getoid(
NULL,