Commit Graph

12671 Commits

Author SHA1 Message Date
Alexey Milovidov
03af27a218 Fixed warnings #2015 2018-08-15 00:48:39 +03:00
Alexey Milovidov
9916a75f2e Merging #2482 2018-08-15 00:35:26 +03:00
alexey-milovidov
ce9c6a5ab3
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:34:23 +03:00
Alexey Milovidov
c80db48a6e Merging #2482 2018-08-15 00:32:49 +03:00
alexey-milovidov
8586e6bb2e
Merge pull request #2787 from zhang2014/fix/replace_asterisk
ISSUES-2786 fix replace asterisk with join query
2018-08-15 00:28:35 +03:00
Alexey Milovidov
c72482528c Merging #2482 2018-08-15 00:18:14 +03:00
Alexey Milovidov
93c9eab088 Merging #2482 2018-08-15 00:15:17 +03:00
chertus
7ca6a0737d some more build fixes 2018-08-15 00:12:23 +03:00
alexey-milovidov
e7b671ec98
Merge branch 'master' into feature/ISSUES-863 2018-08-15 00:10:21 +03:00
Alexey Milovidov
21579a3cc8 Removed static std::string variable #2482 2018-08-14 23:56:23 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
alexey-milovidov
c376b2d476
Merge pull request #2869 from yandex/low-cardinality-fixes
LowCardinality fixes
2018-08-14 22:36:19 +03:00
alexey-milovidov
beabb91903
Update IFunction.cpp 2018-08-14 22:35:52 +03:00
Alexey Milovidov
979154122f Changed strange name #2846 2018-08-14 22:34:25 +03:00
chertus
44c3166c6e Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 22:17:28 +03:00
chertus
21fe103831 fix clang build 2018-08-14 22:16:56 +03:00
Nikolai Kochetov
2953be89a4 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-14 21:00:41 +03:00
Nikolai Kochetov
fce3bc193b Updated test for JOIN ON syntax. [#CLICKHOUSE-3761] 2018-08-14 21:00:17 +03:00
Nikolai Kochetov
2f0f7eacbf Updated test. [#CLICKHOUSE-3621] 2018-08-14 20:19:55 +03:00
Nikolai Kochetov
26f464a4f9 Fix Const(LowCardinality) conversion. [#CLICKHOUSE-3621] 2018-08-14 20:19:48 +03:00
Nikolai Kochetov
f61fdf2076 Better const resolution for LowCardinality type. [#CLICKHOUSE-3621] 2018-08-14 20:19:40 +03:00
alexey-milovidov
c5b90717c2
Merge pull request #2828 from alesapin/master
CLICKHOUSE-3878: ODBC-Bridge tool implementation
2018-08-14 17:25:43 +03:00
chertus
15cdd7b2bd make clang happy 2018-08-14 17:19:58 +03:00
alesapin
942d9a5fee
Merge branch 'master' into master 2018-08-14 17:09:27 +03:00
proller
a2343890dd Build fixes (#2864)
* Try fix internal compiler headers path

* Build fixes

* fix

* wip

* clean

* Update arch.cmake
2018-08-14 16:31:26 +03:00
chertus
8c54b480bc minor fix 2018-08-14 16:26:23 +03:00
chertus
74823c8c17 add allow_experimental_decimal to settings 2018-08-14 15:51:45 +03:00
chertus
241b05c80a merge master 2018-08-14 15:50:28 +03:00
alesapin
edc2dc45b6
Merge branch 'master' into master 2018-08-14 13:35:32 +03:00
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alexey-milovidov
6b3375393d
Merge pull request #2840 from VadimPE/CLICKHOUSE-3211
CLICKHOUSE-3211 add TOP m, and OFFSET k
2018-08-14 12:55:12 +03:00
alexey-milovidov
f42bd36fa0
Merge pull request #2856 from zhang2014/feature/add_check_access_database_for_system_tables
Add check access database for system tables
2018-08-14 12:53:43 +03:00
Vadim
077ed3a61b
Update 00687_top_and_offset.sql 2018-08-14 12:12:38 +03:00
Vadim
f6d6c4b8f7
Update 00687_top_and_offset.sql 2018-08-14 12:09:25 +03:00
zhang2014
e51264c3a5 Add check access database for system tables 2018-08-14 11:28:32 +08:00
alexey-milovidov
3e9f25b1b4
Merge pull request #2830 from yandex/data-type-with-dictionary
LowCardinality data type.
2018-08-13 23:49:21 +03:00
Nikolai Kochetov
df73ef1ba5 Fix tests. 2018-08-13 22:43:26 +03:00
alesapin
83d5dba53b CLICKHOUSE-3878: Move ODBCDictionary to odbc-bridge 2018-08-13 21:10:26 +03:00
Nikolai Kochetov
4f31d136cb Fix build. 2018-08-13 20:52:57 +03:00
Nikolai Kochetov
5d5344f106 Added allow_experimental_low_cardinality_type setting. 2018-08-13 20:02:54 +03:00
alexey-milovidov
c19213c6e7
Merge pull request #2845 from yandex/fix-arrayDistinct
fix arrayDistinct
2018-08-13 19:46:53 +03:00
alesapin
88f1346be4
Merge pull request #2860 from alesapin/fix_test
Fix 00606_quantiles_and_nans test
2018-08-13 18:59:11 +03:00
Vadim
8510bc3bbd
del white space 2018-08-13 18:31:45 +03:00
alesapin
808068526b Fix 00606_quantiles_and_nans test 2018-08-13 18:03:53 +03:00
alesapin
d6fbf23e9d Fix 00606_quantiles_and_nans test 2018-08-13 18:02:23 +03:00
alesapin
76baaf9620 CLICKHOUSE-3878: Remove redundant prefix 2018-08-13 18:00:41 +03:00
Vadim
e51e0f5eb9
Update ErrorCodes.cpp 2018-08-13 15:22:58 +03:00
Vadim
4e0e500e15
Update 00687_top_and_offset.sql 2018-08-13 13:49:00 +03:00
Vadim
b9b6818325
Merge branch 'master' into CLICKHOUSE-3211 2018-08-13 13:48:44 +03:00
Vadim
ed97f7e475
Update 00687_top_and_offset.sql 2018-08-13 13:47:38 +03:00
Vadim
61a26f7846
Update ErrorCodes.cpp 2018-08-13 13:46:06 +03:00
VadimPE
bb9d99b00c CLICKHOUSE-3211 add Exception 2018-08-13 13:45:27 +03:00
alesapin
a78904a2ef Merge remote-tracking branch 'upstream/master' 2018-08-13 13:35:42 +03:00
robot-clickhouse
940a453034 Auto version update to [18.10.3] [54405] 2018-08-13 12:42:01 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
zhang2014
59b25812e7 Add check access database for system tables 2018-08-13 17:35:40 +08:00
sundy-li
4b9a1390ff add quantile tests 2018-08-13 17:28:49 +08:00
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal 2018-08-13 11:57:42 +03:00
VadimPE
a2b1100a82 add tests 2018-08-13 11:52:56 +03:00
sundy-li
65670bc33a return nan when quantileExact with empty float column 2018-08-13 16:33:51 +08:00
robot-clickhouse
9d44eebfe6 Auto version update to [18.10.2] [54405] 2018-08-13 11:30:02 +03:00
alexey-milovidov
6114dfbad2
Merge pull request #2851 from zhang2014/feature/add_dependies_for_system_tables
ISSUES-2850 add dependencies for system tables
2018-08-13 07:57:26 +03:00
Alexey Milovidov
7e50c88538 Added test case [#CLICKHOUSE-3891] 2018-08-13 07:35:12 +03:00
zhang2014
741abc2644 ISSUES-2803 add query test #2803 2018-08-13 11:02:50 +08:00
zhang2014
62a85536b4 ISSUES-2786 add asterisk_left_columns_only setting 2018-08-13 11:02:50 +08:00
zhang2014
d7cd77640d ISSUES-2786 fix replace asterisk with join query 2018-08-13 11:01:55 +08:00
alesapin
53b23e0113 CLICKHOUSE-3878: Add inherited fd's closing function 2018-08-12 15:23:22 +03:00
zhang2014
d766d4b014 ISSUES-2850 add dependencies for system tables 2018-08-12 16:05:12 +08:00
zhang2014
dd10e85e90 ISSUES-2850 add dependencies for system tables 2018-08-11 17:35:29 +08:00
proller
1e3c637741 Try fix internal compiler headers path 2018-08-11 02:28:33 +03:00
proller
3af99efd65 CLICKHOUSE-3530: Versioned inetrnal compiler headers (#2837) 2018-08-10 22:53:49 +03:00
Kirill Shvakov
a3ace87046 Add new system table "merge_tree_settings" (#2841)
* #2249 allow macros while creating kafka engine

* Update Macros.cpp

* Update Macros.h

* Add system table: merge_tree_settings
2018-08-10 20:42:12 +03:00
Vadim
552d789aa6
Update FunctionsArray.cpp 2018-08-10 18:29:28 +03:00
Vadim
2c6a9b2a92
Update FunctionsArray.h 2018-08-10 18:27:06 +03:00
alesapin
f11574cbfb CLICKHOUSE-3878: Sleep optimization 2018-08-10 18:07:54 +03:00
chertus
01c8b1d7bb decimal field extraction (from column or type) 2018-08-10 17:57:55 +03:00
alesapin
c3588a582c CLICKHOUSE-3878: Add some comments and small readme 2018-08-10 17:46:12 +03:00
Nikolai Kochetov
4a62ab9d5c Merged with master. 2018-08-10 16:53:08 +03:00
alesapin
cd9a016f62 CLICKHOUSE-3878: Fix merge conflict 2018-08-10 14:43:20 +03:00
alesapin
dde09bd8a5 CLICKHOUSE-3878: Start bridge not like daemon but background child, more explicit logging, fix mutex bug, add SCOPE_EXIT in bridge 2018-08-10 14:42:12 +03:00
VadimPE
6e461213bb CLICKHOUSE-3211 add tests 2018-08-10 14:27:55 +03:00
VadimPE
e8ebcc4d48 CLICKHOUSE-3211 add TOP m, and OFFSET k 2018-08-10 14:12:43 +03:00
Alexey Milovidov
9c3cd25f6e Fixed link order #1983 2018-08-10 07:53:45 +03:00
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
alesapin
04db4ddc46 CLICKHOUSE-3878: Next iteration in odbc-bridge 2018-08-09 21:49:05 +03:00
chertus
479166283e DecField (in progress) 2018-08-09 19:32:01 +03:00
alesapin
6d40546a9a CLICKHOUSE-3878: Remove connection string building and validation, change format of columns in request, more convinient exception messages 2018-08-09 15:57:34 +03:00
chertus
2b4171af1f remove comment 2018-08-09 15:34:10 +03:00
chertus
cc033803d1 decimale Dec128 arithm overflow 2018-08-09 15:24:03 +03:00
Nikolai Kochetov
b52cb07c2c Less compiler warnings. 2018-08-09 14:44:09 +03:00
Nikolai Kochetov
da822f1cf3 Merged with master. 2018-08-09 14:32:19 +03:00
Nikolai Kochetov
2099d8b7e8 Fixed DataTypeWithDictionary serialization. 2018-08-09 13:52:58 +03:00
Nikolai Kochetov
4fd3d57e79 Less compiler warnings. 2018-08-09 13:52:54 +03:00
Nikolai Kochetov
36da1f2871 Added IFunction::isDeterministicInScopeOfQuery(). 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
79db5b261f Less compiler warnings. 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
ab10005af5 Renamed settings for LowCardinality type. 2018-08-09 13:52:46 +03:00
Nikolai Kochetov
dc828d462c Added test for LowCardinality defaults 2018-08-09 13:52:45 +03:00
Nikolai Kochetov
c339313d8b Fix LowCardinality conversions for defaults. 2018-08-09 13:52:33 +03:00
alesapin
bff4bbf634 Merge remote-tracking branch 'upstream/master' 2018-08-09 12:38:43 +03:00
robot-clickhouse
abbbd26e71 Auto version update to [18.10.0] [54405] 2018-08-09 04:42:46 +03:00
chertus
c45b5d9f9a decimal arithm overflow (except dec128) 2018-08-08 23:15:49 +03:00
alesapin
402815977f Add new error in fetchPartition op 2018-08-08 21:01:25 +03:00
alesapin
1bedb971d0 Merge fixes 2018-08-08 19:54:09 +03:00
alesapin
97bcdcedb3 mistake 2018-08-08 19:52:11 +03:00
alesapin
65c6a8ff93 CLICKHOUSE-3878: Try to avoid merge conflict 2018-08-08 19:49:49 +03:00
alesapin
46e9dc132a CLICKHOUSE-3878: Remove redundant message 2018-08-08 19:44:41 +03:00
alesapin
b31dd7bf1f CLICKHOUSE-3878: Correct max_block_size handling 2018-08-08 19:41:08 +03:00
alesapin
fe10ccb1f7 CLICKHOUSE-3878: Remove some copypaste 2018-08-08 19:29:09 +03:00
alesapin
92f3beb95b CLICKHOUSE-3878: Better odbc-bridge with ability to handle custom logs and exceptions 2018-08-08 19:15:29 +03:00
Nikolai Kochetov
f1c05a2192 Added test with LowCardinality strings serialization. 2018-08-08 18:28:19 +03:00
Nikolai Kochetov
95c64aa5a9 Added test for LowCardinality and WithDictionary. 2018-08-08 17:42:04 +03:00
chertus
5f93ab73fa decimal compare overflow 2018-08-08 16:57:16 +03:00
Nikolai Kochetov
0a46943590 Renamed functions makeDictionary, dictionaryIndexes, dictionaryValues to toLowCardinality, lowCardinalityIndexes, lowCardinalityValues. 2018-08-08 16:55:32 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +03:00
Nikolai Kochetov
c8457abb1b Made IFunction::isDeterministic and IFunction::isDeterministicInScopeOfQuery are const. Disabled default implementation with dictionary for not isDeterministicInScopeOfQuery functions. 2018-08-08 14:26:18 +03:00
chertus
16ad0caf37 move int exp from decimal scale to libcommon 2018-08-08 13:56:24 +03:00
chertus
297053bfac decimal compare optimisation 2018-08-08 13:36:03 +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
Nikolai Kochetov
1be7c4122d Renamed WithDictionary(Type) to LowCardinality(Type) and added TypeWithDictionary alias. 2018-08-07 22:31:41 +03:00
Nikolai Kochetov
bd991a5f7a Fixed comments. 2018-08-07 21:32:06 +03:00
Nikolai Kochetov
62dbef2dfc Optimize mapIndexWithAdditionalKeys for DataTypeWithDictionary. 2018-08-07 21:12:17 +03:00
Nikolai Kochetov
e83268a7f4 Optimize mapUniqueIndex for ColumnWIthDictionary. 2018-08-07 21:12:04 +03:00
Nikolai Kochetov
01209533f7 Optimize reverse index for ColumnUnique. 2018-08-07 21:10:16 +03:00
Nikolai Kochetov
3f4348a88b Use HashTableWithSavedHash for strings in ColumnUnique. 2018-08-07 21:09:55 +03:00
Nikolai Kochetov
a109d8f002 Disabled checks for index values in ColumnWithDictionary. 2018-08-07 21:09:49 +03:00
alesapin
dd01eb6b40 CLICKHOUSE-3878: Add odbc-bridge first version 2018-08-07 20:57:44 +03:00