hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject [1/2] incubator-hawq git commit: HAWQ-599. Fixed coverity issues.
Date Tue, 29 Mar 2016 21:50:16 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master c4d22812f -> aea5e6046


HAWQ-599. Fixed coverity issues.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/05151041
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/05151041
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/05151041

Branch: refs/heads/master
Commit: 05151041514290426bbf9a7b24ee1240ded9e303
Parents: 01a27b7
Author: Oleksandr Diachenko <odiachenko@pivotal.io>
Authored: Mon Mar 28 13:32:21 2016 -0700
Committer: Oleksandr Diachenko <odiachenko@pivotal.io>
Committed: Mon Mar 28 15:28:00 2016 -0700

----------------------------------------------------------------------
 src/backend/access/external/hd_work_mgr.c | 1 -
 src/backend/access/external/pxfutils.c    | 9 +++++----
 src/backend/utils/adt/pxf_functions.c     | 2 +-
 src/bin/gpfusion/gpbridgeapi.c            | 1 -
 src/include/access/pxfutils.h             | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/05151041/src/backend/access/external/hd_work_mgr.c
----------------------------------------------------------------------
diff --git a/src/backend/access/external/hd_work_mgr.c b/src/backend/access/external/hd_work_mgr.c
index 9660d9c..6829de5 100644
--- a/src/backend/access/external/hd_work_mgr.c
+++ b/src/backend/access/external/hd_work_mgr.c
@@ -886,7 +886,6 @@ static void init_client_context(ClientContext *client_context)
 {
 	client_context->http_headers = NULL;
 	client_context->handle = NULL;
-	memset(client_context->chunk_buf, 0, RAW_BUF_SIZE);
 	initStringInfo(&(client_context->the_rest_buf));
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/05151041/src/backend/access/external/pxfutils.c
----------------------------------------------------------------------
diff --git a/src/backend/access/external/pxfutils.c b/src/backend/access/external/pxfutils.c
index 6d19ce6..1b53a4a 100644
--- a/src/backend/access/external/pxfutils.c
+++ b/src/backend/access/external/pxfutils.c
@@ -100,10 +100,11 @@ call_rest(GPHDUri *hadoop_uri,
 static void process_request(ClientContext* client_context, char *uri)
 {
 	size_t n = 0;
+	char buffer[RAW_BUF_SIZE];
 
 	print_http_headers(client_context->http_headers);
 	client_context->handle = churl_init_download(uri, client_context->http_headers);
-	memset(client_context->chunk_buf, 0, RAW_BUF_SIZE);
+	memset(buffer, 0, RAW_BUF_SIZE);
 	resetStringInfo(&(client_context->the_rest_buf));
 
 	/*
@@ -115,10 +116,10 @@ static void process_request(ClientContext* client_context, char *uri)
 	{
 		/* read some bytes to make sure the connection is established */
 		churl_read_check_connectivity(client_context->handle);
-		while ((n = churl_read(client_context->handle, client_context->chunk_buf, sizeof(client_context->chunk_buf)))
!= 0)
+		while ((n = churl_read(client_context->handle, buffer, sizeof(buffer))) != 0)
 		{
-			appendBinaryStringInfo(&(client_context->the_rest_buf), client_context->chunk_buf,
n);
-			memset(client_context->chunk_buf, 0, RAW_BUF_SIZE);
+			appendBinaryStringInfo(&(client_context->the_rest_buf), buffer, n);
+			memset(buffer, 0, RAW_BUF_SIZE);
 		}
 		churl_cleanup(client_context->handle, false);
 	}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/05151041/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 1b455e0..a3a2662 100644
--- a/src/backend/utils/adt/pxf_functions.c
+++ b/src/backend/utils/adt/pxf_functions.c
@@ -63,7 +63,7 @@ pxf_item_fields_enum_next(ItemContext *item_context)
 	else if (lnext(item_context->current_field))
 		item_context->current_field = lnext(item_context->current_field);
 	/* next item */
-	else if (lnext(item_context->current_item))
+	else if (item_context->current_item && lnext(item_context->current_item))
 	{
 		item_context->current_item = lnext(item_context->current_item);
 		item_context->current_field = list_head(((PxfItem *) lfirst(item_context->current_item))->fields);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/05151041/src/bin/gpfusion/gpbridgeapi.c
----------------------------------------------------------------------
diff --git a/src/bin/gpfusion/gpbridgeapi.c b/src/bin/gpfusion/gpbridgeapi.c
index 5cdb624..6d7dfaf 100644
--- a/src/bin/gpfusion/gpbridgeapi.c
+++ b/src/bin/gpfusion/gpbridgeapi.c
@@ -280,7 +280,6 @@ static void init_client_context(ClientContext *client_context)
 {
 	client_context->http_headers = NULL;
 	client_context->handle = NULL;
-	memset(client_context->chunk_buf, 0, RAW_BUF_SIZE);
 	initStringInfo(&(client_context->the_rest_buf));
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/05151041/src/include/access/pxfutils.h
----------------------------------------------------------------------
diff --git a/src/include/access/pxfutils.h b/src/include/access/pxfutils.h
index d6bc016..74fd998 100644
--- a/src/include/access/pxfutils.h
+++ b/src/include/access/pxfutils.h
@@ -28,7 +28,7 @@ typedef struct sClientContext
 {
 	CHURL_HEADERS http_headers;
 	CHURL_HANDLE handle;
-	char chunk_buf[RAW_BUF_SIZE];	/* part of the HTTP response - received	*/
+									/* part of the HTTP response - received	*/
 									/* from one call to churl_read 			*/
 	StringInfoData the_rest_buf; 	/* contains the complete HTTP response 	*/
 } ClientContext;


Mime
View raw message