Commit Graph

1032 Commits

Author SHA1 Message Date
Alexey Milovidov
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +03:00
proller
159cdbbb3e Try fix build (link order) 2018-08-20 18:34:37 +03:00
Alexey Milovidov
e0f1637506 Moved file to appropriate place; split to cpp #2482 2018-08-20 05:34:00 +03:00
Alexey Milovidov
f1ba2f9a33 Try to fix "query in form data" feature while still tracking limits for external tables (try №2) #2482 2018-08-20 05:23:35 +03:00
Alexey Milovidov
6fb8b4e5cd Opinionated changes #2893 2018-08-19 23:18:31 +03:00
alesapin
f6c9587d0a CLICKHOUSE-3878: Move last interaction with ODBC from main code to bridge, split Handlers file on three different, slightly remove copy-paste code 2018-08-19 20:09:54 +03:00
Alexey Milovidov
6741582950 Better diagnostic in test #2482 2018-08-19 07:54:14 +03:00
Alexey Milovidov
99b19c3a66 Miscellaneous #2482 2018-08-19 07:45:39 +03:00
Alexey Milovidov
bf68280bf3 Miscellaneous #2482 2018-08-19 07:43:58 +03:00
Alexey Milovidov
c81eaf66da Corrected comment #2482 2018-08-19 07:31:51 +03:00
Alexey Milovidov
1802b00c0b Fixed bad arithmetic; miscellaneous #2482 2018-08-19 07:25:53 +03:00
Alexey Milovidov
1c4f5d3359 Miscellaneous #2482 2018-08-17 21:57:07 +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
alesapin
2583abfccf CLICKHOUSE-3878: Conflict fixes 2018-08-16 01:02:36 +03:00
alesapin
62c166db79 CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:45 +03:00
alesapin
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
9a78ee3e44 Removed static std::string variable #2482 2018-08-16 00:57:40 +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
c8e945d73d one another build fix 2018-08-15 18:29:57 +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
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
alesapin
942d9a5fee
Merge branch 'master' into master 2018-08-14 17:09:27 +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
alesapin
83d5dba53b CLICKHOUSE-3878: Move ODBCDictionary to odbc-bridge 2018-08-13 21:10:26 +03:00
Vadim
e51e0f5eb9
Update ErrorCodes.cpp 2018-08-13 15:22:58 +03:00
Vadim
b9b6818325
Merge branch 'master' into CLICKHOUSE-3211 2018-08-13 13:48:44 +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
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal 2018-08-13 11:57:42 +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
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
alesapin
04db4ddc46 CLICKHOUSE-3878: Next iteration in odbc-bridge 2018-08-09 21:49:05 +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
chertus
5f93ab73fa decimal compare overflow 2018-08-08 16:57:16 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +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
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
Nikolai Kochetov
01209533f7 Optimize reverse index for ColumnUnique. 2018-08-07 21:10:16 +03:00
alesapin
dd01eb6b40 CLICKHOUSE-3878: Add odbc-bridge first version 2018-08-07 20:57:44 +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
chertus
c590a74981 Merge branch 'master' into decimal 2018-08-06 13:38:18 +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
chertus
a5a7dc0fdd Merge branch 'master' into decimal 2018-08-03 13:30:27 +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
Alexey Milovidov
c9ab39c8c6 Added validation of ODBC connection string [#CLICKHOUSE-3861] 2018-08-01 00:25:26 +03:00
chertus
4a1b7cfebf Merge branch 'master' into decimal 2018-07-30 21:51:08 +03:00
alesapin
744258818e CLICKHOUSE-3852: Fix PR remarks 2018-07-29 04:58:05 +03:00
alesapin
1f32701665 CLICKHOUSE-3852: Remove useless newlines 2018-07-29 04:58:05 +03:00
alesapin
652e5ff9e2 CLICKHOUSE-3852: Add ability to set up config parameters from env variables. 2018-07-29 04:58:05 +03:00
chertus
b9fd87eff7 Merge branch 'master' into decimal 2018-07-27 20:31:33 +03:00
chertus
492875e0f7 decimal comparisons with other integers 2018-07-26 18:28:14 +03:00
chertus
c1c149d74b decimal comparisons 2018-07-25 22:38:21 +03:00
alexey-milovidov
dc2c22ffff
Update IFactoryWithAliases.h 2018-07-25 21:46:16 +03:00
alesapin
9adb251689 CLICKHOUSE-3857: Add table table_engines, alias factory base class and columns alias_to and case_insensitive to functions 2018-07-25 19:08:23 +03:00
Alexey Milovidov
7c07f46d50 Style [#CLICKHOUSE-2] 2018-07-24 21:46:23 +03:00
Nikolai Kochetov
bbd13a25e4 Supported JOIN ON syntax for single and chain in expression analyzer. 2018-07-23 18:54:10 +03:00
chertus
5ec47b4a1c decimal (in progress) 2018-07-20 22:05:07 +03:00
proller
51cdec0bec CLICKHOUSE-3771: fixes 2018-07-18 12:48:45 +03:00
proller
c7848d2062 CLICKHOUSE-3771: Fixes 2018-07-17 21:22:32 +03:00
Alexey Milovidov
6a2d8d4f3f Added support for arbitary complex types in "uniq" family of aggregate functions #2010 2018-07-16 06:55:41 +03:00
Alexey Milovidov
215ec2be98 Tiny improvement [#CLICKHOUSE-3820] 2018-07-13 20:27:58 +03:00
Alexey Milovidov
c315200e64 Fixed rare error in ZooKeeper library: callback never called in case when network error happens after reading response header but before response body was read - that will lead to deadlock and readonly table [#CLICKHOUSE-3820] 2018-07-13 00:31:38 +03:00
Alexey Milovidov
d6a3cade18 Whitespaces [#CLICKHOUSE-3820] 2018-07-11 19:10:02 +03:00
Alexey Milovidov
f80081ca03 Fixed chroot prefix in information about exception for ZooKeeper multi transaction (variant 2) [#MDBSUPPORT-204] 2018-07-10 19:14:27 +03:00
Alexey Milovidov
a26a0f5331 Better exception message for KeeperMiltiException [#MDBSUPPORT-204] 2018-07-10 16:47:14 +03:00
Alexey Milovidov
8e0ae12b4e Miscellaneous [#CLICKHOUSE-2] 2018-07-10 16:43:01 +03:00
Simon Podlipsky
6c7ba03d0f
Add missing UInt128 (UUID) field visitors 2018-07-10 00:39:13 +03:00
Alexey Milovidov
7707b5a209 Improvement [#CLICKHOUSE-3810] 2018-07-08 02:53:49 +03:00
Alexey Milovidov
4b099e385b Fixed typo #2482 2018-07-04 20:28:06 +03:00
alexey-milovidov
3904ba561f
Merge branch 'master' into CLICKHOUSE-2910 2018-06-28 20:47:25 +03:00
Mikhail Surin
c7a305eca3 fix float transform 2018-06-28 16:36:40 +03:00
Alexey Zatelepin
2447755700 BackgroundSchedulePool: remove task from delayed even it it is currently executing
If the task was left in the delayed_tasks set, it could lead to a nasty bug:
delayExecutionThreadFunction() would schedule the task, then it would immediately
go on a next iteration and schedule the same task again. Thus this task would be
continually executing, and other delayed tasks would have no chance to run.
2018-06-27 13:47:58 +03:00
Alexey Zatelepin
7ce74d1730 ZooKeeper client: before the fix we waited 2x longer than necessary before the timeout 2018-06-22 18:30:29 +03:00
proller
a31adcfdea Allow use unbundled cpuid (#2543)
* Wait test server startup for 5s

* clean

* Allow use system libcpuid

* cpuid: move include/cpuid/ -> include/libcpuid/

* fix
2018-06-21 20:35:03 +03:00
proller
e1ae5233df Add // Y_IGNORE tags 2018-06-21 18:24:36 +03:00
Vitaliy Lyudvichenko
1a4157f2a9 clickhouse_common_io does not depend on dbms. [#CLICKHOUSE-2910]
Get rid of extra linking dependencies for clickhouse_common_io. [#CLICKHOUSE-2910]
2018-06-21 15:13:56 +03:00
Vitaliy Lyudvichenko
358e4ae9bf Fixed failures in utils, more precise test. [#CLICKHOUSE-2910] 2018-06-20 18:41:15 +03:00
Vitaliy Lyudvichenko
310bb4116e Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-19 23:33:11 +03:00
Vitaliy Lyudvichenko
e13ba09004 Rewritten ThreadStatus via adding shared thread state. [#CLICKHOUSE-2910]
Fixed race condition in SystemLog.
2018-06-19 23:30:35 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes (#2488)
CONTRIB-254
2018-06-19 21:09:09 +03:00
Vitaliy Lyudvichenko
e031b5360a Minor enhancement. [#CLICKHOUSE-2910] 2018-06-18 16:50:20 +03:00
Vitaliy Lyudvichenko
392f6e0c6c Print query_id in logs. Add own logging interface. [#CLICKHOUSE-2910] 2018-06-18 16:41:13 +03:00
Alexey Milovidov
82102c6896 Fixed conflicting headers on Fedora Rawhide while using Linux native AIO #2520 2018-06-18 04:33:34 +03:00
Alexey Milovidov
2298f1c68b Fixed strange code #2501 2018-06-16 08:54:06 +03:00
Alexey Milovidov
e4776e8b5d Fixed build (no include path was specified) #2513 2018-06-16 05:31:41 +03:00
alexey-milovidov
d853b28543
Merge pull request #2513 from yandex/trim-exit-string
Trim exit string
2018-06-16 05:15:25 +03:00
alexey-milovidov
d578bcbd5c
Update StringUtils.h 2018-06-16 05:14:37 +03:00
alexey-milovidov
e6daa67beb
Merge pull request #1890 from yandex/lz4_experiments
Faster LZ4 decompression (experimental) + simple draft of data mutator.
2018-06-16 04:57:47 +03:00
Vitaliy Lyudvichenko
a0e9d17bfd Add query_id and host_name to server logs. [#CLICKHOUSE-2910] 2018-06-15 16:49:01 +03:00