thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on mac

Browse Source
This commit is contained in:
Antonio Andelic 2023-08-01 11:26:55 +02:00
parent 71e58699b5
commit 0037ab759d
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/libarchive-cmake/CMakeLists.txt
View File

@ -162,6 +162,10 @@ if (OS_LINUX)
MAJOR_IN_SYSMACROS=1 MAJOR_IN_SYSMACROS=1
HAVE_LINUX_FS_H=1 HAVE_LINUX_FS_H=1
HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1 HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1
HAVE_LINUX_TYPES_H=1
HAVE_SYS_STATFS_H=1
HAVE_FUTIMESAT=1
HAVE_ICONV=1
) )
endif() endif()

10
contrib/libarchive-cmake/config.h
View File

@ -628,7 +628,7 @@ typedef uint64_t uintmax_t;
#define HAVE_FUTIMES 1 #define HAVE_FUTIMES 1
/* Define to 1 if you have the `futimesat' function. */ /* Define to 1 if you have the `futimesat' function. */
#define HAVE_FUTIMESAT 1 /* #undef HAVE_FUTIMESAT */
/* Define to 1 if you have the `getea' function. */ /* Define to 1 if you have the `getea' function. */
/* #undef HAVE_GETEA */ /* #undef HAVE_GETEA */
@ -667,7 +667,7 @@ typedef uint64_t uintmax_t;
#define HAVE_GRP_H 1 #define HAVE_GRP_H 1
/* Define to 1 if you have the `iconv' function. */ /* Define to 1 if you have the `iconv' function. */
#define HAVE_ICONV 1 /* #undef HAVE_ICONV */
/* Define to 1 if you have the <iconv.h> header file. */ /* Define to 1 if you have the <iconv.h> header file. */
#define HAVE_ICONV_H 1 #define HAVE_ICONV_H 1
@ -788,7 +788,7 @@ typedef uint64_t uintmax_t;
/* #undef HAVE_LINUX_MAGIC_H */ /* #undef HAVE_LINUX_MAGIC_H */
/* Define to 1 if you have the <linux/types.h> header file. */ /* Define to 1 if you have the <linux/types.h> header file. */
#define HAVE_LINUX_TYPES_H 1 /* #undef HAVE_LINUX_TYPES_H */
/* Define to 1 if you have the `listea' function. */ /* Define to 1 if you have the `listea' function. */
/* #undef HAVE_LISTEA */ /* #undef HAVE_LISTEA */
@ -1081,7 +1081,7 @@ typedef uint64_t uintmax_t;
/* #undef HAVE_SYS_ACL_H */ /* #undef HAVE_SYS_ACL_H */
/* Define to 1 if you have the <sys/cdefs.h> header file. */ /* Define to 1 if you have the <sys/cdefs.h> header file. */
#define HAVE_SYS_CDEFS_H 1 /* #undef HAVE_SYS_CDEFS_H */
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/ */
@ -1122,7 +1122,7 @@ typedef uint64_t uintmax_t;
#define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/statfs.h> header file. */ /* Define to 1 if you have the <sys/statfs.h> header file. */
#define HAVE_SYS_STATFS_H 1 /* #undef HAVE_SYS_STATFS_H */
/* Define to 1 if you have the <sys/statvfs.h> header file. */ /* Define to 1 if you have the <sys/statvfs.h> header file. */
#define HAVE_SYS_STATVFS_H 1 #define HAVE_SYS_STATVFS_H 1

10
tests/queries/0_stateless/02661_select_from_table_in_archive.sh
View File

@ -32,23 +32,23 @@ run_archive_test "zip"
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.zip rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.zip
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.zip rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.zip
tar -cvzf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar.gz ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null tar -cvzf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar.gz ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv &> /dev/null
tar -cvzf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar.gz ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null tar -cvzf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar.gz ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv &> /dev/null
run_archive_test "tar.gz" run_archive_test "tar.gz"
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar.gz rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar.gz
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar.gz rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar.gz
tar -cvf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null tar -cvf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv &> /dev/null
tar -cvf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null tar -cvf ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv &> /dev/null
run_archive_test "tar" run_archive_test "tar"
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.tar
rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar rm ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.tar
7z a ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.7z ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null 7z a ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive1.7z ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null
7z a ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.7z ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null 7z a ${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}_archive2.7z ${CLICKHOUSE_TEST_UNIQUE_NAME}_data.csv > /dev/null
run_archive_test "7z" run_archive_test "7z"