thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-15 10:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
136,958 Commits 9,328 Branches 1,783 Tags 2.1 GiB
24d6dcb96b
Commit Graph

6678 Commits

Author SHA1 Message Date
Alexey Milovidov
146d8253ce Comments and clarifications 2020-05-23 13:57:30 +03:00
Alexey Milovidov
f14b5c02e2 Added a comment 2020-05-23 13:41:49 +03:00
Nikita Vasilev
d4cc01446c Merge remote-tracking branch 'upstream/master' into nikvas0/ssd_dict 2020-05-23 13:06:47 +03:00
Alexey Milovidov
91b8659b4d Avoid data movement 2020-05-23 02:14:14 +03:00
Alexey Milovidov
ba5d0a9793 Avoid virtual calls 2020-05-23 01:40:00 +03:00
Alexey Milovidov
d2cd941f47 Changed strategy to "Franklin" 2020-05-23 00:47:31 +03:00
Alexey Milovidov
5e21a06559 Added bounding box 2020-05-23 00:36:44 +03:00
Alexey Milovidov
4deb69599e Improve performance for non-const polygons 2020-05-23 00:27:06 +03:00
Alexey Milovidov
84dd802ba9 Improve performance for non-const polygons 2020-05-23 00:23:49 +03:00
Alexey Milovidov
a39f1d8bdc Preparation 2020-05-22 23:29:28 +03:00
Alexey Milovidov
ad54b83563 Fix clang-tidy 2020-05-22 22:58:08 +03:00
Alexey Milovidov
a309e1050a Finally fix performance issue 2020-05-22 22:54:16 +03:00
Alexey Milovidov
3f31f2b9e2 Replace polygon key to hash for simplicity 2020-05-22 22:37:56 +03:00
Alexey Milovidov
de83c1129f Better "serialize" function for polygons 2020-05-22 22:27:38 +03:00
Alexey Milovidov
902fc8dd82 Fix outstandingly wrong code from #10623 2020-05-22 22:15:29 +03:00
feng lv
83c0807b43 update 
update name
 2020-05-22 23:45:09 +08:00
Alexey Milovidov
4dd2015056 Preparation 2020-05-22 17:21:49 +03:00
Alexey Milovidov
a9b3de8542 Remove excessive memory allocations 2020-05-22 17:07:17 +03:00
Alexey Milovidov
07a65c3090 Do not validate polygons in non-constant case 2020-05-22 16:50:12 +03:00
Vitaly Baranov
5a0f356cd6
Merge pull request #11038 from Enmk/parseDateTime64BestEffort_fix 
Fixed parseDateTime64BestEffort implementation
 2020-05-22 14:40:39 +03:00
Alexander Kuzmenkov
322d731d28 Remove extra copying from addressToLine 
The line is already serialized to the same arena, so there is no need to
copy it. Also add this function to query profiler test, so that it has
some coverage.
 2020-05-22 03:01:35 +03:00
Alexander Kuzmenkov
f98ffdbc4c
Merge pull request #11087 from azat/context-fwd-decl 
[RFC] Forward declaration for Context as much as possible.
 2020-05-21 19:43:29 +03:00
Vasily Nemkov
403aae9126 Fixed parseDateTime64BestEffort implementation 
Fixed argument resolution issues.
Added tests and made sure -orNull and -orZero variants alwo work correctly.
 2020-05-21 17:21:39 +03:00
alexey-milovidov
b480f137f3
Merge pull request #10623 from livace/master 
Add point in polygon for non-const polygons
 2020-05-21 15:18:24 +03:00
Azat Khuzhin
d93b9a57f6 Forward declaration for Context as much as possible. 
Now after changing Context.h 488 modules will be recompiled instead of 582.
 2020-05-21 01:53:18 +03:00
Alexander Kuzmenkov
50df893dc6 Assert that allocator & container are consistent wrt. inline memory 
There are lots of places where HashTable is used with
AllocatorWithStackMemory, but the size of allocator inline memory is set
incorrectly, and it's less than the initial HashTable buffer size.
Because of this, HashTable is always allocated on the heap, and the
inline memory becomes a useless dead weight.

