Commit Graph

15722 Commits

Author SHA1 Message Date
Nikita Vasilev
0e6f5b4356 fix 2019-01-17 21:22:45 +03:00
proller
f2bbac6523 CLICKHOUSE-4257 remoteSecure 2019-01-17 20:55:44 +03:00
chertus
5289c1337e child free ASTIdentifier 2019-01-17 20:01:48 +03:00
alesapin
b6ad3cf148 Remove shadow variable warning 2019-01-17 19:15:51 +03:00
Alexey Zatelepin
addc9a43b0 remove unused IAST field 2019-01-17 18:52:29 +03:00
Alexey Milovidov
7a4c46b38f Reading the test #4063 2019-01-17 18:30:44 +03:00
Alexey Milovidov
736e1e2d71 Fixed build #4063 2019-01-17 18:21:21 +03:00
Nikita Vasilev
955b002d36 upd test for bug 2019-01-17 18:09:49 +03:00
Alexey Milovidov
303c3cc043 Merge branch 'master' of https://github.com/Miniwoffer/ClickHouse into Miniwoffer-master 2019-01-17 18:04:06 +03:00
alexey-milovidov
af32828d9a
Update 00823_capnproto_input.sh 2019-01-17 18:02:49 +03:00
Alexey Milovidov
178302cc5d Miscellaneous #3960 2019-01-17 17:45:02 +03:00
Nikita Vasilev
8c2a23a129 MTReadStream 2019-01-17 17:23:12 +03:00
alesapin
07e11577d3 Add write logic and remove strange multifile read logic 2019-01-17 17:10:30 +03:00
alexey-milovidov
0ec1fdef04
Merge pull request #3960 from yandex/zk-columns-compact-storage
Compact storage of the part header in ZooKeeper
2019-01-17 17:05:01 +03:00
Nikita Vasilev
c4a725a496 indices 2019-01-17 15:11:36 +03:00
alesapin
2d3e08fc74 Refactor ReadBufferFromHDFS 2019-01-17 14:26:29 +03:00
Nikita Vasilev
6b8c7dadb9 fix 2019-01-17 14:10:43 +03:00
Nikita Vasilev
8d47872436 fix 2019-01-17 13:09:51 +03:00
Odin Hultgren Van Der Horst
94a2726a93 Merge branch 'master' of https://github.com/Miniwoffer/ClickHouse 2019-01-17 10:46:15 +01:00
Odin Hultgren Van Der Horst
da4f4c882f Added test for capnproto 2019-01-17 10:40:18 +01:00
Nikita Vasilev
6a09340eed Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-17 12:34:51 +03:00
Nikita Vasilev
d514d3739a fixed repl alter 2019-01-17 12:16:39 +03:00
Nikita Vasilev
59cb1cbcef rm test files 2019-01-17 11:09:00 +03:00
Nikita Vasilev
062819f0a2 new test and repl fix 2019-01-17 11:05:26 +03:00
alexey-milovidov
b50fa22606
Merge pull request #4077 from 4ertus2/joins
Some more ASTIdentifier refactoring
2019-01-17 00:58:36 +03:00
Nikita Vasilev
f8fa36c6bd fix metadata editing 2019-01-16 22:47:21 +03:00
Nikita Vasilev
62dde8c327 fixed alter bug with drop all indices 2019-01-16 22:31:04 +03:00
alexey-milovidov
2cbd1263a9
Merge pull request #4053 from danlark1/master
MultiVolnitsky added with tests and some benchmark, many multiFunctions are added to support multistring search
2019-01-16 22:24:57 +03:00
Alexey Milovidov
fc2a0cdfb1 Added a test #4004 2019-01-16 22:24:21 +03:00
chertus
394e8b0378 minor improvements and fix 2019-01-16 21:38:19 +03:00
chertus
6a79a03a9e minor improvements 2019-01-16 21:38:19 +03:00
chertus
738080c73f minor improvements 2019-01-16 21:38:19 +03:00
chertus
8bb35ac987 minor changes 2019-01-16 21:38:19 +03:00
Nikita Vasilev
579832ff9b upd setSkipIndexes 2019-01-16 21:35:03 +03:00
Nikita Vasilev
08d23c16d1 fixes 2019-01-16 21:24:38 +03:00
Nikita Vasilev
b4ce03ea7e alter fix + test 2019-01-16 20:59:47 +03:00
Danila Kutenin
45882dc048 Merge branch 'danlark1-master' 2019-01-16 20:46:51 +03:00
Danila Kutenin
4f29102e7f Merge branch 'master' of https://github.com/yandex/ClickHouse 2019-01-16 20:44:21 +03:00
Danila Kutenin
12bcff48ee Miscellaneous and some optimizations 2019-01-16 20:41:08 +03:00
Alexey Milovidov
6433d5efa7 Merge branch 'master' of github.com:yandex/ClickHouse 2019-01-16 20:25:33 +03:00
Alexey Milovidov
61a59956b3 Indentation #4004 2019-01-16 20:25:06 +03:00
Nikita Vasilev
2de2b6f32e fixed alter 2019-01-16 19:53:38 +03:00
Alexey Zatelepin
be6a8d6118 fix clang build 2019-01-16 19:42:02 +03:00
Alexey Milovidov
23fbf18555 Merge branch 'sequence-max-iterations' of https://github.com/ercolanelli-leo/ClickHouse into ercolanelli-leo-sequence-max-iterations 2019-01-16 19:37:51 +03:00
Léo Ercolanelli
043ef82468 fix style in AggregateFunctionSequenceMatch.h 2019-01-16 17:20:29 +01:00
Alexey Milovidov
bf2ca149c9 Merge branch 'sequence-max-iterations' of https://github.com/ercolanelli-leo/ClickHouse into ercolanelli-leo-sequence-max-iterations 2019-01-16 18:22:35 +03:00
Alexey Zatelepin
0f8e5f8522 Merge branch 'master' into zk-columns-compact-storage
Conflicts:
	dbms/src/Storages/StorageReplicatedMergeTree.cpp
