thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-17 21:24:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,119 Commits 9,139 Branches 1,774 Tags 2.1 GiB
b6a5bbc4e9
Commit Graph

12999 Commits

Author SHA1 Message Date
Alexey Zatelepin
19ec609d36 add failing tests with materialized columns #2900 [#CLICKHOUSE-3911] 2018-08-22 15:42:18 +03:00
proller
b6dabaacb3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 15:22:58 +03:00
Alexey Milovidov
6497d3032e Dummy implementation for non-Linux platforms #2482 2018-08-22 09:00:08 +03:00
Alexey Milovidov
bc30d10b67 Dummy implementation for non-Linux platforms #2482 2018-08-22 08:59:27 +03:00
Alexey Milovidov
a1d745888d Dummy implementation for non-Linux platforms #2482 2018-08-22 08:56:06 +03:00
Alexey Milovidov
d355aa3932 Enlarged the size of system log queue 1000 times. It is reasonable, because multiple records are generated for each query for query_thread_log. The maximum size of system log queue will be few hundred MBs #2482 2018-08-22 07:36:53 +03:00
Alexey Milovidov
5435dc3dc2 Fixed error with thread statuses #2482 2018-08-22 07:32:21 +03:00
Alexey Milovidov
6834401118 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:39 +03:00
Alexey Milovidov
deb3ce534c Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:02 +03:00
Alexey Milovidov
ca5b83ac39 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 06:58:19 +03:00
Alexey Milovidov
fc9d335d41 Fixed error when empty part is generated after merge or mutation #2830 2018-08-22 06:33:46 +03:00
Alexey Milovidov
8c76b8e875 TaskStats: addition to prev. revision #2482 2018-08-22 06:12:55 +03:00
Alexey Milovidov
f5326ed29a TaskStats: addition to prev. revision #2482 2018-08-22 06:11:46 +03:00
alexey-milovidov
3d7d600638
Merge pull request #2917 from yandex/fix-restarting-thread-init 
Fix race in initialization of ReplicatedMergeTreeRestartingThread
 2018-08-22 06:10:34 +03:00
Alexey Milovidov
e220a5041f Better location #2877 2018-08-22 06:06:13 +03:00
Alexey Milovidov
d4b038b270 TaskStats: rewrite code #2482 2018-08-22 05:54:24 +03:00
Alexey Milovidov
efca6e4e09 Code cleanups #2482 2018-08-22 03:41:30 +03:00
Alexey Milovidov
43f1f70c9b Code cleanups #2482 2018-08-22 03:24:55 +03:00
Alexey Milovidov
698761020f Code cleanups #2482 2018-08-22 03:05:06 +03:00
proller
3884e0793c Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 03:01:15 +03:00
Alexey Milovidov
44e4f9cd26 Removed useless code #2482 2018-08-22 03:01:15 +03:00
Alexey Milovidov
509b43328e Removed useless method #2482 2018-08-22 02:58:12 +03:00
Alexey Milovidov
b2b26f6e54 Removed useless method #2482 2018-08-22 02:56:55 +03:00
Alexey Milovidov
e0bf8c757b Checking for capabilities in more direct way #2482 2018-08-22 02:52:03 +03:00
proller
67cb2ea294 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:37:09 +03:00
proller
6c21ced0f3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:09:10 +03:00
Alexey Milovidov
ea98d79e56 TaskStats: better code #2482 2018-08-22 00:07:37 +03:00
Alexey Milovidov
aea01a4e0d TaskStats: better code #2482 2018-08-22 00:07:06 +03:00
Alexey Milovidov
3fdff1abea TaskStats: better code #2482 2018-08-22 00:05:30 +03:00
proller
7c5ffcfb4d Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:03:20 +03:00
chertus
eac6dd1c99 Merge branch 'master' into decimal 2018-08-21 21:55:36 +03:00
Alexey Milovidov
99d7b8a7ad Allow to quit client while query is in progress by pressing Ctrl+C twice #2877 2018-08-21 21:42:46 +03:00
proller
300457da7a fix 2018-08-21 21:35:47 +03:00
chertus
1e97f9e549 toDecimalN() functions CLICKHOUSE-3905 2018-08-21 21:25:38 +03:00
proller
df618dd829 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:52:35 +03:00
Alexey Milovidov
f68c322dca Added error codes #2482 2018-08-21 19:49:20 +03:00
Alexey Milovidov
a04177290b Miscellaneous #2482 2018-08-21 19:40:54 +03:00
alexey-milovidov
408ca4649e
Merge pull request #2909 from wawaka/wawaka/fix_reading_user_from_config 
ISSUES-2629 clickhouse-client: fix reading user from config
 2018-08-21 19:22:48 +03:00
alexey-milovidov
edd37cf617
Merge pull request #2910 from yandex/fix-point-in-poligon 
Fix point in poligon
 2018-08-21 19:17:30 +03:00
proller
169d9d3540 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:14:45 +03:00
alexey-milovidov
581a1c85c2
Merge pull request #2915 from alesapin/master 
Add timeout to socket
 2018-08-21 19:14:04 +03:00
