You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by wz...@apache.org on 2021/09/29 00:08:25 UTC

[impala] branch master updated (9e76a8f -> b45cd1b)

This is an automated email from the ASF dual-hosted git repository.

wzhou pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git.


    from 9e76a8f  IMPALA-10784 (part 3): Prepare to publish impala-shell on PyPi
     new 444fedb  IMPALA-10927 TestFetchAndSpooling.test_rows_sent_counters is flaky in core-s3 based test
     new b45cd1b  IMPALA-10933: Impala build finds system libcurl instead of toolchain version

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 cmake_modules/FindCurl.cmake   | 13 +++++++++++--
 tests/query_test/test_fetch.py |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

[impala] 01/02: IMPALA-10927 TestFetchAndSpooling.test_rows_sent_counters is flaky in core-s3 based test

Posted by wz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 444fedbfda6a8527d2136f4afe1a839cf278e2b5
Author: Qifan Chen <qc...@cloudera.com>
AuthorDate: Wed Sep 22 12:54:28 2021 -0400

    IMPALA-10927 TestFetchAndSpooling.test_rows_sent_counters is flaky in core-s3 based test
    
    This fix removes the flakiness for test_rows_sent_counters test by
    disabling it in S3 testing environment.
    
    Testing:
    1. Unit test in a non-S3 environment;
    2. Ran core test successfully.
    
    Change-Id: Ie6f1a8bc80c24c1368282be097aa8f943dd95d1e
    Reviewed-on: http://gerrit.cloudera.org:8080/17862
    Reviewed-by: Wenzhe Zhou <wz...@cloudera.com>
    Tested-by: Qifan Chen <qc...@cloudera.com>
---
 tests/query_test/test_fetch.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/query_test/test_fetch.py b/tests/query_test/test_fetch.py
index 90db9e8..94b667a 100644
--- a/tests/query_test/test_fetch.py
+++ b/tests/query_test/test_fetch.py
@@ -19,6 +19,7 @@ import re
 
 from time import sleep
 from tests.common.impala_test_suite import ImpalaTestSuite
+from tests.common.skip import SkipIfS3
 from tests.common.test_dimensions import extend_exec_option_dimension
 from tests.util.parse_util import parse_duration_string_ms
 
@@ -68,6 +69,7 @@ class TestFetch(ImpalaTestSuite):
       self.client.close_query(handle)
 
 
+@SkipIfS3.variable_listing_times
 class TestFetchAndSpooling(ImpalaTestSuite):
   """Tests that apply when result spooling is enabled or disabled."""
 

[impala] 02/02: IMPALA-10933: Impala build finds system libcurl instead of toolchain version

Posted by wz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wzhou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit b45cd1bf0234de8ce7ac17565eca6c1503d1aad8
Author: Zoltan Borok-Nagy <bo...@cloudera.com>
AuthorDate: Tue Sep 28 12:01:42 2021 +0200

    IMPALA-10933: Impala build finds system libcurl instead of toolchain version
    
    This patch modifies FindCurl.cmake to ignore the system version
    of libcurl. Without this patch the build might find a wrong
    version of libcurl which causes errors during link time.
    
    Change-Id: I3c2d315e9bc06b9b926a492fa8d3729baddc2c82
    Reviewed-on: http://gerrit.cloudera.org:8080/17876
    Reviewed-by: Wenzhe Zhou <wz...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 cmake_modules/FindCurl.cmake | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/cmake_modules/FindCurl.cmake b/cmake_modules/FindCurl.cmake
index 04a3bcd..c8b60f3 100644
--- a/cmake_modules/FindCurl.cmake
+++ b/cmake_modules/FindCurl.cmake
@@ -34,8 +34,17 @@ find_path(CURL_INCLUDE_DIR NAMES curl/curl.h PATHS
   NO_DEFAULT_PATH
 )
 
-find_library(CURL_STATIC_LIB NAMES libcurl.a PATHS ${CURL_SEARCH_LIB_PATH})
-find_library(CURL_SHARED_LIB NAMES libcurl.so PATHS ${CURL_SEARCH_LIB_PATH})
+find_library(CURL_STATIC_LIB NAMES libcurl.a PATHS
+  ${CURL_SEARCH_LIB_PATH}
+  # make sure we don't accidentally pick up a different version
+  NO_DEFAULT_PATH
+)
+
+find_library(CURL_SHARED_LIB NAMES libcurl.so PATHS
+  ${CURL_SEARCH_LIB_PATH}
+  # make sure we don't accidentally pick up a different version
+  NO_DEFAULT_PATH
+)
 
 if (NOT CURL_INCLUDE_DIR OR NOT CURL_STATIC_LIB)
   message(FATAL_ERROR "Curl includes and libraries NOT found. "