Commit Graph

374 Commits

Author SHA1 Message Date
Alexey Milovidov
bf4e74375e generate ya.make 2020-07-31 02:43:55 +03:00
alexey-milovidov
74edcfb87e
Merge pull request #13073 from nikitamikhaylov/rewrite-tests
BayesAB test
2020-07-31 02:30:07 +03:00
Anton Popov
37499f2fe1 bump CI 2020-07-31 02:06:01 +03:00
Alexey Milovidov
83c9d9ef45 Merge branch 'master' into deprecate-special-zero-datetime 2020-07-31 00:17:04 +03:00
Nikita Mikhaylov
4d49d2c671 another removes 2020-07-30 13:31:14 +03:00
Nikita Mikhaylov
1d6c2ba689 rewrite other test + remove useless includes 2020-07-29 20:37:57 +03:00
Anton Popov
2bdf276687 fix access to redis dictionary after connection was dropped once 2020-07-29 19:20:17 +03:00
Anton Popov
48e6253442 minor fixes 2020-07-29 04:32:23 +03:00
Anton Popov
6d58279535 Merge remote-tracking branch 'upstream/master' into HEAD 2020-07-29 02:15:30 +03:00
alesapin
e73961dfe2 Fix columns duplication for range hashed dictionary created from DDL query 2020-07-27 17:06:44 +03:00
libenwang
76ef196c5d Remove settings apply when not local 2020-07-27 18:10:39 +08:00
libenwang
b5bc7c0d97 Fix ClickHouseDictionarySource wrong access check 2020-07-25 12:01:16 +08:00
Alexander Tokmakov
9bcaaea3e0 Merge branch 'master' into database_atomic_improvements 2020-07-22 05:24:48 +03:00
alesapin
1d8cab3379 Better function name and comment 2020-07-21 11:13:23 +03:00
alesapin
82c5ff6e9b Remove redundant new line 2020-07-20 16:48:17 +03:00
alesapin
9881c60fdb Better comment 2020-07-20 16:45:18 +03:00
alesapin
b9a0d0802c Better code 2020-07-20 16:44:07 +03:00
alesapin
6b7d1033e6 Comments for ugly fix 2020-07-20 16:06:44 +03:00
alesapin
479048cf69 Ugly code without races 2020-07-20 15:34:29 +03:00
Alexander Tokmakov
c27de9b424 fixes 2020-07-17 16:11:44 +03:00
Alexander Tokmakov
a612080df1 Merge branch 'master' into database_atomic_improvements 2020-07-17 00:43:59 +03:00
Alexander Tokmakov
d10b4c504d rename database with dictionaries 2020-07-16 17:25:39 +03:00
Alexey Milovidov
7a8bd40c2c Merge branch 'master' into deprecate-special-zero-datetime 2020-07-16 03:21:21 +03:00
Alexander Tokmakov
f6949b2f47 use dictionary ids 2020-07-15 22:25:31 +03:00
Alexander Kuzmenkov
3e6b9f297f Some provisions for Android build 2020-07-15 14:16:00 +03:00
Alexander Tokmakov
eea0cdcf25 add uuid to generated config 2020-07-14 23:32:13 +03:00
Alexander Tokmakov
2e2f17b694 add StorageID to IDictionaryBase 3 2020-07-14 22:19:17 +03:00
Alexander Tokmakov
4de18e3d8b add StorageID to IDictionaryBase 2 2020-07-14 22:18:33 +03:00
Alexander Tokmakov
1f6ffb08e4 add StorageID to IDictionaryBase 1 2020-07-14 21:46:29 +03:00
Alexey Milovidov
a31d8a4f5b Update tests 2020-07-13 05:26:22 +03:00
alexey-milovidov
b1b4f8832d
Merge pull request #12397 from myrrc/bug/part-dict-update
Resolve #12098
2020-07-11 23:07:00 +03:00
myrrc
cfe06a3b2f fix: #12098 2020-07-10 16:06:41 +03:00
Vitaly Baranov
4e40965c88 Show error after TrieDictionary failed to load. 2020-07-08 13:55:39 +03:00
Vitaly Baranov
4733504b51 Don't split dictionary source's table name into schema and table name itself
if ODBC driver doesn't support schema.
2020-07-06 23:41:39 +03:00
alesapin
e72bc39654
Merge pull request #11983 from ClickHouse/storage_mongodb
Merging #10931 (Storage MongoDB)
2020-06-29 11:49:18 +03:00
Alexey Milovidov
1462a66d1e Fix typos 2020-06-27 22:05:00 +03:00
alesapin
6fc6422c4d Remove empty lines 2020-06-26 18:19:00 +03:00
alesapin
4969da85d9 Fixes 2020-06-26 17:28:00 +03:00
alesapin
11f88340a5 Merge branch 'mongo' of https://github.com/ageraab/ClickHouse into storage_mongodb 2020-06-26 16:03:06 +03:00
Nikita Mikhaylov
1934240064 remove useless const 2020-06-25 13:22:48 +03:00
Nikita Mikhaylov
e55577ba65 Merge branch 'nikvas0/ssd_dict' of git://github.com/nikvas0/ClickHouse into merging-ssh-cache 2020-06-24 16:45:18 +03:00
Nikita Mikhaylov
8bbf1ce167
fix + bump tests 2020-06-24 16:36:02 +03:00
Nikita Vasilev
f8c818ccdc logger 2020-06-21 20:09:58 +03:00
Nikita Vasilev
68d3ec5a4c fix 2020-06-21 17:24:29 +03:00
Nikita Vasilev
8fef9f451b fix review 2020-06-21 17:22:35 +03:00
Alexander Tokmakov
1c982d00e3 try fix sync 2020-06-04 16:59:12 +03:00
Alexander Tokmakov
4dae169216 fix gcc warnings 2020-06-04 16:03:06 +03:00
Alexander Tokmakov
64c013610a fix 2020-06-04 01:03:49 +03:00
Alexander Tokmakov
e67837bc4a cleenup 2020-06-04 00:11:17 +03:00
Alexander Tokmakov
73926b2cf9 support loading from multiple partitions with complex key 2020-06-03 14:54:26 +03:00
Alexander Tokmakov
aade00130c add raii wrappers 2020-06-01 20:37:32 +03:00
Alexander Tokmakov
62761eddcc Merge branch 'master' into merging_external_source_cassandra 2020-06-01 14:44:46 +03:00
alexey-milovidov
9984e989c1
Merge pull request #11317 from ClickHouse/logger-fmt-2
Preparation for structured logging
2020-06-01 00:11:29 +03:00
Alexey Milovidov
f47320cb96 Added clarification #10678 2020-05-31 17:28:44 +03:00
Alexey Milovidov
25f941020b Remove namespace pollution 2020-05-31 00:57:37 +03:00
Alexey Milovidov
6468d7af8c Regenerate ya.make 2020-05-30 19:20:19 +03:00
Alexander Tokmakov
8921041706 Merge branch 'master' into merging_external_source_cassandra 2020-05-29 18:20:39 +03:00
Andrey Chulkov
18c14ebc05 Try disabling clang's static_analyzer for some code using boost geometry 2020-05-28 15:02:29 +03:00
Alexander Tokmakov
905bce4aeb fix 2020-05-27 23:53:35 +03:00
Nikita Mikhaylov
ec479839d9 fixed 2020-05-27 22:44:22 +03:00
Andrey Chulkov
48f59fb0b3 fix clang-10 warnings 2020-05-27 18:12:26 +03:00
Alexander Tokmakov
f099ce19a7 fix 2020-05-27 16:54:39 +03:00
Andrey Chulkov
eb70ea6244 fix build 2020-05-27 05:06:11 +03:00
Andrey Chulkov
49276426aa Merge remote-tracking branch 'upstream/master' into polygon-dict-grids 2020-05-27 03:20:21 +03:00
Alexander Tokmakov
940132adc4 Merge branch 'master' into merging_external_source_cassandra 2020-05-27 00:13:57 +03:00
Andrey Chulkov
ce219817d8 fix style errors 2020-05-26 23:52:50 +03:00
Andrey Chulkov
2c910633aa update ya.make 2020-05-26 23:15:45 +03:00
Alexander Tokmakov
310d522528 minimal implementation 2020-05-26 22:21:18 +03:00
Andrey Chulkov
e193bf98d1 fix bug 2020-05-26 21:24:18 +03:00
Andrey Chulkov
74ce47be2d fix unused param 2020-05-26 21:17:53 +03:00
Andrey Chulkov
a10a809a52 fix unused param 2020-05-26 21:15:22 +03:00
Andrey Chulkov
4b3a2d87e5 optimizing the grid 2020-05-26 21:09:32 +03:00
bobrovskij artemij
27c6eefc85 Merge branch 'master' into mongo 2020-05-25 23:33:38 +03:00
Andrey Chulkov
ba241a08b8 Remove grid polygon dict and rename the others 2020-05-25 18:57:03 +03:00
Andrey Chulkov
70f2476046 fix param path bug 2020-05-25 02:49:08 +03:00
Andrey Chulkov
3b17827381 fix switched params 2020-05-25 02:43:24 +03:00
Andrey Chulkov
011e26c8aa fix errors 2020-05-25 02:16:04 +03:00
Andrey Chulkov
71444954ec add parsing multiple parameters from https://github.com/ClickHouse/ClickHouse/pull/8624 & add the actual parameters 2020-05-25 01:51:15 +03:00
bobrovskij artemij
a4d74601a6 build warnings fix 2020-05-25 00:42:05 +03:00
Nikita Vasilev
d6f4c66fbc fix aio for other os 2020-05-25 00:00:44 +03:00
Nikita Vasilev
797fa400b4 fix 2020-05-24 21:59:06 +03:00
Arthur Petukhovsky
c50cc74e70 Clean up code 2020-05-24 21:00:03 +03:00
Nikita Vasilev
3150667aa3 ya.make 2020-05-24 19:57:25 +03:00
Nikita Vasilev
63ef973094 fix other os 2020-05-24 19:06:59 +03:00
Arthur Petukhovsky
893c79f194 Fix some comments and class names 2020-05-24 15:09:36 +03:00
Nikita Vasilev
e76cdbdc43 fix 2020-05-24 14:24:45 +03:00
Nikita Vasilev
c70401b1e4 fix other os 2020-05-24 11:56:34 +03:00
Alexey Milovidov
7e1813825b Return old names of macros 2020-05-24 01:24:01 +03:00
Nikita Vasilev
7358410a84 fix 2020-05-23 23:50:49 +03:00
Arthur Petukhovsky
577c09a370 Throw exception on polygon index error 2020-05-23 22:49:50 +03:00
Andrey Chulkov
5307b781c5 Update eps value to remove errors 2020-05-23 22:29:02 +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
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
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
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
Nikita Vasilev
3fb0eab116 fix 2020-05-23 19:11:20 +03:00
Nikita Vasilev
1b9e2df78e fix 2020-05-23 19:10:19 +03:00
Nikita Vasilev
016964caed style fix 2020-05-23 17:19:14 +03:00
Nikita Vasilev
c258508610 fix 2020-05-23 17:16:52 +03:00
Nikita Vasilev
deb0e2f199 parts count 2020-05-23 13:42:02 +03:00
Nikita Vasilev
d4cc01446c Merge remote-tracking branch 'upstream/master' into nikvas0/ssd_dict 2020-05-23 13:06:47 +03:00
Nikita Vasilev
05938e562c fix 2020-05-23 11:07:24 +03:00
Arthur Petukhovsky
c3c062fa28 Fix bug with two identical edges 2020-05-23 04:52:04 +03:00
Alexander Tokmakov
ac54d470da Merge branch 'master' into merging_external_source_cassandra 2020-05-22 17:27:40 +03:00
Alexander Tokmakov
e6ca09e134 fix build 2020-05-22 17:19:33 +03:00
Nikolai Kochetov
f7456f8320
Merge pull request #11004 from ClickHouse/remove-experimental-use-processors-flag-2
Remove allow_processors flag from executeQuery()
2020-05-22 10:47:15 +03:00
Andrey Chulkov
025618b644 fix bug in which the wrong box was used 2020-05-22 02:59:23 +03:00
Andrey Chulkov
c085c89236 fix bug with points falling on grid borders 2020-05-22 00:21:53 +03:00
Alexander Kuzmenkov
fecd84d3c0
Merge pull request #10915 from ClickHouse/aku/mongodb-uri
Support MongoDB URI
2020-05-21 23:02:12 +03:00
Andrey Chulkov
37e55e67dd improve old grid cells 2020-05-21 20:57:39 +03:00
Alexander Tokmakov
f40fadc3d6 fix segfault 2020-05-21 18:29:18 +03:00
Andrey Chulkov
85779fad97 fix 2020-05-21 06:14:18 +03:00
Andrey Chulkov
e19c13f526 fix 2020-05-21 06:07:18 +03:00
Andrey Chulkov
01d7c3b1e5 fix 2020-05-21 05:56:03 +03:00
Andrey Chulkov
f1bd5c11cd fix 2020-05-21 05:14:03 +03:00
Andrey Chulkov
1c8c48dbad fix 2020-05-21 05:07:17 +03:00
Andrey Chulkov
00637e0104 fix 2020-05-21 05:01:41 +03:00
Andrey Chulkov
b3c1bda0a9 change one_bucket_polygon to use new index 2020-05-21 04:32:18 +03:00
Andrey Chulkov
5b935f52cc fix 2020-05-21 03:50:19 +03:00
Andrey Chulkov
ff1dbe5483 add template to grid 2020-05-21 03:37:03 +03:00
Alexander Tokmakov
4b30b3168c try fix build 2020-05-20 23:26:39 +03:00
Alexander Kuzmenkov
bc34e0ff94 fixup 2020-05-19 23:12:10 +03:00
Alexander Tokmakov
175b7aedf3 Merge branch 'master' into merging_external_source_cassandra 2020-05-19 05:21:27 +03:00
Nikolai Kochetov
0e48cb1f80 Removed allow_processors flag from executeQuery(). 2020-05-18 16:55:07 +03:00
Andrey Chulkov
b64c9a09a5 Merge branch 'master' of github.com:ClickHouse/ClickHouse into polygon-dict-grids 2020-05-18 02:36:26 +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
6d34f24605
Merge branch 'master' into complex_key_direct 2020-05-17 11:55:01 +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
f4ac1eec04 Merge branch 'master' into quota-key-in-client 2020-05-17 08:15:13 +03:00
ageraab
cb24d47472
Merge branch 'master' into mongo 2020-05-16 02:56:22 +03:00
Nikolai Kochetov
fb38c2a30b
Remove experimental_use_processors setting, part 1. (#10924)
Remove experimental_use_processors setting, part 1.
2020-05-15 22:28:10 +03:00
Alexander Kuzmenkov
500b9bac03 fix config prefix 2020-05-15 13:48:55 +03:00
Артем Стрельцов
33d4ae89f2 fixed yandex synchonization error 2020-05-15 12:16:01 +03:00
Артем Стрельцов
be731ad62e Merge branch 'master' of github.com:yandex/ClickHouse into complex_key_direct 2020-05-15 12:01:09 +03:00
bobrovskij artemij
95677432e5 MongoDB engine (read-only) 2020-05-14 23:59:03 +03:00
Alexander Kuzmenkov
a11c9a3a22
Update MongoDBDictionarySource.cpp 2020-05-14 21:18:37 +03:00
Alexander Kuzmenkov
8e532a5d1f
Update MongoDBDictionarySource.cpp 2020-05-14 21:17:15 +03:00
Alexander Kuzmenkov
99d50063f3 Support MongoDB URI 2020-05-14 14:36:49 +03:00
Nikolai Kochetov
4d0503f021 Make IColumn::mutate() static. 2020-05-14 11:30:18 +03:00
Артем Стрельцов
fd16838150 fixed style and build fails 2020-05-13 01:52:56 +03:00
Артем Стрельцов
c860f9f2db added exception for not supporting selective load to Direct Dictionary 2020-05-12 15:41:47 +03:00
Артем Стрельцов
433cd6b993 bug fixes 2020-05-12 15:39:44 +03:00
Alexey Milovidov
d38e6b6840 Fix MSan failure in cache dictionary 2020-05-12 08:43:42 +03:00
Nikita Vasilev
c26144968a fix 2020-05-11 17:44:46 +03:00
Nikita Vasilev
5e9cb4060f fix 2020-05-10 22:58:11 +03:00
Nikita Vasilev
cf93fa9cc3 bytes allocated 2020-05-10 21:01:23 +03:00
Nikita Vasilev
40823524a5 impr 2020-05-10 20:31:45 +03:00
Nikita Vasilev
833637d910 new hashtables 2020-05-10 20:01:02 +03:00
Nikita Vasilev
05dcc1e2fd fix 2020-05-10 18:55:29 +03:00
Nikita Vasilev
982c8b15d9 fix 2020-05-10 13:37:30 +03:00
Nikita Vasilev
bdeea1ac51 fix 2020-05-10 11:22:14 +03:00
Nikita Vasilev
5056328a92 fix names 2020-05-10 10:35:33 +03:00
Nikita Vasilev
99b0abcb92 fix 2020-05-10 10:00:57 +03:00
Артем Стрельцов
de8bf3f78c Draft of ComplexKeyDirectDictionary layout 2020-05-10 02:53:01 +03:00
Nikita Vasilev
873dd7319c fix complex key 2020-05-09 23:33:58 +03:00
Nikita Vasilev
c894976ff2 fix:w 2020-05-09 21:17:32 +03:00
Nikita Vasilev
0896c2a8b4 ret found 2020-05-09 16:40:41 +03:00
Nikita Vasilev
774b107b6c rm lock 2020-05-09 14:53:07 +03:00
Nikita Vasilev
270268f4a2 fix addr 2020-05-09 14:36:23 +03:00
Ivan
85d783c247
Poco contrib refactoring (#10396)
* Remove config_common.h
* Refactor libcpuid contrib
* Remove support for libcpuinfo
* Define USE_CPUID in Arcadia
* Refactor Poco libraries
2020-05-08 17:11:19 +03:00
Alexey Milovidov
048e26dabf Fix "Arcadia" build 2020-05-07 23:40:18 +03:00
Alexey Milovidov
2a3e7f8076 Fix "Arcadia" build 2020-05-07 15:36:56 +03:00
alexey-milovidov
3e583ef45e
Merge pull request #10712 from ClickHouse/merging-extract-groups
Merging #10534
2020-05-07 15:34:41 +03:00
Alexey Milovidov
4a1f9f41fb Update ya.make for Arcadia build 2020-05-07 15:33:50 +03:00
Alexey Milovidov
fce23f4535 Update ya.make for Arcadia build 2020-05-07 15:32:33 +03:00
Alexey Milovidov
c85fec6c67 Update ya.make for Arcadia build 2020-05-07 15:31:28 +03:00
Артем Стрельцов
b2993c314c fixes relevant to review 2020-05-07 00:59:31 +03:00
Артем Стрельцов
9088f220ee style fix 2020-05-06 16:59:48 +03:00
Артем Стрельцов
1428188e21 fixed test for direct layout & fixed data load for FileDictionarySource 2020-05-06 03:52:13 +03:00
Артем Стрельцов
50d2b4c26f code review fixes & added exception in case lifetime parameter presence in config 2020-05-06 02:43:06 +03:00
Артем Стрельцов
a51440cc31 significantly improved performance 2020-05-05 21:49:22 +03:00
Артем Стрельцов
eb5488faeb std::unordered_map -> HashMap 2020-05-05 19:18:21 +03:00
Артем Стрельцов
0f23713488 fixed bug with dictIsIn 2020-05-04 12:53:06 +03:00
Артем Стрельцов
05d4e41949 minor fix 2020-05-04 04:28:54 +03:00
Артем Стрельцов
5bce553d91 performance optimization 2020-05-03 22:08:45 +03:00
Артем Стрельцов
ff7b5db800 fixed bug with dictGetString 2020-05-03 21:03:41 +03:00
Артем Стрельцов
31fb42cf01 removed unused arena 2020-05-03 19:12:17 +03:00
Артем Стрельцов
359de11fee removed redundant lines and comments 2020-05-03 00:49:19 +03:00
Артем Стрельцов
c82b1fc0fe fixed (hope) test flapping 2020-05-02 23:26:22 +03:00
Артем Стрельцов
5ba6572210 fixed problem with dictGetString and Float32 2020-05-02 20:58:24 +03:00
Артем Стрельцов
2a4ce4f41c style fix 2020-05-02 15:02:57 +03:00
Артем Стрельцов
25d7f76e4f fixed bug & created functional test for new layout 2020-05-02 04:03:29 +03:00
Артем Стрельцов
97496048d6 created direct dictionary (has bugs, doesn't work properly) 2020-05-02 02:35:54 +03:00
Nikita Vasilev
fac0439efb complex_key 2020-04-30 23:50:31 +03:00
alexey-milovidov
4c17542096
Merge pull request #10465 from kekekekule/ddl_settings
Add custom settings support in DDL-queries for CREATE DICTIONARY
2020-04-26 20:25:29 +03:00
Nikita Vasilev
c5f8ebd98c fix deadlock 2020-04-26 11:41:07 +03:00
Nikita Vasilev
4f968fb11d fix 2020-04-25 15:05:01 +03:00
Nikita Vasilev
06945d83ec impr 2020-04-25 11:12:13 +03:00
Артем Стрельцов
26a6353284 tried to fix build fail & fixed codestyle 2020-04-24 12:59:49 +03:00
Артем Стрельцов
d7e27d4326 added SETTINGS section to DDL-query for CREATE DICTIONARY 2020-04-24 00:57:40 +03:00
Артем Стрельцов
f39fdf7182 some progress in parsing settings (i did this commit for having something to backup to) 2020-04-23 23:50:01 +03:00
Nikita Vasilev
60648b3d49 fix eintr 2020-04-23 21:03:38 +03:00
Nikita Vasilev
cebe0d5850 fix 2020-04-23 14:44:12 +03:00
Alexey Milovidov
282b5785c1 Fixed error 2020-04-22 21:41:19 +03:00
Nikita Vasilev
04347a94d4 get rid of metadata in ram 2020-04-22 21:00:08 +03:00
Nikita Vasilev
b01ea01e87 metadata on ssd 2020-04-22 20:27:35 +03:00
Nikita Vasilev
464c90a486 Merge remote-tracking branch 'upstream/master' into nikvas0/ssd_dict 2020-04-22 10:27:20 +03:00
Alexey Milovidov
03e17405cd Checkpoint 2020-04-22 10:03:43 +03:00