thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 14:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,378 Commits 9,138 Branches 1,778 Tags 2 GiB
d35baafde8
Commit Graph

1066 Commits

Author SHA1 Message Date
Pawel Rog
9f799820d9 Applied changes requested by Alexey 2017-08-01 10:12:15 +02:00
Alexey Milovidov
6578fb2645 Fixed error [#CLICKHOUSE-3191]. 2017-08-01 00:39:24 +03:00
alexey-milovidov
d174ebc5c9 Update MergeTreeDataWriter.cpp 2017-07-31 20:44:58 +03:00
alexey-milovidov
4877aa394c Update MergeTreeData.cpp 2017-07-31 20:44:41 +03:00
Pawel Rog
3a6c444996 Merge branch 'master' into nocompression 2017-07-31 13:36:58 +02:00
Pawel Rog
e1ab721d3d Use compression method from configs 2017-07-31 13:12:28 +02:00
Pawel Rog
a0cc54457e Added compression NONE 2017-07-31 12:44:45 +02:00
Nikolai Kochetov
78991b25ee fixed preferred_max_column_in_block_size_bytes disabling 2017-07-30 01:24:57 +03:00
Alexey Milovidov
8fb452e99a Fixed wrong log message when removing temporary part after merge, that is not byte-identical than same part on replicas; added profile event; added fail-safe logic [#MTRSADMIN-3175]. 2017-07-29 00:25:24 +03:00
proller
700d4e0904 Fix boost 1.64 and gcc7+ compile errors (#1040) 
* PerformanceTest: use getMultiple*FromConfig, fix debug helpers

* Missing file

* clnag-format of Split ComplexKeyCacheDictionary

* Requested changes

* Fix boost 1.64 and gcc7+ compile errors

* More fixes
 2017-07-28 23:41:51 +03:00
alexey-milovidov
6917eb3153 Update MergeTreeBaseBlockInputStream.cpp 2017-07-28 22:29:40 +03:00
Nikolai Kochetov
b714d2b514 fixed column size calculation for Array column in MergeTreeReader::readRows 2017-07-28 22:29:40 +03:00
Nikolai Kochetov
d9f4f9b0f9 changed skipping rows for Array columns in MergeTreeBaseBlockInputStream 2017-07-28 22:29:40 +03:00
Alexey Milovidov
dd1f54bce2 Changed Poco::RWLock to std::shared_lock [#APRILDEV-91]. 2017-07-28 20:34:02 +03:00
Vitaliy Lyudvichenko
515271544d Add detail comment. [#CLICKHOUSE-3173] 2017-07-27 11:19:20 +03:00
Vitaliy Lyudvichenko
445608afec Fix an iterator pointing after std::end(). [#CLICKHOUSE-3173] 2017-07-27 11:19:20 +03:00
alexey-milovidov
73c2a1483d Update ReplicatedMergeTreeCleanupThread.cpp 2017-07-27 11:19:20 +03:00
alexey-milovidov
dcd7354fb2 Update ReplicatedMergeTreeCleanupThread.cpp 2017-07-27 11:19:20 +03:00
alexey-milovidov
d6750880e0 Update ReplicatedMergeTreeCleanupThread.cpp 2017-07-27 11:19:20 +03:00
Vitaliy Lyudvichenko
cd5bb4d921 Add replicated_deduplication_window_seconds merge_tree parameter. [#CLICKHOUSE-3173] 2017-07-27 11:19:20 +03:00
Vitaliy Lyudvichenko
dcc4d3bff0 Avoid zxid overflow problem when cleaning old blocks used in the deduplication. [#CLICKHOUSE-3173] 2017-07-27 11:19:20 +03:00
Nikolai Kochetov
01a004050d fixed MergeTreeBlockSizePredictor updating from empy block while reading 2017-07-26 20:03:09 +03:00
Alexey Milovidov
4a4e863f9d Fixed warning on clang 6 [#CLICKHOUSE-2]. 2017-07-25 01:44:13 +03:00
Nikolai Kochetov
fcd50e3629 fixed comment 2017-07-24 18:06:32 +03:00
Nikolai Kochetov
b55dcc9f93 cnanged comments; fixed 00443_preferred_block_size_bytes test 2017-07-24 16:59:03 +03:00
Nikolai Kochetov
bc0921a64e added comments 2017-07-21 21:02:02 +03:00
Nikolai Kochetov
c64b65ee29 ignore preferred_max_column_in_block_size_bytes if zero [#CLICKHOUSE-3170] 2017-07-21 20:45:51 +03:00
Nikolai Kochetov
755d16b22d set min block size as index granularity for max_block_size limit during reading [#CLICKHOUSE-3170] 2017-07-21 14:55:33 +03:00
Alexey Milovidov
c7b1e92522 Fixed error after merge [#CLICKHOUSE-3150]. 2017-07-21 09:40:05 +03:00
alexey-milovidov
d4d266fa18 ColumnConst unification (#1011) 
* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* Fixed error in ColumnArray::replicateGeneric [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].

* ColumnConst: unification (incomplete) [#CLICKHOUSE-3150].
 2017-07-21 09:35:58 +03:00
alexey-milovidov
1a1112d8bb Update MergeTreeBlockReadUtils.h 2017-07-20 23:45:23 +03:00
Nikolai Kochetov
0b7439469d fixed MergeTreeBlockSizePredictor initialization for sample block 2017-07-20 23:45:23 +03:00
Nikolai Kochetov
00ae32c946 renamed approximate_number_of_rows_in_part to number_of_rows_in_part 2017-07-20 23:45:23 +03:00
Nikolai Kochetov
e612152584 changed initialization in MergeTreeBlockSizePredictor 2017-07-20 23:45:23 +03:00
Nikolai Kochetov
2afd84c40c fixed is_reading_finished status assignment in MergeTreeRangeReader [#CLICKHOUSE-3161] 2017-07-19 19:39:18 +03:00
Nikolai Kochetov
b5e94ede62 fixed is_reading_finished status assignment in MergeTreeRangeReader [#CLICKHOUSE-3161] 2017-07-19 16:44:46 +03:00
Alexey Milovidov
6e6e9f9d38 Removed useless variable [#CLICKHOUSE-3161]. 2017-07-19 04:05:39 +03:00
Nikolai Kochetov
7e293df9af merged with master 2017-07-17 22:48:22 +03:00
Nikolai Kochetov
eae94edd6b fixed vertical merge for ReplacingSortedBlockInputStream [#CLICKHOUSE-3131] 2017-07-17 22:40:30 +03:00
Alexey Milovidov
9406b6a5aa Get rid of ASTSet, because it is not really an AST and it lead to bugs [#CLICKHOUSE-3148]. 2017-07-15 06:48:36 +03:00
Nikolai Kochetov
a13423e552 added vertical merge for ReplacingSortedBlockInputStream 2017-07-14 21:17:23 +03:00
Alexey Milovidov
1a0f5dd7cf Getting rid of ASTSet (incomplete) [#CLICKHOUSE-2] 2017-07-14 03:33:37 +03:00
Nikolai Kochetov
283810e8ab merged with master 2017-07-13 23:59:34 +03:00
Nikolai Kochetov
75be0b81d8 removed typeid_cast from IColumn.h 2017-07-13 23:58:19 +03:00
Nikolai Kochetov
210f14aaba renamed IDataType::updateAvgValueSizeHints to IDataType::updateAvgValueSizeHint 2017-07-13 21:54:17 +03:00
Nikolai Kochetov
f3f217b40a fixed tests 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
546012079c fixed reading with zero max block size setting 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
e2d032b883 fixed reading with zero max block size setting 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
8ea812e669 better comment for MergeTreeRangeReader 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
f232afd2f8 round number of rows to nearest mark in MergeTreeBaseBlockInputStream 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
f1775af3f0 deleted commented code 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
30ed774bf7 refactoring and more comments in MergeTreeBaseBlockInputStream [#CLICKHOUSE-3065] 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
89386394aa refactoring and more comments in MergeTreeBaseBlockInputStream [#CLICKHOUSE-3065] 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
8c65d6013e added preferred_max_column_in_block_size_bytes setting, added filtration ratio prediction [#CLICKHOUSE-3065] 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
4470afc9a9 added estimateNumRowsMax to MergeTreeBlockSizePredictor based on max column size 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
6b29b3bd47 round number of rows to next mark in MergeTreeBaseBlockInputStream 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
d14f64af7b delected commented logging code 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
586dff9126 delay reading for granulas if prewhere column is false during partial granula reading 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
86680f5513 fixed partial granula reading for const columns in prewhere 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
609711b20c partial part reading with prewhere 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
c6d5ef6d30 added MergeTreeRangeReader 2017-07-13 21:45:09 +03:00
Nikolai Kochetov
985e449bd3 added IDataType::updateAvgValueSizeHints; renamed PODArray::allocated_size to PODArray::allocated_bytes; renamed renamed IColumn::allocatedSize to IColumn::allocatedBytes; removed IColumn.h from IDataType.h 2017-07-13 19:49:09 +03:00
Alexey Milovidov
de75fa000b Using lexer (incomplete) [#CLICKHOUSE-2]. 2017-07-13 08:59:01 +03:00
Alexey Milovidov
83c8043193 Using lexer (incomplete) [#CLICKHOUSE-2]. 2017-07-13 08:59:01 +03:00
Alexey Milovidov
4b1eeee1a3 Using lexer (incomplete) [#CLICKHOUSE-2]. 2017-07-13 08:59:01 +03:00
Alexey Zatelepin
58d541b740 slightly more robust ReplicatedMergeTreePartCheckThread::TemporarilyStop [#CLICKHOUSE-3074] 2017-07-12 20:09:44 +03:00
Vitaliy Lyudvichenko
b843ea5b3f Resolves #964. Fixed input_format_skip_unknown_fields for negative numbers. [#CLICKHOUSE-3] 2017-07-11 21:36:51 +03:00
Alexey Zatelepin
4a98d83a3b introduce replicated_can_become_leader merge_tree setting [#CLICKHOUSE-3109] 2017-07-11 20:44:35 +03:00
Alexey Milovidov
2bd84600d1 Miscellaneous [#CLICKHOUSE-2]. 2017-07-11 04:20:40 +03:00
alexey-milovidov
b64b243a73 Merge pull request #945 from YiuRULE/master 
Implement natively uuid type in Clickhouse
 2017-07-10 07:00:45 +03:00
Alexey Zatelepin
89939a685a Stream row sources from disk for vertical merge [#CLICKHOUSE-3118] 2017-07-09 21:57:06 +03:00
Marek Vavruša
ff73394124 PKCondition: infer index use with pk subexpression 
By default only constraints explicitly matching
primary key expression (or expression wrapped in
a monotonic function) are eligible for part and
range selection. So for example, if index is:

(toStartOfHour(dt), UserID)

Then a query such as this resorts to full scan:

SELECT count() FROM t WHERE dt = now()

Intuitively, only parts with toStartOfHour(now())
could be selected, but it is less trivial to prove.
The primary key currently can be wrapped in a chain
of monotonic functions, so following would work:

toStartOfHour(dt) = toStartOfHour(now()) AND dt = now()

It must be however explicitly stated, if we wanted
to infer that we’d have to know the inverse function,
and prove that the inverse function is monotonic
on given interval. This is not practical as
there is no inverse function that for example undos
rounding, it isn’t strictly monotonic.

There are however functions that don’t transform
output range and preserve monotonicity on the
complete input range, such as rounding or casts
to a same or wider numeric type. This eliminates
the need to find inverse function, as no check for monotonicity over arbitrary interval is needed,
and thus makes this optimisation possible.
 2017-07-09 17:13:51 +03:00
Alexey Milovidov
032d12d431 Fixed translation error [#CLICKHOUSE-2]. 2017-07-04 15:46:31 +03:00
Guillaume Tassery
cba9815981 Change Uuid to UUID datatype and make UInt128 a generic type 2017-07-04 12:42:53 +02:00
Guillaume Tassery
525851ec68 sync master 2017-06-30 22:21:42 +02:00
Guillaume Tassery
1231952fca Implement UUID type and toUuid function 2017-06-30 22:01:27 +02:00
Alexey Zatelepin
9de4d8facb allow loading missing setting from config [#CLICKHOUSE-3091] 2017-06-28 19:56:35 +03:00
Alexey Zatelepin
7cf413dea8 Revert "Raised up limit on max size of parts to merge [#CLICKHOUSE-3091]." 
This reverts commit 425156e32c.
 2017-06-28 15:32:52 +03:00
Alexey Milovidov
a48a21f593 Merge branch 'master' into CLICKHOUSE-2896 2017-06-26 11:54:58 +03:00
Alexey Milovidov
8f145da1e8 Preparation [#CLICKHOUSE-2]. 2017-06-25 06:43:59 +03:00
Alexey Milovidov
275a1d4651 Improvement [#CLICKHOUSE-3091]. 2017-06-25 05:48:38 +03:00
Alexey Milovidov
90a1ae1062 Fixed error in prev. revision [#CLICKHOUSE-3091]. 2017-06-25 05:22:10 +03:00
Alexey Milovidov
8228acd3ea Removed obsolete code that was relevant only in extremely rare case of transforming CollapsingMergeTree to ReplicatedCollapsingMergeTree through ATTACHing data parts and while some considerations about data order in table is important [#CLICKHOUSE-3091]. 2017-06-25 03:51:51 +03:00
Alexey Milovidov
3c660fd65b Fixed translation errors [#CLICKHOUSE-3091]. 2017-06-25 03:17:08 +03:00
Alexey Milovidov
28e9e06992 Preparation: locking block number only after write to filesystem; removed obsolete code [#CLICKHOUSE-3091]. 2017-06-25 03:01:10 +03:00
Alexey Milovidov
c7f35997f5 Removed unused variable [#CLICKHOUSE-2]. 2017-06-25 01:36:43 +03:00
proller
4db8d09de9 Reorganize includes. part 1 (#921) 
* Make libunwind optional. Allow use custom libcctz

* fix

* Fix

* fix

* Update BaseDaemon.cpp

* Update CMakeLists.txt

* Reorganize includes. part 1

* Update dbms_include.cmake

* Reorganize includes. part 2

* Reorganize includes. part 3

* dbms/src/Common/ThreadPool -> libs/libcommon

* Reorganize includes. part 4

* Fix print_include_directories

* Update thread_creation_latency.cpp

* Update StringRef.h
 2017-06-23 23:22:35 +03:00
Alexey Milovidov
061c214c16 Fixed error [#CLICKHOUSE-3074]. 2017-06-23 09:57:55 +03:00
Alexey Milovidov
425156e32c Raised up limit on max size of parts to merge [#CLICKHOUSE-3091]. 2017-06-22 21:29:40 +03:00
Alexey Milovidov
6eb06774d3 Addition to prev. revision [#CLICKHOUSE-3091]. 2017-06-22 19:29:15 +03:00
Alexey Milovidov
c96719685c Lowered max_delay_to_insert to one second, because higher values are non practical and could be harmful for usual failover logic in client apps [#CLICKHOUSE-3091]. 2017-06-22 19:17:01 +03:00
Vitaliy Lyudvichenko
eff3588f28 Rename DROP COLUMN FROM PARTITION -> CLEAR COLUMN IN PARTITION. [#CLICKHOUSE-2896] 2017-06-22 16:18:19 +03:00
Vitaliy Lyudvichenko
53adb891b3 Add replicated DROP COLUMN FROM partition for optimistic case. [#CLICKHOUSE-2896] 2017-06-22 00:56:38 +03:00
Alexey Milovidov
7bdc87adf0 Loosened threshold on broken parts in filesystem [#CLICKHOUSE-3076]. 2017-06-21 22:11:11 +03:00
Alexey Milovidov
5c322f5756 Loosened threshold on amount of replica inconsistency to refuse server startup [#CLICKHOUSE-3076]. 2017-06-21 22:07:08 +03:00
Alexey Milovidov
6df5d556e5 Changed namespace [#DEVTOOLS-3381]. 2017-06-21 11:35:38 +03:00
Alexey Milovidov
604de2bfeb Better [#DEVTOOLS-3381]. 2017-06-21 04:24:05 +03:00
Alexey Milovidov
05accbdcbe Removed cyclic dependency [#DEVTOOLS-3381]. 2017-06-19 23:06:35 +03:00
Vitaliy Lyudvichenko
63ac609e8b Avoid overestimation of avg. column element size. [#CLICKHOUSE-3058] 2017-06-15 20:33:03 +03:00
alexey-milovidov
a669136ac2 Merge branch 'master' into CLICKHOUSE-5 2017-06-13 07:30:36 +03:00
Vitaliy Lyudvichenko
49eab81d9a Fix: ReshardingWorker doesn't finish if ZooKeeper session expired. [#CLICKHOUSE-2] 2017-06-13 07:15:25 +03:00
Alexey Milovidov
43fedfecea Get rid of INSERT ID [#CLICKHOUSE-31]. 2017-06-13 07:13:20 +03:00
Alexey Milovidov
38885d00a3 Merge branch 'storage-startup-method' 2017-06-07 02:27:16 +03:00
Alexey Milovidov
9c5ddce06d Get rid of .hpp files [#CLICKHOUSE-2]. 2017-06-06 20:18:32 +03:00
Alexey Milovidov
9ebf0b633f Added IStorage::startup method to avoid starting replication and merging threads too early during server startup [#CLICKHOUSE-2]. 2017-06-06 20:06:14 +03:00
Alexey Milovidov
153693cd4c Non significant modifications [#CLICKHOUSE-3]. 2017-06-05 23:43:23 +03:00
Vitaliy Lyudvichenko
1e4906816c Avoid SIGSEGV in SystemLog destructors. [#CLICKHOUSE-3023] 2017-06-05 17:25:10 +03:00
Alexey Milovidov
ba499585cd Merge branch 'master' of github.com:yandex/ClickHouse 2017-06-02 18:54:43 +03:00
Alexey Milovidov
80080f1ad6 Small refinements [#CLICKHOUSE-2]. 2017-06-02 18:54:39 +03:00
Vitaliy Lyudvichenko
3a2c1a195d Add ZooKeeper session recovering and trashy integration test. [#CLICKHOUSE-5] 2017-06-01 13:49:20 +03:00
Vitaliy Lyudvichenko
209015574f Workable version for CREATE DROP w/o ZK tests. [#CLICKHOUSE-5] 2017-06-01 13:49:20 +03:00
Vitaliy Lyudvichenko
1a4b0eb355 Remove tmp part directories on server start. [#CLICKHOUSE-3044] 2017-05-31 18:01:25 +03:00
Alexey Milovidov
fa64d14f26 More readable temporary part names [#CLICKHOUSE-2]. 2017-05-26 03:47:06 +03:00
Alexey Milovidov
ed44304c49 Removed obsolete commented code [#CLICKHOUSE-2]. 2017-05-26 03:43:35 +03:00
alexey-milovidov
c79ebc586d Merge pull request #825 from yandex/CLICKHOUSE-2989 
Separate dirs for different part sources, fix RC during replicated alters
 2017-05-26 04:42:03 +04:00
Alexey Milovidov
d35a586af2 Fixed deadlock when using executable dictionary source with cache or complex_key_cache layout [#CLICKHOUSE-3039]. 2017-05-25 23:59:14 +03:00
alexey-milovidov
72822714c3 Merge branch 'master' into CLICKHOUSE-2989 2017-05-25 21:04:37 +04:00
Vitaliy Lyudvichenko
1e29795cf9 Fix race condition between cleanup and fetch thread. [#CLICKHOUSE-2989] 
It was happening during ALTERs.
TODO: stop fetches during ALTER.
 2017-05-25 13:08:52 +03:00
Alexey Zatelepin
e9f8f99e06 Correct index comparisons in case constants cannot be precisely casted [#CLICKHOUSE-3002] 2017-05-25 05:34:26 +04:00
Alexey Milovidov
a77369d082 Preparation: Storages do not modify query [#CLICKHOUSE-31]. 2017-05-25 04:12:41 +03:00
Alexey Milovidov
557c3dc7f4 Preparation: removed support for unreplicated data in Replicated tables [#CLICKHOUSE-31]. 2017-05-25 00:38:56 +03:00
Alexey Milovidov
48f65e9097 Preparation: untangling [#CLICKHOUSE-31]. 2017-05-25 00:06:29 +03:00
Vitaliy Lyudvichenko
d9637c2980 MergeTreeDataPart refactoring. [#CLICKHOUSE-2989] 
Use relative_path to store actual part path.
Use renameTo() to move parts.
 2017-05-24 23:23:58 +03:00
Vitaliy Lyudvichenko
5618234ee8 Separate tmp part dirs for merges, fetches and inserts. [#CLICKHOUSE-2989] 2017-05-24 23:23:58 +03:00
Alexey Milovidov
0c416be381 More simple code; fixed translation error [#CLICKHOUSE-2]. 2017-05-23 04:09:47 +03:00
Vitaliy Lyudvichenko
bbe2a656cd Fixed preferred_block_size_bytes in case of PREWHERE with non-materialized column. [#METR-25237] 2017-05-20 17:30:59 +04:00
Vitaliy Lyudvichenko
1d00f45dd3 Detect race condition between fetches and merges of the same part. [#CLICKHOUSE-2989] 2017-05-17 21:44:16 +04:00
alexey-milovidov
e7b7f6f73d Update MergeTreeData.cpp 2017-05-15 10:34:40 +04:00
Vitaliy Lyudvichenko
6262fc8650 Fix inccorect columns size in MergeTreeData after ALTER. [#CLICKHOUSE-2] 2017-05-15 10:34:40 +04:00
f1yegor
c252863b2e translate comments 2017-05-14 19:03:55 +04:00
Vitaliy Lyudvichenko
021e37943e More clearer code and correct test. [#CLICKHOUSE-1993] 2017-05-12 16:44:11 +03:00
Vitaliy Lyudvichenko
0f1627691e Don't forget to ATTACH MATERIALIZED columns. [#CLICKHOUSE-1993] 2017-05-11 18:39:12 +04:00
Alexey Milovidov
e5e8667bc9 Addition to prev. revision [#CLICKHOUSE-2]. 2017-05-10 04:10:50 -04:00
Alexey Milovidov
a7b9a12759 Returned back Increment and CounterInFile, because they are still needed [#CLICKHOUSE-2]. 2017-05-10 04:08:32 -04:00
Alexey Milovidov
5ca7650c86 Removed Increment and CounterInFile [#CLICKHOUSE-2]. 2017-05-10 02:49:19 -04:00
Alexey Milovidov
8e5f92f025 Fixed translation errors, part 1 [#CLICKHOUSE-3]. 2017-05-09 15:07:35 -04:00
Alexey Milovidov
e0b141e3eb Do not remove temporary directory on fetch [#CLICKHOUSE-2894]. 2017-04-29 01:26:39 +03:00
proller
bcb230ebc6 Fix incudes, move code from daemon/OwnPatternFormatter.h 2017-04-27 08:40:27 +03:00
Alexey Milovidov
110defd56f Disabled replicated max parallel fetches/sends, because it does not work properly [#CLICKHOUSE-2960]. 2017-04-20 21:38:17 +03:00
Alexey Milovidov
ee6a7ee204 Allow to disable replicated max parallel fetches/sends [#CLICKHOUSE-2960]. 2017-04-20 21:37:01 +03:00
Alexey Zatelepin
ba254a082e Merge branch 'master' into lagging-replicas-failover 
Conflicts:
	dbms/src/Core/ErrorCodes.cpp
 2017-04-19 21:31:29 +03:00
Alexey Milovidov
0b5645db1a Better code for parsing part names [#CLICKHOUSE-2]. 2017-04-18 23:38:07 +03:00
Alexey Milovidov
502f42a572 Fixed translation error [#CLICKHOUSE-3]. 2017-04-18 22:13:12 +03:00
Yuri Dyachenko
8fb2b7ee3d fix zookeeper format version 4 2017-04-17 21:15:14 +03:00
alexey-milovidov
9d3e3675fd Update ReplicatedMergeTreeLogEntry.h 2017-04-17 21:15:14 +03:00
alexey-milovidov
acd3c3d4ab Update MergeTreeDataMerger.cpp 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
8792c4f3ca add 'deduplicate' flag into zookeeper 'merge' Entry 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
10082f3ef4 support DEDUPLICATE option in OPTIMIZE query 2017-04-17 21:15:14 +03:00
Yuri Dyachenko
5e61448f25 add support DEDUPLICATE to MergeTreeDataMerger 2017-04-17 21:15:14 +03:00
Alexey Zatelepin
2bd089d589 start counting absolute replica delay when there are problems with queue update [#CLICKHOUSE-2141] 2017-04-17 18:06:12 +03:00
f1yegor
0b243a8b01 translate comments 2017-04-16 23:17:32 +03:00
Alexey Milovidov
676192f16e Fixed errors on clang [#CLICKHOUSE-2902]. 2017-04-15 07:03:12 +03:00
alexey-milovidov
7fcf570c43 Update MergeTreeDataPart.cpp 2017-04-15 06:48:24 +03:00
alexey-milovidov
5a7a155ca1 Update MergeTreeBlockReadUtils.cpp 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
8b54e9fc65 Removed extra diagnostic log messages. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
848c927bb7 Fix race condition. Add test. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
56b00a110a Removed debug code and add docs. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
c78177a28a More accurate prediction. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
f519100946 Split base and derived class implementations. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
4b566304ca Tests are passed. [#CLICKHOUSE-2902] 2017-04-15 06:48:24 +03:00
Vitaliy Lyudvichenko
82af2278fc Avoid code duplication near MergeTreeBlockInputStream. [#CLICKHOUSE-2] 
Add preferred_block_size_bytes for non-uniform reader. [#CLICKHOUSE-2902]

Make enums test more deterministic. [#CLICKHOUSE-2]

Refactored MergeTree readers.

Tabs -> spaces.

Move include/DB/ -> src/.
 2017-04-15 06:48:24 +03:00
Alexey Zatelepin
eb4f895ea5 fix integer overflow [#CLICKHOUSE-2927] 2017-04-12 19:10:06 +03:00
Alexey Zatelepin
0e6c38bd63 throw exception for invalid MergeTreeSettings config values [#CLICKHOUSE-2927] 2017-04-12 18:07:58 +03:00
Alexey Zatelepin
e1c9878c34 more descriptive exception message [#CLICKHOUSE-2927] 2017-04-12 18:07:58 +03:00
proller
38e9254d33 fix http methods for ReadWriteBufferFromHTTP (#675) 2017-04-11 17:13:19 +03:00
Alexey Milovidov
a0b9bf5e97 Moved code to cpp [#CLICKHOUSE-2]. 2017-04-08 04:32:05 +03:00
proller
adba3b8e6d delete ReadBufferFromHTTP, use ReadWriteBufferFromHTTP instead 2017-04-06 22:39:25 +03:00
proller
1bc311eefd ReplicatedMergeTree: Max streams to send data [#CLICKHOUSE-2878] (#656) 
* ReplicatedMergeTree: Max streams to send data [#CLICKHOUSE-2878]

* fix

* better messages on client

* change code to 429 TOO_MANY_REQUESTS

* wip

* better message

* Update InterserverIOHandler.h

* Update InterserverIOHTTPHandler.cpp

* Update StorageReplicatedMergeTree.cpp
 2017-04-06 16:03:23 +03:00
Vitaliy Lyudvichenko
74a92cb8d9 Add test for OPTIMIZE FINAL and more diagnostics. [#CLICKHOUSE-2886] 2017-04-04 15:54:21 +03:00
Alexey Milovidov
310736cd7e Moved headers and sources to same place [#CLICKHOUSE-3]. 2017-04-01 12:22:42 +03:00
Alexey Milovidov
137ad95929 Changed tabs to spaces in code [#CLICKHOUSE-3]. 2017-04-01 11:35:09 +03:00
Alexey Milovidov
4f44445ff0 Removed all trailing whitespaces [#CLICKHOUSE-2]. find . -name '*.h' -or -name '*.cpp' -or -name '*.cmake' -or -name 'CMakeLists.txt' -or -name '*.html' -or -name '*.xml' | grep -v contrib | xargs sed -i -r -e 's/\s+$//' 2017-03-31 19:00:30 +03:00
Ravengg
a973e3898d Add remove for part log (#638) 
* Add REMOVE_PART

* fix

* fix

* fix codestyle
 2017-03-28 20:18:49 +03:00
Alexey Milovidov
e6a41a0256 Fixed error with NULLs [#CLICKHOUSE-2901]. 2017-03-24 07:42:36 +03:00
Alexey Milovidov
c21b4c52c5 Misc [#CLICKHOUSE-3]. 2017-03-21 21:39:07 +03:00
Ravengg
b47cc72701 Fix part log (#591) 
* fix_part_log

* fixed language back

* add reset part_log back

* reset part_log when don't need more

* Fix header

* fix
 2017-03-14 19:58:34 +04:00
Alexey Milovidov
4e67e05835 Fixed error [#CLICKHOUSE-2]. 2017-03-14 03:14:19 +03:00
Alexey Milovidov
f9b4b2012f Removed zero-width spaces [#CLICKHOUSE-2]. 2017-03-13 21:02:45 +03:00
Alexey Milovidov
26788e3938 Formatting [#CLICKHOUSE-2]. 2017-03-13 21:01:46 +03:00
Alexey Milovidov
a6a18db6da Merge branch 'translate/comments' of https://github.com/f1yegor/ClickHouse into f1yegor-translate/comments 2017-03-13 20:51:22 +03:00
f1yegor
401425bb89 translate comments 2017-03-12 20:18:07 +01:00
Alexey Milovidov
65beb6f961 Added support for NULLS FIRST and LAST in ORDER BY (continued) [#CLICKHOUSE-2882]. 2017-03-12 16:03:07 +03:00
Alexey Milovidov
7532a1d564 Added support for NULLS FIRST and LAST in ORDER BY [#CLICKHOUSE-2882]. 2017-03-12 15:56:59 +03:00
alexey-milovidov
6d5bfc8c6f Refactoring of numeric DataTypes (#581) 
* Better code [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].

* Addition to prev. revision [#CLICKHOUSE-2].
 2017-03-12 14:13:45 +04:00
Ravengg
b079dacfd1 Added part_log with statistics scripts (#549) 
* Added part_log

* first_test

* filter and hits_res

* Add renamer and drawer

* Add columns database and table into PartLog

* Add normal way to get table_name and database_name from part

* improve drawer

* add stats for random size parts

* Merge converter and drawer

* make drawer more informative

* add new data

* add new data

* new data

* add long range stats

* for checking best way

* Add add_parts script

* Good style for global merge

* delete commented code

* Fixed spaces to tabs

* Note that Stopwatch is started automatically.

* Style

* Update StorageMergeTree.cpp

* Update StorageReplicatedMergeTree.cpp

* Switch act_time_ms to duration_ms

* Added ability to disable part_log

* fixed getPartLog

* fix usage getPartLog

* fix
 2017-03-07 21:13:54 +04:00
Alexey Zatelepin
7090d0861a reinitialize primary key after ALTER [#CLICKHOUSE-2853] 2017-02-21 21:32:04 +04:00
Vitaliy Lyudvichenko
8bcb1fe970 Add support of AggregateFunction constants in VALUES and Set. [#CLICKHOUSE-2845] 2017-02-18 00:36:31 +04:00
Alexey Milovidov
354bed5bd7 Merge branch 'master' of github.com:yandex/ClickHouse 2017-02-13 19:12:46 +03:00
Alexey Milovidov
db9935337c Misc [#CLICKHOUSE-2]. 2017-02-13 19:12:34 +03:00
Alexey Milovidov
bb7247993a Merge branch 'uncompressed-size-in-system-tables' 2017-02-13 01:08:31 +03:00
Alexey Milovidov
7bf5373390 Added comments [#CLICKHOUSE-2831]. 2017-02-13 01:07:38 +03:00
Alexey Milovidov
c9b4a163be Added info about uncompressed size to system.columns table [#CLICKHOUSE-2831]. 2017-02-12 01:31:22 +04:00
alexey-milovidov
4593d363d1 Fix poor distributed insertion scalability (#481) 
* Fix poor scalability of INSERT into Distributed table [#CLICKHOUSE-2791].

* Fix poor scalability of INSERT into Distributed table (continued) [#CLICKHOUSE-2791].

* Misc [#CLICKHOUSE-2791].

* Fixed error [#CLICKHOUSE-2791].
 2017-02-12 00:20:57 +04:00
Alexey Milovidov
30737aa7a1 Added info about uncompressed size to system.columns table [#CLICKHOUSE-2831]. 2017-02-11 20:43:28 +03:00
Alexey Zatelepin
9918965c5f Allow metadata-only ALTER of primary key columns [#CLICKHOUSE-2027] 2017-02-10 22:19:40 +04:00
Alexey Zatelepin
7b57402291 allow ALTERing Enum types in primary key columns [#CLICKHOUSE-2795] 2017-02-10 22:19:40 +04:00
Alexey Zatelepin
6b47ac1fc0 translate comments [#CLICKHOUSE-3] 2017-02-10 09:05:33 +04:00
Alexey Zatelepin
aace171ef6 forbid multidimensional array columns in MergeTree tables [#CLICKHOUSE-2803] 2017-02-10 09:05:33 +04:00
Alexey Zatelepin
8d001db5d5 forbid altering of date column in MergeTree engines 2017-02-10 09:05:33 +04:00
Alexey Milovidov
d95663865f Miscellaneous [#CLICKHOUSE-2]. 2017-02-09 02:56:40 +03:00
Alexey Zatelepin
4ecfd44015 [#CLICKHOUSE-2115] PR changes: 
* do not insert produced value into the cache if the cache has been reset.
* less logging
* cosmetic fixes
 2017-01-31 22:45:10 +04:00
Alexey Zatelepin
0fdcdd7bdb Introduce LRUCache::getOrSet(), use it to avoid mark cache stampede [#CLICKHOUSE-2115] 2017-01-31 22:45:10 +04:00
Vitaliy Lyudvichenko
b1bccb0bb2 Query KILL QUERY. [#CLICKHOUSE-2120] 2017-01-27 03:59:39 +04:00
Alex Zatelepin
543b6ee757 ensure that all streams point to to_mark after reading even if max_rows_to_read is zero [#CLICKHOUSE-2775] (#396) 2017-01-25 23:16:31 +04:00
Alexey Zatelepin
281744667d use common cur_mark_idx for all streams [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
dc1f0d96bd add clarifying comment [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
f7ca39da77 translate comments [#CLICKHOUSE-3] 2017-01-25 00:48:58 +04:00
Alexey Zatelepin
32e5713822 do not load marks when reading the whole part [#CLICKHOUSE-2116] 2017-01-25 00:48:58 +04:00
Vitaliy Lyudvichenko
1c38a89785 Add source_part_names column into system.merges. [#CLICKHOUSE-2145] 2017-01-24 22:26:29 +04:00
alexey-milovidov
ed5b521110 Less dependencies 2 (#378) 
* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].

* Less dependencies [#CLICKHOUSE-2].
 2017-01-21 08:24:28 +04:00
Alexey Milovidov
5c1ae060a4 Miscellaneous [#CLICKHOUSE-2761]. 2017-01-20 05:22:18 +03:00
Alexey Milovidov
ffed6b1d5e Added one more column to system.parts [#CLICKHOUSE-2757]. 2017-01-17 23:54:32 +03:00
Alexey Milovidov
e407bf879c system.parts: added a column for primary key size in bytes in RAM [#CLICKHOUSE-2757]. 2017-01-17 23:49:16 +03:00
Alexey Milovidov
58e5dad1a1 Squashed commit of the following: 
commit e712f469a5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:59:13 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a00282308
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:58:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9e06f407c8
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:55:14 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 9581620f1e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:54:22 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2a8564c68c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:47:34 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit cf60632d78
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:40:09 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit ee3d1dc6e0
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:22:49 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 65592ef711
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:18:17 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 37972c2573
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:17:06 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit dd909d1499
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:16:28 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 3cf43266ca
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:15:42 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 6731a3df96
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:13:35 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 1b5727e0d5
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:11:18 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit bbcf726a55
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:09:04 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit c03b477d5e
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:06:30 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 2986e2fb04
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:05:44 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit 5d6cdef13d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:04:53 2017 +0300

    Less dependencies [#CLICKHOUSE-2]

commit f2b819b25c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Sat Jan 14 11:01:47 2017 +0300

    Less dependencies [#CLICKHOUSE-2]
 2017-01-14 12:00:19 +03:00
artpaul
402f974fb7 fix where <const> in (<const>) expression; [#METR-24043] 2017-01-10 19:16:37 +05:00
Alexey Milovidov
d89ee33ce2 Squashed commit of the following: 
commit c567d4e1fe
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:35:01 2017 +0300

    Style [#METR-2944].

commit 26bf3e1228
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:33:11 2017 +0300

    Miscellaneous [#METR-2944].

commit eb946f4c6f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:30:19 2017 +0300

    Miscellaneous [#METR-2944].

commit 78c867a147
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 20:11:41 2017 +0300

    Miscellaneous [#METR-2944].

commit 6604c5c83c
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:56:15 2017 +0300

    Miscellaneous [#METR-2944].

commit 23fbf05c1d
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:47:52 2017 +0300

    Miscellaneous [#METR-2944].

commit 98772faf11
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:46:05 2017 +0300

    Miscellaneous [#METR-2944].

commit 3dc636ab9f
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:39:46 2017 +0300

    Miscellaneous [#METR-2944].

commit 3e16aee954
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:38:03 2017 +0300

    Miscellaneous [#METR-2944].

commit ae7e7e90eb
Author: Alexey Milovidov <milovidov@yandex-team.ru>
Date:   Fri Jan 6 19:34:15 2017 +0300

    Miscellaneous [#METR-2944].
 2017-01-06 20:41:19 +03:00
Alexey Milovidov
f7fa5b73b9 Changed names of files with NULL-related data to be more consistent [#METR-19266]. 2017-01-04 07:15:38 +03:00
Alexey Milovidov
1f3aeb066a Renamed methods for bulk binary serialization (continued) [#METR-2944]. 2017-01-03 02:08:09 +03:00
Alexey Milovidov
701ca28c85 Renamed methods for bulk binary serialization [#METR-2944]. 2017-01-03 01:47:28 +03:00
Alexey Milovidov
3fbb597694 Addition to prev. revision [#METR-2944]. 2017-01-02 23:52:30 +03:00
Alexey Milovidov
ca37f28b5f Renamed methods Block::rows and Block::rowsInFirstColumn [#METR-2944]. 2017-01-02 23:45:27 +03:00
Alexey Milovidov
2b4f3b5d34 Renamed method (less confusion) [#METR-2944]. 2017-01-02 23:12:12 +03:00
Vitaliy Lyudvichenko
07d720565c Added profile events for INSERTs. [#METR-23930] 
Added new column and CurrentMetrics data into system.events table.
Removed unnecessary code from Context and Merge list. [#METR-23911]
 2016-12-31 02:39:53 +03:00
Vitaliy Lyudvichenko
108bfac17e Added memory tracking events and columns for merges. [#METR-23911] 2016-12-31 02:39:53 +03:00
Alexey Milovidov
baf29f5c48 NULLs support: fixed totally wrong code [#METR-19266]. 2016-12-30 08:13:14 +03:00
Vitaliy Lyudvichenko
ba2b32b0ad Added vertical_merge_algorithm_min_columns_to_activate option. [#METR-23783] 2016-12-22 16:19:03 +03:00
Vitaliy Lyudvichenko
e2bd364844 Added whole block optimization. [#METR-23783] 2016-12-22 16:19:02 +03:00
Alexey Milovidov
536f88ea55 Adjusted coefficients [#METR-23916]. 2016-12-22 05:04:32 +03:00
Alexey Milovidov
7ebbf72ca6 Removed unused variable [#METR-23305]. 2016-12-22 04:27:41 +03:00
Alexey Milovidov
54587fec1b Tracking memory used in merges [#METR-23888]. 2016-12-20 05:29:35 +03:00
Vitaliy Lyudvichenko
e39b41e158 Typo and codestyle fix. 2016-12-18 22:38:30 +03:00
Vitaliy Lyudvichenko
5aa1822fb2 Consecutive optimization for vertical merge. [#METR-23783] 2016-12-18 22:12:25 +03:00
Vitaliy Lyudvichenko
8835275713 More detail log for merges. [#METR-23770] [#METR-23769] [#METR-23783] 2016-12-18 22:12:25 +03:00
Vitaliy Lyudvichenko
876ad28dd8 Merge remote-tracking branch 'origin/master' into metrics_refinement 2016-12-12 19:17:23 +03:00
Alexey Milovidov
c1ecc41804 Fixed error after merge [#METR-19266]. 2016-12-12 10:25:31 +03:00
Alexey Milovidov
54af522de1 Preparation [#METR-2944]. 2016-12-12 10:24:56 +03:00
Alexey Milovidov
8a69df19c4 Fixed error after merge [#METR-19266]. 2016-12-12 09:00:37 +03:00
Alexey Milovidov
de82683197 Fixed build on clang [#METR-2944].[C 2016-12-12 08:56:34 +03:00
Alexey Milovidov
31c4636538 Using internal boost library [#METR-2944]. 2016-12-12 07:59:19 +03:00
Alexey Milovidov
d605bfdc9d Using internal boost library [#METR-2944]. 2016-12-12 07:57:09 +03:00
Alexey Milovidov
b3e85e6469 Addition to prev. revision [#METR-22442]. 2016-12-11 14:59:55 +03:00
Alexey Milovidov
436d2c43c9 Addition to prev. revision [#METR-22442]. 2016-12-11 14:47:09 +03:00
Alexey Milovidov
ce6556639e Fixed tests after merge [#METR-19266] [#METR-22442]. 2016-12-11 14:33:51 +03:00
Alexey Milovidov
c937d75a78 Merging [#METR-19266]. 2016-12-10 09:10:29 +03:00
Alexey Milovidov
e97ecb6cf7 Merge branch 'master' into METR-19266 
Conflicts:
	dbms/CMakeLists.txt
	dbms/include/DB/Functions/FunctionsArray.h
	dbms/include/DB/Functions/FunctionsString.h
	dbms/include/DB/Parsers/ExpressionListParsers.h
	dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
	dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
	dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
	dbms/src/Core/ErrorCodes.cpp
	dbms/src/Parsers/ASTFunction.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
	dbms/src/Storages/MergeTree/MergeTreeReader.cpp
	dbms/src/Storages/StorageLog.cpp
 2016-12-10 07:51:36 +03:00
Vitaliy Lyudvichenko
ea11f61433 Added requested changes. [#METR-19372] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
855dc56598 Added treshold setting for Vertical merge algorithm. [#METR-23305] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
774eb01fd3 Added MergesTime metric. [#METR-23305] 2016-12-09 13:13:16 +03:00
Vitaliy Lyudvichenko
f8eb9028fd Refined query_log, processes and merges metrics. 
Also, dbms/CMakeLists.txt was rewritten.
 2016-12-09 13:11:25 +03:00
proller
76dc51aae5 Merge remote-tracking branch 'upstream/master' into METR-23466 2016-12-07 22:08:09 +03:00