thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-09 18:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,629 Commits 8,985 Branches 1,770 Tags 2.1 GiB
c5dde2c9fd
Commit Graph

1407 Commits

Author SHA1 Message Date
proller
37a9af5a68 CLICKHOUSE-4109 mlock clickhouse (#3553) 
* CLICKHOUSE-4109 mlock clickhouse

* wip

* Fix

* wip

* fix

* fix

* better place

* wip

* clean

* tidy

* fix
 2018-11-14 04:11:13 +03:00
Alexey Milovidov
ead153e9e4 Better code #3565 2018-11-13 22:48:47 +03:00
Alexey Milovidov
69e57187d2 Fixed error; removed unique_ptr #3565 2018-11-13 22:43:17 +03:00
Alexey Zatelepin
29b34365e6 Merge branch 'master' into alter-order-by 
Conflicts:
	dbms/src/Interpreters/ExpressionAnalyzer.cpp
	dbms/src/Storages/MergeTree/MergeTreeData.cpp
	dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
 2018-11-13 16:27:19 +03:00
Alexey Zatelepin
96d7eee785 fix use-after-free in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-13 16:13:46 +03:00
Alexey Zatelepin
ce1ead5b88 allow arbitrary callbacks in ZooKeeperNodeChange [#CLICKHOUSE-3859] 2018-11-13 16:13:29 +03:00
Alexey Zatelepin
a0a9aad777 Stat data in ZooKeeperNodeCache [#CLICKHOUSE-3859] 2018-11-13 16:13:23 +03:00
Amos Bird
6815b25d18 replace std::tuple with std::variant 2018-11-12 03:29:52 +08:00
proller
5678d1ed98 Build fixes (#3545) 
* StorageSystemContributors clean

* Fix

* ARM fixes

* Fix arm compile

* fix

* Fix macos?

* Fix includes

* fix

* fix

* Try fix apple build part 1

* Fix identation

* Fix static libc++ in clang

* fix arm build

* better

* fix

* fix

*  better check-include
 2018-11-10 23:09:07 +03:00
proller
a996326efe Fix identation 2018-11-07 15:55:56 +03:00
Alexey Milovidov
c5173782dc Potentially better #3490 2018-11-05 17:29:38 +03:00
Alexey Milovidov
a191c32254 Potential improvement #3490 2018-11-05 13:34:48 +03:00
Alexey Milovidov
6f00f165e5 Clarifications; potential improvement #3490 2018-11-05 12:32:59 +03:00
proller
f86d1a7034 CONTRIB-254 Arcadia fixes (#3475) 
* Macos: set ENABLE_EMBEDDED_COMPILER=0 by default (because contrib/llvm temporary broken under macos)

* \n

* arcadia fix

* fix arcadia link

* wip

* wip

* wip

* fix

* wip

* wip

* fix

* try use users from server dir

* Revert "try use users from server dir"

This reverts commit 79b2c6fd9c.

* Fix logging

* fix

* Update ZooKeeperImpl.h
 2018-11-01 20:07:20 +03:00
proller
c35c979285 CLICKHOUSE-4085 system.contributors (#3452) 
* CLICKHOUSE-4085 system.contributors

* fi

* Fix random
 2018-10-26 20:43:50 +03:00
alesapin
20b20d04f9 Include from env 2018-10-26 12:22:33 +03:00
alesapin
c951ec7bad CLICKHOUSE-4067: Fixes in odbc dictionaries. Now dictionaries receives bridge path from global config (as it was before). Quotation performed on table and schema independently. Add tests with postgres interaction. Update documentation 2018-10-15 17:49:23 +03:00
Alexandr Krasheninnikov
92916d3b8d Merge https://github.com/yandex/ClickHouse into base64_functions 2018-10-12 11:29:01 +03:00
Alexandr Krasheninnikov
41281ad397 Make compilation on-demand 2018-10-11 19:25:17 +03:00
Marek Vavruša
0652302d9a Common/MemoryTracker: fix metrics not being updated after MemoryTracker reset 
The #3230 fixed a problem with memory accounting, but it introduces a regression
in which the memory tracker isn't reset until there are zero queries in process list.
This makes it difficult to see in tests as there's always just one query in-flight,
but in production it produces a sawtooth memory usage pattern that resets when
the allocated memory exceeds set memory limits and all queries are terminated.
 2018-10-10 17:37:41 -07:00
alesapin
8591038748 Fix style and clang build 2018-10-10 11:38:54 +03:00
alexey-milovidov
1472e3ae66
Merge pull request #3210 from alex-krash/jdbc-bridge 
External database access unification (jdbc/odbc bridges)
 2018-10-10 02:26:56 +03:00
Alexandr Krasheninnikov
27f288641e Fix config reference, header inclusion and failed tests 2018-10-09 18:03:41 +03:00
Alexey Milovidov
64c7e357e8 Fixed error #3230 2018-10-08 08:30:03 +03:00
Alexey Milovidov
25a3cc4dc2 Merge remote-tracking branch 'origin/master' into fix-memory-tracker 2018-10-04 23:49:38 +03:00
Alexandr Krasheninnikov
d94b574644 Removing destructor 2018-10-04 16:19:08 +03:00
Alexandr Krasheninnikov
82200bc16a Added error codes, bridge startup, fixed destructor in XDBC stuff 2018-10-03 15:10:57 +03:00
Alexandr Krasheninnikov
c7fee9374c fix formatting errors according code review 2018-10-03 13:44:43 +03:00
alexey-milovidov
147a2a13c2
Merge pull request #3257 from amosbird/master 
Correct wcwidth computation for pretty outputs.
 2018-10-02 16:23:41 +03:00
Amos Bird
7df73088ab Correct wcwidth computation for pretty outputs. 2018-10-02 10:06:18 +08:00
alexey-milovidov
7c6b08c21c
Merge pull request #3251 from CurtizJ/table-db-macros 
Support {database} and {table} macros in ReplicatedMergeTree [CLICKHOUSE-3897]
 2018-10-01 21:45:52 +03:00
alexey-milovidov
6432cff455
Update Macros.h 2018-10-01 21:45:39 +03:00
CurtizJ
ed77e40dfe fix implicit macros 2018-10-01 12:01:50 +03:00
CurtizJ
b7b7314ecb remove redundant code 2018-09-28 22:13:16 +03:00
CurtizJ
e0d3aed0c4 remove redundant code 2018-09-28 22:10:16 +03:00
proller
ec11bef633
Build fixes (#3181) 2018-09-28 17:53:20 +03:00
Alexander Krasheninnikov
ceea4b9b33 New bridge interaction, quote identifier via api 2018-09-28 05:46:33 +03:00
Alexandr Krasheninnikov
4b431264db Implement quote getter from ODBC 2018-09-27 18:23:42 +03:00
CurtizJ
90240cb64b support database and table macros 2018-09-27 13:01:10 +03:00
Alexey Milovidov
30da8de1b6 Send log message about peak memory usage to client #3230 2018-09-27 00:19:49 +03:00
Alexey Milovidov
99927a3518 Returned logging peak memory usage in query scope #3230 2018-09-27 00:10:43 +03:00
Alexey Milovidov
dd88c092b7 Attempt to fix inconsistent values in total memory tracker #3143 2018-09-26 23:45:40 +03:00
Alexandr Krasheninnikov
647d1041f1 Implement jdbc/idbc bridge connectors 2018-09-25 17:29:44 +03:00
Alexander Krasheninnikov
fe8affa1cf Initial 2018-09-25 03:21:20 +03:00
Alexey Milovidov
9fbde09725 Memory tracker: added watermark logging #3205 2018-09-24 23:57:10 +03:00
Alexey Milovidov
17b8e20922 Failover for hosts with missing DNS records while connecting to ZooKeeper #3201 2018-09-24 22:09:12 +03:00
alexey-milovidov
4a54a1c310
Merge pull request #3138 from yandex/low-cardinality-group-by 
Low cardinality group by
 2018-09-21 13:38:20 +03:00
alexey-milovidov
06b5c53335
Update TwoLevelHashTable.h 2018-09-20 20:44:10 +03:00
alexey-milovidov
006119b81d
Merge pull request #3155 from yandex/fix-float-parsing-with-custom-csv-delimiter 
Fix float parsing with custom csv delimiter
 2018-09-17 22:39:45 +03:00
alexey-milovidov
c275764647
Merge pull request #3124 from yandex/CLICKHOUSE-3800 
CLICKHOUSE-3800: Enable compilation to llvm by default
 2018-09-17 21:50:45 +03:00
Alexey Milovidov
20326bdcda Added comment #3142 2018-09-17 21:12:50 +03:00
Alexey Milovidov
8218cf3a5f ZooKeeper: retry with different node in case when ZK server closed connection in response for our handshake [#CLICKHOUSE-3987] 2018-09-17 18:49:08 +03:00
Alexey Milovidov
5e3b507bd6 Added functions "toISOWeek", "toISOYear", "toStartOfISOYear" [#CLICKHOUSE-3988] 2018-09-17 06:09:56 +03:00
alexey-milovidov
13406d876c
Merge pull request #3130 from yandex/fix-dependency-on-new-libc 
Fix dependency on too new libc
 2018-09-16 05:24:09 +03:00
Alexey Milovidov
a9824de575 Miscellaneous (avoid valgrind's "Syscall param socketcall.sendto(msg) points to uninitialised byte(s)") [#CLICKHOUSE-3989] 2018-09-16 03:25:25 +03:00
Alexey Milovidov
7d6ec29c5c Fixed tests in Travis (order of destruction of thread-local variables of the main thread vs. static variables) [#CLICKHOUSE-3989] 2018-09-16 03:14:55 +03:00
proller
d752d5d62d Prepare to new poco, build fixes (#3072) 
* WIp

* fix

* fix

* test

* fix poco netssl find

* clean

* fixes

* wip

* wip

* new poco

* fixes

* Fixes

* wip

*  clean

* clean

*     clean

* clean

* Update HTTPHandlerFactory.h
 2018-09-14 22:48:51 +03:00
alesapin
d8a2b063dc CLICKHOUSE-3800: More convinient names for functions, comments and new profile event. 2018-09-14 13:08:38 +03:00
Nikolai Kochetov
3dc5cd3a3a Merged with master. 2018-09-14 12:14:37 +03:00
Nikolai Kochetov
2eb35dd6ef Cache AggregateDataPtr for single low cardinality column. [#CLICKHOUSE-3903] 2018-09-14 11:04:09 +03:00
Amos Bird
af369483a9 Simply Self. 
> When the normal name of the template (i.e., the name from the enclosing scope, not the injected-class-name) is used, it always refers to the class template itself and not a specialization of the template

http://eel.is/c++draft/temp.local
 2018-09-13 22:59:54 +08:00
alexey-milovidov
295606ed37
Update createHardLink.cpp 2018-09-13 04:10:22 +03:00
alexey-milovidov
20d5ddd58c
Merge branch 'master' into alter-update 2018-09-10 17:17:10 +03:00
Alexey Zatelepin
133c9c7c37 Merge branch 'master' into alter-update 
Conflicts:
	docs/en/query_language/alter.md
 2018-09-07 19:11:02 +03:00
CurtizJ
a784b828ce Merge branch 'master' of https://github.com/yandex/ClickHouse into CLICKHOUSE-3723.3 2018-09-07 13:02:07 +03:00
Alexey Milovidov
199d8734f9 Fixed race condition in DROP/CREATE MergeTree tables [#CLICKHOUSE-3939] 2018-09-07 04:39:48 +03:00
CurtizJ
e4a1ba728d better error code 2018-09-06 21:28:43 +03:00
alexey-milovidov
580683310b
Merge pull request #2990 from alesapin/master 
CLICKHOUSE-3800: Add Cache for compiled expression.
 2018-09-06 21:12:08 +03:00
proller
db13ef96d6 Fix ssl init (#3056) 
* Try to fix ../libs/libglibc-compatibility/glibc-compatibility.c:151: multiple definition of `explicit_bzero'
contrib/ssl/crypto/libcrypto.a(explicit_bzero.c.o):../contrib/ssl/crypto/compat/explicit_bzero.c:16: first defined here

* Fix ssl init

* fix

* noncopyable

* clean
 2018-09-06 21:05:33 +03:00
Alexander Sapin
03174e131d Merge remote-tracking branch 'upstream/master' 2018-09-06 12:39:42 +03:00
Alexey Milovidov
b82d532db0 Removed incorrect code [#CLICKHOUSE-3939] 2018-09-06 05:30:58 +03:00
Alexey Milovidov
a2b515483e Understanding the code #2482 2018-09-06 03:28:15 +03:00
Alexey Milovidov
3c7c2e3853 Revert "Revert "Tidy up thread locals usage across translation units"" 
This reverts commit 509386b14d.
 2018-09-06 00:01:43 +03:00
Alexey Milovidov
509386b14d Revert "Tidy up thread locals usage across translation units" 
This reverts commit e28753061f.
 2018-09-05 19:41:34 +03:00
alexey-milovidov
d12c1b02bc
Merge pull request #3029 from nvartolomei/nv/tidyup-thread-locals 
Tidy up thread locals usage across translation units
 2018-09-05 00:16:03 +03:00
Alexey Milovidov
d10f9200b9 Consistency of FileOpen event [#CLICKHOUSE-3943] 2018-09-04 22:24:45 +03:00
Alexey Zatelepin
4f91833e67 Merge branch 'master' into alter-update 
Conflicts:
	dbms/src/Parsers/ASTIdentifier.cpp
 2018-09-04 17:39:08 +03:00
Alexey Zatelepin
b6a5bbc4e9 move validation to MutationsInterpreter [#CLICKHOUSE-13] 2018-09-04 17:33:48 +03:00
Nicolae Vartolomei
e28753061f Tidy up thread locals usage across translation units 
Fixes #3015.
 2018-09-03 22:36:16 +01:00
proller
b9e4c69dd2 fix 2018-09-03 23:09:51 +03:00
proller
bcfcd257be Better odbc-bridge executable select 2018-09-03 21:27:56 +03:00
alesapin
a7bd2b42e8 CLICKHOUSE-3800: Review fixes 2018-09-03 13:14:05 +03:00
alesapin
83574eed7c Merge remote-tracking branch 'upstream/master' 2018-09-03 13:11:33 +03:00
alesapin
11d248ba10 Resolve conflict 2018-09-03 13:11:10 +03:00
alexey-milovidov
72c799ad76
Merge pull request #3008 from 4ertus2/decimal 
even more Decimal
 2018-09-03 07:19:33 +03:00
Alexey Milovidov
1de3f144f6 Padding chunks in Arena in attempt to improve performance [#CLICKHOUSE-2] 2018-09-03 00:28:25 +03:00
Alexey Milovidov
1c6d8e235c Respect alignment in groupArray and maxIntersections aggregate functions [#CLICKHOUSE-2] 2018-09-02 22:20:27 +03:00
Alexey Milovidov
9af71bb733 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 08:25:32 +03:00
Alexey Milovidov
26587dd2bb Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 08:23:20 +03:00
Alexey Milovidov
03038c75c4 Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 08:07:49 +03:00
Alexey Milovidov
77ccc8c65c Addition to prev. revision [#CLICKHOUSE-2] 2018-09-02 07:58:55 +03:00
Alexey Milovidov
fc27be314b Avoid temporary nullptr references [#CLICKHOUSE-2] 2018-09-02 06:00:04 +03:00
Alexey Milovidov
f7107f12b4 Merge branch 'master' into extra-warnings 2018-09-02 03:13:36 +03:00
alexey-milovidov
16dc142a05
Merge pull request #3017 from yandex/ubsan-fixes 
Fixes for UBSan.
 2018-09-02 03:12:20 +03:00
Alexey Milovidov
1c2e4c3654 Documentation for ProfileEvents (more) #3010 2018-09-02 03:11:17 +03:00
Alexey Milovidov
63767c3c4e Documentation for ProfileEvents (more) #3010 2018-09-02 03:06:42 +03:00
Alexey Milovidov
ed6b5fe9eb Documentation for ProfileEvents (more) #3010 2018-09-02 03:05:09 +03:00
Alexey Milovidov
788a97dca1 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:43:43 +03:00
Alexey Milovidov
c8fc8e8cbe Documentation for ProfileEvents (draft) #3010 2018-09-02 02:14:48 +03:00
Alexey Milovidov
8eb746b216 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:13:17 +03:00
Alexey Milovidov
e78dbcbb88 Merge branch 'master' of github.com:yandex/ClickHouse 2018-09-02 02:11:28 +03:00
Alexey Milovidov
35b573e4d2 Documentation for ProfileEvents (draft) #3010 2018-09-02 02:11:11 +03:00
Alexey Milovidov
45a4a95959 Fixed error in UBSan [#CLICKHOUSE-2] 2018-09-02 00:18:33 +03:00
Alexey Milovidov
c75cc14703 Fixed error in UBSan [#CLICKHOUSE-2] 2018-09-01 23:28:46 +03:00
Alexey Milovidov
751cf62262 Added documentation for CurrentMetrics #3010 2018-09-01 22:51:38 +03:00
Alexey Milovidov
f5d03f6ac2 Miscellaneous [#CLICKHOUSE-2] 2018-09-01 22:14:04 +03:00
Alexey Milovidov
ce032470b3 Full support for alignment of aggregate states #2808 2018-09-01 07:39:46 +03:00
Alexey Milovidov
338437baf7 Full support for alignment of aggregate states #2808 2018-09-01 07:28:12 +03:00
Alexey Milovidov
146f3f0a14 Full support for alignment of aggregate states #2808 2018-09-01 07:25:43 +03:00
Alexey Milovidov
7d77d001f5 Full support for alignment of aggregate states #2808 2018-09-01 07:25:03 +03:00
Alexey Milovidov
8f54125884 Minor modifications #2808 2018-09-01 06:17:43 +03:00
alexey-milovidov
6d5092518f
Merge pull request #2808 from chenxing-xc/master 
Aligned aggregate state  #2754
 2018-09-01 05:38:11 +03:00
Alexey Milovidov
652ecc42c6 Fixed alignment issues with AutoArray [#CLICKHOUSE-2] 2018-09-01 04:03:34 +03:00
chertus
fe1e3300b7 remove dirty code [CLICKHOUSE-3765] 2018-08-31 20:36:27 +03:00
alesapin
650d15696f CLICKHOUSE-3800: Add memory comsumption profile_event of compiled expression cache 2018-08-31 15:39:27 +03:00
alesapin
711b228a30 Merge remote-tracking branch 'upstream/master' 2018-08-31 10:15:33 +03:00
alexey-milovidov
a05cdfbb45
Merge branch 'master' into extra-warnings 2018-08-31 03:03:44 +03:00
alexey-milovidov
e0b1b5ff78
Merge pull request #2980 from amosbird/memcpySmall 
Padding for IO buffers.
 2018-08-30 22:53:47 +03:00
alesapin
81a333ee87
Return to odbc-bridge argument. 2018-08-30 22:35:59 +03:00
alesapin
6bfde2825e Fix conflict 2018-08-30 22:23:00 +03:00
Alexey Milovidov
6ccd74aeeb Attempt to fix performance regression due to usage of taskstats #2482 2018-08-30 21:48:41 +03:00
Alexey Milovidov
c06d6b7ae6 Moved file (preparation) #2482 2018-08-30 21:40:46 +03:00
Alexey Milovidov
fd5c419f17 Miscellaneous #2482 2018-08-30 21:36:24 +03:00
alesapin
6e64067a70 CLICKHOUSE-3800: Move cache to context, change hashing algorithm, add drop instruction for compiled expressions cache 2018-08-30 19:31:20 +03:00
Alexey Zatelepin
e9493b3a5f use hard links to copy columns that didn't change [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
Alexey Zatelepin
8e7c58dd75 parse ALTER UPDATE command [#CLICKHOUSE-13] 2018-08-30 16:56:43 +03:00
proller
56e571f18d odbc-bridge fixes (#2993) 
* start clickhouse odbc-bridge as clickhouse-odbc-bridge

* fix

* prepare to odbc bridge tests
 2018-08-30 00:32:46 +03:00
Alexey Milovidov
c94e0f0161 Fixed tests in Sandbox [#CLICKHOUSE-2] 2018-08-30 00:30:39 +03:00
Alexey Milovidov
c34d36bf35 Fixed tests in Sandbox [#CLICKHOUSE-2] 2018-08-29 22:01:01 +03:00
alexey-milovidov
07408490b6
Merge pull request #2982 from VadimPE/CLICKHOUSE-3934 
CLICKHOUSE-3934 add join_default_strictness
 2018-08-29 21:32:03 +03:00
alesapin
d2a5efb11b CLICKHOUSE-3800: Add perf test 2018-08-29 20:49:43 +03:00
VadimPE
f253719eac CLICKHOUSE-3934 add SettingsJoinStrictness 2018-08-29 18:15:42 +03:00
chertus
a69c936b44 improve field visitors for UUID CLICKHOUSE-3249 2018-08-29 14:58:40 +03:00
Amos Bird
8851fbcab2 Padding for IO buffers. 
Testing data

```
select 'aaaaaaaa','bbbbbbbb','cccccccc','dddddddd','eeeeeeee','ffffffff','gggg','hhh' from numbers(3000000) into outfile '/tmp/test.tsv'
```

Testing command
```
echo "select count() from file('/tmp/test.tsv', CSV, 'a String, b String, c String, d String, e String, f String, g String, h String') where not ignore(e)" | clickhouse-benchmark
```

TSV parser has less overhead than CSV, using it would better unveil the benefits of memcpySmall.

Before
```
QPS: 1.662, RPS: 4985463.906, MiB/s: 603.823, result RPS: 1.662, result MiB/s: 0.000.
0.000%  0.559 sec.
10.000% 0.564 sec.
20.000% 0.568 sec.
30.000% 0.572 sec.
40.000% 0.575 sec.
50.000% 0.581 sec.
60.000% 0.592 sec.
70.000% 0.624 sec.
80.000% 0.639 sec.
90.000% 0.664 sec.
95.000% 0.686 sec.
99.000% 0.711 sec.
99.900% 0.715 sec.
99.990% 0.716 sec.
```

After
```
QPS: 1.861, RPS: 5582303.107, MiB/s: 676.110, result RPS: 1.861, result MiB/s: 0.000.
0.000%  0.510 sec.
10.000% 0.514 sec.
20.000% 0.517 sec.
30.000% 0.521 sec.
40.000% 0.523 sec.
50.000% 0.527 sec.
60.000% 0.530 sec.
70.000% 0.539 sec.
80.000% 0.558 sec.
90.000% 0.584 sec.
95.000% 0.589 sec.
99.000% 0.608 sec.
99.900% 0.655 sec.
99.990% 0.663 sec.
```
 2018-08-29 09:39:44 +08:00
alexey-milovidov
f3b2cf6c11
Merge pull request #2985 from 4ertus2/uuid 
field visitors for UUID CLICKHOUSE-3249
 2018-08-29 03:02:25 +03:00
proller
18044995ba Fix includes 2018-08-28 22:36:27 +03:00
chertus
6a02b18b93 field visitors for UUID CLICKHOUSE-3249 2018-08-28 21:36:41 +03:00
Vadim
a8c1199ad4
Merge branch 'master' into CLICKHOUSE-3934 2018-08-28 17:06:17 +03:00
VadimPE
398d38eead CLICKHOUSE-3934 add join_default_strictness 2018-08-28 16:57:31 +03:00
alexey-milovidov
9ff0edc203
Merge pull request #2971 from urykhy/zk-operation-timeout 
Make ZK operation timeout configurable
 2018-08-28 14:23:09 +03:00
Alexey Milovidov
f5cc5ef877 Merge branch 'CLICKHOUSE-3847' of https://github.com/VadimPE/ClickHouse into VadimPE-CLICKHOUSE-3847 2018-08-27 22:04:14 +03:00
Yury Stankevich
f3024d2fba Make ZK operation timeout configurable 2018-08-27 20:26:19 +03:00
Alexey Milovidov
486d87ebcd Merge remote-tracking branch 'origin/master' into extra-warnings 2018-08-27 20:01:33 +03:00
Alexey Milovidov
e5a2dd8624 Merge branch 'master' into extra-warnings 2018-08-27 19:19:04 +03:00
chertus
ee873c8e9f Merge branch 'master' into decimal 2018-08-27 19:18:48 +03:00
Alexey Milovidov
6e57168030 Removed code with duplicate semantics [#CLICKHOUSE-2] 2018-08-27 18:01:33 +03:00
proller
3acce3bff9 Build fix (#2944) 
* Build fix

* Better sample build scripts

* zlib apple fix

* fix

* fix

* better so version

* SPLIT_SHARED -> LINK_MODE

* clean
 2018-08-27 17:39:20 +03:00
Vadim
be2d821669
Merge branch 'master' into CLICKHOUSE-3847 2018-08-27 15:26:41 +03:00
Alexey Milovidov
eb165a0616 Tweak error code in ZooKeeper library for correct expectations from the calling code [#CLICKHOUSE-3916] 2018-08-27 15:19:29 +03:00
Alexey Milovidov
050a080be3 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-26 05:29:42 +03:00
Alexey Milovidov
f7796df158 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-26 05:26:55 +03:00
Alexey Milovidov
5f21f1ba7d Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-26 05:25:45 +03:00
Alexey Milovidov
042d84e1e3 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-26 05:17:18 +03:00
Alexey Milovidov
8a0239b6ad Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-26 05:08:35 +03:00
Alexey Milovidov
a1a70d4a65 Enabling -Wzero-as-null-pointer-constant [#CLICKHOUSE-2] 2018-08-26 04:56:34 +03:00
Alexey Milovidov
625f3fea08 Enabling -Wunused-exception-parameter [#CLICKHOUSE-2] 2018-08-26 04:36:41 +03:00
Alexey Milovidov
44e848856e Enabling -Wunused-exception-parameter [#CLICKHOUSE-2] 2018-08-26 04:33:20 +03:00
Alexey Milovidov
d4ef5d05f2 Enabling -Winconsistent-missing-destructor-override [#CLICKHOUSE-2] 2018-08-26 04:26:25 +03:00
Alexey Milovidov
ac7673db29 Enabling -Wcomma [#CLICKHOUSE-2] 2018-08-26 04:24:21 +03:00
Alexey Milovidov
c193d15ef2 Merge branch 'master' into generalize-zookeeper 2018-08-26 03:32:15 +03:00
Alexey Milovidov
8cc3501c04 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 05:00:36 +03:00
Alexey Milovidov
3475ef5304 Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:58:14 +03:00
Alexey Milovidov
4d343a441c Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2] 2018-08-25 04:14:02 +03:00
Alexey Milovidov
2530561086 ZooKeeperImpl: allow to distinguish cases when request was definitely not been processed #2939 2018-08-25 01:50:20 +03:00
chertus
54a3c028c5 Merge branch 'master' into decimal 2018-08-24 14:19:41 +03:00
Alexey Milovidov
86ede3d38c Removed "_dl_addr" from profile when high amount of queries are instantly rejected with exception as in case when "Too many simultaneous queries" [#CLICKHOUSE-3923] 2018-08-24 11:32:33 +03:00
Alexey Milovidov
6043ea02de Style #2913 2018-08-24 08:25:00 +03:00
Alexey Milovidov
38d5d8eaad Reverted #2325 #2261 2018-08-24 03:53:09 +03:00
chertus
1467ca5610 decimal field visitors CLICKHOUSE-3765 2018-08-23 22:11:31 +03:00
proller
fe45a62c34 fix 2018-08-23 21:39:21 +03:00
VadimPE
9beb841406 CLICKHOUSE-3847 fix throw and del log 2018-08-23 16:55:59 +03:00
proller
38347f120d fixes 2018-08-23 15:20:54 +03:00
proller
426b8c6130 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-23 14:27:05 +03:00
Alexey Milovidov
61b8b60f53 Whitespaces [#CLICKHOUSE-3878] 2018-08-23 03:12:24 +03:00
alexey-milovidov
0265cca018
Merge pull request #2921 from alesapin/master 
Finally create test with odbc drivers
 2018-08-22 22:19:07 +03:00
proller
e40708a1a5 clean 2018-08-22 19:56:00 +03:00
proller
e7d7479ed0 fix 2018-08-22 19:53:11 +03:00
alesapin
ba0bf14175 CLICKHOUSE-3878: Fix message 2018-08-22 18:54:08 +03:00
alesapin
e2f18da1a9 CLICKHOUSE-3878: Add ODBC test 2018-08-22 18:42:27 +03:00
Vadim
1f7ec5d595
Update ErrorCodes.cpp 2018-08-22 17:27:13 +03:00
proller
f47d93c92f Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 17:06:19 +03:00
VadimPE
a6ef4632a6 CLICKHOUSE-3847 add ErrorCodes 2018-08-22 17:04:04 +03:00
Alexey Zatelepin
b6aa7542d0 add BackgroundSchedulePool::TaskInfo::activateAndSchedule() method 
Almost always it (and not activate()) is precisely what is needed.
 2018-08-22 16:43:27 +03:00
proller
d2729f33e6 apple fix 2018-08-22 16:12:20 +03:00
proller
ed5c5083c8 wip 2018-08-22 16:01:50 +03:00
proller
b6dabaacb3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 15:22:58 +03:00
Alexey Milovidov
6497d3032e Dummy implementation for non-Linux platforms #2482 2018-08-22 09:00:08 +03:00
Alexey Milovidov
bc30d10b67 Dummy implementation for non-Linux platforms #2482 2018-08-22 08:59:27 +03:00
Alexey Milovidov
a1d745888d Dummy implementation for non-Linux platforms #2482 2018-08-22 08:56:06 +03:00
Alexey Milovidov
ca5b83ac39 Fixed error when BackgroundSchedulePool is initialized in context of a query #2482 2018-08-22 06:58:19 +03:00
Alexey Milovidov
8c76b8e875 TaskStats: addition to prev. revision #2482 2018-08-22 06:12:55 +03:00
Alexey Milovidov
f5326ed29a TaskStats: addition to prev. revision #2482 2018-08-22 06:11:46 +03:00
Alexey Milovidov
d4b038b270 TaskStats: rewrite code #2482 2018-08-22 05:54:24 +03:00
Alexey Milovidov
efca6e4e09 Code cleanups #2482 2018-08-22 03:41:30 +03:00
Alexey Milovidov
43f1f70c9b Code cleanups #2482 2018-08-22 03:24:55 +03:00
Alexey Milovidov
698761020f Code cleanups #2482 2018-08-22 03:05:06 +03:00
proller
3884e0793c Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 03:01:15 +03:00
Alexey Milovidov
44e4f9cd26 Removed useless code #2482 2018-08-22 03:01:15 +03:00
Alexey Milovidov
b2b26f6e54 Removed useless method #2482 2018-08-22 02:56:55 +03:00
Alexey Milovidov
e0bf8c757b Checking for capabilities in more direct way #2482 2018-08-22 02:52:03 +03:00
proller
67cb2ea294 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:37:09 +03:00
proller
6c21ced0f3 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-22 00:09:10 +03:00
Alexey Milovidov
ea98d79e56 TaskStats: better code #2482 2018-08-22 00:07:37 +03:00
Alexey Milovidov
aea01a4e0d TaskStats: better code #2482 2018-08-22 00:07:06 +03:00
Alexey Milovidov
3fdff1abea TaskStats: better code #2482 2018-08-22 00:05:30 +03:00
chertus
eac6dd1c99 Merge branch 'master' into decimal 2018-08-21 21:55:36 +03:00
proller
df618dd829 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:52:35 +03:00
Alexey Milovidov
f68c322dca Added error codes #2482 2018-08-21 19:49:20 +03:00
Alexey Milovidov
a04177290b Miscellaneous #2482 2018-08-21 19:40:54 +03:00
proller
169d9d3540 Merge remote-tracking branch 'upstream/master' into fix3 2018-08-21 19:14:45 +03:00
alexey-milovidov
581a1c85c2
Merge pull request #2915 from alesapin/master 
Add timeout to socket
 2018-08-21 19:14:04 +03:00
alexey-milovidov
46f00c37e4
Update TaskStatsInfoGetter.cpp 2018-08-21 19:13:07 +03:00
proller
fc2925b567 Squashed commit of the following: 
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd550
Author: proller <proller@github.com>
Date:   Tue Aug 21 18:34:18 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit b4f3af824b88a8b6826583bb483730827574e8ad
Author: proller <proller@github.com>
Date:   Tue Aug 21 17:00:20 2018 +0300

    fix

commit 3a18fa7ded2a7d6b7a0883a1b9c2d6b99360837d
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:57:17 2018 +0300

    fix

commit 5d42220c2cf47e1a86bdc73dbfc24b68f8626891
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:50:21 2018 +0300

    freebsd fixes

commit 7baf4fb5ba4575f79b0d12a9ffaaabd34e1006da
Author: proller <proller@github.com>
Date:   Tue Aug 21 16:17:19 2018 +0300

    fix

commit e1fe707fd765b841a8d0952d91a980128cbf91d0
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:35:21 2018 +0300

    fix

commit 027887c71b3ffa98d9473d50d8c3b79cbf3304ac
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:25:57 2018 +0300

    fix

commit 81af41bfcfff7c02fe4060196cf03c2d2aab416e
Author: proller <proller@github.com>
Date:   Tue Aug 21 15:20:41 2018 +0300

    fix

commit 93d572c85d9c7e331254999a614c3b22b5573b02
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:58:07 2018 +0300

    SPLIT_SHARED

commit dd5b8990d8527d59b1e890943d80c2bf27c613ce
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:52:39 2018 +0300

    fix

commit 4840ca12ab752a38c1ef482e8ec59c5859bb48d7
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:46:31 2018 +0300

    fix

commit abde633beb86f2a0d025d6fcf079965dbd827b92
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:32 2018 +0300

    fix

commit 0d94a5476a5ba8ba5e88638d58f2cfbf2b4b662d
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:45:18 2018 +0300

    Travis: try fail on ninja fail

commit c2686f90b68255c2beb0a708804aef404e80a6d2
Merge: 2c3427bbd 2aa7eb463
Author: proller <proller@github.com>
Date:   Tue Aug 21 14:25:15 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 2c3427bbdb861edbb188ed4621e8a05cafaedafb
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:24 2018 +0300

    fix

commit 530170c6a81d31dcfa81230e48520383234df4bc
Merge: 9abec162c f6e4ec970
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:57:03 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9abec162cb2e09bbc2f33cbe80fe76791f6e5a77
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:49:58 2018 +0300

    Apple fixes

commit 36d05e8217440fbc8ae21571b06d4eb6d679d538
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:25:05 2018 +0300

    apple fix

commit aeec3e845e4456e89fbb1b1af6f9f36820a46e33
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:20:06 2018 +0300

    fixes

commit 427961d916a5954981e47d94733996deb2a616ce
Author: proller <proller@github.com>
Date:   Mon Aug 20 23:11:11 2018 +0300

    fix

commit a7dd55ff8f653624c0f3dbcbc54defd3b3ae97af
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:41:53 2018 +0300

    fix

commit 6200e0d315c7a62bae63a8de0fc32f7937770ad2
Merge: 8a541d7e6 21cedbe46
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:35:49 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8a541d7e64c89e2c16af6c909e0353361153aaa3
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:34:32 2018 +0300

    Do not use poco types

commit fd560f43d048b7e3307c6c6b9c9d9918230014d8
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:20:42 2018 +0300

    Try fix apple build

commit cfb2eba07ac06f19e822d3474341d800b1f98cf1
Merge: 8d2e31c90 5b81fdfc0
Author: proller <proller@github.com>
Date:   Mon Aug 20 22:03:24 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 8d2e31c908be2e99d09e2a9dde2414ab82a5e93c
Author: proller <proller@github.com>
Date:   Mon Aug 20 21:56:06 2018 +0300

    travis: TEST_SERVER_STARTUP_WAIT=10
 2018-08-21 18:56:50 +03:00
alesapin
df012657e8 Change time to 50 mseconds 2018-08-21 18:40:19 +03:00
alesapin
726428a2c5 Add timeout to socket 2018-08-21 18:24:20 +03:00
Vadim
297be5c303
Update ErrorCodes.cpp 2018-08-21 13:45:34 +03:00
Vadim
8f3350216f
Merge branch 'master' into CLICKHOUSE-3847 2018-08-21 13:27:18 +03:00
Alexey Milovidov
3b39f6a4c3 Split ZooKeeperExceptions to three different metrics #2316 2018-08-21 04:27:22 +03:00
Alexey Milovidov
d278cbbed5 Addition to prev. revision #2877 2018-08-21 02:39:41 +03:00
Alexey Milovidov
bcbcbcdbb1 Merge branch 'master' of github.com:yandex/ClickHouse 2018-08-21 02:22:30 +03:00
Alexey Milovidov
7fc39611e5 Implemented #2877 in another way 2018-08-21 02:22:20 +03:00
VadimPE
4064ec0bc2 CLICKHOUSE-3847 add value '1' and '2' in is_lost 2018-08-20 20:15:04 +03:00
proller
159cdbbb3e Try fix build (link order) 2018-08-20 18:34:37 +03:00
chertus
cdff502828 types convertion via helpers CLICKHOUSE-3765 2018-08-20 18:17:55 +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