Commit Graph

1315 Commits

Author SHA1 Message Date
alesapin
36a6121f75 Merge branch 'master' into custom_compression_codecs 2018-12-17 12:56:21 +03:00
alexey-milovidov
7380abf502
Merge pull request #3021 from yandex/ubsan-fixes-3
UBSan fixes, part 2
2018-12-14 22:29:47 +03:00
Alexey Milovidov
cd233cef17 Fixed typo [#CLICKHOUSE-2] 2018-12-14 21:06:10 +03:00
alexey-milovidov
6d27777b19
Merge branch 'master' into ubsan-fixes-3 2018-12-14 20:52:54 +03:00
Nikolai Kochetov
ec59f65a1e Update ReverseIndex. Added tests. 2018-12-13 22:02:28 +03:00
zhang2014
6d0c4eaf89 ISSUES-838 add lz4、none、zstd codec 2018-12-13 12:10:34 +08:00
Sergey V. Galtsev
df9833fd3f Remove no longer used error code. 2018-12-11 02:18:16 +03:00
Amos Bird
197d73d5bc Fix copy-paste error. 2018-12-11 01:31:10 +08: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
0b4f0ca7d5
Merge pull request #3744 from yandex/low-cardinality-nullable-group-by
LowCardinality optimization for single nullable column.
2018-12-07 23:32:27 +03:00
alesapin
21f8a86635 Merge branch 'chenxing-xc-master' 2018-12-07 17:13:11 +03:00
alesapin
80b49e4c0a Add integration test, put dependent libs to contrib, slightly refine
code.
2018-12-07 14:41:24 +03:00
Alexey Milovidov
f3c72daf50 Fixed name [#CLICKHOUSE-2] 2018-12-07 06:21:17 +03:00
proller
65e1e2af13 Fix dmesg error netlink: '...': attribute type 1 has an invalid length. 2018-12-04 15:18:37 +03:00
Nikolai Kochetov
2723b0efbf Fix build. 2018-12-04 15:12:52 +03:00
Nikolai Kochetov
98499b1140 LowCardinality optimization for single nullable column. 2018-12-03 21:00:20 +03:00
alesapin
03ce4c5bc5
Merge branch 'master' into master 2018-12-03 13:02:34 +03:00
alesapin
0090aaf8ee Add missed header 2018-12-03 12:12:03 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
Alexey Milovidov
b7d9910bd3 Merge branch 'master' into dont-allocate-too-much-memory-to-parse-query 2018-12-01 04:54:01 +03:00
alexey-milovidov
bf7b68cf95
Merge pull request #3689 from abyss7/CLICKHOUSE-3936
CLICKHOUSE-3936
2018-12-01 01:50:04 +03:00
Alexey Milovidov
ca1d38914a Don't log to stderr within RE2 library [#CLICKHOUSE-2] 2018-11-30 22:37:31 +03:00
Alexey Milovidov
35f6fb5ae6 Avoid memory over-allocation when large value of "max_query_size" is specified [#CLICKHOUSE-4169] 2018-11-30 18:36:41 +03:00
Ivan
448846fc0d
Merge branch 'master' into CLICKHOUSE-3936 2018-11-28 18:59:57 +03:00
Ivan Lezhankin
8b5a05947c Remove redundant information from RWLock.
And fix broken exception in some race conditions
2018-11-28 18:50:52 +03:00
alexey-milovidov
a4fd7f4eb3
Update configReadClient.h 2018-11-28 17:45:58 +03:00
alexey-milovidov
a991781937
Update configReadClient.cpp 2018-11-28 17:45:01 +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
Alexey Zatelepin
ceea7bde2e better names in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-28 14:40:59 +03:00
Ivan Lezhankin
470f96ce19 Minor refactoring 2018-11-27 19:45:45 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ (#2443) 2018-11-27 19:11:46 +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
proller
ad6ae4fdbe Fix build on mac (caused by #3631) (#3654)
* Fix build on mac (caused by #3631)

* fix
2018-11-24 04:15:00 +03:00
alexey-milovidov
507990d5f2
Merge branch 'master' into master 2018-11-23 23:41:38 +03:00
alexey-milovidov
af013285e9
Merge branch 'master' into base64_functions 2018-11-23 21:33:56 +03:00
alexey-milovidov
0822f500f8
Merge pull request #3642 from yandex/odbc_bridge_die_with_server
ODBC bridge die with server
2018-11-23 16:44:53 +03:00
alesapin
d31d30c8e1 Fix comments, naming, log about kill inability and better test 2018-11-23 11:08:35 +03:00
Alexey Milovidov
64c6951b1a More correct documentation #3644 2018-11-23 00:28:38 +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
Alexey Milovidov
a5d1fc0ca7 Removed unused constructor #3633 2018-11-22 21:09:17 +03:00
alesapin
2b2195d4de Fix stupid if 2018-11-22 19:01:17 +03:00
alesapin
1e879850bb Kill odbc-bridge with clickhouse-server 2018-11-22 18:59:00 +03:00
Alexey Milovidov
7b919c9b2b Removed unused constructor #3633 2018-11-22 18:09:19 +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
chenxing.xc
86f1a18185 withdraw INSERT INFILE feature 2018-11-21 11:59:24 +08:00
alesapin
f08e090bda Better uri scheme check and fix in poco submodule 2018-11-20 20:21:32 +03:00
alesapin
01e2137364 CLICKHOUSE-4112: Add keepalive for http connections 2018-11-20 16:15:44 +03:00
alesapin
d4ce674b93 Add http connection pool between replicas 2018-11-16 16:15:17 +03:00
Alexandr Krasheninnikov
177a00f09a Merge https://github.com/yandex/ClickHouse into base64_functions 2018-11-14 12:32:42 +03:00
Alexey Milovidov
2daab83a23 Fixed bad and wrong code #3553 2018-11-14 04:59:32 +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
ead153e9e4 Better code #3565 2018-11-13 22:48:47 +03:00
Alexey Milovidov
69e57187d2 Fixed error; removed unique_ptr #3565 2018-11-13 22:43:17 +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
96d7eee785 fix use-after-free in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-13 16:13:46 +03:00
Alexey Zatelepin
ce1ead5b88 allow arbitrary callbacks in ZooKeeperNodeChange [#CLICKHOUSE-3859] 2018-11-13 16:13:29 +03:00
Alexey Zatelepin
a0a9aad777 Stat data in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-13 16:13:23 +03:00
Amos Bird
6815b25d18 replace std::tuple with std::variant 2018-11-12 03:29:52 +08: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
proller
a996326efe Fix identation 2018-11-07 15:55:56 +03:00
Alexey Milovidov
c5173782dc Potentially better #3490 2018-11-05 17:29:38 +03:00
Alexey Milovidov
a191c32254 Potential improvement #3490 2018-11-05 13:34:48 +03:00
Alexey Milovidov
6f00f165e5 Clarifications; potential improvement #3490 2018-11-05 12:32:59 +03:00
proller
f86d1a7034 CONTRIB-254 Arcadia fixes (#3475)
* Macos: set ENABLE_EMBEDDED_COMPILER=0 by default (because contrib/llvm temporary broken under macos)

* \n

* arcadia fix

* fix arcadia link

* wip

* wip

* wip

* fix

* wip

* wip

* fix

* try use users from server dir

* Revert "try use users from server dir"

This reverts commit 79b2c6fd9c.

* Fix logging

* fix

* Update ZooKeeperImpl.h
2018-11-01 20:07:20 +03:00
proller
c35c979285 CLICKHOUSE-4085 system.contributors (#3452)
* CLICKHOUSE-4085 system.contributors

* fi

* Fix random
2018-10-26 20:43:50 +03:00
alesapin
20b20d04f9 Include from env 2018-10-26 12:22:33 +03:00
alesapin
c951ec7bad CLICKHOUSE-4067: Fixes in odbc dictionaries. Now dictionaries receives bridge path from global config (as it was before). Quotation performed on table and schema independently. Add tests with postgres interaction. Update documentation 2018-10-15 17:49:23 +03:00
Alexandr Krasheninnikov
92916d3b8d Merge https://github.com/yandex/ClickHouse into base64_functions 2018-10-12 11:29:01 +03:00
Alexandr Krasheninnikov
41281ad397 Make compilation on-demand 2018-10-11 19:25:17 +03:00
Marek Vavruša
0652302d9a Common/MemoryTracker: fix metrics not being updated after MemoryTracker reset
The #3230 fixed a problem with memory accounting, but it introduces a regression
in which the memory tracker isn't reset until there are zero queries in process list.
This makes it difficult to see in tests as there's always just one query in-flight,
but in production it produces a sawtooth memory usage pattern that resets when
the allocated memory exceeds set memory limits and all queries are terminated.
2018-10-10 17:37:41 -07:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +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
Alexandr Krasheninnikov
27f288641e Fix config reference, header inclusion and failed tests 2018-10-09 18:03:41 +03:00
Alexey Milovidov
64c7e357e8 Fixed error #3230 2018-10-08 08:30:03 +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
d94b574644 Removing destructor 2018-10-04 16:19:08 +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
147a2a13c2
Merge pull request #3257 from amosbird/master
Correct wcwidth computation for pretty outputs.
2018-10-02 16:23:41 +03:00
Amos Bird
7df73088ab Correct wcwidth computation for pretty outputs. 2018-10-02 10:06:18 +08:00
alexey-milovidov
7c6b08c21c
Merge pull request #3251 from CurtizJ/table-db-macros
Support {database} and {table} macros in ReplicatedMergeTree [CLICKHOUSE-3897]
2018-10-01 21:45:52 +03:00
alexey-milovidov
6432cff455
Update Macros.h 2018-10-01 21:45:39 +03:00
CurtizJ
ed77e40dfe fix implicit macros 2018-10-01 12:01:50 +03:00
CurtizJ
b7b7314ecb remove redundant code 2018-09-28 22:13:16 +03:00
CurtizJ
e0d3aed0c4 remove redundant code 2018-09-28 22:10:16 +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
CurtizJ
90240cb64b support database and table macros 2018-09-27 13:01:10 +03:00
Alexey Milovidov
30da8de1b6 Send log message about peak memory usage to client #3230 2018-09-27 00:19:49 +03:00
Alexey Milovidov
99927a3518 Returned logging peak memory usage in query scope #3230 2018-09-27 00:10:43 +03:00
Alexey Milovidov
dd88c092b7 Attempt to fix inconsistent values in total memory tracker #3143 2018-09-26 23:45:40 +03:00