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/07/28 21:03:53 UTC
incubator-hawq git commit: HAWQ-954. Check that ExternalSelectDesc
reference exists
Repository: incubator-hawq
Updated Branches:
refs/heads/master 316c5048f -> b2df66b4c
HAWQ-954. Check that ExternalSelectDesc reference exists
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/b2df66b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/b2df66b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/b2df66b4
Branch: refs/heads/master
Commit: b2df66b4c271e65ccbce8d7c558bc4c844e69d86
Parents: 316c504
Author: Kavinder Dhaliwal <ka...@gmail.com>
Authored: Tue Jul 26 16:09:38 2016 -0700
Committer: Shivram Mani <sh...@gmail.com>
Committed: Thu Jul 28 14:03:20 2016 -0700
----------------------------------------------------------------------
src/bin/gpfusion/gpbridgeapi.c | 3 ++-
src/include/access/extprotocol.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/b2df66b4/src/bin/gpfusion/gpbridgeapi.c
----------------------------------------------------------------------
diff --git a/src/bin/gpfusion/gpbridgeapi.c b/src/bin/gpfusion/gpbridgeapi.c
index 465c38d..94c6b7d 100644
--- a/src/bin/gpfusion/gpbridgeapi.c
+++ b/src/bin/gpfusion/gpbridgeapi.c
@@ -182,7 +182,8 @@ void add_querydata_to_http_header(gphadoop_context* context, PG_FUNCTION_ARGS)
inputData.gphduri = context->gphd_uri;
inputData.rel = EXTPROTOCOL_GET_RELATION(fcinfo);
inputData.filterstr = serializePxfFilterQuals(EXTPROTOCOL_GET_SCANQUALS(fcinfo));
- inputData.proj_info = EXTPROTOCOL_GET_PROJINFO(fcinfo);
+ if (EXTPROTOCOL_GET_SELECTDESC(fcinfo))
+ inputData.proj_info = EXTPROTOCOL_GET_PROJINFO(fcinfo);
add_delegation_token(&inputData);
build_http_header(&inputData);
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/b2df66b4/src/include/access/extprotocol.h
----------------------------------------------------------------------
diff --git a/src/include/access/extprotocol.h b/src/include/access/extprotocol.h
index ca7d492..4b69bb7 100644
--- a/src/include/access/extprotocol.h
+++ b/src/include/access/extprotocol.h
@@ -64,6 +64,7 @@ typedef ExtProtocolData *ExtProtocol;
#define EXTPROTOCOL_GET_DATALEN(fcinfo) (((ExtProtocolData*) fcinfo->context)->prot_maxbytes)
#define EXTPROTOCOL_GET_SCANQUALS(fcinfo) (((ExtProtocolData*) fcinfo->context)->prot_scanquals)
#define EXTPROTOCOL_GET_USER_CTX(fcinfo) (((ExtProtocolData*) fcinfo->context)->prot_user_ctx)
+#define EXTPROTOCOL_GET_SELECTDESC(fcinfo) (((ExtProtocolData*) fcinfo->context)->desc)
#define EXTPROTOCOL_GET_PROJINFO(fcinfo) (((ExtProtocolData*) fcinfo->context)->desc->projInfo)
#define EXTPROTOCOL_IS_LAST_CALL(fcinfo) (((ExtProtocolData*) fcinfo->context)->prot_last_call)