thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 15:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,858 Commits 9,152 Branches 1,781 Tags 2.1 GiB
0915657fca
Commit Graph

9246 Commits

Author SHA1 Message Date
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
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
07d594c505 Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:59:58 +03:00
Alexey Milovidov
3403f68c3f Fixed linking [#CLICKHOUSE-2]. 2017-11-20 08:21:50 +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
2106849ec2 Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:40:51 +03:00
Alexey Milovidov
725bd4046f Miscellaneous [#CLICKHOUSE-2]. 2017-11-20 07:36:46 +03:00
Alexey Milovidov
a7d4fef0d2 Removed useless code [#CLICKHOUSE-2]. 2017-11-20 07:21:14 +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
31fc79b809 Returned serialization of zero Date and DateTime as zeros [#CLICKHOUSE-2]. 2017-11-20 05:44:39 +03:00
Alexey Milovidov
6c8b5e29d8 Additions after merge [#CLICKHOUSE-2]. 2017-11-20 00:17:58 +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
60825748d4 Merge branch 'fix11' of https://github.com/proller/ClickHouse into proller-fix11 2017-11-19 22:57:28 +03:00
Pavel Yakunin
bb967007ff merged master 2017-11-19 10:55:46 +03:00
Pavel Yakunin
bd62ea2535 To support "incl" directive in the dictionaries config ConfigProcessor is now used to parse external modules configuration. 
"include_from" directive also works if the config has "<yandex>" as the root element. Otherwise default include file will be used.

To enable substitutions in a dictionary config one needs to have it in the following form:
<yandex>
	<include_from>...</include_from>
	<dictionary>
		<name incl="dict_name"></name>
		...
	</dictionary>
</yandex>

instead of

<dictionaries>
        <include_from>...</include_from>
        <dictionary>
                ...
        </dictionary>
</dictionaries>

The latter form will still work if no substitutions are used or if the default includes file exist. So no outright configuration change is necessary on the existing installations.
 2017-11-19 09:33:20 +03:00
Alexey Milovidov
c0321ce752 BackgroundSchedulePool: miscellaneous [#CLICKHOUSE-2]. 2017-11-19 03:59:57 +03:00
Alexey Milovidov
94d3b49e99 BackgroundSchedulePool: miscellaneous [#CLICKHOUSE-2]. 2017-11-19 03:27:43 +03:00
Alexey Milovidov
9b92c0fecd BackgroundSchedulePool: miscellaneous [#CLICKHOUSE-2]. 2017-11-19 03:22:13 +03:00
Alexey Milovidov
f497b0c63c BackgroundSchedulePool: miscellaneous; added TODO [#CLICKHOUSE-2]. 2017-11-19 03:08:37 +03:00
Alexey Milovidov
69714f0671 BackgroundSchedulePool: miscellaneous [#CLICKHOUSE-2]. 2017-11-19 02:55:53 +03:00
Alexey Milovidov
dfb4a92f5a BackgroundSchedulePool: miscellaneous [#CLICKHOUSE-2]. 2017-11-19 02:47:39 +03:00
Silviu Caragea
dfecd0b2f2 Merge with master 2017-11-18 10:16:06 +02:00
Alexey Milovidov
14e069f748 Allow to extract empty matches in "extractAll" function #1493. 2017-11-18 05:48:11 +03:00
Alexey Milovidov
729b114c15 Removed unsupported functionality [#CLICKHOUSE-2]. 2017-11-18 05:34:00 +03:00
Alexey Milovidov
8517251ebd Improved performance of toString function of Date and DateTime arguments [#CLICKHOUSE-2]. 2017-11-18 02:45:49 +03:00
Alexey Milovidov
655565466c Merge remote-tracking branch 'origin/master' into better-date-parsing-formatting 2017-11-18 02:45:17 +03:00
Alexey Milovidov
076e0ae014 More clear [#CLICKHOUSE-2]. 2017-11-18 00:20:28 +03:00
Alexey Milovidov
8425c56c0f Fixed wrong logic [#CLICKHOUSE-2]. 2017-11-18 00:00:29 +03:00
Alexey Milovidov
7cf5eaddc0 Fixed wrong logic [#CLICKHOUSE-2]. 2017-11-17 23:59:31 +03:00
Alexey Milovidov
4f8009517c Thread name can be 15 bytes max [#CLICKHOUSE-2]. 2017-11-17 23:57:07 +03:00
Alexey Milovidov
f54e99490f Merge branch 'master' into silviucpp-replicated_merge_tree_thread_pool 2017-11-17 23:48:16 +03:00
Alexey Milovidov
8e362ba641 Fixed build [#CLICKHOUSE-2]. 2017-11-17 23:48:00 +03:00
Alexey Milovidov
7c9ba15ba1 Style [#CLICKHOUSE-2]. 2017-11-17 23:42:03 +03:00
Alexey Milovidov
18be706127 Merge remote-tracking branch 'origin/master' into silviucpp-replicated_merge_tree_thread_pool 2017-11-17 23:30:51 +03:00
proller
5190325275 Allocator fix: nothing do when sizes equal, allow reallocate to smaller size (#1512) 
* PerformanceTest fixes.

* format

* Allocator fix: nothing do when sizes equal, allow reallocate to smaller size

* Update Allocator.cpp
 2017-11-17 23:27:12 +03:00
Alexey Milovidov
9264bc4013 Style [#CLICKHOUSE-2]. 2017-11-17 23:18:06 +03:00
proller
19d102cc4f fix 2017-11-17 22:53:02 +03:00
Alexey Milovidov
4ab2d4bc31 Added comment [#CLICKHOUSE-2]. 2017-11-17 22:49:17 +03:00
Alexey Milovidov
263e262413 Style [#CLICKHOUSE-2]. 2017-11-17 22:43:25 +03:00
proller
5ba7e20c03 fixes 2017-11-17 22:40:27 +03:00
proller
aa3dd03389 Split lib dbms to dbms + dbms_common_io 2017-11-17 22:19:49 +03:00
proller
79b3ef2f57 Merge remote-tracking branch 'upstream/master' into fix4 2017-11-17 15:31:13 +03:00
Silviu Caragea
64619c614f Basic idea is : 
- We add BackgroundSchedulePool which can execute a function at a specific point in time. Basically all tasks are added in a queue and precessed by worker threads.
- The most important difference between this and BackgroundProcessingPool is that we have the guarantee that the same function is not executed from many workers in the same time
- Each of the following classes instead starting a thread will register a task in BackgroundSchedulePool and when they need to run will call schedule or scheduleAfter(duration) functions

This commit is moving all threads created by ReplicatedMergeTree to BackgroundSchedulePool tasks

NOTE: I did a minimum number of changes to be much simple to review the code
 2017-11-17 10:58:35 +02:00
proller
7b417de0c7 format 2017-11-17 00:01:00 +03:00
proller
cf35323fc4 PerformanceTest fixes. 2017-11-17 00:01:00 +03:00