Commit Graph

376 Commits

Author SHA1 Message Date
alesapin
5b23210062 Merge branch 'master' into custom_compression_codecs 2018-12-21 11:57:21 +03:00
alexey-milovidov
d9e8cd46da
Merge pull request #3879 from yandex/setting-low_cardinality_allow_in_native_format
Added low_cardinality_allow_in_native_format setting.
2018-12-20 21:02:02 +03:00
alesapin
aee6c0a606 Remove dump code 2018-12-20 20:37:02 +03:00
alexey-milovidov
3cefb27e56
Merge pull request #3851 from abyss7/issue-3592
Refactor constant folding
2018-12-20 19:26:02 +03:00
Nikolai Kochetov
fbcf6640c9 Fix style. 2018-12-20 17:54:26 +03:00
Nikolai Kochetov
7b994d983f Fix Native streams headers. 2018-12-20 17:26:54 +03:00
Alexey Milovidov
2ae6b6414c Fixed error in 'compressor' tool: the 'level' parameter wasn't working #1345 2018-12-20 17:16:07 +03:00
proller
bd17982224 Fix clang build 2018-12-20 12:54:28 +03:00
Sergey V. Galtsev
a2042d60bf Resolve conflict with upstream. 2018-12-20 00:16:44 +03:00
proller
6869771ae4 Fix includes 2018-12-19 20:57:51 +03:00
proller
fdd22ad187 Fix includes 2018-12-19 20:56:58 +03:00
Nikolai Kochetov
78321a04a1 Added low_cardinality_allow_in_native_format setting. 2018-12-19 19:47:30 +03:00
alexey-milovidov
3efb01b3f8
Merge pull request #3857 from yandex/fix_odbc_bridge
Do not log from odbc-bridge when there is no console
2018-12-18 03:26:46 +03:00
alesapin
bb1760c468 Remove idiotic if 2018-12-17 23:11:19 +03:00
Ivan Lezhankin
8c8dc333e5 Fix unavailable shard's host:port for testing. 2018-12-17 21:06:50 +03:00
Daniel Dao
9a676329c2
Fix simple typo in ClusterCopier
Signed-off-by: Daniel Dao <dqminh89@gmail.com>
2018-12-17 16:45:44 +00:00
Ivan Lezhankin
1a539b3a6d Merge remote-tracking branch 'upstream/master' into issue-3592 2018-12-17 19:30:20 +03:00
alesapin
b00669e012 Print stacktrace on client if corresponding option specified 2018-12-13 20:41:13 +03:00
Sergey V. Galtsev
f9869b7d7e Fix default buffer_size for getUserName(). Use real sysconf(_SC_GETPW_R_SIZE_MAX) value. 2018-12-11 02:36:20 +03:00
Sergey V. Galtsev
c9b984285d Fail on user mismatch under root only. Just warn under non root user. 2018-12-11 02:32:21 +03:00
Sergey V. Galtsev
30acd5000e Fix bad merge. 2018-12-11 02:21:03 +03:00
Sergey V. Galtsev
df9833fd3f Remove no longer used error code. 2018-12-11 02:18:16 +03:00
alexey-milovidov
cea269883c
Merge pull request #3803 from yandex/low-cardinality-native-format-conversion-2
LowCardinality support for old clients, part 2
2018-12-10 21:03:43 +03:00
Sergey V. Galtsev
93df4306af Fix style. 2018-12-10 20:42:33 +03:00
Nikolai Kochetov
1a6127dce4 Remove LowCardinality from NativeBlockOutputStream types for old clients. 2018-12-10 15:09:37 +03:00
Sergey V. Galtsev
42de08f3b9 Move euid check back to Server.cpp.
Use getpwnam_r instead of getpwnam.
Fix style.
2018-12-10 01:15:59 +03:00
alexey-milovidov
0fdb3b9628
Merge branch 'master' into issue-3578 2018-12-07 23:53:34 +03:00
alexey-milovidov
acb4feef26
Merge pull request #3760 from yandex/fix-database-ordinary-load-table-deadlock
Fix database ordinary load table deadlock
2018-12-07 07:13:58 +03:00
Nikolai Kochetov
2bb57ce472 Support insertion into LowCardinality from old native clients. 2018-12-06 17:08:42 +03:00
Ivan Lezhankin
887e1089f1 Merge branch 'master' into kanterov_skip_unused_shards 2018-12-05 18:17:04 +03:00
Nikolai Kochetov
b6d7871a54 Log exception if metadata was'n loaded. 2018-12-05 16:13:41 +03:00
Nikolai Kochetov
5149f35167 Log exception if metadata was'n loaded. 2018-12-05 16:07:03 +03:00
chertus
3db00b7b98 Merge branch 'master' into issue-3578 2018-12-05 14:43:14 +03:00
chertus
a71d03737c send defaults via serialized ColumnsDescription CLICKHOUSE-3578 2018-12-04 23:03:04 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
Nikolai Kochetov
f7f5ad3952 Fix build. 2018-11-29 11:23:27 +03:00
Nikolai Kochetov
a75430cbf7 Fix build. 2018-11-29 10:58:59 +03:00
proller
c5eb678187 PerformanceTest fix --secure (#3690)
* fix

* PerformanceTest fix --secure

* clean
2018-11-29 00:21:22 +03:00
Gleb Kanterov
75919bd91e Update server/config.xml for tests
- add test_unavailable_shard cluster
2018-11-28 19:46:19 +01:00
Alexey Milovidov
42631ba857 Fixed bad code #3688 2018-11-28 18:31:09 +03:00
Alexey Milovidov
32baabd9b0 Fixed bad code #3688 2018-11-28 18:27:23 +03:00
Alexey Milovidov
4c527b84d2 Fixed build #3688 2018-11-28 17:50:02 +03:00
proller
7e9d053d5d Benchmark: use client config for ssl options 2018-11-28 17:41:51 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by
Conflicts:
	dbms/programs/server/Server.cpp
2018-11-28 16:47:07 +03:00
proller
107cf2c9b2 Add secure option to clickhouse-benchmark and clickhouse-performance-test 2018-11-28 15:19:01 +03:00
proller
dd2371e071 CLICKHOUSE-4137 DictionaryFactory, DictionarySourceFactory (#3653)
* Split ComplexKeyCacheDictionary to faster compile (part2)

* Dictionaries as lib WIP

* wip

* clean

* Fix build with old capnp

* fix

* wip

* fixes

* fix

* clean

* clean

* clean

* wip

* wip

* wip

* flat

* wip

* cache

* clean

* wip

* faster

* fix style

* fixes

* clean

* clean

* Split CacheDictionary.cpp for faster compile

* fix

* fix

* Less memory usage while compiling

* missing file

* format

* Update registerDictionaries.h

* clean
2018-11-28 14:37:12 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ (#2443) 2018-11-27 19:11:46 +03:00
Ivan Lezhankin
73aa7f2027 Rename method partition() → alterPartition()
Also fix build with internal shared libraries.
2018-11-26 17:43:40 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
2018-11-26 16:01:48 +03:00
Alexey Milovidov
c77930fe30 Whitespaces [#CLICKHOUSE-2] 2018-11-26 03:56:50 +03:00
Alexey Milovidov
141e9799e4 Fixed error with "extractURLParameter" function (read after buffer); improved performance; added support for zero bytes in URLs; renamed Chars_t type [#CLICKHOUSE-2] 2018-11-25 03:08:50 +03:00
Alexey Milovidov
7d6fffff48 More style checks [#CLICKHOUSE-3] 2018-11-24 04:48:06 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
Alexey Milovidov
15ad4b9b1b Whitespaces [#CLICKHOUSE-2] 2018-11-23 18:56:20 +03:00
alexey-milovidov
ac29388224
Merge pull request #3632 from yandex/fix-low-cardinality-distributed-group-by
Fix low cardinality distributed group by
2018-11-23 16:45:56 +03:00
alexey-milovidov
c6bc4279ee
Merge pull request #3377 from s-mx/CLICKHOUSE-4032
Added support for column COMMENTs in table definition.
2018-11-23 16:43:58 +03:00
Alexey Milovidov
d3bb69be74 More correct documentation + miscellaneous name change #3644 2018-11-23 00:27:52 +03:00
alexey-milovidov
49d2d8a1b8
Merge pull request #3644 from proller/fix4
Add VERSION_INT (ClickHouse version in integer format like 18014009) …
2018-11-23 00:22:19 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645)
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
2018-11-23 00:19:58 +03:00
proller
f410c93fb1 Add VERSION_INT (ClickHouse version in integer format like 18014009) to system.metrics and system.build_options 2018-11-22 21:24:38 +03:00
KochetovNicolai
b8882ddd90
Update config.xml
Fix cluster ports in config.xml
2018-11-22 18:09:55 +03:00
Alexey Milovidov
093557dbde Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-22 18:08:28 +03:00
Alexey Milovidov
e53eb702a1 Usability of client error message when it cannot load data for suggestions [#CLICKHOUSE-2] 2018-11-22 18:07:32 +03:00
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