Alexey Milovidov
213ecaedde
Fix issues with merging configs
2021-09-21 21:51:59 +03:00
Alexey Milovidov
a6d0cda7c1
Merging #24404
2021-07-10 10:12:18 +03:00
alexey-milovidov
7a1a184c48
Merge pull request #24404 from nvartolomei/nv/config-in-place-include
...
Support for multiple includes in XML based configuration
2021-07-10 10:10:18 +03:00
Vitaly Baranov
fc3d77bd66
Fix underscore before preprocessed configs.
2021-06-18 06:14:11 +03:00
mergify[bot]
b1deed7659
Merge branch 'master' into config-processor-xml-default
2021-06-08 00:54:17 +00:00
Azat Khuzhin
eb08bb0669
Case-insensitive config extensions
2021-05-30 20:08:37 +03:00
Azat Khuzhin
1cda2bb2f0
Process config w/o extensions as XML format
...
I'm using such hack to hide the password:
$ clickhouse-client --config <(echo '<config><password></password></config>')
But this had been broken in #21858
v2: add a test
v3: fail for unsupported extensions
2021-05-30 20:08:21 +03:00
Nicolae Vartolomei
027fc70ace
Validate that include element is used properly
2021-05-24 14:26:49 +01:00
Nicolae Vartolomei
399e998ecb
Count non-empty substitutions, easier to interpret
2021-05-24 14:26:49 +01:00
Nicolae Vartolomei
700850a970
Add more tests and handle correctly missing include
2021-05-24 14:24:39 +01:00
Nicolae Vartolomei
4c3882f2f9
Config in-place include
2021-05-24 14:24:39 +01:00
kssenii
1c43b333ea
Merge branch 'master' of github.com:ClickHouse/ClickHouse into poco-file-to-std-fs
2021-05-22 21:26:48 +03:00
kssenii
096d117f68
Review fixes
2021-05-22 00:12:46 +03:00
BoloniniD
33755f1f3d
Implemented YAMLParser class
2021-05-21 21:56:22 +03:00
kssenii
3dee003f9b
Merge branch 'master' of github.com:ClickHouse/ClickHouse into poco-file-to-std-fs
2021-05-20 19:20:09 +03:00
kssenii
b123ec1354
Poco::FileException, Poco::parentPath
2021-05-14 00:20:28 +03:00
alesapin
41eadf9127
Something working
2021-05-12 16:04:34 +03:00
kssenii
81797393f1
fs::last_write_time, fs::space
2021-05-12 09:19:11 +03:00
kssenii
ab1a05a1f4
Poco::Path to fs::path, less concatination
2021-05-09 14:59:49 +03:00
kssenii
ee06936596
Merge branch 'master' of github.com:ClickHouse/ClickHouse into poco-file-to-std-fs
2021-05-01 17:24:31 +03:00
kssenii
378195a6d8
Update Dictionaries/*
2021-04-30 23:35:44 +03:00
kssenii
549b5f8a0c
Update Common/*
2021-04-30 23:16:35 +03:00
Benjamin Naecker
57fd59b73b
Adds support for building on Solaris-derived systems
...
This commit adds a number of changes to platform-detection and
compile-time directives required to support building ClickHouse on
Solaris-derived systems, most notably illumos.
2021-04-28 16:32:41 -07:00
Alexey Milovidov
fb3d235e84
Do not use strerror
2020-12-17 21:25:12 +03:00
Alexander Tokmakov
b94cc5c4e5
remove more stringstreams
2020-11-10 21:22:26 +03:00
Alexey Milovidov
fd84d16387
Fix "server failed to start" error
2020-11-07 03:14:53 +03:00
bharatnc
7b89adb10d
use std::filesystem::path in ConfigProcessor
...
This PR improves the way the ClickHouse config path,
preprocessed_configs path etc are being joined inside
`ConfigProcessor.cpp`.
Uses `std::filesystem::path` to join the paths instead of
standard string concatenation. This would improve path concatenation.
Current method of concatenation results in:
```bash
➜ clickhouse-server ls -latr
total 68
-rw-r--r-- 1 root root 5587 Aug 31 05:00 users.xml
drwxr-xr-x 143 root root 12288 Sep 7 11:23 ..
lrwxrwxrwx 1 root root 41 Sep 7 11:23 preprocessed -> /var/lib/clickhouse//preprocessed_configs
drwxr-xr-x 2 root root 4096 Sep 7 11:23 users.d
-rw-r--r-- 1 root root 34252 Sep 7 11:28 config.xml
drwxr-xr-x 4 root root 4096 Sep 7 11:28 .
drwxr-xr-x 2 root root 4096 Sep 7 11:28 config.d
```
The symlink `/var/lib/clickhouse//preprocessed_configs` will still work.
amd this PR is an improvement to the current method of path
concatenation.
2020-09-07 12:45:52 -07:00
Alexey Milovidov
0f79eb3cc5
Embed configs into binary
2020-08-08 06:42:42 +03:00
Nikita Mikhaylov
4d49d2c671
another removes
2020-07-30 13:31:14 +03:00
Alexey Milovidov
25f941020b
Remove namespace pollution
2020-05-31 00:57:37 +03:00
Alexey Milovidov
7e1813825b
Return old names of macros
2020-05-24 01:24:01 +03:00
Alexey Milovidov
61cc605ee7
Remove old method
2020-05-24 01:21:29 +03:00
Alexey Milovidov
f75587e562
Progress on task
2020-05-23 23:13:34 +03:00
Alexey Milovidov
7e2fb9ad65
Apply all transformations again
2020-05-23 22:38:30 +03:00
Alexey Milovidov
29762240de
Remove duplicate whitespaces (preparation)
2020-05-23 22:31:54 +03:00
Alexey Milovidov
7fed65cbe2
Remove duplicate whitespaces (preparation)
2020-05-23 22:14:58 +03:00
Alexey Milovidov
ab0562a574
Make all LOG in single line (preparation)
2020-05-23 22:05:41 +03:00
Alexey Milovidov
241f8c5431
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" \+ [^+]+ \+ "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" \+ ([^+]+) \+ "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5", \4);/'
2020-05-23 20:10:21 +03:00
Alexey Milovidov
8042e5febe
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+" << [^<]+\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)" << ([^<]+)\);/\1_FORMATTED(\2, "\3{}\5{}", \4, \6);/'
2020-05-23 19:58:15 +03:00
Alexey Milovidov
e391b77d81
find {base,src,programs} -name '*.h' -or -name '*.cpp' | xargs grep -l -P 'LOG_\w+\([^,]+, "[^"]+" << [^<]+ << "[^"]+"\);' | xargs sed -i -r -e 's/(LOG_\w+)\(([^,]+), "([^"]+)" << ([^<]+) << "([^"]+)"\);/\1_FORMATTED(\2, "\3{}\5", \4);/'
2020-05-23 19:56:05 +03:00
Alexey Milovidov
be22a4b94e
Checkpoint
2020-04-22 08:39:31 +03:00
Ivan Lezhankin
06446b4f08
dbms/ → src/
2020-04-03 18:14:31 +03:00
