Commit Graph

12535 Commits

Author SHA1 Message Date
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
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
cae97b1e59 abs for decimal 2018-08-07 17:35:21 +03:00
chertus
7984b4f91d negate for dec128 2018-08-07 17:12:24 +03:00
chertus
de68022fc5 rewrite Decimal with own data type 2018-08-07 16:57:28 +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
chertus
b700d7c7db minor changes 2018-08-06 16:48:40 +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
chertus
c590a74981 Merge branch 'master' into decimal 2018-08-06 13:38:18 +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
ap11
2d41b958a3 add test 2018-08-06 12:35:13 +03:00
VadimPE
af9b288969 CLICKHOUSE-3714 add function in Context 2018-08-06 12:09:45 +03:00
VadimPE
d0f587bfc9 CLICKHOUSE-3714 fix 2018-08-06 11:58:30 +03:00
VadimPE
c30d459168 CLICKHOUSE-3714 fix 2018-08-06 11:43:34 +03:00
VadimPE
c15ba5e7d9 CLICKHOUSE-3714 2018-08-06 11:30:54 +03:00
VadimPE
490efebe62 CLICKHOUSE-3714 add size pf all part in partition 2018-08-06 11:27:59 +03:00
VadimPE
93202ca781 CLICKHOUSE-3714 fix code-style and copy-paste 2018-08-06 11:25:29 +03:00
Alexey Milovidov
e523f9a2c8 Fixed names [#CLICKHOUSE-2] 2018-08-05 11:54:57 +03:00
Alexey Milovidov
2ebe6beb10 Whitespace [#CLICKHOUSE-2] 2018-08-05 09:47:02 +03:00
Alexey Milovidov
b9914d6bcd Revert "Updated tests #2094"
This reverts commit 47554229c0.
2018-08-05 09:19:49 +03:00
Alexey Milovidov
d99ef95846 Revert "Check for ambiguous column names in subqueries #2094"
This reverts commit 36eae150d6.
2018-08-05 09:18:53 +03:00
Alexey Milovidov
7459edfa42 Removed support for CHECK TABLE for Distributed tables [#CLICKHOUSE-2] 2018-08-05 09:01:41 +03:00
Alexey Milovidov
47554229c0 Updated tests #2094 2018-08-05 08:25:37 +03:00
Alexey Milovidov
cf2df6d780 Added a test from Stas Sviridov #2083 2018-08-05 07:56:19 +03:00
Alexey Milovidov
ab96e1d581 Imported test from #2094 2018-08-05 07:06:49 +03:00
Alexey Milovidov
36eae150d6 Check for ambiguous column names in subqueries #2094 2018-08-05 07:02:29 +03:00
Alexey Milovidov
4a5d00b6e7 Removing clusters when they are removed from config #2777 2018-08-05 06:55:41 +03:00
Alexey Milovidov
5bce1d78b0 Correct number of columns is returned from an element of UNION ALL inside a subquery if some column was queried more than once #2786 2018-08-05 06:28:31 +03:00
Alexey Milovidov
114725b526 In case of ambiguous column names in block, index by name will point to first column #2094 2018-08-05 05:40:35 +03:00
Alexey Milovidov
c7e960b0a9 Better exception message #2094 2018-08-05 05:39:09 +03:00
Alexey Milovidov
1b1754e598 Fixed build #2794 2018-08-04 00:13:54 +03:00
Alexey Milovidov
fd42e90b2a Merging; added a test #2618 #2611 #1770 2018-08-03 23:25:47 +03:00
Alexey Milovidov
bbaa0d369b Merge branch 'uuid-fix' of https://github.com/simPod/ClickHouse into simPod-uuid-fix 2018-08-03 22:59:45 +03:00
Anton Popov
6c3d780552 ClickHouse 3551 Remove external dictionaries, when config updated (#2779)
* CLICKHOUSE-3551

* CLICKHOUSE-3551 Remove external dictionaties, when config updated

* CLICKHOUSE-3551 Remove external dictionaties, when config updated

* Update config.xml
2018-08-03 22:49:03 +03:00
Alexey Zatelepin
a70301d1f2 add tests for mutations cleaner [#CLICKHOUSE-3828] 2018-08-03 22:21:44 +03:00
Alexey Zatelepin
b6b54eea52 old mutations cleaner for ReplicatedMergeTree engines [#CLICKHOUSE-3828] 2018-08-03 22:21:44 +03:00
Alexey Zatelepin
a0730d7696 old mutations cleaner for non-replicated MergeTree engines [#CLICKHOUSE-3828] 2018-08-03 22:21:44 +03:00
Alexey Zatelepin
94723bea63 add setting [#CLICKHOUSE-3828] 2018-08-03 22:21:44 +03:00
Alexander Marshalov
154d7e3228 Added SETTINGS clause for Kafka storage engine 2018-08-03 21:51:28 +03:00
Alexey Milovidov
0c233d668f Removed useless file; preparations #2791 2018-08-03 21:47:44 +03:00
proller
010350a088 Build fixes (#2794)
* More information in 'Cannot read all data' errors

* Build fixes

* Apple version fix

* Fix

* clean

* New libs fixes

* Freebsd fixes

* macos fix

* Fix macos build

* fix

* fix

* Update CMakeLists.txt

* freebsd fix

* fix

* Update CMakeLists.txt
2018-08-03 19:39:04 +03:00
chertus
a338f657d5 unari arithm operations for decimal (partial support) 2018-08-03 19:32:55 +03:00
Alexey Milovidov
5940f7b1da Auto version update to [18.9.0] [54404] 2018-08-03 19:17:07 +03:00
chertus
e31e4e164f add least and greatest funcs for decimal 2018-08-03 17:46:02 +03:00
Vadim
43cf3d2b2f
Update Context.cpp 2018-08-03 17:22:01 +03:00
Vadim
5142407daf
Update IStorage.h 2018-08-03 16:19:53 +03:00
Vadim
d821f8a4cc
Update StorageMergeTree.cpp 2018-08-03 16:17:32 +03:00
chertus
a5a7dc0fdd Merge branch 'master' into decimal 2018-08-03 13:30:27 +03:00
chertus
36b8204114 one more minor fix 2018-08-03 13:28:31 +03:00
chertus
65882bc42e minor fix 2018-08-03 13:20:44 +03:00
VadimPE
1e208c7186 CLICKHOUSE-3714 fix comment and ';' 2018-08-03 12:54:46 +03:00
VadimPE
b97fa2eb4d CLICKHOUSE-3714 bool ckeck_CanBeDropped -> void ... 2018-08-03 12:39:01 +03:00
VadimPE
6142d9ae6a CLICKHOUSE-3714 fix function names and get partition size 2018-08-03 11:33:57 +03:00
alexey-milovidov
f2d0746056
Update Server.cpp 2018-08-02 23:32:00 +03:00
chertus
e1881d4cfb fix decimal vs int arithm, add some tests 2018-08-02 17:28:55 +03:00
ap11
860587b2ef fix typo 2018-08-02 12:39:47 +03:00
ap11
d30a90dcac add murmurHash3, update FunctionStringHash template 2018-08-02 12:21:26 +03:00
VadimPE
98c33de4e3 CLICKHOUSE-3714 2018-08-02 12:03:38 +03:00
VadimPE
08fe108ba8 CLICKHOUSE-3714 fix methods name 2018-08-02 11:48:57 +03:00
robot-clickhouse
b324f69ede Auto version update to [18.8.0] [54403] 2018-08-02 11:35:38 +03:00
Alexey Milovidov
76e06fe0eb Don't escape values of parameters of ODBC connection string if it is not necessarily, because drivers don't recognize them [#CLICKHOUSE-3861] 2018-08-02 08:30:52 +03:00
alexey-milovidov
9cd5228df2
Using jemalloc instead of tcmalloc. (#2773)
* Added jemalloc as submodule [#CLICKHOUSE-2]

* Imported jemalloc-cmake [#CLICKHOUSE-2]

* Added README for jemalloc-cmake [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Trying to add jemalloc [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]

* Add support for jemalloc: development [#CLICKHOUSE-2]
2018-08-02 03:20:20 +03:00
robot-clickhouse
0906c61a10 Auto version update to [18.7.1] [54402] 2018-08-02 01:24:01 +03:00
chertus
267f28f98d decimal arithm (basic support) 2018-08-01 22:50:19 +03:00
Alexey Milovidov
60187ab716 Miscellaneous [#CLICKHOUSE-3861] 2018-08-01 21:21:03 +03:00
Alexey Milovidov
eb697dca93 Addition to prev. revision [#CLICKHOUSE-3861] 2018-08-01 21:13:35 +03:00
Vadim
f6736a0e6e
Update Context.cpp 2018-08-01 20:44:23 +03:00
Vadim
c30ab5a035
Update StorageMaterializedView.h 2018-08-01 20:43:58 +03:00
Vadim
034a88a504
Merge branch 'master' into CLICKHOUSE-3714 2018-08-01 20:42:56 +03:00
VadimPE
66d9ba3eb7 CLICKHOUSE-3714 add max_partition_size_to_drop 2018-08-01 20:41:18 +03:00
robot-clickhouse
dc5249d0c1 Auto version update to [18.7.0] [54402] 2018-08-01 16:20:46 +03:00
robot-clickhouse
2f612bbcc1 Auto version update to [18.6.0] [54401] 2018-08-01 00:50:05 +03:00
proller
d72ba2701b CLICKHOUSE-3771 Preparing for new version scheme [WIP] (#2646)
* CLICKHOUSE-3771: compatible version transfer

* Fix

* Fixed compatibility

* fix

* Auto version update to [1.1.54401] [54398]

* fix auto revision up

* fix

* comments

* clean

* fix

* Send/recieve patch if we can

* fix

* Auto version update to [18.2.0] [54397]

* Client version in query_log

* Update TCPHandler.cpp

* Update Connection.cpp

* Update Defines.h
2018-08-01 00:36:18 +03:00
alexey-milovidov
405d7f9232
Merge pull request #2742 from yandex/support-join-on-syntax
Support join on syntax
2018-08-01 00:30:46 +03:00
alesapin
e81108b954 CLICKHOUSE-3863: Add more convinient exception message 2018-08-01 00:29:47 +03:00
alesapin
2db2d208e1 CLICKHOUSE-3863: Add HTTPS support for interserver replication 2018-08-01 00:29:47 +03:00
Alexey Milovidov
1cdbf16837 More tests [#CLICKHOUSE-3861] 2018-08-01 00:25:26 +03:00
alexey-milovidov
0f25e8277c Update validateODBCConnectionString.cpp 2018-08-01 00:25:26 +03:00
alexey-milovidov
369145bd30 Update validateODBCConnectionString.cpp 2018-08-01 00:25:26 +03:00
Alexey Milovidov
c9ab39c8c6 Added validation of ODBC connection string [#CLICKHOUSE-3861] 2018-08-01 00:25:26 +03:00
Nikolai Kochetov
9359ae7650 Fix test. 2018-07-31 20:34:17 +03:00
alexey-milovidov
f6b9c46d24
Update ExpressionAnalyzer.cpp 2018-07-31 06:04:35 +03:00
robot-metrika-test
0826127d48 Auto version update to [18.5.1] [54400] 2018-07-31 04:28:24 +03:00
Alexey Milovidov
3caadfadc6 Fixed test #2750 2018-07-31 04:24:32 +03:00
robot-clickhouse
d3db10f315 Auto version update to [18.5.0] [54400] 2018-07-30 23:43:16 +03:00
Alexey Milovidov
b5b48d59fa Compatibility with obsolete version of Poco for alternative build variants #2759 2018-07-30 23:21:45 +03:00
Nikolai Kochetov
368e7d0b08 Added joined_block_actions to SubqueryForSet for join subquery. [#CLICKHOUSE-3761]
3Added joined_block_actions to join expression action.
2018-07-30 22:41:27 +03:00
Nikolai Kochetov
bc054f2247 Fix tests. [#CLICKHOUSE-3761] 2018-07-30 22:40:43 +03:00
chertus
321615ce56 make 00700_decimal_bounds test stable 2018-07-30 22:19:06 +03:00
chertus
4a1b7cfebf Merge branch 'master' into decimal 2018-07-30 21:51:08 +03:00
alexey-milovidov
98e9f4c24c
Merge pull request #2761 from 4ertus2/negative
Fix client's --testmode (allow multiple negative tests with clientError)
2018-07-30 21:48:36 +03:00
Alexey Zatelepin
4863c5c178 fix potential segfault in MergeTreeData::delayInsertOrThrowIfNeeded [#CLICKHOUSE-3862] 2018-07-30 21:47:24 +03:00
Alexey Zatelepin
cc7950a733 don't destroy Cleanup- and AlterThread objects, just deactivate the tasks [#CLICKHOUSE-3862]
Otherwise segfaults are possible when the objects are recreated in the middle of the queue task execution.
2018-07-30 21:47:24 +03:00
chertus
5294c1ec9e Merge branch 'master' into negative 2018-07-30 21:39:36 +03:00
chertus
5f46894cf0 CLICKHOUSE-2 client testmode fixes: reconnect on clientError, clear expected errors, return error to OS 2018-07-30 21:27:04 +03:00