For PODArray, we have previously added a helper template that makes sure
these values are in sync, so there was only one such discrepancy left,
in the unit test.
 2020-05-20 22:37:13 +03:00
fenglv
64207abd0a update 2020-05-18 22:56:29 +08:00
Artem Zuikov
bfcbc08bba arcadia sync fixes 2020-05-18 15:50:23 +03:00
Artem Zuikov
62f77abbc5 add file to ya.make 2020-05-18 13:40:02 +03:00
Alexey Milovidov
c2b6ed5e21 Whitespaces 2020-05-18 04:42:46 +03:00
Andrey Chulkov
33b724befc fix compilation error 2020-05-18 03:02:32 +03:00
Andrei Nekrashevich
770b720620 no reinterpret_cast 2020-05-18 02:58:19 +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
Andrei Nekrashevich
eba043aaf8 Merge branch 'master' into random_string_utf8_function 2020-05-17 22:53:42 +03:00
alexey-milovidov
92686fea27
Merge pull request #10974 from ClickHouse/xolm-random_fixed_string_function 
Merging  #10866
 2020-05-17 22:20:53 +03:00
Andrei Nekrashevich
db07c9f5e9 fix 2020-05-17 16:22:52 +03:00
Andrei Nekrashevich
9d2801e0d8 fix 2020-05-17 16:07:37 +03:00
alexey-milovidov
6d34f24605
Merge branch 'master' into complex_key_direct 2020-05-17 11:55:01 +03:00
alexey-milovidov
1bceb48e65
Merge pull request #10920 from ClickHouse/fix-notNullIn-with-null 
Fix not null in with null
 2020-05-17 11:16:43 +03:00
Alexey Milovidov
7e7fd41266 Fix build + improvement 2020-05-17 11:00:10 +03:00
Alexey Milovidov
157d0b612c Merge branch 'random_fixed_string_function' of https://github.com/xolm/ClickHouse into xolm-random_fixed_string_function 2020-05-17 10:54:48 +03:00
alexey-milovidov
5297d1e86a
Merge pull request #10928 from vitlibar/check-access-once-for-dictget 
dictGet() checks access once
 2020-05-17 09:27:59 +03:00
alexey-milovidov
a3346e9331
Merge pull request #10912 from ClickHouse/static-mutate 
Static mutate
 2020-05-17 09:05:35 +03:00
