Commit Graph

108 Commits

Author SHA1 Message Date
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
6fa4af882f CLICKHOUSE-3878: Build fixes 2018-08-16 01:00:28 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +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
alesapin
af19d4133d CLICKHOUSE-3878: Move connection string validation to common, remove redundant headers, fix compilation issues 2018-08-14 13:33:41 +03:00
alesapin
76baaf9620 CLICKHOUSE-3878: Remove redundant prefix 2018-08-13 18:00:41 +03:00
alesapin
6fe3f0b13c Merge remote-tracking branch 'upstream/master' 2018-08-13 12:36:27 +03:00
alesapin
53b23e0113 CLICKHOUSE-3878: Add inherited fd's closing function 2018-08-12 15:23:22 +03: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
alesapin
c3588a582c CLICKHOUSE-3878: Add some comments and small readme 2018-08-10 17:46:12 +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
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
alesapin
1bedb971d0 Merge fixes 2018-08-08 19:54:09 +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
Alexey Milovidov
bec5a85030 Fixed test #2813 2018-08-08 05:11:16 +03:00
Alexey Milovidov
5860838776 Fixed inconsistency and bad style #1652 2018-08-08 03:12:40 +03:00
alesapin
dd01eb6b40 CLICKHOUSE-3878: Add odbc-bridge first version 2018-08-07 20:57:44 +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
387e68b106 Better order of linking [#CLICKHOUSE-2] 2018-08-06 23:12:55 +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
e523f9a2c8 Fixed names [#CLICKHOUSE-2] 2018-08-05 11:54:57 +03:00
Alexey Milovidov
1b1754e598 Fixed build #2794 2018-08-04 00:13:54 +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
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
VadimPE
08fe108ba8 CLICKHOUSE-3714 fix methods name 2018-08-02 11:48:57 +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
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
alesapin
2db2d208e1 CLICKHOUSE-3863: Add HTTPS support for interserver replication 2018-08-01 00:29:47 +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
alexey-milovidov
cac790f08f
Update Client.cpp 2018-07-27 20:37:53 +03:00
chertus
6283c3f572 CLICKHOUSE-2: support negative tests 2018-07-27 20:19:22 +03:00
alexey-milovidov
24b0be2cf0
Merge pull request #2727 from alesapin/CLICKHOUSE-3832
CLICKHOUSE-3832: Add HTTP Basic authentification in replication protocol
2018-07-26 20:50:09 +03:00
alesapin
368face3c9 CLICKHOUSE-3832: Fix typo 2018-07-26 19:10:21 +03:00
alesapin
4fb89512b1 CLICKHOUSE-3832: Add error code to exception and change message, also change check for interserver_http_credentials 2018-07-26 19:01:43 +03:00
alesapin
b7f937785d CLICKHOUSE-3832: Remove empty lines 2018-07-26 18:23:16 +03:00
alesapin
6abbfbce87 CLICKHOUSE-3832: Add HTTP Basic authentification in replication protocol 2018-07-26 18:10:57 +03:00
alesapin
175f564137 CLICKHOUSE-3832: Fix bracket 2018-07-26 12:53:59 +03:00
alesapin
c3b4551426 CLICKHOUSE-3832: Add interserver-side authentification. 2018-07-25 19:38:29 +03:00
Alexey Milovidov
7c07f46d50 Style [#CLICKHOUSE-2] 2018-07-24 21:46:23 +03:00
proller
dfa41cdc19 Fix build without readline 2018-07-19 12:29:02 +03:00
proller
51cdec0bec CLICKHOUSE-3771: fixes 2018-07-18 12:48:45 +03:00