Commit Graph

14 Commits

Author SHA1 Message Date
Alexey Milovidov
7f27f0e4ca Fixed build #3146 2018-09-17 06:44:29 +03:00
Alexey Milovidov
5e3b507bd6 Added functions "toISOWeek", "toISOYear", "toStartOfISOYear" [#CLICKHOUSE-3988] 2018-09-17 06:09:56 +03:00
Alexey Zatelepin
e55097b866 introduce constants for max level and max block number 2018-06-04 14:23:47 +03:00
Alexey Zatelepin
f6c72f8e56 Merge branch 'master' into replicated-mergetree-mutations
Conflicts:
	dbms/src/Common/ActionBlocker.h
	dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
	dbms/src/Storages/MergeTree/ActiveDataPartSet.h
	dbms/src/Storages/MergeTree/MergeTreeData.h
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
	dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
	dbms/src/Storages/StorageMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
	dbms/src/Storages/StorageReplicatedMergeTree.h
2018-05-28 18:37:30 +03:00
Alexey Zatelepin
9a32c76e76 parts versioning [#CLICKHOUSE-3687] 2018-05-25 23:04:07 +03:00
Alexey Zatelepin
17437a95bf merge selection based on checking current inserts [#CLICKHOUSE-3732] 2018-05-25 23:03:56 +03:00
Alexey Milovidov
13762471da Changed DayNum_t to DayNum as Amos Bird suggested [#CLICKHOUSE-3] 2018-05-25 16:29:15 +03:00
alexey-milovidov
82fa3883f8
Merge pull request #1930 from yandex/nonblocking-precommitted
Allow PreCommitted parts to contain each other
2018-02-22 23:35:16 +03:00
Vitaliy Lyudvichenko
47becc0b92 Try to reduce false positive of sanity check. More detail dignostics. [#CLICKHOUSE-3571] 2018-02-21 20:06:29 +03:00
Alexey Zatelepin
53b5c5f54c add check for intersecting parts when adding new parts 2018-02-20 16:58:41 +03:00
Alexey Zatelepin
5bc6bd55b1 allow PreCommitted parts to contain each other, clean up code 2018-02-20 16:33:28 +03:00
Alexey Zatelepin
2f80c150db save MergeTree data format version and parse part names depending on it [#CLICKHOUSE-3000] 2017-09-26 20:40:02 +03:00
Alexey Zatelepin
99969ab77a Introduce MergeTreePartitionIndex. Isolate its loading code. [#CLICKHOUSE-3000] 2017-08-31 23:32:03 +03:00
Alexey Zatelepin
f25f0cd759 reduce number of places where partitioning by month is assumed [#CLICKHOUSE-3000] 2017-08-15 22:30:52 +03:00