Commit Graph

438 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
chertus
70d2c4ecf6 minor changes [CLICKHOUSE-3765] 2018-08-16 14:05:14 +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
0415c9e34a fix int128 to float comparison [CLICKHOUSE-3765] 2018-08-15 19:43:40 +03:00
chertus
3805794e66 some more build fixes 2018-08-15 16:27:22 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
chertus
21fe103831 fix clang build 2018-08-14 22:16:56 +03:00
chertus
241b05c80a merge master 2018-08-14 15:50:28 +03:00
alexey-milovidov
f538bd2113
Merge branch 'master' into decimal 2018-08-13 11:57:42 +03:00
chertus
01c8b1d7bb decimal field extraction (from column or type) 2018-08-10 17:57:55 +03:00
Nikolai Kochetov
4a62ab9d5c Merged with master. 2018-08-10 16:53:08 +03:00
Alexey Milovidov
36db216abf Preparation for extra warnings [#CLICKHOUSE-2] 2018-08-10 07:02:56 +03:00
chertus
479166283e DecField (in progress) 2018-08-09 19:32:01 +03:00
Nikolai Kochetov
f4d9d50168 Merged with master. 2018-08-08 15:01:18 +03:00
chertus
297053bfac decimal compare optimisation 2018-08-08 13:36:03 +03:00
chertus
de68022fc5 rewrite Decimal with own data type 2018-08-07 16:57:28 +03:00
chertus
c590a74981 Merge branch 'master' into decimal 2018-08-06 13:38:18 +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
36eae150d6 Check for ambiguous column names in subqueries #2094 2018-08-05 07:02:29 +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
chertus
a5a7dc0fdd Merge branch 'master' into decimal 2018-08-03 13:30:27 +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
Nikolai Kochetov
65dcca22a2 Substitute aliases for required columns in ExpressionAnalyzer. [#CLICKHOUSE-3761] 2018-07-27 19:02:56 +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
chertus
5ec47b4a1c decimal (in progress) 2018-07-20 22:05:07 +03:00
Nikolai Kochetov
df8e030b2d Fix tests. 2018-07-20 15:30:04 +03:00
proller
51cdec0bec CLICKHOUSE-3771: fixes 2018-07-18 12:48:45 +03:00
Alexey Milovidov
576885c6b8 Little better [#CLICKHOUSE-2] 2018-07-06 21:35:37 +03:00
Alexey Milovidov
083b075631 Removed useless method #2571 2018-07-04 20:28:52 +03:00
alexey-milovidov
1381369638
Update Defines.h 2018-06-28 20:48:05 +03:00
Vitaliy Lyudvichenko
310bb4116e Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-19 23:33:11 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes (#2488)
CONTRIB-254
2018-06-19 21:09:09 +03:00
Vitaliy Lyudvichenko
392f6e0c6c Print query_id in logs. Add own logging interface. [#CLICKHOUSE-2910] 2018-06-18 16:41:13 +03:00
Vitaliy Lyudvichenko
a0e9d17bfd Add query_id and host_name to server logs. [#CLICKHOUSE-2910] 2018-06-15 16:49:01 +03:00
Alexey Milovidov
1c4eb2c586 Data obfuscator: development [#CLICKHOUSE-2] 2018-06-15 08:33:39 +03:00
Vitaliy Lyudvichenko
608895d9ff Disable compression for Log packets. [#CLICKHOUSE-2910] 2018-06-14 18:33:59 +03:00
Vitaliy Lyudvichenko
4cd230f85c Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-06-14 16:04:00 +03:00
alexey-milovidov
fafecb3c25
Better modularity of formats. (#2492)
* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development): removed very old tests #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447

* Formats: better modularity (development) #2447
2018-06-10 22:22:49 +03:00
Vitaliy Lyudvichenko
ac54e52fb3 Add server logs passing to client. [#CLICKHOUSE-2910] 2018-06-07 20:58:50 +03:00
proller
347579ce46 Cmake: mark system includes as SYSTEM (#1449)
* contrib: cctz as submodule. update cctz.

* pbuilder: add ubuntu bionic, devel

* Cmake: mark system includes as SYSTEM

* Build fixes

* fix

* Fix package without compiler

* Better

* fix

* fix

* fix

* Build fix

* fix

* fix

* fix

* Cmake: Add SYSTEM to includes for external libs
2018-06-06 23:21:58 +03:00
Vitaliy Lyudvichenko
89f2107c75 C++ify taskstats getter, periodic auto update of profile events. [#CLICKHOUSE-2910] 2018-06-04 17:50:35 +03:00
Alexey Milovidov
734cebdf09 Non significant changes according to clang's -Weverything, part 1 [#CLICKHOUSE-2] 2018-06-03 19:51:31 +03:00
Alexey Milovidov
fb91bba279 Miscellaneous [#CLICKHOUSE-2] 2018-05-16 03:34:56 +03:00
proller
b6ffdd93e1 Ignore werror in Core/Field.h 2018-05-08 17:46:55 +03:00
Alexey Milovidov
94369e55d3 Fixed style a bit [#CLICKHOUSE-2] 2018-05-07 05:01:29 +03:00
proller
c26b3bdef1
Fix split shared build; fix build without system odbc libs (#2191)
* Fix split shared build

* Fix build without system odbc libs

* Move dbms/src/Common/iostream_debug_helpers.h -> libs/libcommon/include/common/iostream_debug_helpers.h

* Fix build with libiodbc
2018-04-09 06:52:39 -07:00
Alexey Milovidov
e655cb0bff Better debug helpers [#CLICKHOUSE-2] 2018-04-06 07:46:18 +03:00
Alexey Milovidov
1e2b5f24ac Improved debug helpers [#CLICKHOUSE-2] 2018-04-05 19:43:39 +03:00
proller
a6f9df105c Allow use encryption for distributed tables (#2065)
* Allow use encryption for distributed tables

* wip

* fix

* rename encryption to secure

* Fix DirectoryMonitor with +secure

* fix

* fix

* Update DirectoryMonitor.cpp

* Update DirectoryMonitor.cpp
2018-03-29 04:41:06 +03:00