thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 19:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,517 Commits 9,190 Branches 1,782 Tags 2.2 GiB
21579a3cc8
Commit Graph

267 Commits

Author SHA1 Message Date
proller
694c6ed243 Cmake: move all gtest stuff to one place in dbms/CMakeLists.txt 2018-01-09 20:29:17 +03:00
Roman Tsisyk
3a97fbd0e7 Remove hard-coded paths in Interpreters/Compiler.cpp 
Interpreters/Compiler.cpp contained hard-coded paths for system's
includes needed for query compiler. These paths were not portable
between different Linux distros and gcc/clang versions. For example,
Debian/Ubuntu use /usr/lib/gcc/x86_64-linux-gnu/*/include,
RHEL/Fedora use /usr/lib/gcc/x86_64-redhat-linux/*/include,
others use /usr/lib/gcc/*/include (without x86_64-XXX triplet).

Patch 68850012b "Embedded compiler fixes" attempted to fix this problem
by adding CMAKE_LIBRARY_ARCHITECTURE after /usr/lib. Unfortunally,
CMAKE_LIBRARY_ARCHITECTURE is not defined on RHEL/Fedora because someone
decided to omit "-gnu" from x86_64-redhat-linux (see RHBZ#1531678).

Patch 70e35d0bc "Build fixes (#1718)" added a workaround for
undefined CMAKE_LIBRARY_ARCHITECTURE on RHEL/Fedora, but hasn't fixed
problem with missing /usr/lib/gcc/x86_64-redhat-linux/*/include/
in the list of hardcoded paths.

Remove hard-coded paths and get the list of `-isystem` includes directly
from bundled clickhouse-clang.

Other changes:

- Enable RPATH for the build directory to get working binaries
  without installing them by `make install`.
 2018-01-09 20:24:25 +03:00