Andrei Nekrashevich
c4ff7eec01 fix 2020-05-17 07:49:41 +03:00
Andrei Nekrashevich
675509ed23 Added function randomStringUTF8 2020-05-17 07:43:53 +03:00
Nikolai Kochetov
d948fd61d8 try fix tests. 2020-05-16 23:15:19 +03:00
Nikolai Kochetov
7309cbbfda Try fix build. 2020-05-16 10:23:59 +03:00
Nikolai Kochetov
6aea9c9a21 Tru fix build. 2020-05-15 21:55:30 +03:00
Nikolai Kochetov
c4a07812f7 Try fix build. 2020-05-15 18:48:19 +03:00
Vitaly Baranov
d92ac9ea47
Merge branch 'master' into RBAC-10 2020-05-15 14:12:43 +03:00
Nikolai Kochetov
70ce0149b1 Try fix build. 2020-05-15 13:10:13 +03:00
Nikolai Kochetov
34ce5bec48 Try fix tests. 2020-05-15 12:06:21 +03:00
Артем Стрельцов
be731ad62e Merge branch 'master' of github.com:yandex/ClickHouse into complex_key_direct 2020-05-15 12:01:09 +03:00
Vitaly Baranov
201c88f64f Get dictionary and check access rights only once per each call of any function reading external dictionaries. 2020-05-15 03:14:14 +03:00
Nikolai Kochetov
83d420e608 Try fix tests. 2020-05-14 21:21:35 +03:00
Nikolai Kochetov
b556b7c76e Fix notNullIn with NULL argument. 2020-05-14 17:21:38 +03:00
Nikolai Kochetov
4d0503f021 Make IColumn::mutate() static. 2020-05-14 11:30:18 +03:00
Nikolai Kochetov
f65305878b
Destructive IAggregateFunction::insertResultInto and ColumnAggregateFunction::convertToValues (#10890) 
* Destructive IAggregateFunction::insertResultInto and ColumnAggregateFunction::convertToValues

* Try fix build.

* Try fix build.

* Fix build.

* Make convertToValues static.

* fix build.

* Remove const casts.

* Added comment.

* Fix build.

* Fix build.

* Add test.

* Fix test.
 2020-05-14 10:59:14 +03:00
Vitaly Baranov
5b84121d81 Improve system tables for quotas. Remove function currentQuota(). 2020-05-13 19:40:48 +03:00
Vitaly Baranov
e64e2ebdf6 Improve system table for row policies. Remove function currentRowPolicies(). 2020-05-13 19:40:48 +03:00
Vitaly Baranov
b6fe726777 Rename row policy's 'name' to 'short_name', 'full_name' to 'name'. 
This change simplifies the interface of IAccesEntity.
 2020-05-13 19:40:48 +03:00
alexey-milovidov
a65601e410
Merge pull request #10874 from hczhcz/patch-0513 
Support large tuples in function tupleElement
 2020-05-13 18:42:10 +03:00
hcz
4a4914361c Support large tuples in function tupleElement 2020-05-13 11:53:40 +08:00
Andrei Nekrashevich
767a790fce fix issues 2020-05-13 03:20:41 +03:00
Andrei Nekrashevich
1d52c1b9d0 Added function randomFixedString 2020-05-13 01:48:55 +03:00
Alexey Milovidov
f26f8b99dc Fix "Arcadia" build 2020-05-12 04:28:53 +03:00
alexey-milovidov
46e41f8d86
Update FunctionFactory.h 2020-05-12 00:22:34 +03:00
alexey-milovidov
4a4961fb10
Update FunctionFactory.cpp 2020-05-12 00:21:40 +03:00
Alexey Milovidov
4a142a44a0 Added a patch from Vitaly Stoyan 2020-05-12 00:18:50 +03:00
Alexey Milovidov
cb72b332e6 utils/generate-ya-make$ ./generate-ya-make.sh 2020-05-11 20:21:57 +03:00
alexey-milovidov
1e70230991
Merge pull request #10722 from Enmk/DateTime64_fixes 
function toStartOfSecond(DateTime64) -> DateTime64
 2020-05-11 20:20:58 +03:00
Vasily Nemkov
2c2005817f New function toStartOfSecond(DateTime64) -> DateTime64 
This funtion nullifies sub-second part of DateTime64 value.
 2020-05-11 12:06:06 +03:00
Alexey Milovidov
032eb603f2 Regenerate ya.make 2020-05-11 06:16:16 +03:00
Alexey Milovidov
6a3055a924 Added a comment 2020-05-11 03:38:35 +03:00
Alexey Milovidov
f8d2e599a6 Added a comment 2020-05-11 03:37:31 +03:00
Alexey Milovidov
fe19ca9955 Improve performance two times 2020-05-11 03:36:14 +03:00
Alexey Milovidov
75860eb674 Improve performance 20% 2020-05-11 03:23:47 +03:00
Alexey Milovidov
49e57c555d Fixed code; added a test 2020-05-11 03:16:50 +03:00
Alexey Milovidov
2438a510b0 Merge branch 'fuzz_functions' of https://github.com/xolm/ClickHouse into xolm-fuzz_functions 2020-05-11 02:42:55 +03:00
Alexey Milovidov
20a7889909 Integrate a change from Vitaly Stoyan #10788 2020-05-11 02:39:49 +03:00
Andrei Nekrashevich
84ed5b118c fix 2020-05-10 22:31:47 +03:00
Andrei Nekrashevich
c3873495c9 fix and performance test template 2020-05-10 22:07:02 +03:00
vitstn
be6fba82f9
Update ya.make 2020-05-10 20:51:32 +03:00
Nikita Vasilev
99b0abcb92 fix 2020-05-10 10:00:57 +03:00
alexey-milovidov
ad26306131
Fix clang-tidy. 2020-05-10 03:09:51 +03:00
Артем Стрельцов
de8bf3f78c Draft of ComplexKeyDirectDictionary layout 2020-05-10 02:53:01 +03:00
alexey-milovidov
d459f07eee
Update randomString.cpp 2020-05-09 21:54:23 +03:00
alexey-milovidov
4a66b10669
Update randomString.cpp 2020-05-09 21:52:27 +03:00
Alexey Milovidov
1f0d95e5c3 Added range check for extractGroups function 2020-05-08 02:31:15 +03:00
Alexey Milovidov
048e26dabf Fix "Arcadia" build 2020-05-07 23:40:18 +03:00
Alexey Milovidov
8690b6e702 Fix "Arcadia" build 2020-05-07 23:17:57 +03:00
Alexey Milovidov
8d3e68a30b Fix "Arcadia" build 2020-05-07 21:57:04 +03:00
Andrei Nekrashevich
43bc55ab5f randomString function 2020-05-07 18:36:11 +03:00
Andrei Nekrashevich
28685a80f5 ClickHouse: functions for fuzzing 2020-05-07 17:54:33 +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
Alexey Milovidov
0e00e3049e Regenerate ya.make file 2020-05-07 15:27:42 +03:00
Alexey Milovidov
efeb2acb6b Fix build 2020-05-07 15:19:42 +03:00
Alexey Milovidov
6efe0376de Fix build 2020-05-07 12:06:11 +03:00
Alexey Milovidov
b81b4832fe Fix style 2020-05-07 04:25:46 +03:00
Alexey Milovidov
c73453fa86 Less indirection 2020-05-07 04:25:06 +03:00
Alexey Milovidov
2642d23861 Fixed error 2020-05-07 04:06:23 +03:00
Alexey Milovidov
495d18bb64 Added missing function "extractGroups" 2020-05-07 03:55:54 +03:00
Alexey Milovidov
da2c2c3edf Great simplification 2020-05-07 03:40:25 +03:00
Alexey Milovidov
5d1f36872b Fixed style 2020-05-07 02:51:41 +03:00
Alexey Milovidov
1e690510b6 Fixed style 2020-05-07 02:51:09 +03:00
Alexey Milovidov
466da445e1 Every function in its own file, part 13 2020-05-07 02:21:13 +03:00
alexey-milovidov
eeac7aa313
Merge pull request #10622 from kekekekule/layout_direct 
Add direct layout for dictionaries
 2020-05-07 01:05:29 +03:00
Alexey Milovidov
7d332ab705 Minor improvements 2020-05-06 23:00:54 +03:00
Alexey Milovidov
5f498ad9d9 Range check in h3EdgeAngle function 2020-05-06 22:35:59 +03:00
Vasily Nemkov
87b2d90725 extractAllGroups(haystack, re_needle) function 
Function that extracts from haystack all matching non-overlapping groups with regular expressions,
and put those into Array(Array(String)) column.

Example:
:) SELECT extractAllGroups('abc=111, def=222, "jkl mno"="444 foo bar"', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');

┌─extractAllGroups('abc=111, def=222, "jkl mno"="444 foo bar"', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')─┐
│ [['abc','def','"jkl mno"'],['111','222','"444 foo bar"']]                                      │
└────────────────────────────────────────────────────────────────────────────────────────────────┘
 2020-05-05 17:41:31 +03:00
Alexey Ilyukhov
6a9355c95d Do not use grid for non const 2020-05-05 13:34:58 +03:00
Артем Стрельцов
f8d3999fa2 Merge branch 'master' of github.com:yandex/ClickHouse into layout_direct 2020-05-03 16:23:10 +03:00
alexey-milovidov
0cdd48e468
Merge pull request #10598 from ClickHouse/sampling-memory-profiler 
Add sampling memory profiler
 2020-05-03 15:17:03 +03:00
alexey-milovidov
67efc7f066
Merge pull request #10560 from Enmk/DateTime64_fixes 
Fixed comparing DateTime64 in WHERE against String value
 2020-05-03 00:54:11 +03:00
Alexey Ilyukhov
a03da4eb34 Fix style and array index 2020-05-02 19:48:36 +03:00
Alexey Ilyukhov
c12cd35099 Add point in polygon for non-const polygons 2020-05-02 11:46:18 +03:00
Артем Стрельцов
97496048d6 created direct dictionary (has bugs, doesn't work properly) 2020-05-02 02:35:54 +03:00
Vasily Nemkov
86edceeb81 Comparison between DateTime64 and String values (just like for DateTime) 2020-05-01 15:52:18 +03:00
Nikita Vasilev
fac0439efb complex_key 2020-04-30 23:50:31 +03:00
Alexey Milovidov
293ae88e7f Add sampling memory profiler 2020-04-30 16:25:17 +03:00
alesapin
c24ab563d7 Fix several wrong usages 2020-04-27 18:38:35 +03:00
alesapin
2829774105 Merge branch 'master' into refactor_istorage 2020-04-27 15:34:21 +03:00
Alexey Milovidov
cac130ad3b Use time zone when comparing DateTime with string literal 2020-04-27 01:13:51 +03:00
alesapin
b4425c2dc4 Remove getColumn and hasColumn methods from IStorage 2020-04-24 13:20:03 +03:00
Alexey Milovidov
d3418bbb02 Fix clang-tidy 2020-04-22 11:45:14 +03:00
Alexey Milovidov
8c9408f927 Checkpoint 2020-04-22 11:31:10 +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
Alexey Milovidov
be22a4b94e Checkpoint 2020-04-22 08:39:31 +03:00
alexey-milovidov
c4758b69a2
Merge pull request #10378 from hczhcz/patch-0420 
Add JSONExtractKeysAndValuesRaw
 2020-04-20 23:30:40 +03:00
alexey-milovidov
4912940009
Update FunctionsJSON.h 2020-04-20 23:28:54 +03:00
hcz
32573c0590 Add JSONExtractKeysAndValuesRaw 2020-04-20 18:08:22 +08:00
alexey-milovidov
9d0004cba0
Merge pull request #10365 from ClickHouse/avoid-infinite-loop-in-hierarchical-dictionaries 
Avoid infinite loop in hierarchical dictionaries
 2020-04-20 10:54:16 +03:00
Alexey Milovidov
be4d20e690 Fixed an error and added a test 2020-04-20 07:02:52 +03:00
Alexey Milovidov
3862085af7 Fix for embedded dictionaries 2020-04-20 05:39:43 +03:00
Alexey Milovidov
59a9edd018 Added forgotten modification 2020-04-20 04:43:25 +03:00
Alexey Milovidov
d783162548 Compare with fixed string as smaller string is zero padded #9272 2020-04-20 04:01:31 +03:00
alexey-milovidov
43d48a21c6
Merge pull request #10318 from ClickHouse/least-greatest-generic 
Added generic variants for functions 'least' and 'greatest'.
 2020-04-18 15:35:19 +03:00
alexey-milovidov
b5f8efefa2
Merge pull request #10342 from azat/optimizeGroupBy-isInjective 
[RFC] Use isInjective() over manual list of such functions for GROUP BY optimization
 2020-04-18 14:28:59 +03:00
Azat Khuzhin
322681eb37 Passthrough isInjective via IFunctionOverloadResolver 2020-04-18 01:50:15 +03:00
Azat Khuzhin
f29e5c60a5 Add const qualifier for IFunction::isInjective() 2020-04-18 01:50:15 +03:00
Alexey Milovidov
67790a74e5 Fix test 2020-04-17 06:13:21 +03:00
alexey-milovidov
17e7d4d88a
Merge pull request #10307 from abyss7/arcadia-4 
Changes for auto-sync with Arcadia
 2020-04-17 05:08:34 +03:00
yaqi-zhao
d1b4185392 reduce instructions by _mm512_maskz_set1_epi8 
add performance test for lower/upper function
 2020-04-16 21:26:21 -04:00
Alexander Gololobov
9f50d40915
style fixes 2022-06-07 10:34:47 +02:00
yaqi-zhao
3929baf9ff add avx512 support for Lower/Upper function 2022-06-07 10:19:26 -04:00
Alexey Milovidov
1df5c7cedf Added generic variants of least and greatest functions #4767 2020-04-17 01:28:08 +03:00
Ivan Lezhankin
e230632645 Changes required for auto-sync with Arcadia 2020-04-16 15:31:57 +03:00
Nikolai Kochetov
234c4dbe84 Fix build. 2020-04-15 17:51:03 +03:00
Alexey Milovidov
fbe41a8ee6 Fix clang-tidy 2020-04-15 17:37:43 +03:00
alexey-milovidov
8c8a315bd8
Merge pull request #10271 from ClickHouse/remove-strange-code 
Remove strange code in arrayIndex function
 2020-04-15 16:41:18 +03:00
alesapin
e8cd92bba3 Fix debug build 2020-04-15 13:13:36 +03:00
alexey-milovidov
19c4968ca6
Update arrayIndex.h 2020-04-15 07:02:41 +03:00
Alexey Milovidov
eed2ea3b36 Remove strange code 2020-04-15 06:02:51 +03:00
Alexey Milovidov
db9760af41 Continuation of #6256 2020-04-15 03:12:47 +03:00
Alexey Milovidov
8ad04d4fec Remove useless code 2020-04-15 00:05:45 +03:00
Alexey Milovidov
c64aa011ba Merge branch 'jgon' of https://github.com/amosbird/ClickHouse into amosbird-jgon 2020-04-12 06:21:00 +03:00
Alexey Milovidov
d43903211a Better exception message #9810 2020-04-12 05:51:56 +03:00
alexey-milovidov
716ddc4580
Update isConstant.cpp 2020-04-12 04:26:11 +03:00
Alexey Milovidov
754967bde6 Add function "isConstant" 2020-04-12 04:24:00 +03:00
Alexey Milovidov
dec3e0f986 Make least and greatest functions case insensitive for compatibility with MySQL 2020-04-12 03:38:25 +03:00
alexey-milovidov
00d8e7eefb
Merge branch 'master' into transform_null_in 2020-04-11 23:15:54 +03:00
Ivan
67235834b3
Update libdivide to v3.0 (#10169) 2020-04-11 14:14:01 +03:00
Alexander Kazakov
497df3086f Merge branch 'master' into timed_rwlock 
Change-Id: I620bfde2121ff013773b001d514b40b1e796a58b
 2020-04-10 11:38:20 +03:00
Alexander Kazakov
26dd6140b2 Added new config settings to control timeouts 
* "lock_acquire_timeout" controls for how long a query will continue to
acquire each lock on its argument tables
 * "lock_acquire_timeout_for_background_operations" is a per-table
setting for storages of *MergeTree family
 2020-04-09 21:10:27 +03:00
Vxider
a8cd174fc4 merged with master 2020-04-09 22:34:02 +08:00
alexey-milovidov
0372a6119a
Merge pull request #10110 from amosbird/tsm 
more monotonicity for toString()
 2020-04-08 22:55:04 +03:00
Amos Bird
f1cb928737
more monotonicity for toString() 2020-04-08 20:13:44 +08:00
Amos Bird
0b5cc80580
joinGetOrNull 2020-04-08 11:01:08 +08:00
Vitaly Baranov
c2f5e3c4ad Improve declaration of access rights: single place in code instead of three. 2020-04-07 23:20:38 +03:00
philip.han
53b5dade5e Implement transform_null_in 2020-04-07 20:08:13 +09:00
Artem Zuikov
8297683972
renames: AnalyzedJoin -> TableJoin, Join -> HashJoin (#10065) 2020-04-07 12:48:47 +03:00
Vxider
2fb9138505 merged with master 2020-04-06 17:36:44 +08:00
Alexey Milovidov
110eb599c1 Fix "check style" tool 2020-04-06 02:57:24 +03:00
Ivan Lezhankin
06446b4f08 dbms/ → src/ 2020-04-03 18:14:31 +03:00