Alexey Milovidov
3384f3b77e
Progress on task
2020-05-23 21:07:38 +03:00
Alexey Milovidov
fc412f2d9d
Progress on task
2020-05-23 20:59:03 +03:00
Alexey Milovidov
9d24908e53
Progress on task
2020-05-23 20:52:11 +03:00
Alexey Milovidov
3a09f9ca1c
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\W_]+\([^,]+, [^<+)"]+\);' | xargs sed -i -r -e 's/(LOG_[^\W_]+)\(([^,]+), ([^<+)"]+)\);/\1_FORMATTED(\2, \3);/'
2020-05-23 20:29:56 +03:00
Alexey Milovidov
b3f4fe12dd
Progress on task
2020-05-23 20:25:19 +03:00
Alexey Milovidov
d6bc4d2bd0
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, [^<]+ << "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), ([^<]+) << "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "{}\4{}", \3, \5);/'
2020-05-23 20:14:57 +03:00
Alexey Milovidov
241f8c5431
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" \+ [^+]+ \+ "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" \+ ([^+]+) \+ "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5", \4);/'
2020-05-23 20:10:21 +03:00
Alexey Milovidov
f69cbdcbfc
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" \+ [^+]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" \+ ([^+]+)\);/\1_FORMATTED(\2, "\3{}", \4);/'
2020-05-23 20:09:37 +03:00
Alexey Milovidov
f68d1ceb4f
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}\5{}\7{}", \4, \6, \8);/'
2020-05-23 20:02:09 +03:00
Alexey Milovidov
533f86278a
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5{}\7", \4, \6);/'
2020-05-23 20:00:41 +03:00
Alexey Milovidov
8042e5febe
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}\5{}", \4, \6);/'
2020-05-23 19:58:15 +03:00
Alexey Milovidov
e391b77d81
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5", \4);/'
2020-05-23 19:56:05 +03:00
Alexey Milovidov
ee4ffbc332
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}", \4);/'
2020-05-23 19:47:56 +03:00
Alexey Milovidov
8d2e80a5e2
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+"\)' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+, "[^"]+")\)/\1_FORMATTED(\2)/'
2020-05-23 19:42:39 +03:00
Alexey Milovidov
35d79e1252
fmt-style logging, part 1
2020-05-23 19:33:07 +03:00
alexey-milovidov
ac6deaf8ec
Merge pull request #11036 from excitoon-favorites/s3fixes
...
Fixed parsing of S3 URL
2020-05-23 17:06:59 +03:00
Azat Khuzhin
bc4b75dead
Add table name into logs for StorageDistributed
2020-05-23 11:57:14 +03:00
alesapin
cd83ebc599
Merge pull request #11106 from ClickHouse/fix_deadlock_system_logs_startup
...
Fix deadlock in system tables during server startup
2020-05-22 20:53:07 +03:00
alesapin
e812fa15d1
Merge branch 'consistent_metadata' into consistent_metadata2
2020-05-22 17:41:53 +03:00
alesapin
e971ff627e
Fix gcc-9 build
2020-05-22 17:39:49 +03:00
alesapin
f026fa7de1
Rename PartDestinationType to DataDestionationType, because there is no part-specific information
2020-05-22 16:29:33 +03:00
alesapin
a935db4169
boop CI
2020-05-22 15:34:26 +03:00
alexey-milovidov
b82c633716
Merge pull request #11048 from filimonov/kafka_missed_data_during_drop
...
Fixes the potential missed data during termination of Kafka engine table
2020-05-22 14:11:10 +03:00
alesapin
f4b0d475af
Fix system.tables output
2020-05-22 14:04:15 +03:00
alesapin
98ffefd90c
Fix bug with return type
2020-05-22 13:09:24 +03:00
Vladimir Chebotarev
98f31374d5
Added improved S3 URL parsing to DiskS3
.
2020-05-22 11:18:34 +03:00
alesapin
cbcdb6219e
Slighty more verbose comment
2020-05-22 11:17:57 +03:00
Vladimir Chebotarev
02cb08ea2f
Fixed parsing of S3 URL.
2020-05-22 11:17:10 +03:00
alesapin
b9dfa61774
Merge pull request #11042 from CurtizJ/modify-ttl
...
Apply TTL for old data, after ALTER MODIFY TTL query
2020-05-22 11:12:14 +03:00
alesapin
59b3bc0c05
Merge branch 'master' into fix_deadlock_system_logs_startup
2020-05-21 22:57:52 +03:00
alesapin
09034157cd
Remove comments
2020-05-21 22:53:46 +03:00
alesapin
327d17ac6a
Better
2020-05-21 22:46:03 +03:00
alesapin
41914588fd
More clear
2020-05-21 22:07:18 +03:00
alesapin
1906762119
Merge pull request #11109 from ClickHouse/less_verbose_logging
...
Less verbose logging in mutation finalization task
2020-05-21 21:53:08 +03:00
Alexander Kuzmenkov
f98ffdbc4c
Merge pull request #11087 from azat/context-fwd-decl
...
[RFC] Forward declaration for Context as much as possible.
2020-05-21 19:43:29 +03:00
alesapin
87eab514fb
Merge branch 'master' into consistent_metadata
2020-05-21 18:54:52 +03:00
alesapin
5676340f6b
Less verbose logging in mutation finalization task
2020-05-21 18:52:11 +03:00
alesapin
c036af0261
Fix deadlock after clickhouse-server update (with changes in one of system log tables structure) during startup between concurrent merge and table rename.
2020-05-21 17:11:56 +03:00
alexey-milovidov
765510d5c3
Merge pull request #10991 from ClickHouse/enable-clang-tidy-for-programs-and-utils
...
Enable clang-tidy for programs and utils
2020-05-21 15:12:07 +03:00
Alexey Milovidov
2fa264d83e
Fix style #10591
2020-05-21 12:46:00 +03:00
alexey-milovidov
b6b62dbdbc
Merge pull request #10591 from excitoon-favorites/ttl_introspection
...
Added `move_ttl_info` to `system.parts`
2020-05-21 12:43:49 +03:00
BohuTANG
c9d315654c
Fix Storages/MergeTree typo
2020-05-21 17:00:44 +08:00
Azat Khuzhin
d93b9a57f6
Forward declaration for Context as much as possible.
...
Now after changing Context.h 488 modules will be recompiled instead of 582.
2020-05-21 01:53:18 +03:00
alesapin
616902a995
Sorting and primary key (broken)
2020-05-20 21:11:38 +03:00
alesapin
9fb28f5ac0
Add sampling key
2020-05-20 18:16:39 +03:00
Anton Popov
d62fe980ef
Merge remote-tracking branch 'upstream/master' into modify-ttl
2020-05-20 16:52:30 +03:00
alesapin
8bc527eecd
Compile partition key
2020-05-20 15:16:55 +03:00
alexey-milovidov
da33858d39
Update StorageSystemParts.cpp
2020-05-20 14:07:31 +03:00
Vladimir Chebotarev
02b52df86d
Added delete_ttl_info_min
and delete_ttl_info_max
to system.parts
.
2020-05-20 14:07:31 +03:00
Vladimir Chebotarev
6f68979662
Switched system.parts.move_ttl_info
to separate arrays.
2020-05-20 14:07:31 +03:00
Vladimir Chebotarev
3ed5d9434a
Added move_ttl_info
to system.parts
.
2020-05-20 14:07:31 +03:00
Mikhail Filimonov
e8a13842af
Better fix, previous fix was wrong (was leaving the cycle by eof condition)
2020-05-20 11:02:02 +02:00
alesapin
dc330ca7cb
Merge pull request #11037 from ClickHouse/alter_rename_and_modify
...
Fix alter rename with different types of alter
2020-05-20 11:28:13 +03:00
Mikhail Filimonov
34198336ed
Style
2020-05-19 19:02:37 +02:00
Mikhail Filimonov
b50480cbde
Fixes the potential missed data during termination of Kafka engine table
2020-05-19 18:55:37 +02:00
alesapin
7d382cc7b5
Return missed command
2020-05-19 19:03:10 +03:00
alesapin
4906dbef41
Remove redundant logs
2020-05-19 13:46:56 +03:00
alesapin
2b37a418f2
More clear logic
2020-05-19 13:44:53 +03:00
alesapin
111c576579
Slightly less garbage
2020-05-19 13:03:05 +03:00
alesapin
70e5553204
At least something works
2020-05-19 12:54:56 +03:00
Anton Popov
58ed04dc24
materialize TTL after its modifying
2020-05-19 04:53:01 +03:00
alesapin
07cb21ccb7
Merge branch 'master' into refactor-reservations
2020-05-18 11:43:48 +03:00
Alexey Milovidov
f54435e7fd
Fix clang-tidy
2020-05-18 11:08:55 +03:00
alexey-milovidov
7efd2a825f
Merge pull request #10463 from ClickHouse/parallel-final
...
Parallel final
2020-05-18 05:20:18 +03:00
alexey-milovidov
073dc2e1e3
Merge pull request #10986 from ClickHouse/try-fix-use-after-free-mergetree
...
Try to fix use-after-free error in MergeTree
2020-05-18 03:41:53 +03:00
alexey-milovidov
3820075813
Merge pull request #10983 from azat/configure-librdkafka
...
Configure librdkafka (logging and thread names)
2020-05-17 23:25:18 +03:00
Alexey Milovidov
70c31cbdc4
Fix error
2020-05-17 22:44:31 +03:00
Alexey Milovidov
81a7930c3e
Merge branch 'master' of github.com:yandex/ClickHouse into try-fix-use-after-free-mergetree
2020-05-17 22:42:34 +03:00
Alexey Milovidov
20dbd6c3ef
Fix error
2020-05-17 22:41:49 +03:00
alexey-milovidov
ca1a9b890d
Revert "Try to fix use-after-free error in MergeTree"
2020-05-17 22:36:27 +03:00
alexey-milovidov
8d3c37992a
Merge pull request #10533 from ClickHouse/alter-key-column-better-exception-message
...
Better exception message and error code for ALTER of key column #9078
2020-05-17 22:21:14 +03:00
Azat Khuzhin
e3d69eea88
Configure thread names for librdkafka
...
First of all it is nice to have part of the table name in it.
And secondly, librdkafka uses pthread_setname_np(), but due to
glibc-compatibility it is a noop in clickhouse sources:
# librdkafka uses rdk: prefix for thread names by default
$ grep rdk /proc/$(pgrep clickhouse-serv)/task/*/comm
# just in case:
$ grep rdk /proc/*/task/*/comm
$ grep rdk /proc/*/comm
(gdb) disas pthread_setname_np
Dump of assembler code for function pthread_setname_np:
0x000000000c603250 <+0>: xor %eax,%eax
0x000000000c603252 <+2>: retq
End of assembler dump.
2020-05-17 20:40:18 +03:00
Azat Khuzhin
dbe781451a
Redirect librdkafka logs from stderr to clickhouse logger
2020-05-17 20:27:36 +03:00
alexey-milovidov
7cf3538840
Merge pull request #10270 from ClickHouse/quota-key-in-client
...
Support quota_key for Native client
2020-05-17 14:09:40 +03:00
alexey-milovidov
7ee35f102d
Merge pull request #10867 from azat/dist-INSERT-load-balancing
...
Respect prefer_localhost_replica/load_balancing on INSERT into Distributed
2020-05-17 11:11:35 +03:00
Alexey Milovidov
7971f62776
Fix test
2020-05-17 10:47:53 +03:00
alexey-milovidov
421eb6df8f
Merge pull request #10970 from ClickHouse/try-fix-use-after-free-mergetree
...
Try to fix use-after-free error in MergeTree
2020-05-17 09:09:45 +03:00
alexey-milovidov
a3346e9331
Merge pull request #10912 from ClickHouse/static-mutate
...
Static mutate
2020-05-17 09:05:35 +03:00
Alexey Milovidov
397859ccb8
Fix error
2020-05-17 08:45:20 +03:00
Alexey Milovidov
9fcfe5fb14
Better exception message and error code for ALTER of key column #9078
2020-05-17 07:46:25 +03:00
alexey-milovidov
0fd0711b51
Merge pull request #10910 from filimonov/kafka_drop_hang_fix
...
Fix for the hang during deletion of engine=Kafka
2020-05-17 07:13:54 +03:00
Alexey Milovidov
88ee76186b
Try to fix use-after-free error in MergeTree
2020-05-17 07:12:33 +03:00
alexey-milovidov
0d76091fd9
Merge pull request #10940 from azat/dist-send-partially-written-read-fix
...
Avoid sending partially written files by the DistributedBlockOutputStream
2020-05-17 06:53:51 +03:00
Gleb Novikov
1a25ac6e1f
Merge branch 'master' into refactor-reservations
2020-05-16 23:34:45 +03:00
Gleb Novikov
45b84d491e
small fixes of review remarks
2020-05-16 23:31:17 +03:00
alesapin
d0b56a4c7d
Merge pull request #10887 from ClickHouse/vzakaznikov-add_alter_rename_column_to_distributed
...
Vzakaznikov add alter rename column to distributed
2020-05-16 12:54:32 +03:00
alesapin
be4037abb5
Merge pull request #10895 from ClickHouse/fix_multiple_renames
...
Fix error in multiple rename commands in a single query.
2020-05-16 12:54:04 +03:00
Azat Khuzhin
2498041cc1
Avoid sending partially written files by the DistributedBlockOutputStream
2020-05-16 01:00:42 +03:00
tavplubix
cc4ddfd89e
Merge pull request #10901 from ClickHouse/merging_10554
...
Merging #10554
2020-05-15 23:23:02 +03:00
Mikhail Filimonov
405cce2c53
Another variant of fix. It looks like we do not need destructor at all
2020-05-15 22:19:21 +02:00
alesapin
a504db3451
Fix typo
2020-05-15 18:11:13 +03:00
alesapin
97c2e549be
Merge pull request #10865 from azat/dist-dir-mon-fix
...
Fix ENOENT exception on current_batch.txt in DirectoryMonitor
2020-05-15 18:05:48 +03:00
Vitaly Baranov
d92ac9ea47
Merge branch 'master' into RBAC-10
2020-05-15 14:12:43 +03:00
alesapin
26606dd640
Fix polymorphic parts
2020-05-15 13:36:35 +03:00
alesapin
8eb27f6f13
Fix rename with compact parts
2020-05-14 19:56:13 +03:00
tavplubix
a47bf09337
Merge pull request #10859 from ClickHouse/fix_watch_livelock_with_database_atomic
...
Fix livelock with WATCH queries and DatabaseAtomic
2020-05-14 15:11:41 +03:00
Vitaly Baranov
c30587196a
Add system tables for users, roles and grants.
2020-05-14 14:12:20 +03:00
Vitaly Baranov
b1f362b2dc
Add system table for access types.
2020-05-14 14:12:20 +03:00
Vitaly Baranov
a14f322723
Add system tables for settings profiles.
2020-05-14 14:12:15 +03:00
alesapin
316773d853
Better comment
2020-05-14 13:30:53 +03:00
Mikhail Filimonov
6499d702f9
After review fixes
2020-05-14 12:15:38 +02:00
Nikolai Kochetov
4d22374f24
Merged with master.
2020-05-14 12:06:15 +03:00
Mikhail Filimonov
a1013f1e71
Fix for the hang during deletion of engine=Kafka
2020-05-14 10:38:02 +02:00
Nikolai Kochetov
4d0503f021
Make IColumn::mutate() static.
2020-05-14 11:30:18 +03:00
Azat Khuzhin
52d73c7f45
Fix prefer_localhost_replica=0 and load_balancing for Distributed INSERT
2020-05-14 03:29:03 +03:00
Azat Khuzhin
e1d4837753
Fix list of possible nodes for Distributed INSERT for internal_replication=0
2020-05-14 03:28:08 +03:00
Azat Khuzhin
cdf3845e43
Respect load_balancing in DirectoryMonitor, to fix w/o internal_replication
2020-05-14 01:33:25 +03:00
alexey-milovidov
623b2e5a43
Merge pull request #10849 from ClickHouse/fix_optimize_and_alter_hangs
...
Fix mutations and OPTIMIZE hangs when replica becomes inactive
2020-05-13 23:41:13 +03:00
Nikolai Kochetov
496d90b613
Merge pull request #10860 from CurtizJ/pk-function
...
Fix sample with final (addition to #10715 )
2020-05-13 23:04:25 +03:00
Alexander Tokmakov
ef52acdbde
Merge branch 'master' into merging_10554
2020-05-13 21:30:26 +03:00
alesapin
ab760846c2
Fix some rename cases
2020-05-13 20:43:30 +03:00
Vitaly Baranov
5b84121d81
Improve system tables for quotas. Remove function currentQuota().
2020-05-13 19:40:48 +03:00
Vitaly Baranov
e64e2ebdf6
Improve system table for row policies. Remove function currentRowPolicies().
2020-05-13 19:40:48 +03:00
Vitaly Baranov
b6fe726777
Rename row policy's 'name' to 'short_name', 'full_name' to 'name'.
...
This change simplifies the interface of IAccesEntity.
2020-05-13 19:40:48 +03:00
Vitaly Baranov
6f15a0d443
Improve the function range() to allow iterating through enum values.
2020-05-13 19:40:48 +03:00
Anton Popov
84d4ad4315
add some comments
2020-05-13 19:00:06 +03:00
alesapin
2316851be6
Merge pull request #10855 from ClickHouse/get_rid_of_strange_fields
...
Better comments in IStorage interface
2020-05-13 15:59:50 +03:00
alesapin
352c402cf2
Merge branch 'add_alter_rename_column_to_distributed' of https://github.com/vzakaznikov/ClickHouse into vzakaznikov-add_alter_rename_column_to_distributed
2020-05-13 14:14:23 +03:00
alesapin
f209052519
Better comments
2020-05-13 14:04:27 +03:00
alesapin
377ef6535d
Merge pull request #10847 from ClickHouse/fix_alter_rename_and_constraints
...
Fix constraints after column rename
2020-05-13 11:09:55 +03:00
Alexander Tokmakov
032197b015
fix alter and optimize hangs when replica becomes inactive
2020-05-13 10:06:57 +03:00
alesapin
13c8ffc0c9
Fix exception message after server shutdown ( #10841 )
...
* After shutdown cancel background logs pulling after task were deleted from pool
* Fix comment
* Cancel with lock
* Remove whitspace
2020-05-13 06:35:43 +03:00
Azat Khuzhin
085bafad05
Handle prefer_localhost_replica on INSERT into Distributed
...
Right now it will issue remote send even if finally the local replica
will be selected - not good I guess.
This should also fix load_balancing.
2020-05-13 01:38:03 +03:00
Azat Khuzhin
889f54b549
Fix ENOENT exception on current_batch.txt in DirectoryMonitor
...
current_batch.txt will not exist if there was no send, this is the case
when all batches that was pending has been marked as pending.
2020-05-13 01:23:18 +03:00
Anton Popov
67213b8ad4
fix sample with final
2020-05-12 21:23:40 +03:00
Alexander Tokmakov
5ffb7372af
fix livelock with watch queries and database atomic
2020-05-12 21:10:10 +03:00
alesapin
262b6287ab
Fix clang-tidy warnings
2020-05-12 19:38:11 +03:00
Nikolai Kochetov
0ef9b20823
Try fix sample final.
2020-05-12 17:37:19 +03:00
alesapin
2b51b7aa2a
Remove redundant using
2020-05-12 14:47:59 +03:00
alesapin
979779e06f
Fix constraints after column rename
2020-05-12 14:26:44 +03:00
Nikolai Kochetov
5d13327ad8
Try fix merge with master.
2020-05-12 12:22:01 +03:00
Anton Popov
a1333895eb
Merge pull request #10791 from oandrew/key-condition-source-type
...
Use src_type for conversion in KeyCondition
2020-05-12 03:29:43 +03:00
Alexey Milovidov
25cf842491
Fix the issue with ODBC bridge and identifier_quoting_style = None #7984
2020-05-11 23:05:08 +03:00
Gleb Novikov
d255bb998a
VolumePtr instead of DiskPtr in IMergedBlockOutputStream and inherited classes
2020-05-11 20:20:26 +03:00
alexey-milovidov
33d491edf3
Merge pull request #10516 from azat/dist-GROUP_BY-sharding_key-fixes
...
Disable GROUP BY sharding_key optimization by default (and fix for WITH ROLLUP/CUBE/TOTALS)
2020-05-11 12:03:27 +03:00
alexey-milovidov
06ba85fdf2
Merge pull request #10795 from ClickHouse/list-licenses
...
Added "system.licenses" table
2020-05-11 09:00:55 +03:00
Alexey Milovidov
3fcbb06cab
Fix MSan report in MergeTreeIndexFullText
2020-05-11 08:04:59 +03:00
Alexey Milovidov
141218d44a
Fix Arcadia
2020-05-11 07:36:32 +03:00
Alexey Milovidov
c5e78d12e7
Merge branch 'master' into list-licenses
2020-05-11 07:35:35 +03:00
alexey-milovidov
40ef113503
Merge branch 'master' into parallel-final
2020-05-11 06:47:44 +03:00
alexey-milovidov
ddc84163a7
Merge pull request #10486 from azat/dist-send-on-INSERT
...
Fix distributed send that are scheduled by INSERT query
2020-05-11 06:28:35 +03:00
Alexey Milovidov
da583760c4
Added "system.licenses" table
2020-05-11 05:39:01 +03:00
Andrew Onyshchuk
330f06328f
Use src_type for convertion in KeyCondition
2020-05-10 18:17:54 -05:00
Gleb Novikov
1235c36f3e
data_part instead of volume in IMergeTreeDataPartWriter (as it done in IMergeTreeReader)
2020-05-10 16:33:27 +03:00
Gleb Novikov
57b6fb6d80
Merge branch 'master' into refactor-reservations
2020-05-10 13:01:45 +03:00
Azat Khuzhin
5c89cdbe61
Fix distributed send retries on distributed_directory_monitor_{max_,}sleep_time_ms > 5min
...
In this case error_count can be decreased before checking it for
rescheduling send.
And actually this can be a problem not only when
distributed_directory_monitor_{max_,}sleep_time_ms > 5min, because all
threads can be occupated and the real timeout between sends will be > 5min.
2020-05-10 12:37:38 +03:00
Alexey Milovidov
36d9d646a9
Fix race condition in ReplicatedMergeTreeQueue
2020-05-10 05:18:10 +03:00
alexey-milovidov
992e58923a
Merge pull request #10588 from excitoon-favorites/fixmutations
...
Fixed handling condition variable for synchronous mutations
2020-05-10 03:20:41 +03:00
alexey-milovidov
63c4a7661f
Merge pull request #10715 from CurtizJ/pk-function
...
Fix usage of primary key wrapped into a function.
2020-05-10 02:08:59 +03:00
Gleb Novikov
390b39b272
VolumePtr instead of DiskPtr in MergeTreeData*
2020-05-10 00:24:15 +03:00