thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-01 03:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,038 Commits 9,191 Branches 1,782 Tags 2.2 GiB
71b9fa3a9c
Commit Graph

13038 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Milovidov
63f79b7b4f Unification of serde of data types: development [#CLICKHOUSE-2838]. 2017-11-21 05:23:41 +03:00
Alexey Milovidov
e4d354e39a Fixed error when using libressl instead of openssl #1466 2017-11-21 03:32:05 +03:00
Alexey Milovidov
111cf04627 Merge branch 'master' of github.com:yandex/ClickHouse 2017-11-21 03:30:53 +03:00
Alexey Milovidov
0e12a9c881 Updated submodule to HEAD of clickhouse branch [#CLICKHOUSE-2]. 2017-11-21 03:30:27 +03:00
Alexey Milovidov
0d8d16b2fc Merge branch 'unify-data-types-that-serialized-with-multiple-streams' of github.com:yandex/ClickHouse into unify-data-types-that-serialized-with-multiple-streams 2017-11-21 03:30:22 +03:00
Alexey Milovidov
8fcdc76619 Fixed error when using libressl instead of openssl #1466 2017-11-21 03:30:06 +03:00
alexey-milovidov
2350a73b8a
Merge pull request #1519 from amosbird/patch-3 
Fixes StorageJoin's sample block order.
 2017-11-20 23:16:45 +03:00
Vitaliy Lyudvichenko
2cf6e20fef Fixed a vague error message in integration tests. [#CLICKHOUSE-2] 2017-11-20 23:15:30 +03:00
Alexey Milovidov
6fd1d58256 Updated submodule [#CLICKHOUSE-2]. 2017-11-20 21:44:53 +03:00
Amos Bird
dc6847d5c6
Fixes StorageJoin's sample block order. 
Here is a reproducible test case.
```
create table e (s UInt64, t UInt64) Engine = Memory;
create table v (s UInt64, w Float64, c UInt64) Engine = Join(Any, Inner, s);
insert into e values (1, 2), (1, 3), (1, 4), (2, 1), (2, 4), (3, 1), (4, 2), (4, 3);
insert into v values (1, 0.5, 3), (2, 0.5, 2), (3, 1, 1), (4, 0.5, 2);
select *, w, c from e any inner join v using (s);
```

# before this patch
```
┌─s─┬─t─┬─────w─┬──────────c─┐
│ 1 │ 2 │ 4e-45 │ 1051372192 │
│ 1 │ 3 │ 4e-45 │ 1051372192 │
│ 1 │ 4 │ 4e-45 │ 1051372192 │
│ 2 │ 1 │ 3e-45 │ 1056964608 │
│ 2 │ 4 │ 3e-45 │ 1056964608 │
│ 3 │ 1 │ 1e-45 │ 1065353216 │
│ 4 │ 2 │ 3e-45 │ 1056964608 │
│ 4 │ 3 │ 3e-45 │ 1056964608 │
└───┴───┴───────┴────────────┘
```
# after this patch
```
┌─s─┬─t─┬───w─┬─c─┐
│ 1 │ 2 │ 0.5 │ 3 │
│ 1 │ 3 │ 0.5 │ 3 │
│ 1 │ 4 │ 0.5 │ 3 │
│ 2 │ 1 │ 0.5 │ 2 │
│ 2 │ 4 │ 0.5 │ 2 │
│ 3 │ 1 │   1 │ 1 │
│ 4 │ 2 │ 0.5 │ 2 │
│ 4 │ 3 │ 0.5 │ 2 │
└───┴───┴─────┴───┘
```
 2017-11-20 19:46:24 +08:00
Alexey Milovidov
09eed1b2eb Merge branch 'master' of github.com:yandex/ClickHouse 2017-11-20 09:13:18 +03:00
Alexey Milovidov
2fd17a3072 Fixed linking [#CLICKHOUSE-2]. 2017-11-20 09:01:05 +03:00
Alexey Milovidov
07d594c505 Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:59:58 +03:00
Alexey Milovidov
1334df72a0 Fixed build [#CLICKHOUSE-2]. 2017-11-20 08:56:28 +03:00
Alexey Milovidov
a78871f065 Fixed build [#CLICKHOUSE-2]. 2017-11-20 08:55:19 +03:00
Alexey Milovidov
1748c6c591 Merge remote-tracking branch 'origin/master' into unify-data-types-that-serialized-with-multiple-streams 2017-11-20 08:31:26 +03:00
Alexey Milovidov
3b5f82000c Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:22:54 +03:00
Alexey Milovidov
f6f77f5f0b Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:22:07 +03:00
Alexey Milovidov
3403f68c3f Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:21:50 +03:00
Alexey Milovidov
e218f8d2de Merge remote-tracking branch 'origin/master' into unify-data-types-that-serialized-with-multiple-streams 2017-11-20 08:10:59 +03:00
Alexey Milovidov
087a379b7c Using libc++ as default standard library when using clang [#CLICKHOUSE-2]. 2017-11-20 08:10:04 +03:00
Alexey Milovidov
4565e30339 Updated submodule [#CLICKHOUSE-2]. 2017-11-20 08:08:53 +03:00
Alexey Milovidov
91179c1773 Using libc++ as default standard library when using clang [#CLICKHOUSE-2]. 2017-11-20 08:07:39 +03:00
Alexey Milovidov
7cce063d00 Merge remote-tracking branch 'origin/master' into unify-data-types-that-serialized-with-multiple-streams 2017-11-20 07:50:52 +03:00
Alexey Milovidov
feea8996d5 Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:46:00 +03:00
Alexey Milovidov
02a991a49c Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:45:33 +03:00
Alexey Milovidov
fbab976e09 Merge branch 'master' of github.com:yandex/ClickHouse 2017-11-20 07:44:53 +03:00
alexey-milovidov
c88855873d
Merge pull request #1516 from amosbird/patch-1 
Propagate readPrefix in ParallelInputsProcessor
 2017-11-20 07:45:40 +03:00
Alexey Milovidov
87ff2f35ec Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:41:56 +03:00
Alexey Milovidov
2106849ec2 Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:40:51 +03:00
Alexey Milovidov
380fc668dc Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:37:54 +03:00
Alexey Milovidov
725bd4046f Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:36:46 +03:00
Alexey Milovidov
e340511931 Removed useless code [#CLICKHOUSE-2]. 2017-11-20 07:22:21 +03:00
Alexey Milovidov
a7d4fef0d2 Removed useless code [#CLICKHOUSE-2]. 2017-11-20 07:21:14 +03:00
Alexey Milovidov
b3f6844171 Merge remote-tracking branch 'origin/master' into unify-data-types-that-serialized-with-multiple-streams 2017-11-20 07:18:37 +03:00
Alexey Milovidov
fd3239dd46 Unification of serde of data types: development [#CLICKHOUSE-2838]. 2017-11-20 07:18:27 +03:00
Alexey Milovidov
01e8adbfff Removed "experimental" namespace [#CLICKHOUSE-2]. 2017-11-20 07:15:43 +03:00
Amos Bird
22e9772593
Propagate readPrefix in ParallelInputsProcessor 
UnionBlockInputStream relies on ParallelInputsProcessor to do stream preparation in parallel, which seems to be absent. This patch fixes it.
 2017-11-20 10:53:48 +08:00
Alexey Milovidov
5d57e014a1 Returned serialization of zero Date and DateTime as zeros [#CLICKHOUSE-2]. 2017-11-20 05:45:37 +03:00
Alexey Milovidov
31fc79b809 Returned serialization of zero Date and DateTime as zeros [#CLICKHOUSE-2]. 2017-11-20 05:44:39 +03:00
Alexey Milovidov
8e6466454a Unification of serde of data types: development [#CLICKHOUSE-2838]. 2017-11-20 05:15:15 +03:00
Alexey Milovidov
2ca6952deb Merge branch 'master' into unify-data-types-that-serialized-with-multiple-streams 2017-11-20 02:16:18 +03:00
Alexey Milovidov
6c8b5e29d8 Additions after merge [#CLICKHOUSE-2]. 2017-11-20 00:17:58 +03:00
Alexey Milovidov
61402d052a Merge branch 'proller-fix4' 2017-11-19 23:59:17 +03:00
alexey-milovidov
fc0a51f1b9
Merge branch 'master' into fix4 2017-11-19 23:57:44 +03:00
alexey-milovidov
942e59d459
Merge pull request #1455 from yandex/fix-mv-populate 
Fix applying WHERE clause in MATERIALIZED VIEW with POPULATE
 2017-11-19 23:01:23 +03:00
Alexey Milovidov
0a2a8ce435 Merge branch 'proller-fix11' 2017-11-19 22:58:13 +03:00
Alexey Milovidov
60825748d4 Merge branch 'fix11' of https://github.com/proller/ClickHouse into proller-fix11 2017-11-19 22:57:28 +03:00
alexey-milovidov
02223e3962
Update CMakeLists.txt 2017-11-19 22:55:38 +03:00
Alexey Milovidov
2f2e029e73 Updated Poco submodule [#CLICKHOUSE-2]. 2017-11-19 22:50:07 +03:00