From 2d11ad9884cd7a939c41555bfa41dbc6ceea707f Mon Sep 17 00:00:00 2001 From: Lav Jain Date: Thu, 28 Sep 2017 12:42:59 -0700 Subject: [PATCH] Revert "Start hive for running HiveSmokeTest" This reverts commit e449b1e090a9d34012bdc18c16f529f90534b753. --- concourse/scripts/regression_tests_pxf.bash | 1 - gpAux/extensions/pxf/src/libchurl.c | 7 +------ gpAux/extensions/pxf/src/libchurl.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/concourse/scripts/regression_tests_pxf.bash b/concourse/scripts/regression_tests_pxf.bash index bf14a6c284..c71d093b58 100755 --- a/concourse/scripts/regression_tests_pxf.bash +++ b/concourse/scripts/regression_tests_pxf.bash @@ -91,7 +91,6 @@ function setup_singlecluster() { export SLAVES=1 ./init-gphd.sh ./start-hdfs.sh - ./start-hive.sh popd } diff --git a/gpAux/extensions/pxf/src/libchurl.c b/gpAux/extensions/pxf/src/libchurl.c index c9644a81cb..6e0c4e1041 100644 --- a/gpAux/extensions/pxf/src/libchurl.c +++ b/gpAux/extensions/pxf/src/libchurl.c @@ -638,12 +638,7 @@ get_dest_address(CURL *curl_handle) /* add dest url, if any, and curl was nice to tell us */ if (CURLE_OK == curl_easy_getinfo(curl_handle, CURLINFO_EFFECTIVE_URL, &dest_url) && dest_url) { - char *uri_start = dest_url + strlen(PxfProtocolStr); - char *uri_end = strchr(uri_start, '/'); - elog(INFO, "get dest address: %s", uri_start); - elog(INFO, "get dest address: %s", uri_end); - elog(INFO, "get dest address: %s", pnstrdup(uri_start, uri_end - uri_start)); - return pnstrdup(uri_start, uri_end - uri_start); + return psprintf("'%s'", dest_url); } return dest_url; } diff --git a/gpAux/extensions/pxf/src/libchurl.h b/gpAux/extensions/pxf/src/libchurl.h index 97ab803cf7..f5d23d9bd1 100644 --- a/gpAux/extensions/pxf/src/libchurl.h +++ b/gpAux/extensions/pxf/src/libchurl.h @@ -144,7 +144,6 @@ void churl_cleanup(CHURL_HANDLE handle, bool after_error); */ void print_http_headers(CHURL_HEADERS headers); -#define PxfProtocolStr "pxf://" #define PxfServiceAddress "localhost:51200" #define LocalhostIpV4Entry ":127.0.0.1" #define LocalhostIpV4 "localhost" -- GitLab