Commit Graph

3239 Commits

Author SHA1 Message Date
alesapin
83574eed7c Merge remote-tracking branch 'upstream/master' 2018-09-03 13:11:33 +03:00
alesapin
11d248ba10 Resolve conflict 2018-09-03 13:11:10 +03:00
Alexey Milovidov
226a7f491e Whitespaces [#CLICKHOUSE-3944] 2018-09-03 08:06:19 +03:00
Alexey Milovidov
a903a5a755 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 06:58:31 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
684d3f6162 Fixed bug #2830 2018-09-02 05:27:56 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
Alexey Milovidov
8eb746b216 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:13:17 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
alesapin
6bfde2825e Fix conflict 2018-08-30 22:23:00 +03:00
alesapin
6e64067a70 CLICKHOUSE-3800: Move cache to context, change hashing algorithm, add drop instruction for compiled expressions cache 2018-08-30 19:31:20 +03:00
Alexey Milovidov
87dfd8e47e Removed useless field #2447 2018-08-29 17:55:28 +03:00
Alexey Milovidov
3e216f055c Miscellaneous #2758 2018-08-28 03:44:42 +03:00
Alexey Milovidov
9a4b4fbccd Miscellaneous #2758 2018-08-28 03:23:52 +03:00
Alexey Milovidov
236c3872b8 Miscellaneous #2758 2018-08-28 03:23:38 +03:00
Alexey Milovidov
32286484cd Miscellaneous #2758 2018-08-28 03:22:32 +03:00
Alexey Milovidov
52379be265 Miscellaneous #2758 2018-08-28 03:21:02 +03:00
Alexey Milovidov
4f8d324fa7 Miscellaneous #2758 2018-08-28 03:18:32 +03:00
Alexey Milovidov
fa0ffcf8dc Miscellaneous #2758 2018-08-28 03:17:27 +03:00
Alexey Milovidov
2a4b4eefd6 Miscellaneous #2758 2018-08-28 03:10:05 +03:00
Alexey Milovidov
ea643eeff9 Miscellaneous #2758 2018-08-28 03:03:10 +03:00
Alexey Milovidov
7c777c48d7 Miscellaneous #2758 2018-08-28 03:01:03 +03:00
Alexey Milovidov
0a7e288d70 Miscellaneous #2758 2018-08-28 02:59:49 +03:00
Alexey Milovidov
bab6cd504d Miscellaneous #2758 2018-08-27 22:16:38 +03:00
Alexey Milovidov
24bd803c07 Whitespaces #2758 2018-08-27 22:06:32 +03:00
Vadim
2d8bffafa3
Update MergeTreeSettings.h 2018-08-27 19:38:54 +03:00
Vadim
4d9d80b271
Update MergeTreeSettings.h 2018-08-27 19:38:36 +03:00
Alexey Milovidov
076e1fb2e1 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-27 19:31:45 +03:00
VadimPE
418375aa1d Merge branch 'CLICKHOUSE-3847' of https://github.com/VadimPE/ClickHouse into CLICKHOUSE-3847 2018-08-27 19:23:08 +03:00
VadimPE
70ebb6a47d CLICKHOUSE-3847 fix code-style 2018-08-27 19:22:39 +03:00
Vadim
64a27e592b
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 19:00:40 +03:00
VadimPE
4d198f2bfe CLICKHOUSE-3847 fix build 2018-08-27 18:54:07 +03:00
VadimPE
0281678c3e CLICKHOUSE-3847 fix code style 2018-08-27 18:44:51 +03:00
VadimPE
a8974f8786 CLICKHOUSE-3847 add Coordinator 2018-08-27 16:51:22 +03:00
Vadim
be2d821669
Merge branch 'master' into CLICKHOUSE-3847 2018-08-27 15:26:41 +03:00
Vadim
c4e90d89f0
Update ReplicatedMergeTreeCleanupThread.cpp 2018-08-27 15:16:52 +03:00
VadimPE
22aa521884 CLICKHOUSE-3847 fix bug when replica recover and it's log_pointer will be deleted 2018-08-27 15:14:48 +03:00
VadimPE
cf0a7c1529 CLICKHOUSE-3847 fix bug when replica recover and it's log_pointer will be deleted 2018-08-27 15:09:22 +03:00
Alexey Milovidov
a1a70d4a65 Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 04:56:34 +03:00
Alexey Milovidov
c193d15ef2 Merge branch 'master' into generalize-zookeeper 2018-08-26 03:32:15 +03:00
alexey-milovidov
f92bae33f8
Merge pull request #2949 from yandex/distinguish-between-definitely-lost-and-unknown-requests-in-zookeeper
ZooKeeperImpl: allow to distinguish cases when request was definitely not been processed.
2018-08-26 03:12:20 +03:00
Alexey Milovidov
068e50329e Support for max_block_size in system.tables and system.columns tables #2447 2018-08-25 19:07:48 +03:00
alexey-milovidov
046137f9c5
Merge pull request #2946 from amosbird/locking
Better locking for StorageBuffer
2018-08-25 13:47:29 +03:00
Amos Bird
2602177525 Better locking for StorageBuffer 2018-08-25 13:52:06 +08:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
Alexey Milovidov
01082d03d2 Adopted logic in ReplicatedMergeTreeBlockOutputStream #2949 2018-08-25 01:55:02 +03:00
alexey-milovidov
7ba62c2e25
Merge pull request #2939 from yandex/fix-potential-data-loss-in-case-of-zk-errors
Fixed potential data loss in case of ZK errors [#CLICKHOUSE-3916]
2018-08-25 01:08:31 +03:00
Alexey Milovidov
eec8af52f3 Fixed potential data loss [#CLICKHOUSE-3916] 2018-08-24 11:57:24 +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