Commit Graph

69 Commits

Author SHA1 Message Date
alesapin
c9880ad9c0 Fix join of unjoinable thread 2018-10-02 16:38:28 +03:00
Alexey Milovidov
6e18af7ed3 Enabling -Wshadow [#CLICKHOUSE-2] 2018-08-27 20:18:14 +03:00
Alexey Milovidov
acb99b49df Merge branch 'master' into CLICKHOUSE-2910 2018-08-14 23:29:42 +03:00
Alexey Milovidov
d8ca4345b6 Fixed style violations [#CLICKHOUSE-2] 2018-08-10 04:41:54 +03:00
Anton Popov
6c3d780552 ClickHouse 3551 Remove external dictionaries, when config updated (#2779)
* CLICKHOUSE-3551

* CLICKHOUSE-3551 Remove external dictionaties, when config updated

* CLICKHOUSE-3551 Remove external dictionaties, when config updated

* Update config.xml
2018-08-03 22:49:03 +03:00
Vitaliy Lyudvichenko
0355f81f20 [WIP] Introduced query_thread_log. [#CLICKHOUSE-2910] 2018-05-31 18:54:08 +03:00
Vitaliy Lyudvichenko
de6c48f4df Merge remote-tracking branch 'origin/master' into CLICKHOUSE-2910 2018-05-14 19:09:00 +03:00
Nikolai Kochetov
d63d9a4ffb fix test [#CLICKHOUSE-3590] 2018-03-26 18:48:19 +03:00
Vitaliy Lyudvichenko
efdda9cc9b Introduced ThreadStatus. [#CLICKHOUSE-2910] 2018-03-07 14:35:10 +03:00
proller
d97b2edc7c Make separate libs Common/ZooKeeper and Common/ConfigProcessor (#1749)
* Make separate libs Common/ZooKeeper and Common/ConfigProcessor
renamed:    dbms/src/Common/StringUtils.h -> dbms/src/Common/StringUtils/StringUtils.h

* Fix space

* Fix data in system.build_options

* merge

* merge
2018-01-15 22:07:47 +03:00
Nikolai Kochetov
39ec3f7d74 changed exception message, added comments 2017-12-19 22:51:59 +03:00
Alexey Milovidov
acd78e4891 Better [#CLICKHOUSE-2]. 2017-12-02 00:13:25 +03:00
Roman Lipovsky
639d850d97 abstract config repository of user-defined objects (dictionaries, models) 2017-11-28 14:00:07 +03:00
Alexey Vasiliev
592f892821 fixed one more ConfigProcessor usage [#MOBMET-7044] 2017-11-25 02:00:10 +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
Nikolai Kochetov
371e234f01 changed ExternalLoader::getObjectsMap return type [#CLICKHOUSE-3305] 2017-10-26 17:26:03 +03:00
Nikolai Kochetov
2e6b1dfd92 renamed cloneObject to clone in IExternalLoadable [#CLICKHOUSE-3305] 2017-10-26 16:42:14 +03:00
Nikolai Kochetov
99e9c0c486 fix build [#CLICKHOUSE-3305]
fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]

fix build [#CLICKHOUSE-3305]
2017-10-20 18:45:16 +03:00
Nikolai Kochetov
61bef2adf1 added ExternalLoader [#CLICKHOUSE-3305] 2017-10-06 13:31:06 +03:00