2019-01-16 17:45:16 +03:00
Alexey Milovidov
95d4f5089e Merge branch 'master' into open-test-data-2 2019-01-16 17:15:04 +03:00
Danila Kutenin
1badabdcd0 Merge branch 'master' of https://github.com/yandex/ClickHouse 2019-01-16 17:06:38 +03:00
Alexey Milovidov
7d03804d06 Miscellaneous #4053 2019-01-16 16:57:11 +03:00
Alexey Milovidov
0817ff0d58 Merge branch 'master' of https://github.com/danlark1/ClickHouse into danlark1-master 2019-01-16 16:28:28 +03:00
alexey-milovidov
eeac860e0a
Update CapnProtoRowInputStream.cpp 2019-01-16 16:14:54 +03:00
alexey-milovidov
fb68929b10
Update CapnProtoRowInputStream.cpp 2019-01-16 16:14:34 +03:00
Nikita Vasilev
65539bfea0 fix "after" 2019-01-16 16:05:27 +03:00
Nikita Vasilev
8c35ccdd1d fix alters 2019-01-16 15:29:26 +03:00
alesapin
87229baac0
commit just to trigger ci 2019-01-16 15:07:26 +03:00
robot-clickhouse
6047636296 Auto version update to [19.1.1] [54413] 2019-01-16 14:04:37 +03:00
Odin Hultgren Van Der Horst
f7d70b86cb Style complience 2019-01-16 11:00:40 +01:00
Léo Ercolanelli
6048a83462 add comment to sequenceMatch's DFA implementation 2019-01-16 10:39:35 +01:00
Léo Ercolanelli
04651503d6 sequence: implement DFA matching algorithm 2019-01-16 10:39:35 +01:00
Alexey Milovidov
78671d15bd Avoid bad code #4052 2019-01-16 03:52:33 +03:00
Alexey Milovidov
e8871bc211 Added a check #3837 2019-01-16 03:26:15 +03:00
Alexey Milovidov
63f62f2548 Added a bug #3837 2019-01-16 03:22:10 +03:00
Alexey Milovidov
368b5f965e Fixed bad test #3837 2019-01-16 03:20:44 +03:00
Alexey Milovidov
36f679f59a Removed test case that reproduces a bug 2019-01-16 03:19:47 +03:00
alesapin
e33de8133e Unaligned store of the first element 2019-01-15 23:50:57 +03:00
Nikita Vasilev
b110738f61 alters fix 2019-01-15 22:14:47 +03:00
Nikita Vasilev
2f07e31903 fix 2019-01-15 20:39:10 +03:00
alesapin
cb42608fab Add data comparison 2019-01-15 19:34:43 +03:00
Danila Kutenin
ce90ad32d1 some style 2019-01-15 19:26:14 +03:00
alesapin
8d2f0e0cda Add compression ratio tests for Float64, UInt64 and String 2019-01-15 19:20:33 +03:00
Nikita Vasilev
026a30092e added alter 2019-01-15 17:49:22 +03:00
alesapin
361d26c643 Use information about type in Delta codec to choose correct delta size if possible 2019-01-15 17:20:34 +03:00
alesapin
37c78aa3d2 Merge branch 'master' of github.com:yandex/ClickHouse into compression_codec_delta 2019-01-15 16:24:49 +03:00
Danila Kutenin
43965c1703 Merge branch 'master' of https://github.com/yandex/ClickHouse 2019-01-15 16:19:15 +03:00
alesapin
4714bb5f68
Merge pull request #4054 from yandex/compression_codec_alter
Compression codec alter
2019-01-15 16:18:33 +03:00
Ivan Lezhankin
76c4b86e0a Add sample instruction on how to test Kafka with ClickHouse locally 2019-01-15 15:57:06 +03:00
alesapin
8315c540d4 Merge branch 'master' into compression_codec_delta 2019-01-15 15:45:02 +03:00
chertus
a5d8858ee2 minor ASTIdentifier changes 2019-01-15 15:28:17 +03:00
alesapin
48847441f1 Add spaces in codecs description 2019-01-15 14:06:00 +03:00
alesapin
694f746798 Merge branch 'master' into compression_codec_alter 2019-01-15 13:52:45 +03:00
Odin Hultgren Van Der Horst
3ff868917e Changed tabs to spaces 2019-01-15 09:41:48 +01:00
Odin Hultgren Van Der Horst
3378bf58f5 Comments and changes to parent check
- Added some comments.
 - Immplemented a recurisve parent check so fields with parents by
