Commit Graph

624 Commits

Author SHA1 Message Date
Nikolai Kochetov
b282a1775f Add description setting. 2020-06-27 12:30:37 +03:00
Nikolai Kochetov
47d9f4af9c Header for explain. 2020-06-27 12:30:51 +03:00
Nikolai Kochetov
e1481ccfc2 Add initial explain. 2020-06-27 12:30:38 +03:00
Avogar
81d459a5a8 Small update ORCBlockOutputFormat and add ORC output format to performance test. 2020-06-26 23:17:28 +03:00
Nikolai Kochetov
4f5be494c5
Merge pull request #11950 from 4ertus2/joins
Extract JOIN in own plan step
2020-06-26 15:52:58 +03:00
alexey-milovidov
751d36f7c7
Merge pull request #11954 from oandrew/avro-uuid
Avro UUID support
2020-06-26 14:09:54 +03:00
Artem Zuikov
54fd9ce76b fix totals 2020-06-26 03:23:11 +03:00
Artem Zuikov
2d7d389b77 better ExpressionAction::execute() 2020-06-25 23:28:41 +03:00
Andrew Onyshchuk
9364d42eb0 Add CANNOT_PARSE_UUID extern const 2020-06-25 14:50:07 -05:00
Artem Zuikov
bfe30a9723 remove a trick with expression continuation 2020-06-25 22:26:03 +03:00
Andrew Onyshchuk
fc1ae85600 Avro UUID support 2020-06-25 14:25:45 -05:00
Anton Popov
14e09e5650 Merge remote-tracking branch 'upstream/master' into HEAD 2020-06-25 14:59:15 +03:00
Nikita Mikhaylov
717f63923a
Merge branch 'master' into orc_output_format 2020-06-23 15:07:05 +04:00
Nikita Mikhaylov
ec3d101768
style fix + bump tests 2020-06-23 13:50:56 +03:00
Nikolai Kochetov
d4d1a4d3f1 Fix style. 2020-06-22 21:17:23 +03:00
Nikolai Kochetov
f0c8ec1c0d Fix tests. 2020-06-22 14:34:06 +03:00
Nikolai Kochetov
58b3b5c2f9 Rename step. 2020-06-22 13:21:13 +03:00
Nikolai Kochetov
d7d334bf6f Update query plan traits for DISTINCT. Add more comments. 2020-06-22 13:18:28 +03:00
alesapin
f262c4f652 Better comments 2020-06-22 12:49:21 +03:00
alesapin
b1e8976df4 Merge with master 2020-06-22 12:04:27 +03:00
alesapin
b9e74f4e82 Merge branch 'master' into atomic_metadata5 2020-06-22 12:03:53 +03:00
Alexey Milovidov
199a6576a5 Remove dependency 2020-06-21 19:37:12 +03:00
Alexey Milovidov
3f96bdaa24 Minor changes after merge 2020-06-21 15:16:08 +03:00
alexey-milovidov
4ee623ccac
Merge pull request #10242 from MovElb/movelb-postgresql-wire-protocol-impl
PostgreSQL wire protocol implementation
2020-06-21 14:39:22 +03:00
alexey-milovidov
90b5e5d2f9
Merge pull request #11688 from ClickHouse/query-plan
Query plan
2020-06-21 14:05:13 +03:00
alexey-milovidov
9bfefc99ab
Merge pull request #11599 from filimonov/better_kafka_states
Kafka work with formats based on PeekableReadBuffer and other improvements
2020-06-20 20:36:54 +03:00
Nikolai Kochetov
a58b152140 Fix build. 2020-06-20 13:40:53 +03:00
Nikolai Kochetov
4d70cc34c1 Merge branch 'master' into query-plan 2020-06-20 10:53:48 +03:00
Nikolai Kochetov
e75091ab6c Fix distinct for FinishSortingStep. 2020-06-20 10:50:45 +03:00
alexey-milovidov
f27ae6a12a
Merge pull request #11682 from ClickHouse/fix-parallel-final-stuck
Fix parallel final stuck
2020-06-20 09:05:32 +03:00
Avogar
2a923f434f Fix build errors 2020-06-20 01:32:57 +03:00
alesapin
a462462610 Merge branch 'master' into atomic_metadata5 2020-06-19 18:58:42 +03:00
Avogar
f6ab431f2f Change String type to Binary 2020-06-19 17:50:44 +03:00
Nikolai Kochetov
f6cd3f43bb Fix Context leak in InterpreterSelectQuery 2020-06-19 17:42:01 +03:00
Avogar
07ad947c1d Add arrays support 2020-06-19 17:21:35 +03:00
Nikolai Kochetov
ec892775a5 Fix Context leak in InterpreterSelectQuery 2020-06-19 16:34:40 +03:00
Nikolai Kochetov
b85b6a6cc2 Fix MergingAggregatedStep 2020-06-19 14:27:07 +03:00
Nikolai Kochetov
cac365689f Fix mx_threads in query_plan. 2020-06-19 13:45:48 +03:00
Nikolai Kochetov
690b88d331
Merge pull request #11291 from Provet/master
Partial sorting optimization fix
2020-06-19 12:58:44 +03:00
Nikolai Kochetov
9ddd7b98cc Fix tests. 2020-06-19 12:47:15 +03:00
Mikhail Filimonov
9609bd9dee Kafka better states, formats based on PeekableReadBuffer, and other minor fixes.
Add formats tests, fixes for JSONCompactEachRowWithNamesAndTypes, TSVWithNamesAndTypes. Some CR fixes
Add sanitizing for kafka_max_block_size and kafka_poll_max_batch_size
2020-06-19 10:49:05 +02:00
Nikolai Kochetov
cda4de40d7 Merge branch 'master' into query-plan 2020-06-19 11:29:15 +03:00
Nikolai Kochetov
1f013208db Fix style. 2020-06-18 23:11:42 +03:00
Nikolai Kochetov
de6ef17d27 Fix QueryPipeline::unitePipelines 2020-06-18 22:42:28 +03:00
Nikolai Kochetov
26161aac8a Fix ReadFromStorageStep 2020-06-18 22:17:21 +03:00
Nikolai Kochetov
6cbdb6da00 Fix build. 2020-06-18 22:03:21 +03:00
Nikolai Kochetov
0ba7ff85e1 Fix build. 2020-06-18 21:45:27 +03:00
Nikolai Kochetov
b7bed87a7f Use QueryPlan in InterpreterSelectQuery [part 3]. 2020-06-18 21:29:33 +03:00
Avogar
71b5d267ce Set compression to None 2020-06-18 21:02:13 +03:00
Nikolai Kochetov
45adacf0bc Use QueryPlan in InterpreterSelectQuery [part 2]. 2020-06-18 20:45:00 +03:00
alesapin
d79982f497 Better locks in Storages 2020-06-18 19:10:47 +03:00
Nikolai Kochetov
e0841360db Use QueryPlan in InterpreterSelectQuery [part 1]. 2020-06-18 16:38:45 +03:00
Nikolai Kochetov
35ab9ad051 Merge branch 'master' into fix-parallel-final-stuck 2020-06-18 16:04:14 +03:00
Nikolai Kochetov
5bb2ddc6f9 Add DISTINCT trait for QueryPlanStep. 2020-06-18 16:00:16 +03:00
Avogar
75a66fbba3 Fix errors 2 2020-06-18 15:52:46 +03:00
Nikolai Kochetov
21d9c7fcc8 Fix build. 2020-06-18 12:22:29 +03:00
Nikolai Kochetov
c111836ada Update PartialSortingTransform. 2020-06-18 12:08:25 +03:00
alesapin
ebb36bec8a Merge branch 'master' into atomic_metadata5 2020-06-18 11:57:16 +03:00
alexey-milovidov
c9924b8aa1
Merge pull request #11697 from CurtizJ/fix-with-fill
Fix 'ORDER BY ... WITH FILL' over const columns.
2020-06-18 06:38:24 +03:00
Avogar
4fd3bcd823 Fix build errors 2020-06-18 03:17:08 +03:00
Anton Popov
8ba5bd8530 Merge remote-tracking branch 'upstream/master' into distinct-combinator 2020-06-18 01:44:36 +03:00
Nikolai Kochetov
9ad00187e3 Update InterpreterSelectQuery.. 2020-06-17 23:19:55 +03:00
Nikolai Kochetov
169ad5e805 Add FinishSortingStep. 2020-06-17 22:57:13 +03:00
Nikolai Kochetov
e8049d34c5 Add OffsetsStep. 2020-06-17 22:38:45 +03:00
Anton Popov
88b325dcdc rework distinct combinator 2020-06-17 22:36:27 +03:00
Avogar
7780a74bd8 Update ORCBlockOutputFormat and add orc include directory in include path 2020-06-17 22:32:11 +03:00
Nikolai Kochetov
69ff3a8f7d Add ExtremesStep. 2020-06-17 22:30:36 +03:00
Nikolai Kochetov
d795b2b037 Add FillingStep 2020-06-17 22:20:30 +03:00
Nikolai Kochetov
7fcea660de Fix ya.make/ 2020-06-17 22:08:30 +03:00
Nikolai Kochetov
38bebfb20d Merge remote-tracking branch 'origin' into provert-master 2020-06-17 22:05:45 +03:00
Nikolai Kochetov
d41db3622f Add RollupStep and CubeStep. 2020-06-17 20:15:24 +03:00
Nikolai Kochetov
c5d9379df0 Add TotalsHavingStep. 2020-06-17 19:54:51 +03:00
Nikolai Kochetov
ce7c8782e2
Update PartialSortingTransform.cpp 2020-06-17 19:13:44 +03:00
Nikolai Kochetov
1ad4f2c0fd Add CreatingSets step. 2020-06-17 18:50:21 +03:00
Nikolai Kochetov
f279df6015 Added AggregatingStep. 2020-06-17 17:21:48 +03:00
Nikolai Kochetov
582ea24469 Added AddingDelayedStreamStep 2020-06-17 16:38:17 +03:00
Alexander Tokmakov
3938b051c2 fix type duduction in values format 2020-06-17 16:21:06 +03:00
Nikolai Kochetov
6c477d06ad Review fixes. 2020-06-17 14:43:55 +03:00
Nikolai Kochetov
0829d1d16d Fix ya.make 2020-06-17 12:16:01 +03:00
alesapin
2fac3290f0 Merge branch 'master' into atomic_metadata5 2020-06-17 11:14:03 +03:00
Alexey Milovidov
a655765040 Merge branch 'master' into return-not-nullable-from-count-distinct-2 2020-06-17 01:15:57 +03:00
Artem Zuikov
857d84bf7c
Buffer left blocks optimisation for MergeJoin (#10601) 2020-06-16 23:13:18 +03:00
Nikolai Kochetov
fdacc9f90e Add MergingAggregatedStep. 2020-06-16 21:57:21 +03:00
Nikolai Kochetov
148257abb5 Add LimitStep. 2020-06-16 21:23:01 +03:00
Nikolai Kochetov
5bb1d5cc43 Add LimitByStep. 2020-06-16 19:49:49 +03:00
Nikolai Kochetov
603bcdde2d Add DistinctStep. 2020-06-16 19:13:07 +03:00
Nikolai Kochetov
cfe87a77ea Add MergingSortedStep. 2020-06-16 18:49:09 +03:00
Nikolai Kochetov
08e9ce8661 Add MergingSortedStep. 2020-06-16 18:47:40 +03:00
Nikolai Kochetov
a0a1445da9 Fix build. 2020-06-16 18:10:40 +03:00
Nikolai Kochetov
f563193967 Add MergeSortingStep. 2020-06-16 18:08:01 +03:00
Nikolai Kochetov
815ac03892 Add PartialSortingStep. 2020-06-16 17:45:52 +03:00
Nikolai Kochetov
ab452e9391 Added source steps. 2020-06-16 17:14:14 +03:00
Nikolai Kochetov
4407bd7daa Added source steps. 2020-06-16 17:11:19 +03:00
Nikolai Kochetov
be8029e54f Expression and Filter steps. 2020-06-16 15:02:10 +03:00
Nikolai Kochetov
e28552ec71 Fix build. 2020-06-16 12:53:59 +03:00
Nikolai Kochetov
1bb72205bd Expression and Filter steps. 2020-06-16 12:42:25 +03:00
Nikolai Kochetov
61070a03cd Fix build. 2020-06-16 10:56:22 +03:00
Anton Popov
03058c3c25 fix 'ORDER BY WITH FILL' over const columns 2020-06-16 05:56:16 +03:00
Nikolai Kochetov
03e0a5ddbc Merge branch 'master' into query-plan 2020-06-15 23:38:35 +03:00
Nikolai Kochetov
da11190677 Fix tests. 2020-06-15 23:20:45 +03:00
Nikolai Kochetov
dbef88e073 Fix tests. 2020-06-15 22:33:24 +03:00
alesapin
36ba0192df Metadata in read and write methods of IStorage 2020-06-15 22:08:58 +03:00
Nikolai Kochetov
012fb819db Fix build. 2020-06-15 21:49:41 +03:00
Nikolai Kochetov
68f8372c12 Fix build. 2020-06-15 21:41:47 +03:00
Nikolai Kochetov
b456a3cc77 Fix tests. 2020-06-15 20:48:04 +03:00
Nikolai Kochetov
5436ef38bf Fix MergingSortedAlgorithm. 2020-06-15 18:21:10 +03:00
Nikolai Kochetov
b725df6366 Added ReadFromStorageStep. 2020-06-15 18:17:44 +03:00
Nikolai Kochetov
b5ecef6adf Fix tests. 2020-06-15 16:56:38 +03:00
Nikolai Kochetov
ccf2ceb876 Fix pipeline stuck for parallel final. 2020-06-15 14:02:47 +03:00
Alexey Milovidov
394fb64a9c Better way of implementation 2020-06-14 20:42:11 +03:00
Avogar
93aee32ae4 Add ORCBlockOutputFormat 2020-06-14 18:35:32 +03:00
Dmitry
e5897bbfb6 size_t -> ssize_t 2020-06-12 18:59:11 +03:00
Nikolai Kochetov
595fc9eff6
Merge pull request #11440 from ClickHouse/add-remote-source
Add remote source
2020-06-09 19:27:28 +03:00
Nikolai Kochetov
4c179e454a Add QueryPlan. 2020-06-08 12:14:58 +03:00
Alexey Milovidov
d3d02a67f4 Speed up build by removing old example programs 2020-06-06 19:19:16 +03:00
Anton Popov
5c42408add
Merge pull request #9113 from dimarub2000/group_by_in_order_optimization
[WIP] Optimization of GROUP BY with respect to table sorting key.
2020-06-06 14:25:59 +03:00
alexey-milovidov
050ef9eb54
Merge pull request #11455 from azat/INSERT-SELECT-FINAL-pipeline-stuck
Fix Pipeline stuck for INSERT SELECT FINAL
2020-06-06 12:36:07 +03:00
Nikolai Kochetov
108575c8ad Added IQueryPlanStep. 2020-06-05 18:38:03 +03:00
Nikolai Kochetov
5fea34d0e1 Use Resize instead of Concat in InterpreterInsertQuery. 2020-06-05 12:30:16 +03:00
Azat Khuzhin
1887e343ec Fix Pipeline stuck for INSERT SELECT FINAL
INSERT SELECT FINAL where SELECT (max_threads>1) has multiple streams
but INSERT has only one (max_insert_threads==0) will add ConcatProcessor
that will stuck the pipeline in this case.
2020-06-05 01:14:30 +03:00
Nikolai Kochetov
d87b474665 Remove debug output. 2020-06-04 23:42:59 +03:00
Nikolai Kochetov
31ad5d7e5d Remove debug output. 2020-06-04 23:42:03 +03:00
Alexander Kuzmenkov
435f53e05a Improve error messages
Also support fmt for exception messages, the same way we use it in
logging macros.
2020-06-04 20:50:29 +03:00
Albert Kidrachev
60b86f524f add perf-test and fix 2020-06-04 20:10:52 +03:00
Nikolai Kochetov
18516ba09f Fix DelayedSource. 2020-06-04 16:46:27 +03:00
Nikolai Kochetov
563fe4ea35 Fix DelayedSource. 2020-06-04 16:45:23 +03:00
Nikolai Kochetov
dcf9b9ef39 Fix build. 2020-06-04 16:08:09 +03:00
Nikolai Kochetov
f54f948162 Added DelayedSource. 2020-06-04 15:17:35 +03:00
Albert Kidrachev
ae7bad368b run optimization for limit >= 1500 and hint for comparing ColumnString 2020-06-04 01:50:58 +03:00
Anton Popov
5348e5a746
Fix build 2020-06-04 00:58:51 +03:00
Nikolai Kochetov
83b6467308 Added RemoteSource. 2020-06-03 22:50:11 +03:00
Alexander Kuzmenkov
8bf8b44510
Merge pull request #11366 from ClickHouse/fix-SortingTransform-bug
Fix sorting transform bug
2020-06-03 12:11:57 +03:00
alexey-milovidov
6864016e22
Merge pull request #11324 from ClickHouse/improve-performance-of-client-interactive-mode
Add setting "output_format_pretty_max_value_width".
2020-06-03 00:17:29 +03:00
Dmitry
5391d26703 better logging 2020-06-02 23:38:10 +03:00
Alexey Milovidov
6fea843d88 Fix Mac OS build 2020-06-02 16:56:03 +03:00
Alexey Milovidov
933644b8e4 Fix clang-tidy 2020-06-02 16:53:34 +03:00
Nikolai Kochetov
46493b9878 Fix PartialSortingTransform. 2020-06-02 14:56:58 +03:00
Nikolai Kochetov
ecdbd888cf Clase all inputs in SortingTransform. 2020-06-02 13:50:27 +03:00
Nikolai Kochetov
cc3abb12d3 Disable filtration for PartialSortingTransform 2020-06-02 11:28:57 +03:00
Nikolai Kochetov
fded020cdc Fix build. 2020-06-02 10:53:55 +03:00
Alexey Milovidov
cd07d61ce7 Updated tests 2020-06-02 05:39:21 +03:00
Alexey Milovidov
d34b1a8791 Merge branch 'master' into improve-performance-of-client-interactive-mode 2020-06-02 04:24:17 +03:00
Albert Kidrachev
d717919c0c some improvements of vectorization compare 2020-06-02 03:23:41 +03:00
Nikolai Kochetov
53d12f5ab8 Try fix build. 2020-06-01 20:06:21 +03:00
Nikolai Kochetov
3a0acb00c1 Remove some streams. 2020-06-01 19:31:06 +03:00
Albert Kidrachev
02611de051 merge 2020-06-01 15:11:36 +03:00
Albert Kidrachev
fe170508bd devirtualize compareAt calls 2020-06-01 15:10:32 +03:00
Alexey Milovidov
c901a657f8 Improvement 2020-06-01 01:17:40 +03:00
Alexey Milovidov
a76bd99e84 Added setting "output_format_pretty_max_value_width" 2020-06-01 01:12:13 +03:00
Alexey Milovidov
2895cfb480 Limit value width in Pretty formats 2020-05-31 22:22:59 +03:00
Alexey Milovidov
25f941020b Remove namespace pollution 2020-05-31 00:57:37 +03:00
Alexey Milovidov
5aff138956 Preparation for structured logging 2020-05-31 00:35:52 +03:00
Dmitry
4b0d32f026 Merge branch 'master' of github.com:yandex/ClickHouse into group_by_in_order_optimization 2020-05-31 00:21:02 +03:00
alexey-milovidov
a5770fe041
Update PullingPipelineExecutor.cpp 2020-05-30 21:05:05 +03:00
MovElb
b4b5c90343 squash 2020-05-30 20:05:05 +03:00
Nikolai Kochetov
f7e0e87c7d Try fix tests. 2020-05-29 19:35:09 +03:00
Albert Kidrachev
43c0499e87 merging 2020-05-29 17:53:33 +03:00
Albert Kidrachev
c91ca6fd4b fix optimization, add comments and performance test 2020-05-29 04:50:02 +03:00
Nikolai Kochetov
a9c6fa1ca7 Try fix tests. 2020-05-28 23:05:07 +03:00
Dmitry
871539e4cc test and ya.make 2020-05-28 20:30:21 +03:00
tavplubix
801c1c1240
Merge pull request #11205 from ClickHouse/fix-view-totals
Fix totals and extremes header for view.
2020-05-28 15:05:34 +03:00
Nikolai Kochetov
2a217e64e0
Merge pull request #11171 from Provet/master
Optimized partial sort transformer
2020-05-28 12:28:50 +03:00
Albert Kidrachev
c38caafe93 fix tests 2020-05-28 11:55:20 +03:00
Albert Kidrachev
fedf1f5dd2 more relaxation 2020-05-28 11:55:20 +03:00
Albert Kidrachev
c301471c53 fix 2020-05-28 11:55:20 +03:00
Albert Kidrachev
e24e6257c7 fix 2020-05-28 11:55:20 +03:00
Albert Kidrachev
e51e828d5c init 2020-05-28 11:55:20 +03:00
Alexander Kuzmenkov
a697560738
Merge pull request #11224 from ClickHouse/aku/merge-arrow-stream
Merge ArrowStream format #11088
2020-05-28 09:37:40 +03:00
Nikolai Kochetov
2dcee3db5c Merge branch 'master' into remove-experimental-use-processors-flag-3 2020-05-27 21:25:34 +03:00
Nikolai Kochetov
e93882c977 Insert select using PipelineExecutor. 2020-05-27 21:20:26 +03:00
Albert Kidrachev
4c5324600b fix tests 2020-05-27 18:38:29 +03:00
Albert Kidrachev
a727e1fb1b more relaxation 2020-05-27 15:57:14 +03:00
Alexander Kuzmenkov
ac263f921e Merge remote-tracking branch 'origin/master' into HEAD 2020-05-27 15:51:03 +03:00
Alexander Kuzmenkov
ad93644254 make single if 2020-05-27 15:50:12 +03:00
Alexander Kuzmenkov
c1cfc68cd6 revert accidental changes 2020-05-27 15:46:49 +03:00
Alexander Kuzmenkov
f54c892b49
Update src/Processors/Formats/Impl/ArrowBlockInputFormat.h 2020-05-27 15:41:59 +03:00
Alexander Kuzmenkov
61f833efc1
Update src/Processors/Formats/Impl/ArrowBlockInputFormat.h 2020-05-27 15:41:52 +03:00
Alexander Kuzmenkov
81a5af1938
Update src/Processors/Formats/Impl/ArrowBlockInputFormat.h 2020-05-27 15:41:45 +03:00
Albert Kidrachev
a0f99fde70 fix 2020-05-27 14:56:01 +03:00
Albert Kidrachev
d24286d5da fix 2020-05-27 14:52:45 +03:00
Dmitry
112e86b134 small fix 2020-05-26 22:20:02 +03:00
Nikolai Kochetov
361b92f083
Merge pull request #11200 from ClickHouse/fix-strict-resize-finishing
Fix StrictResize
2020-05-26 21:31:44 +03:00
Dmitry
38c585f867 Merge branch 'master' of github.com:yandex/ClickHouse into group_by_in_order_optimization 2020-05-26 21:27:50 +03:00
Nikolai Kochetov
12384551da Fix totals and extremes header for views. 2020-05-26 16:19:24 +03:00
Nikolai Kochetov
e9d348ebf9
Merge pull request #11198 from ClickHouse/fix-step-by-step-pipeline-execution
Fix PipelineExecutor::executeStepImpl
2020-05-26 15:27:56 +03:00
Nikolai Kochetov
709f705886 Fix PipelineExecutor::executeStepImpl 2020-05-26 13:26:38 +03:00
Nikolai Kochetov
54f50745ec Fix StrictResizeProcessor. 2020-05-26 13:19:56 +03:00
Nikolai Kochetov
1f9e4996c7 Fix PipelineExecutor::executeStepImpl 2020-05-26 10:51:53 +03:00
hcz
f2e3bcdd15 Improve code style in src and test files of Arrow formats 2020-05-25 10:50:55 +08:00
Albert Kidrachev
96260cf33a init 2020-05-25 02:56:24 +03:00
Alexey Milovidov
7e1813825b Return old names of macros 2020-05-24 01:24:01 +03:00
Alexey Milovidov
ce0619dabf Progress on task 2020-05-24 00:26:45 +03:00
Alexey Milovidov
bab24879e9 Progress on task 2020-05-24 00:16:05 +03:00
Alexey Milovidov
d2621fee30 Progress on task 2020-05-23 23:57:48 +03:00
Alexey Milovidov
18febd7b97 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\_(]+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | while read file; do perl -pne 's/(LOG_[^\_(]+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/${1}_FORMATTED(${2}, "${3}{}${5}{}${7}{}${9}{}${11}", ${4}, ${6}, ${8}, ${10});/' $file > ${file}.tmp; mv ${file}.tmp $file; done 2020-05-23 22:56:05 +03:00
Alexey Milovidov
d5b7883451 find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_[^\_(]+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_[^\_(]+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5{}\7{}\9", \4, \6, \8);/' 2020-05-23 22:41:08 +03:00
Alexey Milovidov
eacff92d0e Progress on task 2020-05-23 22:35:08 +03:00
Alexey Milovidov
9d2a0d2dd7 Apply all transformations again 2020-05-23 21:59:49 +03:00
Alexey Milovidov
a2ad11897f Remove duplicate whitespaces (preparation) 2020-05-23 21:53:58 +03:00
Alexey Milovidov
1f13515a65 Make all LOG in single line (preparation) 2020-05-23 21:31:37 +03:00