Commit Graph

363 Commits

Author SHA1 Message Date
Sabyanin Maxim
3a67b505c5 Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-4032 2018-11-22 16:54:10 +03:00
Nikolai Kochetov
41951a926e Fix test cluster config. 2018-11-22 12:18:13 +03:00
Alexey Milovidov
ab5d76fc42 Fixed error introduced in #3553 and prevent it happening 2018-11-21 23:56:37 +03:00
proller
1d40c2c871 Better link and deps (#3631)
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
2018-11-21 22:20:27 +03:00
Amos Bird
ab8821255c Remove redundant query context attachment 2018-11-20 22:21:48 +08:00
proller
160ffb2283
Build fixes (clang 7.0.0+) (#3582) 2018-11-16 15:22:51 +03:00
chertus
65d34ca231 do not override current_database in context [CLICKHOUSE-3578] 2018-11-15 18:03:13 +03:00
chertus
0e1044b165 Merge branch 'master' into issue-3578 2018-11-15 13:28:53 +03:00
chertus
ebf3d60186 column defaults without CapNProto [CLICKHOUSE-3578] 2018-11-14 21:20:16 +03:00
Alexey Milovidov
1aa89ed63a Fixed code after review #3553 2018-11-14 04:20:46 +03:00
proller
37a9af5a68 CLICKHOUSE-4109 mlock clickhouse (#3553)
* CLICKHOUSE-4109 mlock clickhouse

* wip

* Fix

* wip

* fix

* fix

* better place

* wip

* clean

* tidy

* fix
2018-11-14 04:11:13 +03:00
Alexey Milovidov
5441b6c3d2 Whitespace [#CLICKHOUSE-3] 2018-11-13 21:54:38 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
2018-11-13 16:27:19 +03:00
Alexey Zatelepin
ce1ead5b88 allow arbitrary callbacks in ZooKeeperNodeChange [#CLICKHOUSE-3859] 2018-11-13 16:13:29 +03:00
chertus
9aae1d0d8f fix branches merge mistake 2018-11-12 21:34:43 +03:00
chertus
c1518da50f fix build with CAPNP 2018-11-12 20:29:02 +03:00
chertus
9966f975a3 Merge branch 'master' into issue-3578 2018-11-12 17:58:00 +03:00
chertus
2fe3cdb3f5 restore lost commits [CLICKHOUSE-3578] 2018-11-12 17:52:30 +03:00
proller
5678d1ed98 Build fixes (#3545)
* StorageSystemContributors clean

* Fix

* ARM fixes

* Fix arm compile

* fix

* Fix macos?

* Fix includes

* fix

* fix

* Try fix apple build part 1

* Fix identation

* Fix static libc++ in clang

* fix arm build

* better

* fix

* fix

*  better check-include
2018-11-10 23:09:07 +03:00
chertus
cc005c3ac9 Merge branch 'master' into issue-3578 2018-11-09 13:12:34 +03:00
Sabyanin Maxim
dacd999d4f Merge branch 'master' into CLICKHOUSE-4032 2018-11-06 16:50:07 +03:00
Amos Bird
d7fe560090
restore query context before polling 2018-11-01 17:14:01 +08:00
Alexey Zatelepin
31bc680ac5 ErrorCodes::SYNTAX_ERROR now causes HTTP_BAD_REQUEST 2018-10-29 21:00:36 +03:00
Sabyanin Maxim
65bd40e290 Merge branch 'master' of github.com:yandex/ClickHouse into CLICKHOUSE-4032 2018-10-27 22:33:52 +03:00
CurtizJ
7963e952f1 rename setting to tcp_keep_alive 2018-10-23 02:02:57 +03:00
proller
abfe675097
Build fixes (#3419) 2018-10-18 22:28:05 +03:00
Sabyanin Maxim
e050bc0428 Merge branch 'master' into CLICKHOUSE-4032 2018-10-14 18:35:45 +03:00
Sabyanin Maxim
ab050c8466 add comment section in column declaration.
add comment column type in alter method.
add comment section in system.columns.
2018-10-14 18:30:06 +03:00
Alexey Milovidov
881893da56 Merge branch 'master' of github.com:yandex/ClickHouse 2018-10-13 17:33:53 +03:00
Alexey Milovidov
f720a5bf95 Fixed typos in code #3373 2018-10-13 17:33:43 +03:00
avsharapov
11da23f153 Fix typo in readme 2018-10-13 15:28:08 +03:00
Alexey Milovidov
81a9ab424f Style #3362 2018-10-12 06:11:19 +03:00
Alexey Milovidov
f0db16af20 Whitespaces [#CLICKHOUSE-2] 2018-10-12 00:12:14 +03:00
CurtizJ
3d15ae8eed fix sigint receive 2018-10-11 21:25:05 +03:00
CurtizJ
d46fa0f37f fix incorrect number of iterations 2018-10-11 21:12:28 +03:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +03:00
Alexey Milovidov
0b3a8cb489 Merge branch 'joins' of https://github.com/4ertus2/ClickHouse into 4ertus2-joins 2018-10-10 04:06:06 +03:00
alexey-milovidov
1472e3ae66
Merge pull request #3210 from alex-krash/jdbc-bridge
External database access unification (jdbc/odbc bridges)
2018-10-10 02:26:56 +03:00
alexey-milovidov
fe2c4e4102
Update getIdentifierQuote.cpp 2018-10-10 02:19:38 +03:00
Alexandr Krasheninnikov
27f288641e Fix config reference, header inclusion and failed tests 2018-10-09 18:03:41 +03:00
chertus
ec8d3b388d move DumpASTNode to own file, style fixes [CLICKHOUSE-4001] 2018-10-09 17:32:11 +03:00
Alexey Milovidov
25a3cc4dc2 Merge remote-tracking branch 'origin/master' into fix-memory-tracker 2018-10-04 23:49:38 +03:00
Alexandr Krasheninnikov
82200bc16a Added error codes, bridge startup, fixed destructor in XDBC stuff 2018-10-03 15:10:57 +03:00
Alexandr Krasheninnikov
c7fee9374c fix formatting errors according code review 2018-10-03 13:44:43 +03:00
alexey-milovidov
94b0432faa
Merge pull request #3262 from proller/fix17
Arcadia sync
2018-10-01 22:00:01 +03:00
alesapin
6017be28f6 CLICKHOUSE-4007: Fix PerfTest substitution function 2018-10-01 19:30:12 +03:00
proller
ca03cd6606 Sync with arcadia 2018-10-01 18:43:48 +03:00
Alexey Milovidov
85ca2006b0 Fixed bug in client (double whitespace) [#CLICKHOUSE-4038] 2018-09-29 22:33:23 +03:00
proller
ec11bef633
Build fixes (#3181) 2018-09-28 17:53:20 +03:00
Alexander Krasheninnikov
ceea4b9b33 New bridge interaction, quote identifier via api 2018-09-28 05:46:33 +03:00
Alexandr Krasheninnikov
4b431264db Implement quote getter from ODBC 2018-09-27 18:23:42 +03:00
Alexey Milovidov
30da8de1b6 Send log message about peak memory usage to client #3230 2018-09-27 00:19:49 +03:00
proller
0047987333 CLICKHOUSE-3885: add partition_key alias (#3166)
* Allow run integration tests from ctest: cmake .. -DENABLE_TEST_INTEGRATION=1 && ninja && ctest -V -R integration

* CLICKHOUSE-3885: add partition_key alias

* fix

* Update ClusterCopier.cpp

* Better test

* fixing..
2018-09-21 13:46:58 +03:00
Alexey Milovidov
7d291142ec Less dependencies [#CLICKHOUSE-2] 2018-09-20 23:51:21 +03:00
proller
d752d5d62d Prepare to new poco, build fixes (#3072)
* WIp

* fix

* fix

* test

* fix poco netssl find

* clean

* fixes

* wip

* wip

* new poco

* fixes

* Fixes

* wip

*  clean

* clean

*     clean

* clean

* Update HTTPHandlerFactory.h
2018-09-14 22:48:51 +03:00
Alexey Milovidov
136d9d7b18 Added setting names for suggest [#CLICKHOUSE-2] 2018-09-12 04:03:58 +03:00
Alexey Milovidov
54ea7b0b20 Fixed error [#CLICKHOUSE-2] 2018-09-09 06:28:45 +03:00
Alexey Milovidov
a3745a6aa7 Fixed usage of query scope in TCPHandler #2482 2018-09-08 02:22:02 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
alesapin
790b4b3eca Fix build 2018-09-06 22:13:49 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master
CLICKHOUSE-3800: Add Cache for compiled expression.
2018-09-06 21:12:08 +03:00
proller
db13ef96d6 Fix ssl init (#3056)
* Try to fix ../libs/libglibc-compatibility/glibc-compatibility.c:151: multiple definition of `explicit_bzero'
contrib/ssl/crypto/libcrypto.a(explicit_bzero.c.o):../contrib/ssl/crypto/compat/explicit_bzero.c:16: first defined here

* Fix ssl init

* fix

* noncopyable

* clean
2018-09-06 21:05:33 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
alexey-milovidov
4f9dd85c5e
Merge pull request #3050 from proller/fix20
Internal compiler run fixes
2018-09-06 03:29:10 +03:00
Alexey Milovidov
3c7c2e3853 Revert "Revert "Tidy up thread locals usage across translation units""
This reverts commit 509386b14d.
2018-09-06 00:01:43 +03:00
proller
5877eece58 Internal compiler run fixes 2018-09-05 21:50:17 +03:00
Alexey Milovidov
509386b14d Revert "Tidy up thread locals usage across translation units"
This reverts commit e28753061f.
2018-09-05 19:41:34 +03:00
alesapin
16eaeefc6e Fix naming 2018-09-05 15:42:37 +03:00
alesapin
2647c13c6b CLICKHOUSE-3800: Fix naming, move compiled cache size setting to config.xml 2018-09-05 14:37:41 +03:00
Nicolae Vartolomei
e28753061f Tidy up thread locals usage across translation units
Fixes #3015.
2018-09-03 22:36:16 +01:00
Alexey Milovidov
3873ab1adb Fixed tests in Sandbox [#CLICKHOUSE-2] 2018-09-03 05:32:29 +03:00
Alexey Milovidov
bc84ca06a6 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 23:46:16 +03:00
Alexey Milovidov
243441cb51 Disable leak sanitizer for embedded clang and lld [#CLICKHOUSE-2] 2018-09-02 22:46:09 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
alexey-milovidov
16dc142a05
Merge pull request #3017 from yandex/ubsan-fixes
Fixes for UBSan.
2018-09-02 03:12:20 +03:00
Alexey Milovidov
61413ead23 Removed notice in gcc-8 [#CLICKHOUSE-2] 2018-09-02 00:03:06 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
Alexey Milovidov
c060fde75e Removed notice in gcc-8 [#CLICKHOUSE-2] 2018-09-01 05:22:30 +03:00
Alexey Milovidov
dbd0e2f533 Clarifications #2482 2018-09-01 01:41:42 +03:00
Alexey Milovidov
37438b6750 More thread names #2482 2018-08-31 04:00:09 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
Amos Bird
4ae8721a82
ill formated #else breaks client history 2018-08-28 20:05:27 +08:00
Alexey Milovidov
e5a2dd8624 Merge branch 'master' into extra-warnings 2018-08-27 19:19:04 +03:00
proller
3acce3bff9 Build fix (#2944)
* Build fix

* Better sample build scripts

* zlib apple fix

* fix

* fix

* better so version

* SPLIT_SHARED -> LINK_MODE

* clean
2018-08-27 17:39:20 +03:00
Alexey Milovidov
e33b1d13aa Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 05:48:48 +03:00
Alexey Milovidov
595bd32f41 Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 04:41:08 +03:00
Alexey Milovidov
625f3fea08 Enabling -Wunused-exception-parameter [#CLICKHOUSE-2] 2018-08-26 04:36:41 +03:00
Alexey Milovidov
29a6a85ccf Enabling -Winconsistent-missing-destructor-override [#CLICKHOUSE-2] 2018-08-26 04:31:12 +03:00
Alexey Milovidov
4754abbc7d Enabling -Wextra-semi [#CLICKHOUSE-2] 2018-08-26 04:14:00 +03:00
Alexey Milovidov
fa6e364f68 Enabling -Wextra-semi [#CLICKHOUSE-2] 2018-08-26 03:51:37 +03:00
Alexey Milovidov
c193d15ef2 Merge branch 'master' into generalize-zookeeper 2018-08-26 03:32:15 +03:00
Alexey Milovidov
93b44fb17c Made suggest case sensitive again. Otherwise there is a glitch when you type SELECT DIS<TAB> #2447 2018-08-25 19:19:00 +03:00
Alexey Milovidov
417cc1ab4d Additions #2447 2018-08-25 19:05:01 +03:00
Alexey Milovidov
24083e3088 Separate files #2447 2018-08-25 16:55:18 +03:00
Alexey Milovidov
9293882206 Allow to disable suggestion; check server revision #2447 2018-08-25 16:41:50 +03:00
Alexey Milovidov
32eb1a7942 Merge branch 'feature/suggestions' of https://github.com/Tezd/ClickHouse into Tezd-feature/suggestions 2018-08-25 16:15:30 +03:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
alexey-milovidov
eab95e43d1
Merge pull request #2938 from yandex/speed-up-fuzz-tests-2
Speed up fuzz tests, part 2 #2924
2018-08-24 14:07:35 +03:00
Amos Bird
26903d6e8f Add schema argument to ODBC table func.
Useful for datbases like postgres and greenplum.
2018-08-24 16:18:17 +08:00
Alexey Milovidov
a2fefa1617 Speed up fuzz tests, part 2 #2924 2018-08-24 10:30:53 +03:00
alexey-milovidov
442c501dd0
Merge pull request #2923 from yandex/remove-useless-option-in-clickhouse-local
Removed useless option --silent from the clickhouse-local, because it was implemented not according to the specs and the options --silent, --verbose, --echo was messed up #1773
2018-08-24 04:21:52 +03:00
Alexey Milovidov
1437e5cbe3 Fix style [#CLICKHOUSE-2] 2018-08-24 03:07:25 +03:00
Alexey Milovidov
b76b5af044 Fixed bad code in clickhouse-local #2923 2018-08-24 02:59:16 +03:00
Alexey Milovidov
0562ab69e8 Fixed inconsistency between clickhouse-client and clickhouse-local [#CLICKHOUSE-2] 2018-08-23 04:35:19 +03:00
Alexey Milovidov
61f3c4f0d1 Removed useless option --silent from the clickhouse-local, because it was implemented not according to the specs and the options --silent, --verbose, --echo was messed up #1773 2018-08-23 03:14:26 +03:00
Alexey Milovidov
a1d745888d Dummy implementation for non-Linux platforms #2482 2018-08-22 08:56:06 +03:00
Alexey Milovidov
e220a5041f Better location #2877 2018-08-22 06:06:13 +03:00
Alexey Milovidov
3fdff1abea TaskStats: better code #2482 2018-08-22 00:05:30 +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
Alexey Milovidov
a04177290b Miscellaneous #2482 2018-08-21 19:40:54 +03:00
Vladimir Kozbin
cdb7116f37 ISSUES-2629 clickhouse-client: fix reading user from config 2018-08-21 17:04:27 +07: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
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +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
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
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
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
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
2018-08-17 00:47:15 +03:00
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +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
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alesapin
76baaf9620 CLICKHOUSE-3878: Remove redundant prefix 2018-08-13 18:00:41 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
alesapin
53b23e0113 CLICKHOUSE-3878: Add inherited fd's closing function 2018-08-12 15:23:22 +03: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
alesapin
c3588a582c CLICKHOUSE-3878: Add some comments and small readme 2018-08-10 17:46:12 +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
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
alesapin
1bedb971d0 Merge fixes 2018-08-08 19:54:09 +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
Alexey Milovidov
bec5a85030 Fixed test #2813 2018-08-08 05:11:16 +03:00
Alexey Milovidov
5860838776 Fixed inconsistency and bad style #1652 2018-08-08 03:12:40 +03:00