Commit Graph

12278 Commits

Author SHA1 Message Date
Alexey Milovidov
cc8a0488d3 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-10 07:03:32 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
robot-clickhouse
e53899a561 Auto version update to [18.10.1] [54405] 2018-08-10 06:02:50 +03:00
Alexey Milovidov
d8ca4345b6 Fixed style violations [#CLICKHOUSE-2] 2018-08-10 04:41:54 +03:00
Alexey Milovidov
29e40f0087 Fixed potential error #2832 2018-08-10 04:31:55 +03:00
Anton Popov
c019d732c5 ClickHouse 3419 Add setting prefer_localhost_replica (#2832)
* add setting prefer_localhost_replica

* add prefer_localhost_replica setting

* fix bugs

* update setting comment

* Add test for prefer_localhost_replica

* fix bug
2018-08-10 04:27:54 +03:00
proller
973bdab77f Format ODBCDriver2 with NULL support (#2834)
* Format ODBCDriver2 with NULL support

* Fix comment

* Update ODBCDriver2BlockOutputStream.cpp

* clean
2018-08-10 04:20:10 +03:00
Alexey Milovidov
b6d6b57cec Revert "Fixed link order #2807"
This reverts commit 2f2fafb74a.
2018-08-10 00:01:59 +03:00
Alexey Milovidov
2f2fafb74a Fixed link order #2807 2018-08-09 23:43:28 +03:00
robot-clickhouse
abbbd26e71 Auto version update to [18.10.0] [54405] 2018-08-09 04:42:46 +03:00
alesapin
402815977f Add new error in fetchPartition op 2018-08-08 21:01:25 +03:00
Alexey Milovidov
4ae1830f78 Updated instruction [#CLICKHOUSE-2] 2018-08-08 07:14:53 +03:00
Alexey Milovidov
1e316e9229 Fixed error #2795 2018-08-08 07:14:53 +03:00
Amos Bird
bb244e1482 Fix concurrent issue of StorageSetOrJoin. 2018-08-08 06:54:56 +03:00
Alexey Milovidov
e0dc0ccaff Removed misleading message [#CLICKHOUSE-2] 2018-08-08 06:03:26 +03:00
Alexey Milovidov
bec5a85030 Fixed test #2813 2018-08-08 05:11:16 +03:00
Alexey Milovidov
a693258169 Removed merging "config.d" files to every configs. "config.d" is only for "config.xml", users.d for users.xml, etc. Only "conf.d" is used for all configs. [#CLICKHOUSE-2] 2018-08-08 03:58:24 +03:00
Alexey Milovidov
5860838776 Fixed inconsistency and bad style #1652 2018-08-08 03:12:40 +03:00
Alexey Milovidov
1082619320 Added test #2813 2018-08-08 03:10:01 +03:00
Alexey Milovidov
e99a24c12c Fixed test #2813 2018-08-08 03:07:40 +03:00
alexey-milovidov
b1d70c125f Update 00685_output_format_json_escape_forward_slashes.sql 2018-08-08 02:35:32 +03:00
Alex Bocharov
e8d4654419 Remove FormatSettings default value for writeJSONString and add tests for output_format_json_escape_forward_slashes. 2018-08-08 02:35:32 +03:00
alexey-milovidov
4e7b2927dd Update Settings.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
0a4d07b995 Update WriteHelpers.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
bc16e8ca69 Update FormatSettings.h 2018-08-08 02:35:32 +03:00
alexey-milovidov
31cff11fee Update FormatFactory.cpp 2018-08-08 02:35:32 +03:00
alexey-milovidov
03727012a6 Update Settings.h 2018-08-08 02:35:32 +03:00
Alex Bocharov
a8818bb8af Add output_format_json_escape_slashes setting - controls escaping slashes for string outputs in JSON output format. 2018-08-08 02:35:32 +03:00
Alexey Milovidov
d1a548638f Imported stateful tests (without data) [#CLICKHOUSE-3] 2018-08-07 20:10:03 +03:00
Alexey Milovidov
3021852383 Imported stateful tests (without data) [#CLICKHOUSE-3] 2018-08-07 20:08:51 +03:00
chertus
8fde28deda issues-2813 return error code to OS on query processing error 2018-08-07 13:55:39 +03:00
alexey-milovidov
1d7e4a439c
Merge pull request #2791 from CurtizJ/CLICKHOUSE-3785
CLICKHOUSE-3785 add murmurHash3, update FunctionStringHash template.
2018-08-07 00:21:43 +03:00
Anton Popov
0d5c3b7967
Update 00678_murmurhash.sql 2018-08-06 23:53:28 +03:00
Anton Popov
0f2aceba02
Update 00678_murmurhash.reference 2018-08-06 23:52:56 +03:00
Alexey Milovidov
387e68b106 Better order of linking [#CLICKHOUSE-2] 2018-08-06 23:12:55 +03:00
Alexey Milovidov
705cce48f0 Removed misleading comment [#CLICKHOUSE-3] 2018-08-06 23:07:50 +03:00
Alexey Milovidov
9975960d77 Added max_partition_size_to_drop to config #2782 2018-08-06 20:23:27 +03:00
alexey-milovidov
0ef2a94d46
Merge pull request #2782 from VadimPE/CLICKHOUSE-3714
CLICKHOUSE-3714 add max_partition_size_to_drop
2018-08-06 20:20:59 +03:00
alexey-milovidov
72af99fdd5
Merge pull request #2814 from alesapin/master
Fix REPLACE PARTITION logic inside replicated merge tree
2018-08-06 20:18:30 +03:00
alexey-milovidov
aa4b2b1782
Update ReplicatedMergeTreeQueue.h 2018-08-06 20:18:11 +03:00
alexey-milovidov
38c2b2c8ab
Update FunctionsHashing.h 2018-08-06 20:04:32 +03:00
alexey-milovidov
4bfbe80d4f Update MergedBlockOutputStream.cpp 2018-08-06 19:54:00 +03:00
Alexey Zatelepin
72c4d8f064 add assert that MinMax index is correctly initialized [#CLICKHOUSE-3879] 2018-08-06 19:54:00 +03:00
Alexey Zatelepin
6d7c1cfaa4 add test that empty parts correctly merge to an empty part [#CLICKHOUSE-3879] 2018-08-06 19:54:00 +03:00
Alexey Zatelepin
1f2d4f90b9 allow empty parts after merge for Summing, Collapsing and VersionedCollapsing engines [#CLICKHOUSE-3879] 2018-08-06 19:54:00 +03:00
alesapin
134da31177 CLICKHOUSE-3880: Fix comment 2018-08-06 16:18:52 +03:00
alesapin
425918afe1 CLICKHOUSE-3880: Fix replace partition logic inside replicated merge tree 2018-08-06 15:59:51 +03:00
alesapin
b321963b35 CLICKHOUSE-3880: Test for REPLACE PARTITION with failover cases 2018-08-06 13:01:08 +03:00
Anton Popov
efddb89d18
Merge branch 'master' into CLICKHOUSE-3785 2018-08-06 12:42:01 +03:00
ap11
58fe7b3cfc add tests 2018-08-06 12:38:26 +03:00