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
alexey-milovidov
06a0bd65b5
Merge pull request #1515 from lemmsh/stable-dicts-config-substitutions
...
Substitutions in dictionaries config
2017-11-19 22:47:27 +03:00
Pavel Yakunin
09616149c4
updating docs for dictionaries
2017-11-19 15:11:23 +03:00
Pavel Yakunin
975a9dcab9
updating docs for dictionaries
2017-11-19 15:07:08 +03:00
Pavel Yakunin
bb967007ff
merged master
2017-11-19 10:55:46 +03:00
Pavel Yakunin
753b862e45
Docs changed to support substitutions in dictionaries
2017-11-19 10:32:36 +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
9456674649
Merge branch 'silviucpp-replicated_merge_tree_thread_pool'
2017-11-19 07:35:37 +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
f0b60b013b
Little better [#CLICKHOUSE-2].
2017-11-18 02:48:55 +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
proller
829a70f256
Fix submodule contrib/poco
2017-11-18 02:23:55 +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
alexey-milovidov
c74dc219c6
Update syntax.rst
2017-11-17 23:09:13 +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
Alexey Milovidov
69d6ea51ba
Merge branch 'replicated_merge_tree_thread_pool' of https://github.com/silviucpp/ClickHouse into silviucpp-replicated_merge_tree_thread_pool
2017-11-17 22:25:48 +03:00
proller
aa3dd03389
Split lib dbms to dbms + dbms_common_io
2017-11-17 22:19:49 +03:00
proller
fcc8c27970
Merge remote-tracking branch 'upstream/master' into fix11
2017-11-17 21:45:32 +03:00
BayoNet
c56ada3200
Links fixed to standard MD syntax and the docs sources are the linked GitHub site.
...
Russian sources are updated following the english ones.
2017-11-17 21:39:58 +03:00
proller
08922b98b5
Merge remote-tracking branch 'upstream/master' into fix11
...
Conflicts:
libs/libcommon/src/mremap.cpp
2017-11-17 20:48:21 +03:00
proller
7a5dd87802
Update build_debian.sh
2017-11-17 16:14:13 +03:00
