incubator-hawq git commit: HAWQ-682: hawq init master fails to syncup hawq-site xml if there is a segment host down (bhuvnesh2703)
Repository: incubator-hawq
Updated Branches:
refs/heads/master 775597818 -> e45f405c5
HAWQ-682: hawq init master fails to syncup hawq-site xml if there is a segment
host down (bhuvnesh2703)
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/e45f405c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/e45f405c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/e45f405c
Branch: refs/heads/master
Commit: e45f405c527eb23e5eb108edd7474617289645e7
Parents: 7755978
Author: Bhuvnesh Chaudhary
Authored: Fri Apr 15 20:55:53 2016 -0700
Committer: Bhuvnesh Chaudhary
Committed: Fri Apr 15 20:55:53 2016 -0700
--
tools/bin/hawq_ctl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/e45f405c/tools/bin/hawq_ctl
--
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index 91ac814..d592d25 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -256,8 +256,9 @@ class HawqInit:
self.default_hash_table_bucket_number = buckets
logger.info("Set default_hash_table_bucket_number as: %s" %
self.default_hash_table_bucket_number)
-cmd = "hawq config -c default_hash_table_bucket_number -v %s
--skipvalidation -q > /dev/null" % \
- self.default_hash_table_bucket_number
+ignore_bad_hosts = '--ignore-bad-hosts' if opts.ignore_bad_hosts else
''
+cmd = "hawq config -c default_hash_table_bucket_number -v %s
--skipvalidation -q %s > /dev/null" % \
+ (self.default_hash_table_bucket_number, ignore_bad_hosts)
result = local_ssh(cmd, logger)
if result != 0:
logger.error("Set default_hash_table_bucket_number failed")
incubator-hawq git commit: HAWQ-682 Include ignore-bad-hosts option in hawq init master command to avoid syncup failures during setting default bucket number
Repository: incubator-hawq
Updated Branches:
refs/heads/HAWQ-682 [created] d0b8379d3
HAWQ-682 Include ignore-bad-hosts option in hawq init master command to avoid
syncup failures during setting default bucket number
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/d0b8379d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/d0b8379d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/d0b8379d
Branch: refs/heads/HAWQ-682
Commit: d0b8379d34574f22e94536562f403a515215ffbd
Parents: 7755978
Author: Bhuvnesh Chaudhary
Authored: Fri Apr 15 14:55:25 2016 -0700
Committer: Bhuvnesh Chaudhary
Committed: Fri Apr 15 14:55:25 2016 -0700
--
tools/bin/hawq_ctl | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d0b8379d/tools/bin/hawq_ctl
--
diff --git a/tools/bin/hawq_ctl b/tools/bin/hawq_ctl
index 91ac814..d592d25 100755
--- a/tools/bin/hawq_ctl
+++ b/tools/bin/hawq_ctl
@@ -256,8 +256,9 @@ class HawqInit:
self.default_hash_table_bucket_number = buckets
logger.info("Set default_hash_table_bucket_number as: %s" %
self.default_hash_table_bucket_number)
-cmd = "hawq config -c default_hash_table_bucket_number -v %s
--skipvalidation -q > /dev/null" % \
- self.default_hash_table_bucket_number
+ignore_bad_hosts = '--ignore-bad-hosts' if opts.ignore_bad_hosts else
''
+cmd = "hawq config -c default_hash_table_bucket_number -v %s
--skipvalidation -q %s > /dev/null" % \
+ (self.default_hash_table_bucket_number, ignore_bad_hosts)
result = local_ssh(cmd, logger)
if result != 0:
logger.error("Set default_hash_table_bucket_number failed")
incubator-hawq git commit: HAWQ-681. Removed hcatalog_enable GUC.
Repository: incubator-hawq
Updated Branches:
refs/heads/HAWQ-681 5ce4130b4 -> bf5e92dfe
HAWQ-681. Removed hcatalog_enable GUC.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/bf5e92df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/bf5e92df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/bf5e92df
Branch: refs/heads/HAWQ-681
Commit: bf5e92dfe7cb7a1713ac42e6fe7e40106bcd5612
Parents: 5ce4130
Author: Oleksandr Diachenko
Authored: Fri Apr 15 14:40:24 2016 -0700
Committer: Oleksandr Diachenko
Committed: Fri Apr 15 14:40:24 2016 -0700
--
src/backend/catalog/namespace.c| 8
src/backend/utils/adt/pxf_functions.c | 8
src/backend/utils/misc/guc.c | 13 -
src/include/utils/guc.h| 3 ---
src/test/regress/input/hcatalog_lookup.source | 9 -
src/test/regress/output/hcatalog_lookup.source | 16
6 files changed, 4 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bf5e92df/src/backend/catalog/namespace.c
--
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index 0de311f..4685bfa 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -245,14 +245,6 @@ RangeVarGetRelid(const RangeVar *relation, bool failOK,
bool allowHcatalog)
relation->catalogname,
relation->schemaname,
relation->relname)));
}
- if (!hcatalog_enable)
- {
- ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-errmsg("HCatalog querying is not enabled,
query for \"%s.%s.%s\" is not allowed in this context",
- relation->catalogname,
relation->schemaname,
- relation->relname)));
- }
/* Pull relation metadata via the hcat proxy(pxf) only if
relation doesn't exist*/
if(!RelationExists(relation, dboid))
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bf5e92df/src/backend/utils/adt/pxf_functions.c
--
diff --git a/src/backend/utils/adt/pxf_functions.c
b/src/backend/utils/adt/pxf_functions.c
index a3a2662..ee19a8b 100644
--- a/src/backend/utils/adt/pxf_functions.c
+++ b/src/backend/utils/adt/pxf_functions.c
@@ -94,14 +94,6 @@ Datum pxf_get_item_fields(PG_FUNCTION_ARGS)
text *profile = PG_GETARG_TEXT_P(0);
text *pattern = PG_GETARG_TEXT_P(1);
-
- if (!hcatalog_enable)
- {
- ereport(ERROR,
- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-errmsg("HCatalog querying is not enabled")));
- }
-
/* stuff done only on the first call of the function */
if (SRF_IS_FIRSTCALL())
{
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bf5e92df/src/backend/utils/misc/guc.c
--
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 3125c58..8e047a2 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -623,9 +623,6 @@ bool pxf_service_singlecluster = false;
char *pxf_remote_service_login = NULL;
char *pxf_remote_service_secret = NULL;
-/* HCatalog GUC */
-bool hcatalog_enable = false;
-
/* Time based authentication GUC */
char *gp_auth_time_override_str = NULL;
@@ -4326,16 +4323,6 @@ static struct config_bool ConfigureNamesBool[] =
},
{
- {"hcatalog_enable", PGC_USERSET, EXTERNAL_TABLES,
- gettext_noop("Enables HCatalog querying"),
- NULL,
- GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
- },
- &hcatalog_enable,
- false, NULL, NULL
- },
-
- {
{"gp_disable_catalog_access_on_segment", PGC_USERSET,
DEVELOPER_OPTIONS,
gettext_noop("Disables non-builtin object access on segments"),
NULL,
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bf5e92df/src/include/utils/guc.h
--
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index c70c491..7da1dec 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -513,9 +513,6 @@ extern bool pxf_service_sing
[incubator-hawq] Git Push Summary
Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-681 [created] 5ce4130b4
incubator-hawq git commit: HAWQ-644. Fix for dispatching dfs filespace for PXF tables
Repository: incubator-hawq
Updated Branches:
refs/heads/master 5ce4130b4 -> 775597818
HAWQ-644. Fix for dispatching dfs filespace for PXF tables
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/77559781
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/77559781
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/77559781
Branch: refs/heads/master
Commit: 7755978183ccff28ff5fc7ccbda995f2bb21002f
Parents: 5ce4130
Author: Shivram Mani
Authored: Fri Apr 15 13:47:13 2016 -0700
Committer: Shivram Mani
Committed: Fri Apr 15 13:47:13 2016 -0700
--
src/backend/cdb/cdbquerycontextdispatching.c | 15 +++
src/bin/gpfusion/gpbridgeapi.c | 10 --
2 files changed, 11 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/77559781/src/backend/cdb/cdbquerycontextdispatching.c
--
diff --git a/src/backend/cdb/cdbquerycontextdispatching.c
b/src/backend/cdb/cdbquerycontextdispatching.c
index c6647cd..efc6079 100644
--- a/src/backend/cdb/cdbquerycontextdispatching.c
+++ b/src/backend/cdb/cdbquerycontextdispatching.c
@@ -779,21 +779,24 @@ static void
RebuildNamespace(QueryContextInfo *cxt)
{
+ MemoryContext oldContext;
int len;
char buffer[4], *binary;
+ oldContext = MemoryContextSwitchTo(MessageContext);
ReadData(cxt, buffer, sizeof(buffer), TRUE);
len = (int) ntohl(*(uint32 *) buffer);
binary = palloc(len);
if(ReadData(cxt, binary, len, TRUE))
{
- StringInfoData buffer;
- initStringInfoOfString(&buffer, binary, len);
- dfs_address = strdup(buffer.data);
+ dfs_address = pstrdup(binary);
} else {
+ pfree(binary);
+ MemoryContextSwitchTo(oldContext);
elog(ERROR, "Couldn't rebuild Namespace");
}
pfree(binary);
+ MemoryContextSwitchTo(oldContext);
}
/*
@@ -3031,7 +3034,11 @@ prepareDfsAddressForDispatch(QueryContextInfo* cxt)
if (!enable_secure_filesystem)
return;
const char *namespace = cxt->sharedPath;
- int size = strlen(namespace);
+ elog(DEBUG2, "*** MASTER SHARED PATH VALUE %s
*", cxt->sharedPath);
+ /*
+* Need to account for '\0' when dispatching length
+*/
+ int size = strlen(namespace) + 1;
StringInfoData buffer;
initStringInfo(&buffer);
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/77559781/src/bin/gpfusion/gpbridgeapi.c
--
diff --git a/src/bin/gpfusion/gpbridgeapi.c b/src/bin/gpfusion/gpbridgeapi.c
index bd304ac..011b0fc 100644
--- a/src/bin/gpfusion/gpbridgeapi.c
+++ b/src/bin/gpfusion/gpbridgeapi.c
@@ -62,7 +62,6 @@ void build_uri_for_write(gphadoop_context* context,
PxfServer* rest_server);
size_t fill_buffer(gphadoop_context* context, char* start, size_t size);
void add_delegation_token(PxfInputData *inputData);
void free_token_resources(PxfInputData *inputData);
-void free_dfs_address();
/* Custom protocol entry point for read
*/
@@ -242,8 +241,6 @@ void gpbridge_import_start(PG_FUNCTION_ARGS)
/* read some bytes to make sure the connection is established */
churl_read_check_connectivity(context->churl_handle);
-
- free_dfs_address();
}
void gpbridge_export_start(PG_FUNCTION_ARGS)
@@ -273,8 +270,6 @@ void gpbridge_export_start(PG_FUNCTION_ARGS)
context->churl_handle = churl_init_upload(context->uri.data,
context->churl_headers);
-
- free_dfs_address();
}
/*
@@ -537,8 +532,3 @@ void free_token_resources(PxfInputData *inputData)
pfree(inputData->token);
}
-
-void free_dfs_address()
-{
- free(dfs_address);
-}
