Commit Graph

16690 Commits

Author SHA1 Message Date
Alexey Milovidov
3f7d634fd7 Merge branch 'master' of github.com:yandex/ClickHouse 2019-03-08 16:15:24 +03:00
Alexey Milovidov
ee996c0c99 Fixed excessive whitespace #4467 2019-03-08 16:14:40 +03:00
Alexey Milovidov
73c571412c Fixed awful error after #3920 2019-03-08 06:32:43 +03:00
Alexey Milovidov
356a5c54b8 Whitespaces 2019-03-08 06:23:34 +03:00
alexey-milovidov
84763b129f
Merge pull request #4599 from yandex/dictionaries-dont-check-is-modified-under-lock
ExternalDictionaries: don't lock when checking if a dictionary is modified
2019-03-07 22:57:17 +03:00
alexey-milovidov
286d03de97
Merge pull request #4619 from yandex/fix-inconsistent-memory-tracker
Fixed inconsistency of MemoryTracker usage in Allocator (tnx. proller)
2019-03-07 22:08:39 +03:00
Alexey Milovidov
d53da3d497 Fixed typo 2019-03-07 20:58:28 +03:00
Alexey Milovidov
64897faf84 Fixed inconsistency of MemoryTracker usage in Allocator (tnx. proller) 2019-03-07 19:48:24 +03:00
proller
2c4dced9d2 Add functions used in arcadia 2019-03-07 19:27:03 +03:00
alesapin
4532b4be94 Fix kill query test once again 2019-03-07 16:42:58 +03:00
Alexey Zatelepin
4caf4472cc make test more stable 2019-03-07 15:59:37 +03:00
Alexey Milovidov
58bfcba361 Merge branch 'master' into dictionaries-dont-check-is-modified-under-lock 2019-03-07 02:46:27 +03:00
alexey-milovidov
b72894d693
Merge pull request #4613 from zlobober/host_context
CHYT-67: introduce host context for using CH as a library.
2019-03-07 02:35:15 +03:00
alexey-milovidov
5411920ee7
Merge pull request #4614 from proller/fix23
Fix bug in arrayEnumerateRanked
2019-03-07 02:34:31 +03:00
alexey-milovidov
98cabc6903
Merge pull request #4608 from yandex/fix-locks-streams-destruction-order
Fix order of destruction of table locks and child streams
2019-03-07 00:38:26 +03:00
alexey-milovidov
b403419527
Merge pull request #4612 from yandex/threadpool-fix-ub
Fixed undefined behaviour in ThreadPool
2019-03-07 00:38:03 +03:00
Maxim Akhmedov
15576ca809 Better lifetime of query context in TCP handler. 2019-03-07 00:32:26 +03:00
proller
55cf27da07 Build fix (copier) 2019-03-06 23:07:00 +03:00
proller
86d9876221 Merge remote-tracking branch 'upstream/master' into fix23 2019-03-06 22:58:47 +03:00
Alexey Milovidov
2f368b24df Merge branch 'threadpool-fix-ub' of github.com:yandex/ClickHouse into threadpool-fix-ub 2019-03-06 22:58:28 +03:00
Alexey Milovidov
f49562bff3 Flush query metrics before joining thread #4612 2019-03-06 22:57:54 +03:00
alexey-milovidov
df50dac691
Merge pull request #4601 from yandex/array-enumerate-ranked-dig-through-code
Code cleanups for `arrayEnumerateRanked`
2019-03-06 22:37:10 +03:00
proller
9e47a149c5 Merge remote-tracking branch 'upstream/master' into threadpool-fix-ub 2019-03-06 22:32:51 +03:00
Maxim Akhmedov
28bc3fd7d8 Remove accidental modification of unrelated file. 2019-03-06 22:28:48 +03:00
proller
18e53999be Merge remote-tracking branch 'upstream/master' into fix23 2019-03-06 22:19:30 +03:00
proller
ee15cb237c Better fix 2019-03-06 22:19:21 +03:00
alexey-milovidov
7e4c497e19
Merge pull request #4594 from yandex/fix-low-cardinality_serialization-for-set-index
Fix Nullable and LowCardinality serialization for set index
2019-03-06 21:57:26 +03:00
Alexey Zatelepin
274ef6d51b Merge branch 'master' into fix-locks-streams-destruction-order 2019-03-06 21:47:12 +03:00
alexey-milovidov
61e82da684
Update TCPHandler.cpp 2019-03-06 21:38:26 +03:00
proller
482d153dcd clickhouse-odbc #157 : Remove LowCardinality from type (#4381)
* clickhouse-odbc #157 : Remove LowCardinality from type

* Update ODBCDriver2BlockOutputStream.cpp

* fix
2019-03-06 21:37:16 +03:00
alexey-milovidov
e2fde4f0d8
Merge pull request #4576 from BayoNet/DOCAPI-5203-direct-io-settings
DOCAPI-5203 direct i/o settings EN description
2019-03-06 21:34:35 +03:00
Alexey Milovidov
47df38f7a0 Adapted test for TSan #4572 2019-03-06 21:09:25 +03:00
Alexey Milovidov
41469cc874 More simple #4572 2019-03-06 20:54:20 +03:00
proller
9159d602f5 Fix bug in arrayEnumerateRanked 2019-03-06 20:19:26 +03:00
alesapin
a233b93b6a Fix kill_not_initialized_query again 2019-03-06 20:10:26 +03:00
Maxim Akhmedov
9a56294fdf CHYT-67: introduce host context for using CH as a library. 2019-03-06 19:47:47 +03:00
Alexey Milovidov
89917ced9e Fixed undefined behaviour in ThreadPool #4572 2019-03-06 19:46:05 +03:00
Alexey Zatelepin
aff14bc899 clarify comment 2019-03-06 16:48:59 +03:00
Alexey Zatelepin
bc30ed92d4 fix order of destruction of table locks and child streams
Incorrect order could lead to a very rare `mutex lock failed: Invalid argument`
error when MergeTree table was dropped and its parts were deleted defore the destruction
of streams that were reading from that parts.
2019-03-06 15:25:59 +03:00
alexey-milovidov
98fe1a6e8b
Update CMakeLists.txt 2019-03-06 04:01:53 +03:00
Alexey Milovidov
01f7efe615 Added support for clang-9 2019-03-06 03:44:25 +03:00
alexey-milovidov
1df9c1720e
Merge pull request #4426 from Felixoid/graphite-rollup
Graphite rollup: combined rules
2019-03-06 03:10:45 +03:00
alexey-milovidov
2e6dde45b4
Update GraphiteRollupSortedBlockInputStream.cpp 2019-03-06 03:09:49 +03:00
alexey-milovidov
74f7ef390a
Merge pull request #4595 from 4ertus2/joins
Multiple JOINs multiple fixes
2019-03-06 02:55:05 +03:00
alexey-milovidov
812d563e5f
Merge pull request #4598 from 4ertus2/ast
Fix CrossToInnerJoin rewrite
2019-03-06 02:54:30 +03:00
proller
ffc9fbf769 Build fixes (#4600)
* Add Y_IGNORE

* Build fixes
2019-03-06 02:53:35 +03:00
Alexey Milovidov
dd40956d8b Fixed test 2019-03-06 02:31:34 +03:00
Alexey Milovidov
5a644f0052 Miscellaneous 2019-03-06 02:05:47 +03:00
Alexey Milovidov
b5b3f52f0f Added documentation 2019-03-06 01:43:18 +03:00
Alexey Milovidov
224839a58a Attempt to read the code #4475 2019-03-06 00:53:16 +03:00