thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-06 00:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,854 Commits 8,976 Branches 1,768 Tags 1.9 GiB
762f1d3a85
Commit Graph

688 Commits

Author SHA1 Message Date
Yuriy
e4766a4ef9 caching_sha2_password authentication plugin 2019-04-22 13:57:50 +03:00
Alexey Milovidov
ee1a843609 COWPtr: improvements (C++ Russia 2019, suggested by Alexey Malov) 2019-04-19 23:22:06 +03:00
alesapin
214bf77b17
Merge pull request #5012 from nvartolomei/nv/lb-first-or-random 
Add FIRST_OR_RANDOM Load Balancing policy
 2019-04-18 18:54:04 +03:00
alexey-milovidov
ab27970fd7
Merge pull request #5028 from mhsekhavat/patch-1 
Fix settings.max_partitions_per_insert_block type
 2019-04-18 16:39:17 +03:00
proller
ad42179bec Remove rvo_test 2019-04-18 15:25:30 +03:00
Ivan
118bea2be6
Enable predicate push-down optimization by default. (#4846) 
* Enable predicate push-down optimization by default.
* Forbid push-downs for some JOIN cases.
* Fix existing tests
* Forbid optimization if a select query has ARRAY JOIN on any side.
 2019-04-18 13:39:25 +03:00
Vitaly Baranov
58a9105038 Fix ubsan error "outside the range of representable values" in convertFieldToType.cpp 2019-04-17 19:10:40 +03:00
Mohammad Hossein Sekhavat
322079e2af
Fix settings.max_partitions_per_insert_block type 
The `max_partitions_per_insert_block` field is of `size_t` type, rather than `Boolean`
 2019-04-17 10:16:02 +00:00
Nicolae Vartolomei
c2ec23c953
Add FIRST_OR_RANDOM Load Balancing policy 
For cross-replication topology setups load_balancing=in_order works best
as nodes handle equal amount of load and usually they hit only 1/n of
data (n = number of replicas), which makes page cache usage more
efficient.

The problem is when one node of the shard goes down. If one replica goes
down, the next one in config will handle twice the usual load while
remaining ones will handle usual traffic.

Closes #4820.
 2019-04-15 23:31:40 +01:00
alesapin
a53b002973 Merge remote-tracking branch 'origin' into adaptive_index_granularity 2019-04-08 14:29:33 +03:00
Yuriy
2789a83c03 fixed compilation with clang 2019-04-08 10:03:04 +03:00
Yuriy
1dc5c4cba3 explicitly defined constructors 2019-04-07 15:33:06 +03:00
Yuriy
b792568bdc added golang mysql client test 2019-04-07 13:29:30 +03:00
Alexey Milovidov
879d746abd Miscellaneous changes 2019-04-07 01:20:09 +03:00
Alexey Milovidov
07334ebad4 Fixed race condition in DNSCacheUpdater 2019-04-06 04:09:15 +03:00
Nikolai Kochetov
ec65b4c229 Check num columns in Block::cloneWithColumns. 2019-04-05 14:39:07 +03:00
Nikolai Kochetov
7626b1b267 Multiple fixes. 2019-04-05 13:52:07 +03:00
Nikolai Kochetov
5e39ec610c Merged with master 2019-04-03 14:21:38 +03:00
Yuriy
0f3ec94ebd added mysql protocol test 2019-04-03 01:45:06 +03:00
alesapin
69b623c47c Return logic for cache 2019-04-01 14:09:30 +03:00
alesapin
37427077b8 Remove average granularity logic from code 2019-04-01 13:34:22 +03:00
Yuriy
107f33e888 added password check and changed packets serialization 2019-04-01 12:27:39 +03:00
Vitaly Baranov
37b904b8f5
Merge pull request #4808 from vitlibar/kafka-with-protobuf-format 
Kafka with protobuf format
 2019-03-30 19:00:57 +03:00
Vitaly Baranov
a78e067c70 Allow empty row_delimiter when using Kafka. 2019-03-29 17:38:52 +03:00
Alexey Milovidov
8cb1619607 Implement "max_partitions_per_insert_block" setting #4700 2019-03-29 12:34:07 +03:00
Alexey Milovidov
3c29b5f611 Fixed bad code 2019-03-28 21:17:44 +03:00
Alexey Milovidov
42dd521e45 Added a setting to disallow Hyperscan 2019-03-27 00:56:46 +03:00
chertus
0cc90cf2db rename insert_sample_with_metadata setting 2019-03-22 19:15:44 +03:00
proller
fce9db12b9 Move Interpreters/Settings* -> Core/Settings* 2019-03-22 15:08:30 +03:00
Yuriy
bfd53e3ccc draft 2019-03-17 10:11:22 +03:00
proller
1a33f4da40
Optional current_thread and memory_tracker (#4664) 2019-03-14 21:03:35 +03:00
Alexey Milovidov
312148a40d Merge branch 'master' into libcxx-as-submodule 2019-03-14 06:30:00 +03:00
proller
cf8001b6a9
Fix includes (#4673) 2019-03-13 16:58:04 +03:00
Alexey Milovidov
e81d8e8b02 Fixed build 2019-03-12 21:35:23 +03:00
Alexey Milovidov
880cbbb632 Merge branch 'master' into libcxx-as-submodule 2019-03-11 04:03:13 +03:00
alexey-milovidov
97cea95f74
Merge pull request #4536 from amosbird/fixedhashtable 
A Proper lookup table that uses HashTable's API
 2019-03-01 17:47:33 +03:00
Amos Bird
26ab5dd7a7 A Proper lookup table that uses HashTable's API 
This is the first step of allowing heterogeneous cells in hash tables.

performance test results are

```

1. HashMap<UInt16, UInt8, TrivialHash, HashTableFixedGrower<16>>;
2. NewLookupMap<UInt16, UInt8>

ResolutionWidth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................223550276.46
ResolutionWidth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................248772721.24
Best: 2 - 24877272124

ResolutionWidth 100000 1 ..........................................................................................................................................................................................................................................................238498413.99
ResolutionWidth 100000 2 ..........................................................................................................................................................................................................................................................261808889.98
Best: 2 - 26180888998

ResolutionWidth 300000 1 ...................................................................................239307348.81
ResolutionWidth 300000 2 ...................................................................................257592761.30
Best: 2 - 25759276130

ResolutionWidth 1000000 1 .........................240144759.26
ResolutionWidth 1000000 2 .........................257093531.91
Best: 2 - 25709353191

ResolutionWidth 5000000 1 .....241573260.35
ResolutionWidth 5000000 2 .....259314162.79
Best: 2 - 25931416279

ResolutionDepth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................217108119.84
ResolutionDepth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................249459504.41
Best: 2 - 24945950441

ResolutionDepth 100000 1 ..........................................................................................................................................................................................................................................................229065162.17
ResolutionDepth 100000 2 ..........................................................................................................................................................................................................................................................253769105.64
Best: 2 - 25376910564

ResolutionDepth 300000 1 ...................................................................................233079225.18
ResolutionDepth 300000 2 ...................................................................................256316273.78
Best: 2 - 25631627378

ResolutionDepth 1000000 1 .........................234184633.51
ResolutionDepth 1000000 2 .........................261100491.57
Best: 2 - 26110049157

ResolutionDepth 5000000 1 .....233118795.66
ResolutionDepth 5000000 2 .....252436160.41
Best: 2 - 25243616041

```
 2019-03-01 16:47:13 +08:00
alexey-milovidov
918750c3ba
Merge pull request #4535 from yandex/fix-concurrent-alters 
Fix deadlock of concurrent SELECTs and DDL queries
 2019-03-01 04:10:10 +03:00
Alexey Zatelepin
eee73dac42 Merge branch 'master' into fix-concurrent-alters 2019-02-28 19:19:21 +03:00
hcz
8f099af799
Fix readBinary linkage error in Field.cpp 2019-02-28 14:16:45 +08:00
proller
aad2856eba CLICKHOUSE-4179 : arrayEnumerateDenseRanked arrayEnumerateUniqRanked (#4475) 
* Build fixes (clang 7.0.0+)

* better

* wip

* wip

* fix

* fix

* wip

* fix

* clean

* clean

* CLICKHOUSE-4179 WIP

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

*    wip

* wip

* wip

* wip

* wip

* cf

*    wip

* wip

* wip

* wip

* cf

* wip

* wip# Please enter the commit message for your changes. Lines starting

* wip# Please enter the commit message for your changes. Lines starting

* cf

* wip# Please enter the commit message for your changes. Lines starting

* wip

* cf

* wip

* wip

* clean

* clean

* clean

* clean

* wip

* wip

* wip

* cf

* wip

* wip

* wip

* cf

* clean

* wip

* clean

* cf

* clean

* clean

* test

* clean

* wip

* cf

* wip

* clean

* clean

* wip

* wip

* clean

* cf

* clean

* Requested changes

* cf

* no convertToFullColumnIfConst

* clean

* clean

* clean

* fix

* Remove comment
 2019-02-28 01:18:58 +03:00
Alexey Zatelepin
0d7ab9e3ea allow acquiring read lock to a table out of order if it was already locked by the same query [#CLICKHOUSE-3789] 
this is important in preventing ALTER deadlocks
 2019-02-27 21:34:38 +03:00
Nikolai Kochetov
2f98e779e1 Added MergingSortedTransform. 2019-02-26 21:40:08 +03:00
Alexey Milovidov
ae28c46a46 Added workaround for compiler bug 2019-02-26 13:37:47 +03:00
proller
263e69e861
Build fixes (FreeBSD port) (#4397) 2019-02-15 14:46:07 +03:00
Alexey Milovidov
62eb65774a Added suppression for libunwind 2019-02-13 16:42:01 +03:00
alesapin
af4c4dc1e5 Fix old clients insert query processing with embedded data 2019-02-13 15:54:22 +03:00
Nikolai Kochetov
c35439a5f0 Updated FieldVisitor. 2019-02-11 18:46:19 +03:00
Nikolai Kochetov
9787b3a1ee Added Field type AggregateFunctionState. 2019-02-11 14:19:56 +03:00
Alexey Milovidov
29c3195742 Removed bad code; fixed error 2019-02-05 02:18:04 +03:00
Alexey Milovidov
65f8e4d4a8 Merge branch 'master' into global-thread-pool 2019-01-25 16:33:50 +03:00
alexey-milovidov
fbefc99fb1
Merge pull request #4129 from ercolanelli-leo/sumMapFiltered 
implement sumMapFiltered
 2019-01-24 21:27:03 +03:00
alexey-milovidov
18f1266dab
Merge pull request #4099 from yandex/mutations-fix-in 
Get rid of IAST::range
 2019-01-24 20:29:13 +03:00
Léo Ercolanelli
ba1f1c7460 sumMapFiltered: use an unordered_set 2019-01-24 13:32:30 +01:00
Danila Kutenin
7f4b0f3c04 added powerpc build support 2019-01-23 17:18:19 +03:00
Alexey Zatelepin
f3b4292fc6 add data types to the prepared_sets key for literals #4058 2019-01-23 14:20:01 +03:00
Alexey Milovidov
f6b9b06307 Attempt to implemnt global thread pool #4018 2019-01-14 22:22:09 +03:00
Alexey Milovidov
d4f5310358 Miscellaneous [#CLICKHOUSE-2] 2019-01-07 22:57:32 +03:00
Alexey Milovidov
67c236b067 Added some warnings from clang's -Weverything 2019-01-04 17:14:48 +03:00
Alexey Milovidov
cf1cacc366 Added some warnings from clang's -Weverything 2019-01-04 16:54:39 +03:00
Alexey Milovidov
1d4701b0bc Added some warnings from clang's -Weverything 2019-01-04 15:10:00 +03:00
Alexey Milovidov
9a51f0ab7b Preparations for MSan [#CLICKHOUSE-2] 2018-12-28 07:43:24 +03:00
Alexey Milovidov
da5b62ab67 Fixed UB #3926 2018-12-27 04:20:06 +03:00
Alexey Milovidov
732f60c8be Allowed some UB under UBSan #3926 2018-12-27 02:55:09 +03:00
Alexey Milovidov
37a2d51e0c Added attribute #3926 2018-12-27 02:17:04 +03:00
alexey-milovidov
3cefb27e56
Merge pull request #3851 from abyss7/issue-3592 
Refactor constant folding
 2018-12-20 19:26:02 +03:00
Ivan Lezhankin
937c0fb4a4 Treat Enum* types as Int* inside If() function. 2018-12-19 17:02:26 +03:00
Ivan Lezhankin
1a539b3a6d Merge remote-tracking branch 'upstream/master' into issue-3592 2018-12-17 19:30:20 +03:00
Ivan Lezhankin
6df757c6f7 Refactor constant folding and make it reusable for primary_key_expr 2018-12-17 17:59:01 +03:00
Alexey Milovidov
9e6d835137 Preparations #2609 2018-12-14 19:17:09 +03:00
alexey-milovidov
0fdb3b9628
Merge branch 'master' into issue-3578 2018-12-07 23:53:34 +03:00
chertus
60dc8fcac2 fixes for review CLICKHOUSE-3578 2018-12-06 20:20:17 +03:00
Nikolai Kochetov
2bb57ce472 Support insertion into LowCardinality from old native clients. 2018-12-06 17:08:42 +03:00
chertus
8500335ef5 cleanup unused code 2018-12-05 15:49:15 +03:00
chertus
3db00b7b98 Merge branch 'master' into issue-3578 2018-12-05 14:43:14 +03:00
chertus
dcb003bebf fix for review: rename variable CLICKHOUSE-3578 2018-12-04 23:10:43 +03:00
chertus
a71d03737c send defaults via serialized ColumnsDescription CLICKHOUSE-3578 2018-12-04 23:03:04 +03:00
alexey-milovidov
48b30edcf5
Merge branch 'master' into alter-order-by 2018-12-02 21:06:38 +03:00
Alexey Milovidov
52fea90a86 Removed useless code [#CLICKHOUSE-2] 2018-11-28 17:33:40 +03:00
Alexey Zatelepin
1b27fb046d Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/programs/server/Server.cpp
 2018-11-28 16:47:07 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ (#2443) 2018-11-27 19:11:46 +03:00
Alexey Zatelepin
d3d9242462 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Parsers/ASTAlterQuery.h
	dbms/src/Parsers/ParserAlterQuery.cpp
	dbms/src/Storages/AlterCommands.cpp
	dbms/src/Storages/AlterCommands.h
 2018-11-26 16:01:48 +03:00
Alexey Milovidov
c77930fe30 Whitespaces [#CLICKHOUSE-2] 2018-11-26 03:56:50 +03:00
Alexey Milovidov
dbbacf4f87 Added more style checks [#CLICKHOUSE-3] 2018-11-23 21:52:00 +03:00
alexey-milovidov
2c2d75cceb
Don't allow exceptions without code (#3645) 
* Don't allow exceptions without code #3633

* Don't allow exceptions without code #3633
 2018-11-23 00:19:58 +03:00
proller
1d40c2c871 Better link and deps (#3631) 
* try fix 1

* Better deps

* fix

* fix

* fix

* Update CMakeLists.txt

* Update CMakeLists.txt

* fix

* fix

* fix

* disable old

* Update find_odbc.cmake
 2018-11-21 22:20:27 +03:00
alexey-milovidov
f67e54dbf3
Merge pull request #3594 from yandex/CLICKHOUSE-4112 
Add http connection pool between replicas
 2018-11-21 06:57:22 +03:00
Alexey Milovidov
78e72a1962 Little better #3624 2018-11-20 23:09:20 +03:00
alexey-milovidov
98ed411da3
Update Field.h 2018-11-20 20:37:50 +03:00
Alexey Milovidov
38d2e9efa2 Fixed code that was not quite correct 2018-11-20 20:36:21 +03:00
alesapin
57ea89c5f3 Merge branch 'master' into CLICKHOUSE-4112 2018-11-20 20:23:08 +03:00
alesapin
00f1329c59 Merge branch 'master' of github.com:yandex/ClickHouse 2018-11-20 17:04:07 +03:00
alesapin
01e2137364 CLICKHOUSE-4112: Add keepalive for http connections 2018-11-20 16:15:44 +03:00
Sabyanin Maxim
08fc057a15 make is_in_primary_key and etcetera work. add test. 2018-11-19 17:31:16 +03:00
alesapin
2a4a8d180b Try to change stupid naming 2018-11-16 16:33:43 +03:00
alesapin
d4ce674b93 Add http connection pool between replicas 2018-11-16 16:15:17 +03:00
chertus
13646eb4c4 move BlockMissingValues from Block to IBlockInputStream::getMissingValues() 2018-11-15 18:57:20 +03:00
chertus
65d34ca231 do not override current_database in context [CLICKHOUSE-3578] 2018-11-15 18:03:13 +03:00
chertus
ebf3d60186 column defaults without CapNProto [CLICKHOUSE-3578] 2018-11-14 21:20:16 +03:00
Alexey Zatelepin
b071547b2d add checks for ALTER MODIFY ORDER BY [#CLICKHOUSE-3859] 2018-11-14 20:12:32 +03:00
chertus
2fe3cdb3f5 restore lost commits [CLICKHOUSE-3578] 2018-11-12 17:52:30 +03:00
chertus
cc005c3ac9 Merge branch 'master' into issue-3578 2018-11-09 13:12:34 +03:00
proller
9a98b80cf8 Try fix apple build part 2 2018-11-07 16:24:36 +03:00
proller
bb1dafd2b3 Try fix apple build part 1 2018-11-07 15:50:36 +03:00
alexey-milovidov
b1db9ec23c
Merge pull request #3436 from amosbird/master 
Flexible fields assignment
 2018-11-01 20:22:28 +03:00
Amos Bird
3cf2177268 Flexible fields assignment 
Field f;

before:

f = Int64(-42);

after:

f = -42;
 2018-10-24 08:47:33 +08:00
alexey-milovidov
4bf54337b9
Merge pull request #3292 from CurtizJ/order-by-efficient 
Efficiently finish sorting by (x, y) stream, that already sorted by (x) [CLICKHOUSE-4022]
 2018-10-23 11:34:22 +03:00
CurtizJ
6ff8a60460 fix style 2018-10-19 16:04:50 +03:00
CurtizJ
8a72ddd94b wip on finish sorting 2018-10-19 15:02:31 +03:00
Alexey Milovidov
f720a5bf95 Fixed typos in code #3373 2018-10-13 17:33:43 +03:00
Alexey Milovidov
98859f232b Merge branch 'master' into group_by_two_level_compatibility 2018-10-13 02:13:30 +03:00
Alexey Milovidov
218366e17f Fixed error introduced in #3342 2018-10-12 00:31:36 +03:00
Alexey Milovidov
613061cee5 Fixed incompatibility when versions prior to 18.12.17 are used on remote servers and newer is used on initiating server, and GROUP BY both fixed and non-fixed keys, and when two-level group by method is activated [#CLICKHOUSE-4035] 2018-09-28 23:17:38 +03:00
proller
d752d5d62d Prepare to new poco, build fixes (#3072) 
* WIp

* fix

* fix

* test

* fix poco netssl find

* clean

* fixes

* wip

* wip

* new poco

* fixes

* Fixes

* wip

*  clean

* clean

*     clean

* clean

* Update HTTPHandlerFactory.h
 2018-09-14 22:48:51 +03:00
chertus
57260bbd6a math funcs for decimal (Float64 inside) [CLICKHOUSE-3765] 2018-09-14 17:40:51 +03:00
Alexey Milovidov
c7b1a40296 Fixed test [#CLICKHOUSE-2] 2018-09-09 05:23:24 +03:00
chertus
0b35cdae69 refactoring: add some sugar in type checks [CLICKHOUSE-0002] 2018-09-07 17:37:26 +03:00
chertus
3bd586cad9 Merge branch 'master' into decimal 2018-09-06 11:57:46 +03:00
Alexey Milovidov
f584344184 Miscellaneous [#CLICKHOUSE-3939] 2018-09-06 05:24:35 +03:00
chertus
0581545cba disable Decimal Comparison and Conditional compilation [CLICKHOUSE-3765] 2018-09-05 17:56:55 +03:00
chertus
60a39c28d1 better NaN comparison fix [CLICKHOUSE-3760] 2018-09-03 18:57:39 +03:00
chertus
522674d37f fix for NaN comparison [CLICKHOUSE-3760] 2018-09-03 16:34:16 +03:00
chertus
c03291ce60 extract callOnTypeIndex.h from FunctionHelpers.h [CLICKHOUSE-3765] 2018-09-03 13:46:58 +03:00
alexey-milovidov
72c799ad76
Merge pull request #3008 from 4ertus2/decimal 
even more Decimal
 2018-09-03 07:19:33 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
e97d1bb63f Rectification of FunctionsComparison [#CLICKHOUSE-2] 2018-09-02 04:12:32 +03:00
chertus
fe1e3300b7 remove dirty code [CLICKHOUSE-3765] 2018-08-31 20:36:27 +03:00
chertus
845db9b46e CAST for decimal [CLICKHOUSE-3905] 2018-08-31 11:59:21 +03:00
chertus
ee873c8e9f Merge branch 'master' into decimal 2018-08-27 19:18:48 +03:00
chertus
c86f2878ff add special ColumnDecimal instead of ColumnVector<DecimalNN> CLICKHOUSE-3765 2018-08-27 19:16:16 +03:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
chertus
53ec40eeee some decimal field improvements CLICKHOUSE-3765 2018-08-24 19:35:00 +03:00
chertus
54a3c028c5 Merge branch 'master' into decimal 2018-08-24 14:19:41 +03:00
chertus
1467ca5610 decimal field visitors CLICKHOUSE-3765 2018-08-23 22:11:31 +03:00
chertus
cbb80f52c2 own DecimalField for Decimal32/64/128, better field comparison CLICKHOUSE-3765 2018-08-23 17:03:37 +03:00
Alexey Zatelepin
b6aa7542d0 add BackgroundSchedulePool::TaskInfo::activateAndSchedule() method 
Almost always it (and not activate()) is precisely what is needed.
 2018-08-22 16:43:27 +03:00
Alexey Milovidov
6834401118 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:39 +03:00
Alexey Milovidov
deb3ce534c Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 07:04:02 +03:00
Alexey Milovidov
ca5b83ac39 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 06:58:19 +03:00
chertus
eac6dd1c99 Merge branch 'master' into decimal 2018-08-21 21:55:36 +03:00
chertus
1e97f9e549 toDecimalN() functions CLICKHOUSE-3905 2018-08-21 21:25:38 +03:00
Alexey Milovidov
7d76c3fd4f Miscellaneous [#CLICKHOUSE-3765] 2018-08-21 07:31:35 +03:00
proller
159cdbbb3e Try fix build (link order) 2018-08-20 18:34:37 +03:00
chertus
cdff502828 types convertion via helpers CLICKHOUSE-3765 2018-08-20 18:17:55 +03:00
Alexey Milovidov
e0f1637506 Moved file to appropriate place; split to cpp #2482 2018-08-20 05:34:00 +03:00
Alexey Milovidov
aef490d173 Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Common/ODBCBridgeHelper.h
 2018-08-17 00:47:15 +03:00
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +03:00
Alexey Milovidov
76af46ed5d Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 
Conflicts:
	dbms/src/Interpreters/Settings.h
	dbms/tests/queries/0_stateless/00687_top_and_offset.sql
 2018-08-16 00:44:24 +03:00
chertus
0415c9e34a fix int128 to float comparison [CLICKHOUSE-3765] 2018-08-15 19:43:40 +03:00
chertus
3805794e66 some more build fixes 2018-08-15 16:27:22 +03:00