Alexey Milovidov
104b09604a Merging [#CLICKHOUSE-3114] 2017-12-28 00:45:05 +03:00
proller
f9d3c01a01 Add package clickhouse-test, allow testing in pbuilder (#1709) 
* Allow 32bit build (with warning)

* Add package clickhouse-test

* Test fixes

* fix

* fix

* clickhouse-test: aloow work in read-only queries dir (--tmp)

* Fix test
 2017-12-27 22:01:57 +03:00
Alexey Milovidov
f87cc75734 Fixed build [#CLICKHOUSE-2]. 2017-12-24 13:12:49 +03:00
Alexey Milovidov
acb341b2c9 Unification of aggregate function combinators [#CLICKHOUSE-3511]. 2017-12-24 09:50:11 +03:00
Alexey Milovidov
d7a36519da Simplification of aggregate functions: development [#CLICKHOUSE-2]. 2017-12-21 05:08:25 +03:00
proller
741117a390
Fix freebsd build. Little cmake fixes. (#1634) 2017-12-13 22:07:12 +03:00
Alexey Milovidov
1b60106333 Simplification of Nullable [#CLICKHOUSE-2] 2017-12-08 09:58:48 +03:00
Alexey Milovidov
28d40e2c9a Enabled -Wextra [#CLICKHOUSE-2]. 2017-12-02 06:39:38 +03:00
Alexey Milovidov
c748493a86 Better [#CLICKHOUSE-2]. 2017-12-02 05:47:12 +03:00
Alexey Milovidov
f5ecb2db5d Better [#CLICKHOUSE-2]. 2017-12-01 20:49:12 +03:00
Roman Lipovsky
9ed1ba2441 separate geo dictionaries from geo data providers 2017-11-29 01:15:06 +03:00
proller
0d3c4f4d67 Core/FieldVisitors.h -> Common/FieldVisitors.h 
Core/Progress.h -> IO/Progress.h
    tests: sudo --non-interactive
    Fix freebsd link
 2017-11-24 16:55:31 +03:00
proller
2778f35e48 Lib Parsers 2017-11-21 22:35:54 +03:00
proller
19d102cc4f fix 2017-11-17 22:53:02 +03:00
proller
5ba7e20c03 fixes 2017-11-17 22:40:27 +03:00
proller
aa3dd03389 Split lib dbms to dbms + dbms_common_io 2017-11-17 22:19:49 +03:00
Marek Vavruša
0d942a69c5 DataStreams: added Cap’n Proto format support 
Cap'n Proto is a binary message format.
Like Protocol Buffers and Thrift (but unlike JSON or MessagePack), Cap'n Proto messages are strongly-typed and not self-describing. Due to this, it requires a schema setting to specify schema file and the root object. The schema is parsed on runtime and cached for each SQL statement.
 2017-10-27 23:03:51 +03:00
Alexey Zatelepin
6ada6d9aa5 remove dead code [#CLICKHOUSE-2] 2017-10-26 07:53:52 +03:00
Alexey Zatelepin
01c39dcf1c fix CREATE TABLE bugs and idiosyncrasies: [#CLICKHOUSE-3000] 
* fix segfault on ATTACH MATERIALIZED VIEW
* allow only TEMPORARY TABLEs (not databases or views)
* forbid choosing ENGINE for TEMPORARY tables
* fix segfault on CREATE TABLE t1 AS t2 where t2 is a View
 2017-10-26 07:53:52 +03:00
proller
4ffbca2d8c Fix warnings (#1406) 
* Log query id in executeQuery; Better type mismatch error; change format in report tool

* Better log query_id

* fix message

* Use c++11 thread_local instaed of gcc's __thread

* lock mutex before notifying waiting thread in sync insertion into distributed [#CLICKHOUSE-3379]

* Cmake: fix build without downloaded submodules (#1379)

* fix

* ZooKeeper: fixed stack smashing with tryGet()

The tryGet() operation creates a 1MB buffer on stack. This may or
may not work depending on the default stack size for threads,
whether the stack protector is enabled or not, recursion depth,
and the actual value size.

This is probably going to slow down some ZK operations, but I don't
see how else this could work reliably with the existing API.

* increased timeout for test_insertion_sync_fails_with_timeout

* Update CHANGELOG_RU.md

* Update ZooKeeper.cpp

* Fix warnings

* Fixes

* Dont strip debug info from  asan, tsan and other builds except releases

* Fix asan error causd by test 00144

* Fix empty log message (#CLICKHOUSE-3378)
 2017-10-25 21:39:10 +03:00
alexey-milovidov
8c327e9378 Revert "Make gperftools (libtcmalloc) as submodule and update. (#1381)" 
This reverts commit fa2484ea90.
 2017-10-24 22:18:15 +03:00
proller
fa2484ea90 Make gperftools (libtcmalloc) as submodule and update. (#1381) 
* Update tcmalloc and make submodule

* wip

* wip

* wip

* wip

* clean

* fix

* fix

* fix

* Fix tests
 2017-10-24 22:11:42 +03:00
proller
2d2a4afa3f Fix stripping debug info from huge .o (-g0) 2017-10-24 16:30:44 +03:00
Marek Vavruša
70543200be dbms: Fix build with clang after Poco update 
In the current version of Poco, unsigned long no longer aliases to
UInt64 with LP64. The size_t aliases to unsigned long with clang,
so all the uses of size_t instead of UInt64 when interacting with
Poco interfaces are gone. I replaced uses with UInt64 where it makes
sense, and added an overloaded function for readVarUInt() to support size_t.
 2017-10-13 18:26:24 -07:00
proller
4c7850fdc2 Optional kafka (#1355) 
* Zookeeper include fix

* Update submodule contrib/poco

* Fix zookeeper submodule ho-to-make doc

* Update zookeeper submodule

* Update submodule zookeeper

* Fix compile with external zookeeper

* Optional kafka

* fix

* Fix

* fix
 2017-10-14 03:53:01 +03:00
alexey-milovidov
9ccdb5420b Merge branch 'master' into upstream-add-kafka 2017-10-13 23:52:42 +03:00
proller
fd072b58bb zstd, lz4 as submodule (#1214) 
* Contrib: use zstd, lz4 as submodule

* fix shared build

* re-test me.

* wip

* Update CHANGELOG_RU.md

* Update CHANGELOG.md

* Update CHANGELOG_RU.md

* Whitespaces [#CLICKHOUSE-2].

* Implemented TODO [#CLICKHOUSE-2].

* Whitespaces [#CLICKHOUSE-2].

* Remove wrong test

* Implemented TODO [#CLICKHOUSE-2].

* Moved chown to correct place [#CLICKHOUSE-2].

* Resolves #1273. Exception safe users update. [#CLICKHOUSE-3]

* Less noisy logging. [#CLICKHOSUE-2]

* Add metrics for RWLockFIFO. [#CLICKHOUSE-3246]

* Executable dictionaries: fail if program returns non zero exit code (#CLICKHOUSE-3171)

* Add better logging if OPTIMIZE cannot be executed. [#CLICKHOUSE-2]

* test me

* Fixing documentation fragment about "default" user. It is not mandatory anymore.

* append yurial/clickhouse-client to docs/interfaces

* Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369].

* Removed tcp_ssl_port by default [#CLICKHOUSE-2].

* Update MergeTreeDataMerger.cpp

* Update ShellCommand.cpp

* Disable part sendings and fetches before ALTER. [#CLICKHOUSE-3343]

* Update ExecutableDictionarySource.cpp

* Update ExecutableDictionarySource.cpp

* Miscellaneous changes after merge [#CLICKHOUSE-2].

* Improve tests: allow redefine some values (clickhouse path, ports, ...)

* Received signal Segmentation fault (#1300) (#1302)

* Received signal Segmentation fault (#1300)

* Add test

* Tests: Use new possibly redefined values from env (in 2 tests)

* Proper fix for the issue: better exception message [#CLICKHOUSE-2].

* Split GatherUtils.cpp for faster compile (#1312)

* Split GatherUtils.cpp for faster compile

* remove GatherUtils.cpp

* Fix array writing (#1314)

* changed MergedBlockOutputStream [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* disabled checkNoMultidimensionalArrays [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* fix IMergedBlockOutputStream::writeDataImpl [#CLICKHOUSE-3341]

* added test [#CLICKHOUSE-3341]

* fixed test [#CLICKHOUSE-3341]

* refactoring and comments [#CLICKHOUSE-3341]

* fix build [#CLICKHOUSE-3341]

* Update ColumnArray.h

* Update ActionBlocker.h

* Fix section tabulation

* Fixed infinite recursion in expression analyzer. [#CLICKHOUSE-3125]

* Update ActionBlocker.h

* Improvement [#CLICKHOUSE-2].

* Try fix strange terminate (#1329)

* Tests: External: rename --use_http  => --no_http and fix

* Try fix strange terminate

* Misc [#CLICKHOUSE-2].

*  Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa) (#1333)

* Fix compile with boost 1.65.1+ and clang 3.8 ( https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222439 )

* Fix compile CallPointInPolygon on clang4 (Thanks to @vavrusa)

* Fix complex queries with GLOBAL IN and UNION ALL  (#CLICKHOUSE-3356) (#1339)

* TEST only: why initQueryAnalyzer ?

* Better tests

* missing file

* Missing file

* Add test

* Test fixes

* Fixed FREEZE PARTITION: using only active data parts; acquire snapshot of parts [#CLICKHOUSE-3369].

* Removed tcp_ssl_port by default [#CLICKHOUSE-2].

* Better tests

* comment

* clean

* REmove wrong code

* clean

* dbms: Added compression level for ZSTD. [#METR-26742]

* dbms: CompressionSettingsSelector. [#METR-21516]

* dbms: Minor fix. [#METR-21516]

* Fix SummingMergeTree argument checking logic.

This patch fixes the Nested Column Name checking logic, which allows nested
columns be explicitly specified in SummingMergeTree engine.
 2017-10-13 21:52:23 +03:00
Marek Vavruša
011658bb02 contrib: include librdkafka as submodule 2017-10-10 08:33:00 -07:00
Alexey Milovidov
fabfed6f22 Added support for "include-what-you-use" tool [#CLICKHOUSE-2]. 2017-09-10 09:51:27 +03:00
Alexey Milovidov
cd540c2674 Replaced Mersenne Twister to PCG-Random [#CLICKHOUSE-2]. 2017-09-10 02:17:38 +03:00
proller
3269b1da57 libmariadb as submodule (CLICKHOUSE-3261) (#1181) 
* Use bundled libmariadbclient (CLICKHOUSE-3261)

* wip

* wip

* wip

* Update docs about git clone. move docs/en/development/build_*.sh -> utils/build/build_debian.sh
 2017-08-31 20:11:30 +03:00
proller
c351b367fb Fix sparcehash include (#1084) 
* Fix sparcehash include

* Fix re2_st include
 2017-08-10 02:11:28 +03:00
proller
ac178bde1f Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM (#1083) 
* Cmake: link ltdl with pocoodbc static only. rename ARM -> ARCH_ARM

* Fix lib find order

* Allow define non-contrib cityhash farmhash metrohash

* Fix message

* Cmake: fixes

* clean

* Update CMakeLists.txt
 2017-08-09 23:52:55 +03:00
proller
465d305479 gcc7 and arm fixes (#1041) 
* PerformanceTest: use getMultiple*FromConfig, fix debug helpers

* Missing file

* gcc7 fixes

* clnag-format of Split ComplexKeyCacheDictionary

* Requested changes

* Fix boost 1.64 and gcc7+ compile errors

* More fixes

* Fix arm build

* Fix nothrow

* Better arm detection
 2017-07-29 22:58:10 +03:00
Alexey Milovidov
6851a7754a Fixed linkage [#CLICKHOUSE-2]. 2017-07-25 21:32:52 +03:00
Alexey Milovidov
b52d2eab51 Fixed linkage [#CLICKHOUSE-2]. 2017-07-25 21:20:50 +03:00
Alexey Milovidov
d20c411b0d Fixed linkage [#CLICKHOUSE-2]. 2017-07-25 21:19:22 +03:00
proller
4db8d09de9 Reorganize includes. part 1 (#921) 
* Make libunwind optional. Allow use custom libcctz

* fix

* Fix

* fix

* Update BaseDaemon.cpp

* Update CMakeLists.txt

* Reorganize includes. part 1

* Update dbms_include.cmake

* Reorganize includes. part 2

* Reorganize includes. part 3

* dbms/src/Common/ThreadPool -> libs/libcommon

* Reorganize includes. part 4

* Fix print_include_directories

* Update thread_creation_latency.cpp

* Update StringRef.h
 2017-06-23 23:22:35 +03:00
Alexey Milovidov
05accbdcbe Removed cyclic dependency [#DEVTOOLS-3381]. 2017-06-19 23:06:35 +03:00
Alexey Milovidov
6aa69c06cf Moved tools sources out of library code [#CLICKHOUSE-2]. 2017-06-16 19:20:51 +03:00
Alexey Milovidov
0fcb6300a2 Fixed error in linkage (thanks Orivej) [#DEVTOOLS-3381]. 2017-06-15 23:24:23 +03:00
Alexey Milovidov
a782f81f8f Moved common code from Functions; fixed build after merge [#CLICKHOUSE-2]. 2017-06-13 07:45:30 +03:00
Alexey Milovidov
45c76803a9 Moved table functions to separate library; fixed errors; improved testability [#CLICKHOUSE-31]. 2017-06-10 12:04:31 +03:00
Marek Vavruša
9520234365 Dictionaries/TrieDictionary: IP prefix dictionary 
This commit implements a basic IP prefix dictionary
that allows storing IPv4/IPv6 prefixes and
matching them against a single IP address on query
time. This allows for doing IP -> ASN matching and
other similar things on query time.

The implementation is basic for start, using a
simple bitwise trie and reusing interface for
complex key dictionaries (so using tuple instead
of UInt32/FixedString(16) as the key). A faster
bitwise trie implementation (like poptrie) is
desired to improve lookup performance and
memory consumption with large prefix tables.
 2017-05-15 10:51:03 +04:00
proller
fac00792f9 Move most AggregateFunctions to separate lib, use AggregateFunctionFactory as singletone, rename lib storages_system->clickhouse_storages_system 2017-05-05 16:59:18 -07:00
proller
c3a62f1bb0 Fix build without icu and readline 2017-04-24 06:28:28 +03:00
proller
8cf716fa29 Functions as separate lib 2017-04-21 21:30:16 +03:00
alexey-milovidov
c9c8c8ec50 Better option to disable mysqlclient (#710) 
* Better support for disabling libmysqlclient [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
 2017-04-19 03:25:57 +03:00
proller
ab5e6c4840 Fix build without installd unixodbc (#708) 
* Fix build without installd unixodbc

* clean

* no openssl error

* fix

* fix
 2017-04-19 03:21:16 +03:00
proller
72ccc69212 Debian: simpler package (#662) 
* Allow use external re2 with re2_st=re2

* fix

* remove dupe

* use re2_st in FunctionsStringSearch.h

* fix

* move files from tools/etc to debian

* dont generate control

* version

* ok.

* wip

* Cmake: dont touch CMAKE_INSTALL_PREFIX

* wip

* works!

* clean

* okay

* like old

* wip

* wip

* okay

* clickhouse-server-base-dbg

* clean

* clickhouse-server-dbg

* Debian: Remove daemons

* Update rules

* add source/format

* control clean

* add watch

* clean

* clean

* temp fix build

* clean

* docs

* fake make_control

* fix

* testme

* testme

* add metrika package

* fake metrika files
 2017-04-10 20:43:30 +03:00
proller
11218b9ba5 cmake: remove hardcoded src/ in macros add_headers_and_sources 2017-04-04 15:37:04 +03:00
Alexey Milovidov
310736cd7e Moved headers and sources to same place [#CLICKHOUSE-3]. 2017-04-01 12:22:42 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
proller
8a9d9dddb4 Allow build with poco with disabled MongoDB or DataODBC or NetSSL (#636) 
* partial poco support

* fix

* fix optional ssl

* servier without netssl

* fix link order

* testme

* requested changes

* throw on https listen, shutdown tip
 2017-03-28 23:30:57 +03:00
proller
37f3ccb1ab cmake: split USE_STATIC_LIBRARIES to USE_STATIC_LIBRARIES + MAKE_STATIC_LIBRARIES 
fix freebsd install path
fix TEST_COVERAGE flags
 2017-03-28 20:50:58 +03:00
Vitaliy Lyudvichenko
2ab25099cd Move boost::tests to Google Tests. [#CLICKHOUSE-2] 2017-03-28 20:46:16 +03:00
Vitaliy Lyudvichenko
15254f91d2 Improve CMakeLists.txt for tests. [#CLICKHOUSE-2] 2017-03-28 20:46:16 +03:00
Vitaliy Lyudvichenko
19a2195710 Implemented re-readable buffers, add unit tests. [#CLICKHOUSE-2070] 2017-03-28 20:46:16 +03:00
Alexey Zatelepin
1ce0300c51 better detection of local timezone id [#CLICKHOUSE-2852] 2017-03-23 20:13:04 +04:00
proller
4271ef80ea fix moveing cmake files 2017-03-16 19:46:05 +03:00
proller
a08714105b Simpler vercorclass 2017-03-16 13:51:41 +04:00
proller
28ed324702 add cmake option USE_VECTORIZED_MATH_FUNCTIONS, reorganize auto configs 2017-03-16 13:51:41 +04:00
proller
d777cab172 link Storages/System via lib 2017-03-15 23:43:02 +04:00
Alexey Milovidov
30aae40300 Removed usage of iconv [#CLICKHOUSE-2879]. 2017-03-11 07:39:16 +03:00
proller
067ff7a5c7 Customizable internal compiler 2017-03-02 16:34:43 +03:00
proller
0e91c47066 Allow build with external double-conversion lz4 zstd re2 zookeeper (#531) 
* Allow build with external double-conversion lz4 zstd re2 zookeeper

* fix

* fix

* freebsd fixes

* spaces

* fix

* fix

* fix

* wip

* move

* fix
 2017-03-01 03:49:04 +04:00
proller
57c336f267 HTTPDictionarySource support HTTPS (#510) 
* https support in dictionaries

* Style
 2017-02-28 01:07:57 +04:00
proller
b5b64ceb2b Fix apple .so version (#490) 
* Cmake: fix fallback to internal libs if no external found

* wip

* style

* fix

* Fix apple .so version
 2017-02-14 16:34:32 +04:00
proller
f8d2f19280 Fix odbc include, clang-format fixes, misc (#484) 
* Cmake: fix fallback to internal libs if no external found

* wip

* style

* fix
 2017-02-13 17:59:34 +04:00
alexey-milovidov
cee5ab01fb Merge branch 'master' into merge_with_metrika 2017-02-11 00:27:15 +04:00
proller
9bbe8fe5c4 Dynamic library mode (#471) 
* Cmake: UNBUNDLED option

* Dynamic library mode
 2017-02-08 22:53:00 +04:00
proller
f87ae6808f cmake: USE_INTERNAL_ZLIB_LIBRARY (#463) 
* Correct fix of building with external poco with disabled sending progress

    Revert "Removed wrong code [#CLICKHOUSE-2]."

    This reverts commit 33f9917f53.

* fix

* fix

* cmake: USE_INTERNAL_ZLIB_LIBRARY
 2017-02-08 01:28:13 +04:00
Pavel Kartavyy
224ba16dcb use project source and binary dirs instead of global dirs 2017-02-06 18:15:19 +03:00
proller
9cea606881 Fix linking iconv under macos and freebsd 
Partially Revert "Removed usage of glib [#CLICKHOUSE-2]."
This reverts commit e4ff740ef1.
 2017-01-31 04:15:59 +03:00
proller
2688f4563f cmake: remove add_definitions(-DNO_TCMALLOC), instead use ENABLE_LIBTCMALLOC from config (#375) 
* Manual version update to [54135]

* Temporary release script fix [#METRIQA-732]

* cmake: remove add_definitions(-DNO_TCMALLOC), instead use ENABLE_LIBTCMALLOC from config
 2017-01-20 21:58:07 +04:00
proller
04d2149e8a enable -Werror only for 'libs' and 'dbms' ; add 'cmake .. -DNO_WERROR… (#372) 
* enable -Werror only for 'libs' and 'dbms' ; add 'cmake .. -DNO_WERROR=1'  option

* add -Werror for utils
 2017-01-19 23:30:58 +04:00
proller
cafc2fbbb1 Fix ENABLE_LIBTCMALLOC=0 build (#359) 
Again fix ENABLE_LIBTCMALLOC=0 build
 2017-01-18 18:09:10 +03:00
proller
7e21f1dd14 Fix build with -D NO_TCMALLOC, better sanitizers calls (#355) 
* Fix generate includes for clang

* Fix build with -D NO_TCMALLOC, better sanitizers calls
 2017-01-18 16:41:47 +04:00
proller
29475c94c0 Reorganize includes, less depends in .h files 2017-01-16 22:47:11 +03:00
proller
ee3882f251 Allow link with external libs: poco, tcmalloc 2017-01-13 14:25:44 +03:00
proller
d00765fb15 Find pthread lib by cmake 2017-01-11 16:40:02 +03:00
Alexey Zatelepin
1b61f2a9d3 use zlib-ng from contrib everywhere [#METR-23582] 2017-01-08 22:24:38 +03:00
Alexey Milovidov
a4d9d766b6 Reworking ExpressionAnalyzer (preparations) [#METR-20307]. 2017-01-04 09:52:02 +03:00
proller
4bc003c4c1 Porting to freebsd: initial, compile ok, most tests ok. 2016-12-24 01:03:10 +00:00
Vladimir Chebotarev
cc7db759fe create_init_script: Avoid generation of init file each configuration phase. [#METR-21516] 2016-12-13 14:09:22 +03:00
Vitaliy Lyudvichenko
876ad28dd8 Merge remote-tracking branch 'origin/master' into metrics_refinement 2016-12-12 19:17:23 +03:00
Alexey Milovidov
54af522de1 Preparation [#METR-2944]. 2016-12-12 10:24:56 +03:00
Alexey Milovidov
70b01f0a53 Do not include ClickHouseRevision.h in header files [#METR-2944]. 2016-12-12 08:14:46 +03:00
Alexey Milovidov
fc43827a6c Preparation [#METR-2944]. 2016-12-12 06:33:34 +03:00
Alexey Milovidov
8b06b09f34 Moved code to cpp [#METR-2944]. 2016-12-12 04:33:18 +03:00
Alexey Milovidov
599308aef0 Get rid of obsolete mongodb client library [#METR-23791]. 2016-12-11 12:43:16 +03:00
Alexey Milovidov
e97ecb6cf7 Merge branch 'master' into METR-19266 
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
 2016-12-10 07:51:36 +03:00
Vitaliy Lyudvichenko
6540156100 Removed redundant code from CMakeLists. 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
f8eb9028fd Refined query_log, processes and merges metrics. 
Also, dbms/CMakeLists.txt was rewritten.
 2016-12-09 13:11:25 +03:00
Alexey Milovidov
2dc425b7e6 Preparation [#METR-23747]. 2016-12-08 06:04:30 +03:00
Alexey Milovidov
514715589b Preparation [#METR-23747]. 2016-12-08 05:49:04 +03:00
Alexey Milovidov
9303a07b39 Removed garbage [#METR-23747]. 2016-12-08 04:11:44 +03:00
Alexey Milovidov
f2cd8de5b4 Removed garbage [#METR-23747]. 2016-12-08 04:08:19 +03:00