alexey-milovidov
46f00c37e4
Update TaskStatsInfoGetter.cpp 2018-08-21 19:13:07 +03:00
proller
fc2925b567 Squashed commit of the following: 
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd550
Author: proller <proller@github.com>
Date:   Tue Aug 21 18:34:18 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit b4f3af824b88a8b6826583bb483730827574e8ad
Author: proller <proller@github.com>
Date:   Tue Aug 21 17:00:20 2018 +0300

    fix

commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:57:17 2018 +0300

    fix

commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:50:21 2018 +0300

    freebsd fixes

commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:17:19 2018 +0300

    fix

commit e1fe707fd765b841a8d0952d91a980128cbf91d0
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:35:21 2018 +0300

    fix

commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:25:57 2018 +0300

    fix

commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:20:41 2018 +0300

    fix

commit 93d572c85d9c7e331254999a614c3b22b5573b02
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:58:07 2018 +0300

    SPLIT_SHARED

commit dd5b8990d8527d59b1e890943d80c2bf27c613ce
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:52:39 2018 +0300

    fix

commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:46:31 2018 +0300

    fix

commit abde633beb86f2a0d025d6fcf079965dbd827b92
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:32 2018 +0300

    fix

commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:45:18 2018 +0300

    Travis: try fail on ninja fail

commit c2686f90b68255c2beb0a708804aef404e80a6d2
Merge: 2c3427bbd 2aa7eb463
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:15 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:24 2018 +0300

    fix

commit 530170c6a81d31dcfa81230e48520383234df4bc
Merge: 9abec162c f6e4ec970
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:03 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:49:58 2018 +0300

    Apple fixes

commit 36d05e8217440fbc8ae21571b06d4eb6d679d538
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:25:05 2018 +0300

    apple fix

commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:20:06 2018 +0300

    fixes

commit 427961d916a5954981e47d94733996deb2a616ce
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:11:11 2018 +0300

    fix

commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:41:53 2018 +0300

    fix

commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2
Merge: 8a541d7e6 21cedbe46
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:35:49 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8a541d7e64c89e2c16af6c909e0353361153aaa3
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:34:32 2018 +0300

    Do not use poco types

commit fd560f43d048b7e3307c6c6b9c9d9918230014d8
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:20:42 2018 +0300

    Try fix apple build

commit cfb2eba07ac06f19e822d3474341d800b1f98cf1
Merge: 8d2e31c90 5b81fdfc0
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:03:24 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c
Author: proller <proller@github.com>
Date:   Mon Aug 20 21:56:06 2018 +0300

    travis: TEST_SERVER_STARTUP_WAIT=10
 2018-08-21 18:56:50 +03:00
