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

Merge branch 'master' into ks1322-master

Browse Source
This commit is contained in:
Alexey Milovidov 2017-12-19 20:49:02 +03:00
commit 2ac61adfec
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/find_readline_edit.cmake
View File

@ -46,8 +46,8 @@ if (LINE_EDITING_LIBS AND READLINE_INCLUDE_DIR)
#include <readline/readline.h>
#include <readline/history.h>
int main() {
add_history(nullptr);
append_history(1,nullptr);
add_history(NULL);
append_history(1,NULL);
return 0;
}
" HAVE_READLINE_HISTORY)

12
copy_headers.sh
View File

@ -54,8 +54,14 @@ done
# Копируем больше заголовочных файлов с интринсиками, так как на серверах, куда будут устанавливаться
# заголовочные файлы, будет использоваться опция -march=native.
for i in $(ls -1 $($CLANG -v -xc++ - <<<'' 2>&1 | grep '^ /' | grep 'include' | grep -E '/lib/clang/|/include/clang/')/*.h | grep -vE 'arm|altivec|Intrin');
for src_file in $(ls -1 $($CLANG -v -xc++ - <<<'' 2>&1 | grep '^ /' | grep 'include' | grep -E '/lib/clang/|/include/clang/')/*.h | grep -vE 'arm|altivec|Intrin');
do
mkdir -p "$DST/$(echo $i | sed -r -e 's/\/[^/]*$/\//')";
cp "$i" "$DST/$i";
mkdir -p "$DST/$(echo $src_file | sed -r -e 's/\/[^/]*$/\//')";
cp "$src_file" "$DST/$src_file";
done
# Even more platform-specific headers
for src_file in $(ls -1 $SOURCE_PATH/contrib/libboost/boost_1_65_0/boost/smart_ptr/detail/*);
do
cp "$src_file" "$DST/$src_file";
done

3
dbms/src/Interpreters/SpecializedAggregator.h
View File

@ -58,7 +58,6 @@ struct AggregateFunctionsCreator
AggregateFunctionsCreator(
const Aggregator::AggregateFunctionsPlainPtrs & aggregate_functions_,
const Sizes & offsets_of_aggregate_states_,
Aggregator::AggregateColumns & aggregate_columns_,
AggregateDataPtr & aggregate_data_)
: aggregate_functions(aggregate_functions_),
offsets_of_aggregate_states(offsets_of_aggregate_states_),
@ -195,7 +194,7 @@ void NO_INLINE Aggregator::executeSpecializedCase(
AggregateDataPtr place = aggregates_pool->alloc(total_size_of_aggregate_states);
AggregateFunctionsList::forEach(AggregateFunctionsCreator(
aggregate_functions, offsets_of_aggregate_states, aggregate_columns, place));
aggregate_functions, offsets_of_aggregate_states, place));
aggregate_data = place;
}