the same name but grandparents with diffrent names dont cause problems
2019-01-15 09:27:38 +01:00
Odin Hultgren Van Der Horst
8bff8d4e2d Merge branch 'master' of https://github.com/yandex/ClickHouse 2019-01-15 08:13:51 +01:00
alexey-milovidov
27a0c37d77
Update Join.h 2019-01-15 00:41:35 +03:00
alexey-milovidov
64c31a6ad7
Update Join.h 2019-01-15 00:40:42 +03:00
alexey-milovidov
8a401e491a
Update Join.cpp 2019-01-15 00:40:02 +03:00
alexey-milovidov
bcc54d1606
Merge pull request #4025 from abyss7/fix-kafka
Update Kafka libraries
2019-01-15 00:23:20 +03:00
alexey-milovidov
8a251753be
Merge pull request #4056 from 4ertus2/ast
Helpers for ASTIdentifier (based on 'QueryNormalizer refactoring' changes)
2019-01-15 00:22:54 +03:00
alexey-milovidov
d727689ca4
Merge pull request #4031 from 4ertus2/joins
QueryNormalizer refactoring
2019-01-15 00:22:23 +03:00
chertus
dbb88e8cb4 helpers for ASTIdentifier (hide semantic and casts) 2019-01-14 21:15:04 +03:00
proller
4b6af5788a Fix macos build 2019-01-14 19:55:11 +03:00
alesapin
84e3dbc2eb Add test codec don't changes 2019-01-14 19:00:56 +03:00
Danila Kutenin
a5669b6b7a MultiVolnitsky added with tests and some benchmark, many multiFunctions are added to support multistring search 2019-01-14 18:54:47 +03:00
alesapin
24b7214611 Even more tests 2019-01-14 18:53:10 +03:00
alesapin
43436aaf9d More strict tests 2019-01-14 18:34:06 +03:00
proller
72df7ceee6 Macos build fix 2019-01-14 18:20:09 +03:00
zhang2014
cdb138f13c merge 2019-01-14 18:14:34 +03:00
alesapin
4089700e6d Fix segfault but don't know why 2019-01-14 18:10:48 +03:00
proller
af0b875f57 Fix macos build 2019-01-14 17:17:43 +03:00
proller
c0b72492c0 Fix macos build 2019-01-14 16:34:14 +03:00
alesapin
23a53c7e4e Add compression codec delta 2019-01-14 14:55:53 +03:00
alesapin
c8257f6d0b Add compression codec delta and fix naming for parametric codecs 2019-01-14 14:54:40 +03:00
proller
5024d1b7f7 Fix macos build 2019-01-14 14:53:22 +03:00
Ivan Lezhankin
337c092c7e Use cppkafka instead of raw C interface 2019-01-14 14:15:57 +03:00
Ivan Lezhankin
9c35598373 Add cppkafka to contrib 2019-01-14 14:15:57 +03:00
chertus
5147e2ad03 Merge branch 'master' into joins 2019-01-14 14:11:35 +03:00
Nikita Vasilev
e197697b22 fix 2019-01-13 22:31:48 +03:00
Nikita Vasilev
d0db87b412 alter cmds parse 2019-01-13 20:23:08 +03:00
Nikita Vasilev
4f48ebd971 removed throw 2019-01-13 19:05:21 +03:00
Nikita Vasilev
183ddea518 added parsing 2019-01-13 19:04:41 +03:00
Nikita Vasilev
e288022fea Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-13 17:33:24 +03:00
alexey-milovidov
5c5358f9c9
Merge pull request #4042 from yandex/compiled_expressions_cache_memory_usage
Try to reduce CompiledExpressionsCache size
2019-01-12 13:19:58 +03:00
alesapin
a9550c5a43
Update ExpressionJIT.cpp 2019-01-12 10:19:18 +03:00
alesapin
748bcb0a3c Remove accident changes 2019-01-12 00:18:57 +03:00
alesapin
00200615e8 Trying to remove redundant objects from CompiledExpressionsCache (LLVMFunction), also remove CompiledExpressionsCacheBytes metric because it's not connected with real size 2019-01-12 00:16:49 +03:00
alexey-milovidov
f5271417ae
Merge pull request #4041 from yandex/compiled_expressions_cache_memory_usage
CLICKHOUSE-4249: Limit compiled expressions cache size
2019-01-11 23:22:52 +03:00
chertus
b759219243 fix crash on wrong data 2019-01-11 22:33:00 +03:00
chertus
e098348aa4 more QueryNormalizer refactoring: split visit function 2019-01-11 22:07:38 +03:00
alesapin
0ba1db8b27 CLICKHOUSE-4249: Limit compiled expressions cache 2019-01-11 22:03:23 +03:00
proller
7cefef6983
Fix linking in all modes (unbundled, split, ...) (#4037) 2019-01-11 19:52:46 +03:00
chertus
c53854125f QueryNormalizer with visitor interface 2019-01-11 17:09:23 +03:00
proller
497b6ec2ad
Better compile with low memory; Fix macos build, add utils/build/build_debian_unbundled_split.sh test script (#4030) 2019-01-11 15:40:19 +03:00
chertus
861c225c1e one another build fix 2019-01-11 01:04:37 +03:00
chertus
0084785898 fix build 2019-01-11 00:05:01 +03:00
chertus
275d6b2fcc some QueryNormalizer refactoring 2019-01-10 21:58:55 +03:00
Nikita Vasilev
89b831eaf7 added indexes meta to zookeeper 2019-01-10 20:48:04 +03:00
Nikita Vasilev
d310d1a5ec fixed setSkipIndexes 2019-01-10 19:51:49 +03:00
Nikita Vasilev
0c18e73871 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-10 17:55:08 +03:00
Nikita Vasilev
701627ec60 fixed includes 2019-01-10 16:50:41 +03:00
Nikita Vasilev
634d5eb516 fix style 2019-01-10 16:30:06 +03:00
Nikita Vasilev
3f8c2ad814 fixed constructor 2019-01-10 15:57:12 +03:00
alesapin
8ae59da557 Fix name hiding 2019-01-10 14:46:20 +03:00
alesapin
6401628dc8 Fix clang-7 werrors 2019-01-10 14:25:59 +03:00
Nikita Vasilev
6490c23aa6 added tests for minmax index 2019-01-10 14:17:10 +03:00
Odin Hultgren Van Der Horst
b844bdef15 Tabs are now spaces 2019-01-10 09:18:13 +01:00
Odin Hultgren Van Der Horst
23c93b8c79 Removed include statemnets 2019-01-10 08:55:59 +01:00
alexey-milovidov
9b46678920
Merge pull request #4014 from 4ertus2/joins
minor SyntaxAnalyzer refactoring
2019-01-09 23:10:40 +03:00
alexey-milovidov
6fabb5eb03
Merge pull request #4017 from yandex/netlink-sockets-pool
Don't use a pool for TaskStatsInfoGetters
2019-01-09 22:56:27 +03:00
alexey-milovidov
a739edc239
Merge pull request #4013 from yandex/pvs-studio-fixes-2
Fixed bugs found by PVS-Studio
2019-01-09 22:55:11 +03:00
Nikita Vasilev
d9b7f30245 added indexes to checkDataPart 2019-01-09 22:20:50 +03:00
proller
64c2c3650c
cmake: Dont cache version; macos: fix build; /release_lib.sh move to utils (#4016) 2019-01-09 21:32:43 +03:00
Alexey Zatelepin
006a764df9 don't use pool for TaskStatsInfoGetter [#CLICKHOUSE-4209]
Pool is not needed because creation of a TaskStatsInfoGetter takes
an order of 10us. Also pool is harmful because created sockets are
never closed.
2019-01-09 20:52:25 +03:00
chertus
c460a270da enlight when SyntaxAnalyzer affects only selects 2019-01-09 20:40:26 +03:00
Alexey Milovidov
4712fd668e Addition to prev. revision 2019-01-09 20:31:30 +03:00
chertus
7ba268049a extract OptimizeIfWithConstantConditionVisitor from SyntaxAnalyzer 2019-01-09 20:06:40 +03:00
Nikita Vasilev
0ba6f1421a fixed style 2019-01-09 20:05:52 +03:00
alexey-milovidov
08f4e792b1
Merge pull request #4009 from yandex/test_for_remote_global_in_user
Fix bug with wrong user in remote table function.
2019-01-09 19:29:34 +03:00
alexey-milovidov
ca7c3c0bfd
Merge pull request #4012 from yandex/fix-low-cardinality-numeric-distinct
Distinct by single LowCardinality numeric column.
2019-01-09 19:28:42 +03:00
chertus
729ca697d9 minor SyntaxAnalyzer refactoring 2019-01-09 19:16:59 +03:00
Alexey Milovidov
19f4652959 Fixed bugs found by PVS-Studio 2019-01-09 18:44:20 +03:00
Odin Hultgren Van Der Horst
ffdf565528 Merge branch 'master' of https://github.com/Miniwoffer/ClickHouse 2019-01-09 15:27:11 +00:00
Odin Hultgren Van Der Horst
96352ce78d Added _ as delim
Added _ as delim
This makes it so you do not have to use . when addresing structures
and since Capnproto can not use _ in its naming its fine to use.
2019-01-09 15:24:17 +00:00
alexey-milovidov
715abd0e0a
Merge pull request #4011 from yandex/fix-empty-low-cardinality-array
LowCardinality empty array serialization.
2019-01-09 18:22:05 +03:00
Nikolai Kochetov
5ab362a303 Fix distinct by single LowCardinality numeric column. 2019-01-09 17:47:51 +03:00
Nikita Vasilev
10355ae555 Merge remote-tracking branch 'upstream/master' into nikvas0/index 2019-01-09 17:36:06 +03:00
Alexey Milovidov
87c4443f98 Removed outdated test 2019-01-09 17:34:25 +03:00
Nikita Vasilev
d8f8b6352b removed test index 2019-01-09 17:30:25 +03:00
Nikita Vasilev
1e8fa5d9ea working minmax 2019-01-09 17:15:23 +03:00
alesapin
f00b7ba08a Simplify test 2019-01-09 15:23:41 +03:00
alesapin
b8efafd400 Fix bug with wrong user restrictions in remote table func 2019-01-09 15:21:04 +03:00
Nikolai Kochetov
cea23a1486 Fix LowCardinality empty array serialization. #3907 2019-01-09 15:16:03 +03:00
alesapin
a1cdb0049d Add test for user exception check 2019-01-09 13:47:22 +03:00
Nikita Vasilev
91fb17f27f fixed mutation 2019-01-09 12:55:28 +03:00
Nikita Vasilev
e580180efc fixed merging 2019-01-09 12:54:18 +03:00
alexey-milovidov
0648088ff0
Merge pull request #4000 from housepower/feature/gccHash
Add gccHash function
2019-01-09 10:29:37 +03:00
sundy-li
31a516300a rename to gccMurmurHash 2019-01-09 10:03:50 +08:00
Nikita Vasilev
6eeed48e86 fixed select 2019-01-08 23:17:45 +03:00
Nikita Vasilev
ad4df16899 fix 2019-01-08 22:41:36 +03:00
Nikita Vasilev
49148ac3e9 minmax index 2019-01-08 20:27:44 +03:00
Alexey Milovidov
ad586e9bd2 Miscellaneous #4000 2019-01-08 18:57:15 +03:00
Alexey Milovidov
ed07c1a1d2 Added "reserve" for "arrayFirst" #3920 2019-01-08 18:30:04 +03:00
Alexey Milovidov
224e688e9c Added test for #3920 2019-01-08 18:27:58 +03:00
Alexey Milovidov
da449ff9d1 Little better #3920 2019-01-08 17:56:50 +03:00
Alexey Milovidov
3874dc5ac3 Fixed error in #3920 2019-01-08 17:56:07 +03:00
Alexey Milovidov
a594293b50 Addition to Amos Bird changes #3920 2019-01-08 17:55:37 +03:00
alexey-milovidov
2884b870b3
Merge pull request #3993 from yandex/weverything-2
Added more warnings from clang's -Weverything, that are available in clang 8
2019-01-08 17:54:43 +03:00
Odin Hultgren Van Der Horst
68ed4d5c78 Removed console logs used in debuging 2019-01-08 15:02:41 +01:00
Odin Hultgren Van Der Horst
3875265721 CapnProto should now load jagged structures
Changed how actions are created for CapnProto so it supports jagged
structures.
2019-01-08 14:57:52 +01:00
Nikita Vasilev
d1e2ab85e3 asts -> exprlist 2019-01-08 14:04:25 +03:00
Alexey Milovidov
0630e67a21 Addition to Amos Bird changes #3920 2019-01-08 13:07:33 +03:00
Nikita Vasilev
48e136f029 unique names 2019-01-08 12:38:46 +03:00
sundy-li
e6c02a2356 Add gccHash function 2019-01-08 13:12:52 +08:00
Nikita Vasilev
541c641b24 fix 2019-01-08 00:06:08 +03:00
Alexey Milovidov
d4f5310358 Miscellaneous [#CLICKHOUSE-2] 2019-01-07 22:57:32 +03:00
Alexey Milovidov
1c7ccbf108 Miscellaneous [#CLICKHOUSE-2] 2019-01-07 22:56:53 +03:00
Nikita Vasilev
76c25c2024 fixed 2019-01-07 22:21:51 +03:00
Nikita Vasilev
69c6e77d53 fixed nullptr error 2019-01-07 21:53:51 +03:00
Nikita Vasilev
6871665231 test index 2019-01-07 19:49:34 +03:00
Nikita Vasilev
11d37efa74 reading 2019-01-07 15:51:14 +03:00
Alexey Milovidov
ac48a83ebd Added more warnings from clang's -Weverything, that are available in clang 8 2019-01-07 13:43:45 +03:00
Alexey Milovidov
0dfa553fca Added more warnings from clang's -Weverything, that are available in clang 8 2019-01-07 13:40:58 +03:00
Alexey Milovidov
a5e354fba9 Fixed warning [#CLICKHOUSE-2] 2019-01-07 11:00:29 +03:00
Amos Bird
8ea4d7987b Add join_overwrite settings for StorageJoin.
This makes using StorageJoin as dictionary more flexible.
2019-01-07 01:23:26 +08:00
alexey-milovidov
457bb58f3e
Update sanitizers.md 2019-01-06 19:43:46 +03:00
Nikita Vasilev
17f6618fa3 fix 2019-01-06 18:22:04 +03:00
alexey-milovidov
14f471dd0d
Merge pull request #3980 from zhang2014/fix/ISSUES-3710
ISSUES-3710 fix alias is missing when distributed & join on
2019-01-06 17:26:45 +03:00
Nikita Vasilev
e95376e550 Merge branch 'master' into nikvas0/index 2019-01-06 16:21:00 +03:00
Nikita Vasilev
7e0e301067 fix 2019-01-06 15:12:42 +03:00
Nikita Vasilev
83368a4866 upd error 2019-01-06 15:10:22 +03:00