alesapin
df012657e8 Change time to 50 mseconds 2018-08-21 18:40:19 +03:00
alesapin
726428a2c5 Add timeout to socket 2018-08-21 18:24:20 +03:00
Alexey Zatelepin
55d82dfc84 fix race in initialization of ReplicatedMergeTreeRestartingThread [#CLICKHOUSE-3899] 2018-08-21 18:22:55 +03:00
Nikolai Kochetov
04a91a79a9 Added test for low cardinality deserialization. #2896 2018-08-21 17:05:57 +03:00
Nikolai Kochetov
b291a9694e Force update dictionary when seek to new granule. #2896 2018-08-21 17:05:50 +03:00
Nikolai Kochetov
c27bade22b Added test for pointInPolygon #2866 2018-08-21 14:33:31 +03:00
Nikolai Kochetov
3404d72da1 Fix pointInPolygon case with nonconvex polygon with two nontrivial halfplanes in cell. #2866 2018-08-21 14:33:15 +03:00
Vadim
297be5c303
Update ErrorCodes.cpp 2018-08-21 13:45:34 +03:00
Vadim
8f3350216f
Merge branch 'master' into CLICKHOUSE-3847 2018-08-21 13:27:18 +03:00
VadimPE
99a26f17f6 CLICKHOUSE-3847 fix settings 2018-08-21 13:23:48 +03:00
Vladimir Kozbin
cdb7116f37 ISSUES-2629 clickhouse-client: fix reading user from config 2018-08-21 17:04:27 +07:00
Alexey Milovidov
2aa7eb463a Fixed test #2888 2018-08-21 08:03:35 +03:00
Alexey Milovidov
7d76c3fd4f Miscellaneous [#CLICKHOUSE-3765] 2018-08-21 07:31:35 +03:00
Alexey Milovidov
15c971a225 Decimal: fixed error [#CLICKHOUSE-3765] 2018-08-21 07:00:50 +03:00
Alexey Milovidov
9287a63180 Removed useless headers [#CLICKHOUSE-3249] 2018-08-21 06:40:47 +03:00
Alexey Milovidov
be80ac893e Whitespace [#CLICKHOUSE-3621] 2018-08-21 06:40:09 +03:00
Alexey Milovidov
3b39f6a4c3 Split ZooKeeperExceptions to three different metrics #2316 2018-08-21 04:27:22 +03:00
Alexey Milovidov
d278cbbed5 Addition to prev. revision #2877 2018-08-21 02:39:41 +03:00
Alexey Milovidov
b98cfe0f66 Addition to prev. revision #2877 2018-08-21 02:30:24 +03:00
Alexey Milovidov
cf224f32c4 Addition to prev. revision #2877 2018-08-21 02:28:27 +03:00
Alexey Milovidov
bcbcbcdbb1 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-21 02:22:30 +03:00
Alexey Milovidov
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +03:00
VadimPE
a49cc41279 CLICKHOUSE-3847 add support old version of CH server 2018-08-21 02:08:45 +03:00
Alexey Milovidov
21cedbe46f Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 22:24:45 +03:00
Alexey Milovidov
0a7638fc9f Added test #2897 2018-08-20 22:24:39 +03:00
VadimPE
4064ec0bc2 CLICKHOUSE-3847 add value '1' and '2' in is_lost 2018-08-20 20:15:04 +03:00
proller
91363760ea Merge remote-tracking branch 'upstream/master' into fix3 2018-08-20 19:34:09 +03:00
Alexey Milovidov
b657c6b848 Added forwarding of mutation for Materialized views #2897 2018-08-20 19:28:30 +03:00
Alexey Milovidov
37a49a5898 Added test #2888 2018-08-20 19:20:58 +03:00
Alexey Milovidov
9f007ab3a0 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 19:12:07 +03:00
Alexey Milovidov
2138f50e48 Better exception message #2888 2018-08-20 19:10:58 +03:00
Alexey Zatelepin
765b908450 change the order in which the locks are taken to make TSan happy [#CLICKHOUSE-3892] 2018-08-20 19:07:07 +03:00
Alexey Milovidov
465ff07398 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-20 18:50:09 +03:00
Alexey Milovidov
2717185991 Modified names #2015 2018-08-20 18:49:39 +03:00
proller
159cdbbb3e Try fix build (link order) 2018-08-20 18:34:37 +03:00
chertus
cdff502828 types convertion via helpers CLICKHOUSE-3765 2018-08-20 18:17:55 +03:00
alexey-milovidov
934d480a7a
Merge pull request #2894 from yandex/fix-catboost-pool-path-normalization 
Fix catboost pool path normalization
 2018-08-20 17:16:09 +03:00
VadimPE
0c119d7667 CLICKHOUSE-3847 fix bugs 2018-08-20 16:31:24 +03:00
Nikolai Kochetov
b64bb8af14 Fix tests. 2018-08-20 15:57:31 +03:00
Nikolai Kochetov
391b4b5927 Merged with master. 2018-08-20 15:25:06 +03:00
Nikolai Kochetov
8d8c399f95 Added for catboost pool [#CLICKHOUSE-3871] 2018-08-20 14:51:14 +03:00
Nikolai Kochetov
aaf719d671 Fix header for catboost pool [#CLICKHOUSE-3871] 2018-08-20 13:33:14 +03:00
Nikolai Kochetov
57b626a796 Added path canonization for catboost pool. [#CLICKHOUSE-3871] 2018-08-20 12:51:11 +03:00
alexey-milovidov
bce94dae9b
Merge pull request #2887 from housepower/retention 
Add AggregateFunctionRetention
 2018-08-20 09:38:43 +03:00
alexey-milovidov
89ee237ee4
Update AggregateFunctionRetention.h 2018-08-20 07:22:04 +03:00
Alexey Milovidov
4cf162914a Example server config: listen to IPv4 (for Travis) [#CLICKHOUSE-2] 2018-08-20 06:47:27 +03:00
Alexey Milovidov
1c9c6f6cfc Moved "TestHint" code to separate file #2744 2018-08-20 06:34:10 +03:00
Alexey Milovidov
79fb33d14f Fixed test #2015 2018-08-20 06:28:21 +03:00
Alexey Milovidov
b07ad553ef Fixed test #2015 2018-08-20 06:27:16 +03:00
Alexey Milovidov
9e15b49254 Added useful comments that code is totally wrong #2744 2018-08-20 06:21:26 +03:00
Alexey Milovidov
f9a70a378c Addition to prev. revision #2482 2018-08-20 05:42:17 +03:00
Alexey Milovidov
e0f1637506 Moved file to appropriate place; split to cpp #2482 2018-08-20 05:34:00 +03:00
Alexey Milovidov
f1ba2f9a33 Try to fix "query in form data" feature while still tracking limits for external tables (try №2) #2482 2018-08-20 05:23:35 +03:00
Alexey Milovidov
40a0551d85 Client --testmode cannot be used to catch exceptions thrown from query parser #2840 2018-08-19 23:41:45 +03:00
Alexey Milovidov
41ec796a67 Little better [#CLICKHOUSE-2] 2018-08-19 23:26:11 +03:00
Alexey Milovidov
ce10e5bd6f Modified example config for running clickhouse-server from the source tree to run tests smoothly [#CLICKHOUSE-2] 2018-08-19 23:21:36 +03:00
Alexey Milovidov
6fb8b4e5cd Opinionated changes #2893 2018-08-19 23:18:31 +03:00
alexey-milovidov
5a30b4790e
Update ColumnInfoHandler.h 2018-08-19 23:13:22 +03:00
alesapin
f6c9587d0a CLICKHOUSE-3878: Move last interaction with ODBC from main code to bridge, split Handlers file on three different, slightly remove copy-paste code 2018-08-19 20:09:54 +03:00
Alexey Milovidov
a6945ba00b Fix according to @ludv1x advise #2482 2018-08-19 08:33:50 +03:00
Alexey Milovidov
06a7d0194d Fixed test #2482 2018-08-19 07:56:20 +03:00
Alexey Milovidov
6741582950 Better diagnostic in test #2482 2018-08-19 07:54:14 +03:00
Alexey Milovidov
99b19c3a66 Miscellaneous #2482 2018-08-19 07:45:39 +03:00
Alexey Milovidov
bf68280bf3 Miscellaneous #2482 2018-08-19 07:43:58 +03:00
Alexey Milovidov
c81eaf66da Corrected comment #2482 2018-08-19 07:31:51 +03:00
Alexey Milovidov
1802b00c0b Fixed bad arithmetic; miscellaneous #2482 2018-08-19 07:25:53 +03:00
sundy-li
63d74978d8 add AggregateFunctionRetention 2018-08-18 20:39:07 +08:00
Alexey Milovidov
2dae8f9396 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-18 04:45:00 +03:00
Alexey Milovidov
1c4f5d3359 Miscellaneous #2482 2018-08-17 21:57:07 +03:00
proller
62b6b6d73e Rare segfault fix 2018-08-17 21:23:10 +03:00
Amos Bird
57970a8bef
Using correct config ref to initialize odbc bridge 2018-08-17 19:00:42 +08:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
 2018-08-17 00:47:15 +03:00
chertus
23c0e8efb5 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-16 14:05:20 +03:00
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +03:00
Alexey Milovidov
b088154b14 Merge branch 'CLICKHOUSE-2910' of github.com:yandex/ClickHouse into CLICKHOUSE-2910 2018-08-16 01:43:59 +03:00
Alexey Milovidov
e2eb0650b8 Auto version update to [18.11.0] [54406] 2018-08-16 01:43:16 +03:00
Alexey Milovidov
56af576fe5 Removed duplicate query_id logging #2482 2018-08-16 01:39:19 +03:00
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
62c166db79 CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:45 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
9a78ee3e44 Removed static std::string variable #2482 2018-08-16 00:57:40 +03:00
Alexey Milovidov
76af46ed5d Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Interpreters/Settings.h
	dbms/tests/queries/0_stateless/00687_top_and_offset.sql
 2018-08-16 00:44:24 +03:00
chertus
0415c9e34a fix int128 to float comparison [CLICKHOUSE-3765] 2018-08-15 19:43:40 +03:00
chertus
c8e945d73d one another build fix 2018-08-15 18:29:57 +03:00
chertus
3805794e66 some more build fixes 2018-08-15 16:27:22 +03:00
alexey-milovidov
4524dcaf9a
Merge pull request #2871 from zhang2014/fix/build_failure 
ISSUES-2846 fix build failure with gcc 8.1
 2018-08-15 13:35:23 +03:00
zhang2014
1549baa4e9 ISSUES-863 fix test failure #2015 #2840 2018-08-15 13:43:44 +08:00
zhang2014
3b0f0ac01e ISSUES-2846 fix build failure with gcc 8.1 2018-08-15 11:51:03 +08:00
Alexey Milovidov
ab2213442d Miscellaneous #2482 2018-08-15 01:01:41 +03:00
Alexey Milovidov
dfd9be86d8 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:50:00 +03:00
Alexey Milovidov
5410f73ba7 Fixed warnings #2015 2018-08-15 00:49:51 +03:00
Alexey Milovidov
31867c0612 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-08-15 00:48:51 +03:00
Alexey Milovidov
03af27a218 Fixed warnings #2015 2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e Merging #2482 2018-08-15 00:35:26 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:34:23 +03:00
Alexey Milovidov
c80db48a6e Merging #2482 2018-08-15 00:32:49 +03:00
alexey-milovidov
8586e6bb2e
Merge pull request #2787 from zhang2014/fix/replace_asterisk 
ISSUES-2786 fix replace asterisk with join query
 2018-08-15 00:28:35 +03:00
Alexey Milovidov
c72482528c Merging #2482 2018-08-15 00:18:14 +03:00
Alexey Milovidov
93c9eab088 Merging #2482 2018-08-15 00:15:17 +03:00
chertus
7ca6a0737d some more build fixes 2018-08-15 00:12:23 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:10:21 +03:00
Alexey Milovidov
21579a3cc8 Removed static std::string variable #2482 2018-08-14 23:56:23 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
alexey-milovidov
c376b2d476
Merge pull request #2869 from yandex/low-cardinality-fixes 
LowCardinality fixes
 2018-08-14 22:36:19 +03:00
alexey-milovidov
beabb91903
Update IFunction.cpp 2018-08-14 22:35:52 +03:00
Alexey Milovidov
979154122f Changed strange name #2846 2018-08-14 22:34:25 +03:00
chertus
44c3166c6e Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 22:17:28 +03:00
chertus
21fe103831 fix clang build 2018-08-14 22:16:56 +03:00
Nikolai Kochetov
2953be89a4 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 21:00:41 +03:00
Nikolai Kochetov
fce3bc193b Updated test for JOIN ON syntax. [#CLICKHOUSE-3761] 2018-08-14 21:00:17 +03:00
Nikolai Kochetov
2f0f7eacbf Updated test. [#CLICKHOUSE-3621] 2018-08-14 20:19:55 +03:00
Nikolai Kochetov
26f464a4f9 Fix Const(LowCardinality) conversion. [#CLICKHOUSE-3621] 2018-08-14 20:19:48 +03:00
Nikolai Kochetov
f61fdf2076 Better const resolution for LowCardinality type. [#CLICKHOUSE-3621] 2018-08-14 20:19:40 +03:00
alexey-milovidov
c5b90717c2
Merge pull request #2828 from alesapin/master 
CLICKHOUSE-3878: ODBC-Bridge tool implementation
 2018-08-14 17:25:43 +03:00
chertus
15cdd7b2bd make clang happy 2018-08-14 17:19:58 +03:00
alesapin
942d9a5fee
Merge branch 'master' into master 2018-08-14 17:09:27 +03:00
proller
a2343890dd Build fixes (#2864) 
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
 2018-08-14 16:31:26 +03:00
chertus
8c54b480bc minor fix 2018-08-14 16:26:23 +03:00
chertus
74823c8c17 add allow_experimental_decimal to settings 2018-08-14 15:51:45 +03:00
chertus
241b05c80a merge master 2018-08-14 15:50:28 +03:00
alesapin
edc2dc45b6
Merge branch 'master' into master 2018-08-14 13:35:32 +03:00
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alexey-milovidov
6b3375393d
Merge pull request #2840 from VadimPE/CLICKHOUSE-3211 
CLICKHOUSE-3211 add TOP m, and OFFSET k
 2018-08-14 12:55:12 +03:00
alexey-milovidov
f42bd36fa0
Merge pull request #2856 from zhang2014/feature/add_check_access_database_for_system_tables 
Add check access database for system tables
 2018-08-14 12:53:43 +03:00
Vadim
077ed3a61b
Update 00687_top_and_offset.sql 2018-08-14 12:12:38 +03:00
Vadim
f6d6c4b8f7
Update 00687_top_and_offset.sql 2018-08-14 12:09:25 +03:00
zhang2014
e51264c3a5 Add check access database for system tables 2018-08-14 11:28:32 +08:00
alexey-milovidov
3e9f25b1b4
Merge pull request #2830 from yandex/data-type-with-dictionary 
LowCardinality data type.
 2018-08-13 23:49:21 +03:00
Nikolai Kochetov
df73ef1ba5 Fix tests. 2018-08-13 22:43:26 +03:00
alesapin
83d5dba53b CLICKHOUSE-3878: Move ODBCDictionary to odbc-bridge 2018-08-13 21:10:26 +03:00
Nikolai Kochetov
4f31d136cb Fix build. 2018-08-13 20:52:57 +03:00
Nikolai Kochetov
5d5344f106 Added allow_experimental_low_cardinality_type setting. 2018-08-13 20:02:54 +03:00
alexey-milovidov
c19213c6e7
Merge pull request #2845 from yandex/fix-arrayDistinct 
fix arrayDistinct
 2018-08-13 19:46:53 +03:00
alesapin
88f1346be4
Merge pull request #2860 from alesapin/fix_test 
Fix 00606_quantiles_and_nans test
 2018-08-13 18:59:11 +03:00
Vadim
8510bc3bbd
del white space 2018-08-13 18:31:45 +03:00
alesapin
808068526b Fix 00606_quantiles_and_nans test 2018-08-13 18:03:53 +03:00
alesapin
d6fbf23e9d Fix 00606_quantiles_and_nans test 2018-08-13 18:02:23 +03:00
alesapin
76baaf9620 CLICKHOUSE-3878: Remove redundant prefix 2018-08-13 18:00:41 +03:00
Vadim
e51e0f5eb9
Update ErrorCodes.cpp 2018-08-13 15:22:58 +03:00
Vadim
4e0e500e15
Update 00687_top_and_offset.sql 2018-08-13 13:49:00 +03:00
Vadim
b9b6818325
Merge branch 'master' into CLICKHOUSE-3211 2018-08-13 13:48:44 +03:00
Vadim
ed97f7e475
Update 00687_top_and_offset.sql 2018-08-13 13:47:38 +03:00
Vadim
61a26f7846
Update ErrorCodes.cpp 2018-08-13 13:46:06 +03:00
VadimPE
bb9d99b00c CLICKHOUSE-3211 add Exception 2018-08-13 13:45:27 +03:00
alesapin
a78904a2ef Merge remote-tracking branch 'upstream/master' 2018-08-13 13:35:42 +03:00
robot-clickhouse
940a453034 Auto version update to [18.10.3] [54405] 2018-08-13 12:42:01 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
zhang2014
59b25812e7 Add check access database for system tables 2018-08-13 17:35:40 +08:00
sundy-li
4b9a1390ff add quantile tests 2018-08-13 17:28:49 +08:00
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal 2018-08-13 11:57:42 +03:00
VadimPE
a2b1100a82 add tests 2018-08-13 11:52:56 +03:00
sundy-li
65670bc33a return nan when quantileExact with empty float column 2018-08-13 16:33:51 +08:00
robot-clickhouse
9d44eebfe6 Auto version update to [18.10.2] [54405] 2018-08-13 11:30:02 +03:00
alexey-milovidov
6114dfbad2
Merge pull request #2851 from zhang2014/feature/add_dependies_for_system_tables 
ISSUES-2850 add dependencies for system tables
 2018-08-13 07:57:26 +03:00
Alexey Milovidov
7e50c88538 Added test case [#CLICKHOUSE-3891] 2018-08-13 07:35:12 +03:00
zhang2014
741abc2644 ISSUES-2803 add query test #2803 2018-08-13 11:02:50 +08:00
zhang2014
62a85536b4 ISSUES-2786 add asterisk_left_columns_only setting 2018-08-13 11:02:50 +08:00
zhang2014
d7cd77640d ISSUES-2786 fix replace asterisk with join query 2018-08-13 11:01:55 +08:00
alesapin
53b23e0113 CLICKHOUSE-3878: Add inherited fd's closing function 2018-08-12 15:23:22 +03:00
zhang2014
d766d4b014 ISSUES-2850 add dependencies for system tables 2018-08-12 16:05:12 +08:00
zhang2014
dd10e85e90 ISSUES-2850 add dependencies for system tables 2018-08-11 17:35:29 +08:00
proller
1e3c637741 Try fix internal compiler headers path 2018-08-11 02:28:33 +03:00
proller
3af99efd65 CLICKHOUSE-3530: Versioned inetrnal compiler headers (#2837) 2018-08-10 22:53:49 +03:00
Kirill Shvakov
a3ace87046 Add new system table "merge_tree_settings" (#2841) 
* #2249 allow macros while creating kafka engine

* Update Macros.cpp

* Update Macros.h

* Add system table: merge_tree_settings
 2018-08-10 20:42:12 +03:00
Vadim
552d789aa6
Update FunctionsArray.cpp 2018-08-10 18:29:28 +03:00
Vadim
2c6a9b2a92
Update FunctionsArray.h 2018-08-10 18:27:06 +03:00
alesapin
f11574cbfb CLICKHOUSE-3878: Sleep optimization 2018-08-10 18:07:54 +03:00
chertus
01c8b1d7bb decimal field extraction (from column or type) 2018-08-10 17:57:55 +03:00
alesapin
c3588a582c CLICKHOUSE-3878: Add some comments and small readme 2018-08-10 17:46:12 +03:00
Nikolai Kochetov
4a62ab9d5c Merged with master. 2018-08-10 16:53:08 +03:00
alesapin
cd9a016f62 CLICKHOUSE-3878: Fix merge conflict 2018-08-10 14:43:20 +03:00
alesapin
dde09bd8a5 CLICKHOUSE-3878: Start bridge not like daemon but background child, more explicit logging, fix mutex bug, add SCOPE_EXIT in bridge 2018-08-10 14:42:12 +03:00
VadimPE
6e461213bb CLICKHOUSE-3211 add tests 2018-08-10 14:27:55 +03:00
VadimPE
e8ebcc4d48 CLICKHOUSE-3211 add TOP m, and OFFSET k 2018-08-10 14:12:43 +03:00
Alexey Milovidov
9c3cd25f6e Fixed link order #1983 2018-08-10 07:53:45 +03:00
Alexey Milovidov
cc8a0488d3 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-10 07:03:32 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
robot-clickhouse
e53899a561 Auto version update to [18.10.1] [54405] 2018-08-10 06:02:50 +03:00
Alexey Milovidov
d8ca4345b6 Fixed style violations [#CLICKHOUSE-2] 2018-08-10 04:41:54 +03:00
Alexey Milovidov
29e40f0087 Fixed potential error #2832 2018-08-10 04:31:55 +03:00
Anton Popov
c019d732c5 ClickHouse 3419 Add setting prefer_localhost_replica (#2832) 
* add setting prefer_localhost_replica

* add prefer_localhost_replica setting

* fix bugs

* update setting comment

* Add test for prefer_localhost_replica

* fix bug
 2018-08-10 04:27:54 +03:00
proller
973bdab77f Format ODBCDriver2 with NULL support (#2834) 
* Format ODBCDriver2 with NULL support

* Fix comment

* Update ODBCDriver2BlockOutputStream.cpp

* clean
 2018-08-10 04:20:10 +03:00
Alexey Milovidov
b6d6b57cec Revert "Fixed link order #2807" 
This reverts commit 2f2fafb74a.
 2018-08-10 00:01:59 +03:00
Alexey Milovidov
2f2fafb74a Fixed link order #2807 2018-08-09 23:43:28 +03:00
alesapin
04db4ddc46 CLICKHOUSE-3878: Next iteration in odbc-bridge 2018-08-09 21:49:05 +03:00
chertus
479166283e DecField (in progress) 2018-08-09 19:32:01 +03:00
Vadim
44cb046eb9
Update StorageReplicatedMergeTree.cpp 2018-08-09 19:25:19 +03:00
Vadim
fad1e37605
Update ReplicatedMergeTreeQueue.h 2018-08-09 19:24:37 +03:00
Vadim
a133f20b33
Update ReplicatedMergeTreeQueue.cpp 2018-08-09 19:24:03 +03:00
Vadim
434017d193
Update StorageReplicatedMergeTree.cpp 2018-08-09 18:09:05 +03:00
VadimPE
75900f494f CLICKHOUSE-3847 add "is_lost". load() in Queue can check duplicate records 2018-08-09 18:06:39 +03:00
alesapin
6d40546a9a CLICKHOUSE-3878: Remove connection string building and validation, change format of columns in request, more convinient exception messages 2018-08-09 15:57:34 +03:00
chertus
2b4171af1f remove comment 2018-08-09 15:34:10 +03:00
chertus
cc033803d1 decimale Dec128 arithm overflow 2018-08-09 15:24:03 +03:00
Nikolai Kochetov
b52cb07c2c Less compiler warnings. 2018-08-09 14:44:09 +03:00
VadimPE
e3495a6484 Merge branch 'CLICKHOUSE-3847' of github.com:VadimPE/ClickHouse into CLICKHOUSE-3847 2018-08-09 14:39:46 +03:00
Nikolai Kochetov
da822f1cf3 Merged with master. 2018-08-09 14:32:19 +03:00
Nikolai Kochetov
2099d8b7e8 Fixed DataTypeWithDictionary serialization. 2018-08-09 13:52:58 +03:00
Nikolai Kochetov
4fd3d57e79 Less compiler warnings. 2018-08-09 13:52:54 +03:00
Nikolai Kochetov
36da1f2871 Added IFunction::isDeterministicInScopeOfQuery(). 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
79db5b261f Less compiler warnings. 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
ab10005af5 Renamed settings for LowCardinality type. 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
dc828d462c Added test for LowCardinality defaults 2018-08-09 13:52:45 +03:00
Nikolai Kochetov
c339313d8b Fix LowCardinality conversions for defaults. 2018-08-09 13:52:33 +03:00
alesapin
bff4bbf634 Merge remote-tracking branch 'upstream/master' 2018-08-09 12:38:43 +03:00
Vadim
ee97a35f12
Update StorageReplicatedMergeTree.cpp 2018-08-09 11:46:41 +03:00
VadimPE
d5a6967fc4 CLICKHOUSE-3847 fix 2018-08-09 11:44:49 +03:00
robot-clickhouse
abbbd26e71 Auto version update to [18.10.0] [54405] 2018-08-09 04:42:46 +03:00
chertus
c45b5d9f9a decimal arithm overflow (except dec128) 2018-08-08 23:15:49 +03:00
alesapin
402815977f Add new error in fetchPartition op 2018-08-08 21:01:25 +03:00
alesapin
1bedb971d0 Merge fixes 2018-08-08 19:54:09 +03:00
alesapin
97bcdcedb3 mistake 2018-08-08 19:52:11 +03:00
alesapin
65c6a8ff93 CLICKHOUSE-3878: Try to avoid merge conflict 2018-08-08 19:49:49 +03:00
alesapin
46e9dc132a CLICKHOUSE-3878: Remove redundant message 2018-08-08 19:44:41 +03:00
alesapin
b31dd7bf1f CLICKHOUSE-3878: Correct max_block_size handling 2018-08-08 19:41:08 +03:00
alesapin
fe10ccb1f7 CLICKHOUSE-3878: Remove some copypaste 2018-08-08 19:29:09 +03:00
alesapin
92f3beb95b CLICKHOUSE-3878: Better odbc-bridge with ability to handle custom logs and exceptions 2018-08-08 19:15:29 +03:00
Vadim
61338697b0
Update MergeTreeSettings.h 2018-08-08 18:28:48 +03:00
Nikolai Kochetov
f1c05a2192 Added test with LowCardinality strings serialization. 2018-08-08 18:28:19 +03:00
VadimPE
c16d876867 CLICKHOUSE-3847 fix race in set log_pointer in cloneReplica() 2018-08-08 18:25:07 +03:00
Nikolai Kochetov
95c64aa5a9 Added test for LowCardinality and WithDictionary. 2018-08-08 17:42:04 +03:00
VadimPE
3b9002dfc9 CLICKHOUSE-3847 fix 2018-08-08 17:31:56 +03:00
VadimPE
4c0bb93345 CLICKHOUSE-3847 fix UInt - UInt. del clearQueue() 2018-08-08 17:07:39 +03:00
chertus
5f93ab73fa decimal compare overflow 2018-08-08 16:57:16 +03:00
Nikolai Kochetov
0a46943590 Renamed functions makeDictionary, dictionaryIndexes, dictionaryValues to toLowCardinality, lowCardinalityIndexes, lowCardinalityValues. 2018-08-08 16:55:32 +03:00
VadimPE
8d28b9f6b4 CLICKHOUSE-3847 we can do pullToLog() after we mark replica is_active and before we calc delay. 2018-08-08 16:53:06 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +03:00
Nikolai Kochetov
c8457abb1b Made IFunction::isDeterministic and IFunction::isDeterministicInScopeOfQuery are const. Disabled default implementation with dictionary for not isDeterministicInScopeOfQuery functions. 2018-08-08 14:26:18 +03:00
chertus
16ad0caf37 move int exp from decimal scale to libcommon 2018-08-08 13:56:24 +03:00
chertus
297053bfac decimal compare optimisation 2018-08-08 13:36:03 +03:00
Alexey Milovidov
4ae1830f78 Updated instruction [#CLICKHOUSE-2] 2018-08-08 07:14:53 +03:00
Alexey Milovidov
1e316e9229 Fixed error #2795 2018-08-08 07:14:53 +03:00
Amos Bird
bb244e1482 Fix concurrent issue of StorageSetOrJoin. 2018-08-08 06:54:56 +03:00
Alexey Milovidov
e0dc0ccaff Removed misleading message [#CLICKHOUSE-2] 2018-08-08 06:03:26 +03:00
Alexey Milovidov
bec5a85030 Fixed test #2813 2018-08-08 05:11:16 +03:00
Alexey Milovidov
a693258169 Removed merging "config.d" files to every configs. "config.d" is only for "config.xml", users.d for users.xml, etc. Only "conf.d" is used for all configs. [#CLICKHOUSE-2] 2018-08-08 03:58:24 +03:00
Alexey Milovidov
5860838776 Fixed inconsistency and bad style #1652 2018-08-08 03:12:40 +03:00
Alexey Milovidov
1082619320 Added test #2813 2018-08-08 03:10:01 +03:00
Alexey Milovidov
e99a24c12c Fixed test #2813 2018-08-08 03:07:40 +03:00
alexey-milovidov
b1d70c125f Update 00685_output_format_json_escape_forward_slashes.sql 2018-08-08 02:35:32 +03:00
Alex Bocharov
e8d4654419 Remove FormatSettings default value for writeJSONString and add tests for output_format_json_escape_forward_slashes. 2018-08-08 02:35:32 +03:00
alexey-milovidov
4e7b2927dd Update Settings.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
0a4d07b995 Update WriteHelpers.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
bc16e8ca69 Update FormatSettings.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
31cff11fee Update FormatFactory.cpp 2018-08-08 02:35:32 +03:00
alexey-milovidov
03727012a6 Update Settings.h 2018-08-08 02:35:32 +03:00
Alex Bocharov
a8818bb8af Add output_format_json_escape_slashes setting - controls escaping slashes for string outputs in JSON output format. 2018-08-08 02:35:32 +03:00
Nikolai Kochetov
1be7c4122d Renamed WithDictionary(Type) to LowCardinality(Type) and added TypeWithDictionary alias. 2018-08-07 22:31:41 +03:00
Nikolai Kochetov
bd991a5f7a Fixed comments. 2018-08-07 21:32:06 +03:00
Nikolai Kochetov
62dbef2dfc Optimize mapIndexWithAdditionalKeys for DataTypeWithDictionary. 2018-08-07 21:12:17 +03:00
Nikolai Kochetov
e83268a7f4 Optimize mapUniqueIndex for ColumnWIthDictionary. 2018-08-07 21:12:04 +03:00
Nikolai Kochetov
01209533f7 Optimize reverse index for ColumnUnique. 2018-08-07 21:10:16 +03:00
Nikolai Kochetov
3f4348a88b Use HashTableWithSavedHash for strings in ColumnUnique. 2018-08-07 21:09:55 +03:00
Nikolai Kochetov
a109d8f002 Disabled checks for index values in ColumnWithDictionary. 2018-08-07 21:09:49 +03:00
alesapin
dd01eb6b40 CLICKHOUSE-3878: Add odbc-bridge first version 2018-08-07 20:57:44 +03:00
Alexey Milovidov
d1a548638f Imported stateful tests (without data) [#CLICKHOUSE-3] 2018-08-07 20:10:03 +03:00
Alexey Milovidov
3021852383 Imported stateful tests (without data) [#CLICKHOUSE-3] 2018-08-07 20:08:51 +03:00