Commit Graph

8021 Commits

Author SHA1 Message Date
Alexey Milovidov
22e7070fb0 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-22 19:07:57 +03:00
Alexey Milovidov
bb7fc04e2b Whitespaces [#CLICKHOUSE-2]. 2017-06-22 19:07:52 +03:00
proller
8ef51bf19b Fixing PerformanceTest: table_exists condition, move getMemoryAmount function to file. Add more debug helpers (#905)
* Fix missing includes

* ComplexKeyCacheDictionary: Move includes to .cpp

* Fixing PerformanceTest: table_exists condition, move getMemoryAmount function to file. Add more debug helpers

* Multiplatform memory size getter

* Requested changes

* Requested changes

* Requested changes

* fix

* Requested changes
2017-06-22 18:57:37 +03:00
Nikolai Kochetov
4c114bc3a1 added DatabaseDictionary 2017-06-22 18:44:19 +03:00
Vitaliy Lyudvichenko
d7db235269 Better names and log messages. [#CLICKHOUSE-2896] 2017-06-22 18:32:09 +03:00
Vitaliy Lyudvichenko
99f502d5e0 Support OPTIMIZE query on non-leader replica. [#CLICKHOUSE-2] 2017-06-22 18:01:08 +03:00
proller
51b41aa0e3 Fix build 2017-06-22 17:14:13 +03:00
Vitaliy Lyudvichenko
eff3588f28 Rename DROP COLUMN FROM PARTITION -> CLEAR COLUMN IN PARTITION. [#CLICKHOUSE-2896] 2017-06-22 16:18:19 +03:00
Alexey Milovidov
4af5a9c7ba Merge branch 'cache_parts_that_cannot_be_merged' 2017-06-22 03:56:44 +03:00
Alexey Milovidov
946c275dfb Added missing case for broken files in StorageDistributed [#CLICKHOUSE-3091]. 2017-06-22 03:56:17 +03:00
Alexey Milovidov
db546dc827 Caching parts that cannot be merged for some time [#CLICKHOUSE-3091]. 2017-06-22 03:28:44 +03:00
Vitaliy Lyudvichenko
53adb891b3 Add replicated DROP COLUMN FROM partition for optimistic case. [#CLICKHOUSE-2896] 2017-06-22 00:56:38 +03:00
Alexey Zatelepin
374e92f76e performance-test: allow same stop condition to be present in all_of and any_of sections [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Zatelepin
1783d233e2 performance-test: do not take cancelled query times into account [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Zatelepin
0bc0150682 performance-test: add server version to json output [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Zatelepin
53aa599dc7 performance-test: rename params for clarity [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Zatelepin
678d1ef605 performance-test: fix incorrect results reporting [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Zatelepin
ef2cf67736 performance-test: allow several queries in xml scenarios [#CLICKHOUSE-3086] 2017-06-21 22:20:57 +03:00
Alexey Milovidov
7bdc87adf0 Loosened threshold on broken parts in filesystem [#CLICKHOUSE-3076]. 2017-06-21 22:11:11 +03:00
Alexey Milovidov
5c322f5756 Loosened threshold on amount of replica inconsistency to refuse server startup [#CLICKHOUSE-3076]. 2017-06-21 22:07:08 +03:00
Alexey Milovidov
1624835a08 Added test [#METR-25109]. 2017-06-21 21:24:25 +03:00
Alexey Milovidov
f16eaa99a1 Fixed error with unusual case of ARRAY JOIN [#METR-25109]. 2017-06-21 21:21:37 +03:00
Alexey Milovidov
4738094d7e Fixed error when dynamically compiled .so file is broken [#METR-25550]. 2017-06-21 20:31:22 +03:00
robot-metrika-test
7412167cba Auto version update to [54240] 2017-06-21 18:15:32 +03:00
Alexey Milovidov
6df5d556e5 Changed namespace [#DEVTOOLS-3381]. 2017-06-21 11:35:38 +03:00
Alexey Milovidov
a99f25f2a0 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-21 04:24:10 +03:00
Alexey Milovidov
604de2bfeb Better [#DEVTOOLS-3381]. 2017-06-21 04:24:05 +03:00
Vitaliy Lyudvichenko
8b72f573d8 Get rid of SET GLOBAL command. [#MTRSADMIN-3068] 2017-06-20 22:26:59 +03:00
Vitaliy Lyudvichenko
2167e4efdd Removed SET GLOBAL query. [#MTRSADMIN-3068]
It even was not supported properly in console client.
2017-06-20 22:26:59 +03:00
Vitaliy Lyudvichenko
353dba545d Correct cascade of user setting calculation. [#MTRSADMIN-3068] [#CLICKHOUSE-2906] 2017-06-20 22:26:59 +03:00
proller
9c7d30e0df Fix missing includes 2017-06-20 17:16:51 +03:00
robot-metrika-test
5fd6d75fbf Auto version update to [54239] 2017-06-20 13:43:35 +03:00
Георгий Кондратьев
a736ef618a Put ClickHouse variant of CityHash into DB namespace [#DEVTOOLS-3381]
This avoids symbol conflict when linking external applications that use another
variant of CityHash in the global namespace with ClickHouse libraries.
2017-06-20 12:25:16 +03:00
alexey-milovidov
057b919f20 Update ArrayCache.h 2017-06-20 10:51:53 +03:00
alexey-milovidov
ec5d2c3914 Update Allocator.cpp 2017-06-20 10:51:53 +03:00
Георгий Кондратьев
4d57012c62 Fix older Darwin build [#DEVTOOLS-3381] 2017-06-20 10:51:53 +03:00
Vitaliy Lyudvichenko
534b766250 CREATE of MergeTree checks that data dir is empty. [#CLICKHOUSE-3083] 2017-06-20 10:49:18 +03:00
Vitaliy Lyudvichenko
515ffa5262 Add extra check. [#CLICKHOUSE-3083] 2017-06-20 10:49:18 +03:00
Vitaliy Lyudvichenko
a098fb170a Avoid creating multiple global Context. [#CLICKHOUSE-3083] 2017-06-20 10:49:18 +03:00
Alexey Milovidov
150d3bb60f Removed useless code [#CLICKHOUSE-2]. 2017-06-20 10:36:16 +03:00
Георгий Кондратьев
47161f8425 Specify all link dependencies [#DEVTOOLS-3381]
Tested with:

export LDFLAGS="-Wl,--no-undefined"
cmake -DUSE_STATIC_LIBRARIES=OFF -DBUILD_SHARED_LIBS=ON
2017-06-20 00:53:12 +03:00
Alexey Milovidov
47484b4bed Tiny modifications [#DEVTOOLS-3381]. 2017-06-20 00:06:46 +03:00
Георгий Кондратьев
7ca75180c7 Fix type name [#DEVTOOLS-3381] 2017-06-19 23:50:56 +03:00
Alexey Milovidov
1b17f6191b Addition to prev. revision [#DEVTOOLS-3381]. 2017-06-19 23:09:11 +03:00
Alexey Milovidov
f578bbd459 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-19 23:06:53 +03:00
Alexey Milovidov
05accbdcbe Removed cyclic dependency [#DEVTOOLS-3381]. 2017-06-19 23:06:35 +03:00
Vitaliy Lyudvichenko
b772eaa3a8 Resolved #891. Fixed aliases for empty scalar subqueries. [#CLICKHOUSE-3] 2017-06-19 22:40:12 +03:00
robot-metrika-test
d7c5acbdcc Auto version update to [54238] 2017-06-19 07:20:55 +03:00
Alexey Milovidov
b0c0432b71 Fixed build [#CLICKHOUSE-31]. 2017-06-19 06:18:30 +03:00
Alexey Milovidov
f6be687717 Added test [#CLICKHOUSE-31]. 2017-06-19 06:06:17 +03:00
Alexey Milovidov
eb47356e4f Qualified names: continued [#CLICKHOUSE-31]. 2017-06-19 06:05:05 +03:00
Alexey Milovidov
6fe3e432c5 Implemented qualified identifiers in a bad way [#CLICKHOUSE-31]. 2017-06-19 05:14:18 +03:00
Alexey Milovidov
4e08309eaa Attempt to fix test of dictionaries with cache layouts and executable source [#CLICKHOUSE-2]. 2017-06-18 22:24:49 +03:00
Alexey Milovidov
401d922a4b Tiny modifications [#CLICKHOUSE-3044]. 2017-06-18 09:11:49 +03:00
Alexey Milovidov
f51db5e1f6 Fixed build [#CLICKHOUSE-3044]. 2017-06-18 08:55:46 +03:00
Alexey Milovidov
6be0428ffe Preparation [#CLICKHOUSE-31]. 2017-06-18 08:44:09 +03:00
Alexey Milovidov
d64f2beaf8 Fixed build [#CLICKHOUSE-3044]. 2017-06-18 08:43:29 +03:00
Alexey Milovidov
942c1dea21 Fixed build [#CLICKHOUSE-31]. 2017-06-18 07:09:04 +03:00
Alexey Milovidov
b19f4d1a0e Added test [#CLICKHOUSE-31]. 2017-06-18 06:38:17 +03:00
Alexey Milovidov
62be911d79 Additions to prev. revision [#CLICKHOUSE-31]. 2017-06-18 06:35:25 +03:00
Alexey Milovidov
313e52279d UNION ALL rewrite: preparation [#CLICKHOUSE-31]. 2017-06-18 06:35:25 +03:00
Alexey Milovidov
35b656e11c Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-16 21:39:17 +03:00
Alexey Milovidov
a726c68865 Check Nullable(... Nullable) early [#CLICKHOUSE-2]. 2017-06-16 21:39:09 +03:00
Alexey Zatelepin
18bff11da6 cosmetics [#CLICKHOUSE-1979] 2017-06-16 21:35:49 +03:00
Alexey Zatelepin
c90ea346ce add cross-replication test [#CLICKHOUSE-1979] 2017-06-16 21:24:18 +03:00
Alexey Milovidov
5006042bac Added test [#CLICKHOUSE-2993]. 2017-06-16 21:08:19 +03:00
Alexey Milovidov
8343cf3578 Fixed error with NULLs [#CLICKHOUSE-2993]. 2017-06-16 21:05:45 +03:00
Alexey Milovidov
ee49c37fa6 Whitespaces [#CLICKHOUSE-2]. 2017-06-16 19:23:23 +03:00
Alexey Milovidov
6aa69c06cf Moved tools sources out of library code [#CLICKHOUSE-2]. 2017-06-16 19:20:51 +03:00
Alexey Milovidov
7a0ffc9986 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-16 19:19:42 +03:00
Alexey Zatelepin
3c6b278b3d fix infinite recursion in StorageMerge::isRemote() [#CLICKHOUSE-2911] 2017-06-16 19:19:15 +03:00
Alexey Milovidov
b1a645cb6d Moved tools sources out of library code [#CLICKHOUSE-2]. 2017-06-16 19:16:22 +03:00
Vitaliy Lyudvichenko
aef0bf7e2e Fix trying to load database.sql from incorrect path. [#CLICKHOUSE-3044] 2017-06-16 19:08:24 +03:00
Vitaliy Lyudvichenko
67fdd0f544 Load the system database first. [#CLICKHOUSE-3044] 2017-06-16 19:08:24 +03:00
Alex Zatelepin
4cd9df27ab fix infinite loop in StorageMerge::isRemote() [#CLICKHOUSE-2911] 2017-06-16 03:21:00 +03:00
Alexey Milovidov
a3590e266e Trying to fix test of external dictionaries [#CLICKHOUSE-2]. 2017-06-16 02:54:41 +03:00
Alexey Milovidov
708515dd1e Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-15 23:25:16 +03:00
Alexey Milovidov
0fcb6300a2 Fixed error in linkage (thanks Orivej) [#DEVTOOLS-3381]. 2017-06-15 23:24:23 +03:00
alexey-milovidov
43a18b164d Merge pull request #883 from yandex/fix-merge-global-in
Fix GLOBAL IN for Merge table over Distributed tables
2017-06-15 23:09:51 +03:00
alexey-milovidov
f2c1858f78 Merge pull request #882 from proller/freebsd
Freebsd and macos fixes
2017-06-15 23:07:33 +03:00
proller
4c7dd6ff8b Freebsd and macos fixes 2017-06-15 22:39:35 +03:00
Alexey Zatelepin
8ee85e6440 calculate isRemote() from underlying tables of StorageMerge [#CLICKHOUSE-2911] 2017-06-15 22:24:59 +03:00
Alexey Milovidov
0743cfe6d7 Removed code that was used solely by Metrika [#DEVTOOLS-3343]. 2017-06-15 21:27:51 +03:00
Alexey Milovidov
9bf083625d Removed support for QuickLZ (obsolete) [#CLICKHOUSE-2]. 2017-06-15 21:21:59 +03:00
Alexey Milovidov
4f3738c527 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-15 20:56:05 +03:00
Alexey Milovidov
bc45598c08 Fixed name [#CLICKHOUSE-2]. 2017-06-15 20:55:57 +03:00
Vitaliy Lyudvichenko
63ac609e8b Avoid overestimation of avg. column element size. [#CLICKHOUSE-3058] 2017-06-15 20:33:03 +03:00
Nikolai Kochetov
221c05402f fixed bytes_allocated counter for cache dictionaries 2017-06-15 20:31:48 +03:00
Alexey Zatelepin
deca700689 add failing test [#CLICKHOUSE-2911] 2017-06-15 18:45:45 +03:00
Alexey Milovidov
e2c00fc46c Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-15 00:45:38 +03:00
Alexey Milovidov
a0c4e50135 Attempt to fix dictionaries test on Precise [#CLICKHOUSE-2]. 2017-06-15 00:45:05 +03:00
Alexey Milovidov
686b29cc97 Fixed test [#CLICKHOUSE-4]. 2017-06-14 22:48:10 +03:00
Alexey Milovidov
3ec14e0481 Fixed error [#CLICKHOUSE-4]. 2017-06-14 22:31:05 +03:00
Alexey Zatelepin
3b33d3fbab force reconnect by default for connections returned by ConnectionPool [#CLICKHOUSE-3068] 2017-06-14 22:16:19 +03:00
Alexey Zatelepin
ad379271ed add failing test [#CLICKHOUSE-3068] 2017-06-14 22:16:19 +03:00
Alexey Zatelepin
d95e5d40a3 fix integration tests 2017-06-14 16:23:23 +03:00
LiuCong
55b5f9bae3 Fixed a comment typo of Server/Server.cpp 2017-06-13 22:27:39 +03:00
Vitaliy Lyudvichenko
6d74a5f5d1 Resolves #851. Table was in shutdown state after aborted drop. [#CLICKHOUSE-2184] 2017-06-13 22:27:18 +03:00
Alexey Milovidov
91b5599412 Miscellaneous [#CLICKHOUSE-2]. 2017-06-13 09:22:20 +03:00
Alexey Milovidov
1e45dc5480 Fixed build [#CLICKHOUSE-2]. 2017-06-13 09:21:52 +03:00
Alexey Milovidov
f1f336275e Removed useless file [#CLICKHOUSE-2]. 2017-06-13 09:12:13 +03:00
Alexey Milovidov
10f5543a49 Revert "Add support for skipping whitespaces"
This reverts commit 704a79ee6c.
2017-06-13 09:09:59 +03:00
Alexey Milovidov
49e8473456 Fixed error [#CLICKHOUSE-2]. 2017-06-13 08:55:04 +03:00
Alexey Milovidov
8ba0ed9aeb Less dependencies [#CLICKHOUSE-2]. 2017-06-13 08:15:12 +03:00
Alexey Milovidov
a73790f17d Less dependencies [#CLICKHOUSE-2]. 2017-06-13 08:14:24 +03:00
Alexey Milovidov
2cc7c776ce Fixed build [#CLICKHOUSE-2]. 2017-06-13 07:50:26 +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
77aa0ed3d2 Fixed build [#CLICKHOUSE-31]. 2017-06-13 07:33:07 +03:00
alexey-milovidov
a669136ac2 Merge branch 'master' into CLICKHOUSE-5 2017-06-13 07:30:36 +03:00
alexey-milovidov
e03ae570f7 Merge pull request #763 from yandex/storage-dictionary
Storage dictionary
2017-06-13 07:20:46 +03:00
alexey-milovidov
3f6cccaaa1 Merge pull request #834 from luc1ph3r/Add-performance-test
Add performance test
2017-06-13 07:20:01 +03:00
Vitaliy Lyudvichenko
49eab81d9a Fix: ReshardingWorker doesn't finish if ZooKeeper session expired. [#CLICKHOUSE-2] 2017-06-13 07:15:25 +03:00
Alexey Milovidov
74bd90701e Removed useless code [#CLICKHOUSE-31]. 2017-06-13 07:14:23 +03:00
Alexey Milovidov
3ddea6b260 Removed useless code [#CLICKHOUSE-31]. 2017-06-13 07:14:23 +03:00
Alexey Milovidov
1c219c5a7b Addition to prev. revision [#CLICKHOUSE-31]. 2017-06-13 07:14:23 +03:00
Alexey Milovidov
782fe332b1 Miscellaneous [#CLICKHOUSE-31]. 2017-06-13 07:13:54 +03:00
Alexey Milovidov
43fedfecea Get rid of INSERT ID [#CLICKHOUSE-31]. 2017-06-13 07:13:20 +03:00
Alexey Milovidov
1790eeeb5e Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-13 07:13:00 +03:00
Alexey Milovidov
5aa1a1da27 Modified comment [#CLICKHOUSE-31]. 2017-06-13 07:12:51 +03:00
proller
f6f85440d4 Fix compile with gcc7 2017-06-13 02:50:34 +03:00
Alexey Milovidov
7f87bb07da Fixed linkage [#CLICKHOUSE-2]. 2017-06-12 03:26:22 +03:00
Alexey Milovidov
e9ea838c66 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-10 13:43:49 +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
Alexey Milovidov
5548f1fdd9 Analyzers: Memoizing table functions [#CLICKHOUSE-31] 2017-06-10 08:31:14 +03:00
Alexey Milovidov
d5ca92093a Fixed comment [#CLICKHOUSE-2]. 2017-06-10 08:30:07 +03:00
Nikolai Kochetov
b872751c5e Merge branch 'master' into storage-dictionary 2017-06-09 11:38:23 +03:00
Alexey Zatelepin
877283b589 fix sorting when all columns are const [#CLICKHOUSE-3062] 2017-06-09 09:13:20 +03:00
Alexey Zatelepin
b03c87be39 fix nulls sorting when limit is greater than rows count [#CLICKHOUSE-3061] 2017-06-09 09:13:20 +03:00
Nikolai Kochetov
2f7f9a328e changed ComplexKeyCacheDictionary key serialization 2017-06-08 20:51:46 +03:00
Vitaliy Lyudvichenko
58db4b7be4 Fix HTTP session test again. [#CLICKHOUSE-2] 2017-06-08 19:36:45 +03:00
Nikolai Kochetov
679cccc52d renamed *.hpp to *.h in DictionaryBlickInputStream 2017-06-08 16:35:35 +03:00
Nikolai Kochetov
bff77d1bae merged with master 2017-06-08 15:00:11 +03:00
Alexey Milovidov
a4b28db411 Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-08 09:29:49 +03:00
Vitaliy Lyudvichenko
7ab88b8055 Fix HTTP sessions test. [#CLICKHOUSE-3] 2017-06-07 22:06:43 +03:00
Nikolai Kochetov
b931ca4edb removed cache dictionaries from test_select_all 2017-06-07 19:50:56 +03:00
Nikolai Kochetov
af661f9be1 integration tests for StorageDictionary 2017-06-07 19:43:07 +03:00
Alexey Milovidov
0b4c23d0fc Added test [#CLICKHOUSE-2]. 2017-06-07 04:56:20 +03:00
Alexey Milovidov
7c6f647559 Removed questionable code [#CLICKHOUSE-2]. 2017-06-07 04:52:11 +03:00
Alexey Milovidov
d5a83f6cef Removed questionable code [#CLICKHOUSE-2]. 2017-06-07 04:49:23 +03:00
Alexey Milovidov
38885d00a3 Merge branch 'storage-startup-method' 2017-06-07 02:27:16 +03:00
Alexey Milovidov
dc0d5b604f Addition to prev. revision [#CLICKHOUSE-2]. 2017-06-06 22:06:44 +03:00
Alexey Milovidov
50b84fcc9d Removed duplicate code [#CLICKHOUSE-2]. 2017-06-06 21:48:38 +03:00
Alexey Milovidov
0d7d379b44 Removed duplicate code [#CLICKHOUSE-2]. 2017-06-06 21:36:13 +03:00
Alexey Milovidov
9c5ddce06d Get rid of .hpp files [#CLICKHOUSE-2]. 2017-06-06 20:18:32 +03:00
Alexey Milovidov
9ebf0b633f Added IStorage::startup method to avoid starting replication and merging threads too early during server startup [#CLICKHOUSE-2]. 2017-06-06 20:06:14 +03:00
Vitaliy Lyudvichenko
d4d316dbb8 More sophisticated test. [#CLICKHOUSE-2] 2017-06-06 17:18:23 +03:00
Vitaliy Lyudvichenko
cce302588a Revert "Avoid extra context copying. [#CLICKHOUSE-3023]"
This reverts commit 87af5b5576.
2017-06-06 16:29:08 +03:00
Alexey Milovidov
153693cd4c Non significant modifications [#CLICKHOUSE-3]. 2017-06-05 23:43:23 +03:00
Alexey Milovidov
aba8432477 Fixed bad translation [#CLICKHOUSE-3]. 2017-06-05 23:18:15 +03:00
Alexey Milovidov
9593119a64 Fixed error after merge; tiny modification [#CLICKHOUSE-2]. 2017-06-05 17:40:44 +03:00