alesapin
6ff1dce79a
Backquote key in debsign
2019-07-23 12:46:54 +03:00
Vitaly Baranov
e6aebb5b13
Fix after review.
2019-07-19 12:19:47 +03:00
Vitaly Baranov
9fb3135c23
Improve utility zookeeper-adjust-block-numbers-to-parts.
...
Add filter on shards and tables.
Add flag --dry-run.
The utility now checks cversion before doing anything.
2019-07-19 03:39:22 +03:00
alesapin
f32b3975c7
Fix version
2019-07-16 13:02:31 +03:00
alesapin
458a171fef
Add dependencies to rpm packages
2019-07-16 12:33:47 +03:00
alesapin
3f0df28109
Merge pull request #5977 from yandex/sign_rpms
...
Add ability to sign rpm packages
2019-07-11 19:03:21 +03:00
alesapin
a6220e289a
Add ability to sign rpm packages
2019-07-11 15:50:41 +03:00
Alexey Milovidov
8abe0990b2
Remove "clickhouse_compression" library because it is not a library (cyclic dependency via IDataType)
2019-07-10 00:43:04 +03:00
alexey-milovidov
3571011a49
Merge pull request #5719 from excitoon-favorites/arch-package
...
Added Arch linux package generation.
2019-06-28 15:00:15 +03:00
Vladimir Chebotarev
b0b821e5e3
Moved Arch Linux package template to a proper folder.
2019-06-28 07:22:03 +03:00
alesapin
ab8dd1d4e3
Merge pull request #5769 from yandex/add_rpm_build_to_packager
...
Add ability to build rpm and tgz packages via packager
2019-06-27 23:14:19 +03:00
alesapin
265c18b45f
Fix tgz-release in push packages
2019-06-27 19:00:26 +03:00
proller
1bb911f742
release --rpm: Fix redefining version
2019-06-27 18:37:13 +03:00
proller
0bd65f49a2
Better release --rpm
2019-06-27 17:12:53 +03:00
proller
3149b57100
release script: convert .deb to .rpm and .tgz ( #5740 )
2019-06-25 16:55:31 +03:00
alexey-milovidov
f9cab91447
Merge pull request #5617 from proller/fix15
...
19.8 build fixes
2019-06-14 17:29:51 +03:00
proller
09f3d68f6e
Use logging in clickhouse-local. Use config options in command line in clickhouse-client ( #5540 )
...
* Try fix macos server run
* Doc macos build
# Please enter the commit message for your changes. Lines starting
* CLICKHOUSE-3957 start wip
* tests wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* fix
* fix
* Making logger for clickhouse-local
* fixes
* wip
* wip
* wip
* wip
* clean
* cf
* wip
* fix
* Update CMakeLists.txt
* Update argsToConfig.h
* Update argsToConfig.cpp
* Update ExtendedLogChannel.h
* Update OwnPatternFormatter.cpp
2019-06-14 17:00:37 +03:00
proller
fc7ae399c4
Use system rapidjson; Fix types for macos;
2019-06-14 13:28:30 +03:00
Alexey Milovidov
f38042f006
Check for namespace comments in "check-style" tool #5561
2019-06-13 13:45:32 +03:00
alesapin
d4f474cd19
Add prestable releases to packages pusher
2019-05-31 14:42:36 +03:00
Alexey Milovidov
f406eb17ae
Added a tool to calculate checksums caused by bit flips
2019-05-19 01:48:28 +03:00
proller
51ca4cbaa4
Build fixes ( #5278 )
2019-05-15 20:19:39 +03:00
Ivan
4a5832b18a
Check the time limit every (flush_interval / poll_timeout) number of rows from Kafka ( #5249 )
2019-05-14 18:52:03 +03:00
proller
cc3de4115f
Build fixes ( #5261 )
2019-05-14 12:58:33 +03:00
Ivan
1eb835be35
Reduce maximum page size ( #5140 )
2019-04-29 17:22:04 +03:00
proller
fd63093032
Add gperf to build requirements (for upcoming pull request #5030 )
2019-04-25 17:31:08 +03:00
alesapin
8d808aedf3
Fix bug in s3uploader
2019-04-23 14:50:43 +03:00
Alexey Milovidov
720f911379
Removed obsolete files
2019-04-22 22:28:10 +03:00
alexey-milovidov
0cf40e0029
Merge pull request #5082 from yandex/pvs-studio-fixes-3
...
Resolved some of PVS-Studio warnings
2019-04-22 22:06:07 +03:00
alexey-milovidov
b1cf026b5b
Merge pull request #5080 from abyss7/issue-4736
...
Do not drop Kafka Consumer buffers after deletion of stream
2019-04-22 19:18:33 +03:00
Alexey Milovidov
58d7d1e451
Resolved some of PVS-Studio warnings
2019-04-22 19:07:09 +03:00
Ivan Lezhankin
7723a63d0a
Add helper utils to interact with Kafka broker
2019-04-18 17:36:51 +03:00
proller
525726a5e2
Remove pocoext ( #5036 )
2019-04-17 20:36:58 +03:00
alesapin
ed47aa109d
Merge pull request #4998 from abyss7/release-helpers
...
Detect backports by PRs to stable branches with `pr-backport` label
2019-04-16 20:05:18 +03:00
alesapin
faeb95cfd7
Merge branch 'master' into adaptive_index_granularity
2019-04-15 19:36:36 +03:00
Ivan Lezhankin
31a566c4f2
Detect backports by PRs to stable branches with pr-backport label
...
Also add some fancy colors.
2019-04-12 19:08:38 +03:00
alesapin
3accb16cc6
Merge pull request #4949 from abyss7/release-helpers
...
Add python util to help with releases
2019-04-11 19:28:58 +03:00
Ivan Lezhankin
722e022e54
Allow to filter PRs by login
2019-04-11 19:16:57 +03:00
Ivan Lezhankin
af7ab86ab6
Refactor queries
2019-04-11 18:08:25 +03:00
alesapin
9544784b71
Retry 500-error codes in changelog script
2019-04-11 13:54:19 +03:00
Ivan Lezhankin
1311244203
Detect backports via manually set labels.
2019-04-09 14:57:46 +03:00
Ivan Lezhankin
78d5de9dd3
Respect label color to check for backporting
2019-04-09 12:55:10 +03:00
Ivan Lezhankin
40be310fa0
Prettify output
2019-04-09 12:25:18 +03:00
Ivan Lezhankin
692c5a6ed2
Better filter associated pull-requests
2019-04-08 22:28:08 +03:00
Ivan Lezhankin
5a909b01b0
Print more problems
2019-04-08 19:11:13 +03:00
Ivan Lezhankin
be23dff3b0
Initial implementation.
...
Prints "good" and "bad" commits.
2019-04-08 18:33:05 +03:00
alesapin
a53b002973
Merge remote-tracking branch 'origin' into adaptive_index_granularity
2019-04-08 14:29:33 +03:00
Danila Kutenin
37d70ac558
MarkCache and UncompressedCache use different allocator to catch segfaults more reliable
2019-04-06 18:27:39 +03:00
alesapin
1291ecbed7
Better logging in adjust block util
2019-04-04 22:44:04 +03:00
alesapin
43ed0a8e7f
Style fix
2019-04-04 16:03:20 +03:00
alesapin
ee49252160
Add util for adjust block numbers in zookeper
2019-04-04 16:01:48 +03:00
alesapin
7b67200258
Merge remote-tracking branch 'origin' into adaptive_index_granularity
2019-04-01 11:54:19 +03:00
proller
1584fd4367
Fix hyperscan library find and use ( #4798 )
2019-03-26 00:31:00 +03:00
alesapin
b5d6813604
Fix vertical merge again
2019-03-20 20:04:34 +03:00
alesapin
2b2a637a38
Simpliest write/merge/select test works
2019-03-18 18:54:58 +03:00
Alexey Milovidov
825f0aab48
Fixed typo
2019-03-15 21:31:36 +03:00
proller
8c70de3bc7
Build fixes (freebsd) ( #4696 )
2019-03-14 23:52:10 +03:00
proller
cf8001b6a9
Fix includes ( #4673 )
2019-03-13 16:58:04 +03:00
proller
d2e18d47fb
Fix link in split mode ( #4574 )
2019-03-04 20:47:31 +03:00
alesapin
11a3a4bf68
Add first version of script for packages push
2019-03-04 15:56:46 +03:00
Amos Bird
26ab5dd7a7
A Proper lookup table that uses HashTable's API
...
This is the first step of allowing heterogeneous cells in hash tables.
performance test results are
```
1. HashMap<UInt16, UInt8, TrivialHash, HashTableFixedGrower<16>>;
2. NewLookupMap<UInt16, UInt8>
ResolutionWidth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................223550276.46
ResolutionWidth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................248772721.24
Best: 2 - 24877272124
ResolutionWidth 100000 1 ..........................................................................................................................................................................................................................................................238498413.99
ResolutionWidth 100000 2 ..........................................................................................................................................................................................................................................................261808889.98
Best: 2 - 26180888998
ResolutionWidth 300000 1 ...................................................................................239307348.81
ResolutionWidth 300000 2 ...................................................................................257592761.30
Best: 2 - 25759276130
ResolutionWidth 1000000 1 .........................240144759.26
ResolutionWidth 1000000 2 .........................257093531.91
Best: 2 - 25709353191
ResolutionWidth 5000000 1 .....241573260.35
ResolutionWidth 5000000 2 .....259314162.79
Best: 2 - 25931416279
ResolutionDepth 30000 1 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................217108119.84
ResolutionDepth 30000 2 .................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................249459504.41
Best: 2 - 24945950441
ResolutionDepth 100000 1 ..........................................................................................................................................................................................................................................................229065162.17
ResolutionDepth 100000 2 ..........................................................................................................................................................................................................................................................253769105.64
Best: 2 - 25376910564
ResolutionDepth 300000 1 ...................................................................................233079225.18
ResolutionDepth 300000 2 ...................................................................................256316273.78
Best: 2 - 25631627378
ResolutionDepth 1000000 1 .........................234184633.51
ResolutionDepth 1000000 2 .........................261100491.57
Best: 2 - 26110049157
ResolutionDepth 5000000 1 .....233118795.66
ResolutionDepth 5000000 2 .....252436160.41
Best: 2 - 25243616041
```
2019-03-01 16:47:13 +08:00
Vitaly Baranov
2e8669211a
Improve test: check input/output with protobuf schema containing nested messages.
2019-02-27 14:37:17 +03:00
Vitaly Baranov
78c808da10
Add a test for checking reading data from protobuf messages.
2019-02-20 07:28:18 +03:00
proller
e20c77e4c6
Add parquet support. Fixes, tests, ...
2019-02-19 23:51:44 +03:00
proller
f5560660be
Fix brotli (unbundled, missing, ...)
2019-02-13 18:35:11 +03:00
Alexey Milovidov
57e038c754
Added a script to check for ungrouped includes
2019-02-10 20:40:18 +03:00
Alexey Milovidov
fdf69f38c0
Added a script to check for duplicate includes
2019-02-10 20:00:29 +03:00
proller
e4f3713102
Fix link in split mode
2019-02-06 17:14:16 +03:00
alesapin
1c2087d3b8
Read revision from files only if it was not specified explicitly
2019-02-05 14:07:28 +03:00
alesapin
9d61d09c8c
Add ability to set version in release_lib.sh via env variables
2019-02-04 18:14:44 +03:00
alexey-milovidov
012bd5267b
Merge pull request #4195 from yandex/convert-parts-from-old-format
...
А tool to convert an old month-partition part to the custom-partitioned format
2019-01-31 22:45:44 +03:00
Alexey Zatelepin
8957e73681
a tool to convert an old month-partition part to the custom-partitioned format [#CLICKHOUSE-4231]
2019-01-30 16:51:39 +03:00
alesapin
0531722fc9
Better logging in script
2019-01-29 19:29:03 +03:00
alesapin
b7583337a8
Add s3uploader script in tools
2019-01-29 15:12:28 +03:00
alexey-milovidov
a175c9734a
Merge pull request #4173 from yandex/make-chengelog-script
...
make_changelog.py review fixes.
2019-01-28 23:37:51 +03:00
Nikolai Kochetov
8263b66510
make_changelog.py review fixes.
2019-01-28 21:06:13 +03:00
alexey-milovidov
25e0f56e39
Merge pull request #4169 from yandex/make-chengelog-script
...
Added script for changelog.
2019-01-28 19:48:39 +03:00
Nikolai Kochetov
b82c34f0c2
Added script for changelog.
2019-01-28 18:33:34 +03:00
Alexey Milovidov
4e3d9a0f15
Merge branch 'master' of github.com:yandex/ClickHouse into global-thread-pool
2019-01-28 14:20:24 +03:00
proller
5328251ff1
Fix build without protobuf, gtest, cppkafka ( #4152 )
2019-01-25 23:02:03 +03:00
Vitaly Baranov
ed1136e49e
Use more IO/WriteHelpers.h functions in the class ProtobufSimpleWriter,
...
rename variant=>varint.
2019-01-25 17:15:44 +03:00
Alexey Milovidov
65f8e4d4a8
Merge branch 'master' into global-thread-pool
2019-01-25 16:33:50 +03:00
Vitaly Baranov
2e383bfdeb
Added tests for writing protobufs.
2019-01-24 17:54:57 +03:00
proller
0939387514
Build fixes ( #4076 )
...
Move copy_headers.sh and formath.sh from root.
Debian: use default build dir (obj-x86_64-linux-gnu)
Debian: add test after build (GLIBC_required_version)
cmake: dont run copy headers if already copied
2019-01-18 18:19:53 +03:00
Alexey Milovidov
a7c468da8e
Merge remote-tracking branch 'origin/master' into global-thread-pool
2019-01-17 21:57:01 +03:00
Alexey Zatelepin
0f8e5f8522
Merge branch 'master' into zk-columns-compact-storage
...
Conflicts:
dbms/src/Storages/StorageReplicatedMergeTree.cpp
2019-01-16 17:45:16 +03:00
Alexey Milovidov
00a4b2cf8a
Removing garbage, part 1
2019-01-13 21:51:57 +03:00
proller
497b6ec2ad
Better compile with low memory; Fix macos build, add utils/build/build_debian_unbundled_split.sh test script ( #4030 )
2019-01-11 15:40:19 +03:00
alexey-milovidov
a739edc239
Merge pull request #4013 from yandex/pvs-studio-fixes-2
...
Fixed bugs found by PVS-Studio
2019-01-09 22:55:11 +03:00
proller
64c2c3650c
cmake: Dont cache version; macos: fix build; /release_lib.sh move to utils ( #4016 )
2019-01-09 21:32:43 +03:00
Alexey Milovidov
19f4652959
Fixed bugs found by PVS-Studio
2019-01-09 18:44:20 +03:00
proller
300bbdfb43
Fix cyclic lib depend ppart 2: clean
2018-12-28 21:15:26 +03:00
proller
0c78ef8573
Fix cyclic lib depend (make clickhouse_compression lib)
2018-12-28 20:27:53 +03:00
Alexey Zatelepin
46621aea32
add util to copy zookeeper trees [#CLICKHOUSE-4024]
2018-12-28 16:20:35 +03:00
alexey-milovidov
d16447c3f4
Merge pull request #3899 from yandex/custom_compression_codecs
...
Custom compression codecs
2018-12-28 08:29:09 +03:00
proller
1a0a879a51
Build fixes
2018-12-27 18:23:37 +03:00
alesapin
1e771a4aec
Fix error codes
2018-12-24 14:34:50 +03:00
proller
bebaf9d861
Fix includes, Faster compile ( #3898 )
...
* Fix includes
* Faster compile
* WTFix
* Limit compile and linking jobs according to available memory
* Add comment
* fix
* Remove ALL from copy-headers target
* Freebsd fix
* Better
* cmake: split use libcxx
2018-12-23 17:19:11 +03:00
alesapin
42b9735760
Add LZ4HC
2018-12-21 17:03:53 +03:00
proller
6869771ae4
Fix includes
2018-12-19 20:57:51 +03:00
proller
f1791e94e2
Do not write preprocessed configs to /etc/ ( #2443 )
2018-11-27 19:11:46 +03:00
Alexey Milovidov
7d6fffff48
More style checks [#CLICKHOUSE-3]
2018-11-24 04:48:06 +03:00
Alexey Milovidov
5ec3db20cd
More style checks [#CLICKHOUSE-2]
2018-11-23 21:55:43 +03:00
Alexey Milovidov
dbbacf4f87
Added more style checks [#CLICKHOUSE-3]
2018-11-23 21:52:00 +03:00
Alexey Milovidov
ab5d76fc42
Fixed error introduced in #3553 and prevent it happening
2018-11-21 23:56:37 +03:00
proller
1d40c2c871
Better link and deps ( #3631 )
...
* try fix 1
* Better deps
* fix
* fix
* fix
* Update CMakeLists.txt
* Update CMakeLists.txt
* fix
* fix
* fix
* disable old
* Update find_odbc.cmake
2018-11-21 22:20:27 +03:00
proller
2deb523265
Fix build with old capnp
2018-11-20 18:10:28 +03:00
proller
5678d1ed98
Build fixes ( #3545 )
...
* StorageSystemContributors clean
* Fix
* ARM fixes
* Fix arm compile
* fix
* Fix macos?
* Fix includes
* fix
* fix
* Try fix apple build part 1
* Fix identation
* Fix static libc++ in clang
* fix arm build
* better
* fix
* fix
* better check-include
2018-11-10 23:09:07 +03:00
proller
7dafcacd15
Build fixes ( #3459 )
2018-10-24 20:20:27 +03:00
proller
ff1598e972
Macos: set ENABLE_EMBEDDED_COMPILER=0 by default (because contrib/llvm temporary broken under macos) ( #3382 )
2018-10-16 12:30:51 +03:00
Alexey Milovidov
35d3a65881
Fixed postprocess-traces script [#CLICKHOUSE-4017]
2018-09-28 07:35:59 +03:00
alexey-milovidov
3fd0edefb9
Merge pull request #2992 from proller/fix13
...
Start making code quality tests : cmake .. -DENABLE_CODE_QUALITY=1 && ninja && ctest
2018-08-29 23:18:30 +03:00
proller
0f16160cb7
stderr.log fixes
2018-08-29 22:52:04 +03:00
proller
0ce1a9c095
Start making code quality tests : cmake .. -DENABLE_CODE_QUALITY=1 && ninja && ctest
2018-08-29 22:43:58 +03:00
proller
18044995ba
Fix includes
2018-08-28 22:36:27 +03:00
proller
3acce3bff9
Build fix ( #2944 )
...
* Build fix
* Better sample build scripts
* zlib apple fix
* fix
* fix
* better so version
* SPLIT_SHARED -> LINK_MODE
* clean
2018-08-27 17:39:20 +03:00
Alexey Milovidov
3475ef5304
Attempt to generalize ZooKeeper interface [#CLICKHOUSE-2]
2018-08-25 04:58:14 +03:00
proller
744b310a0f
Debian: Dont build utils
2018-08-23 19:06:45 +03:00
proller
518f1f41a3
clean
2018-08-23 15:28:45 +03:00
proller
300457da7a
fix
2018-08-21 21:35:47 +03:00
proller
87de8db717
fix
2018-08-21 19:35:54 +03:00
proller
fc2925b567
Squashed commit of the following:
...
commit 2722e540abfee4a527d716474c4ca582eceeee08
Merge: b4f3af824 aebddd5502aa7eb463f6e4ec97021cedbe465b81fdfc0
2018-08-21 18:56:50 +03:00
Alexey Milovidov
f6e4ec970a
Removed Poco::NumberParser (almost) [#CLICKHOUSE-2]
2018-08-20 22:48:15 +03:00
Alexey Milovidov
328c1387c0
Removed Poco::NumberFormatter [#CLICKHOUSE-2]
2018-08-20 22:35:04 +03:00
Alexey Milovidov
a2fca20a4b
Using libressl #1983
2018-08-05 11:42:09 +03:00
Alexey Milovidov
cf6e74aeac
Fixed Travis #2789
2018-08-03 23:34:33 +03:00
proller
010350a088
Build fixes ( #2794 )
...
* More information in 'Cannot read all data' errors
* Build fixes
* Apple version fix
* Fix
* clean
* New libs fixes
* Freebsd fixes
* macos fix
* Fix macos build
* fix
* fix
* Update CMakeLists.txt
* freebsd fix
* fix
* Update CMakeLists.txt
2018-08-03 19:39:04 +03:00
Alexey Milovidov
6b8fdb16f6
Fixed Travis [#CLICKHOUSE-2]
2018-08-02 22:17:21 +03:00
alexey-milovidov
9cd5228df2
Using jemalloc instead of tcmalloc. ( #2773 )
...
* Added jemalloc as submodule [#CLICKHOUSE-2]
* Imported jemalloc-cmake [#CLICKHOUSE-2]
* Added README for jemalloc-cmake [#CLICKHOUSE-2]
* Trying to add jemalloc [#CLICKHOUSE-2]
* Trying to add jemalloc [#CLICKHOUSE-2]
* Trying to add jemalloc [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
* Add support for jemalloc: development [#CLICKHOUSE-2]
2018-08-02 03:20:20 +03:00
proller
f88f68db09
Macos: fix include for mysql, use mariadb-connector-c in docs ( #2717 )
...
* Macos: fix mysql link
* Macos: Fix mysql include
* doc
2018-07-25 18:27:31 +03:00
proller
ab2a898257
Use clang-6 in release script for sanitizers
2018-07-12 20:58:37 +03:00
Max Vetrov
6e273978c5
Update mutator.cpp
...
Don't check variable res twice.
2018-06-25 21:04:57 +03:00
proller
fbe7df73a2
CLICKHOUSE-3762 Build fixes ( #2488 )
...
CONTRIB-254
2018-06-19 21:09:09 +03:00
Alexey Milovidov
eefc4fd9c5
Addition to prev. revision #2520
2018-06-18 05:19:42 +03:00
Alexey Milovidov
4b3b6b0d9b
Addition to prev. revision #2520
2018-06-18 05:14:29 +03:00
Alexey Milovidov
3d8455de00
Updated performance testing tool: output single number #1890
2018-06-13 09:04:04 +03:00
Alexey Milovidov
397ac0fb24
Updated performance testing tool #1890
2018-06-13 05:52:03 +03:00
Alexey Milovidov
37ffa4c948
Updated performance testing tool #1890
2018-06-13 04:52:52 +03:00
Alexey Milovidov
880807da5d
Updated performance testing tool #1890
2018-06-13 04:51:15 +03:00
Alexey Milovidov
4c8f2eb625
Updated performance testing tool #1890
2018-06-13 04:50:33 +03:00
Alexey Milovidov
fd7949a5c6
Updated performance testing tool #1890
2018-06-13 04:46:23 +03:00
Alexey Milovidov
a4939b9a98
Updated performance testing tool #1890
2018-06-13 04:44:13 +03:00
Alexey Milovidov
755310d6ff
Updated LZ4 performance testing tool #1890
2018-06-12 08:06:23 +03:00
Alexey Milovidov
e3d5a2860e
Updated LZ4 performance testing tool #1890
2018-06-12 08:04:16 +03:00
alexey-milovidov
17d90fe6da
Merge branch 'master' into lz4_experiments
2018-06-10 23:13:38 +03:00
Alexey Milovidov
64ea1046e1
Using ninja by default: updated instructions [#CLICKHOUSE-2]
2018-06-08 19:18:07 +03:00
proller
01a31414eb
Build fixes ( #2474 )
2018-06-06 21:41:39 +03:00
Alexey Milovidov
51044279e5
Squashed #2471
2018-06-05 23:09:51 +03:00
proller
4d12a823da
Use copy-headers from cmake. (working compiler test without package install) ( #2456 )
...
* Try use copy-headers from cmake [WIP]
* Using internal compiler without install
* 32bit Compile fix
* Fixes
* fix
* clean
* fix
* clean
2018-06-04 23:26:17 +03:00
Alexey Zatelepin
c9bb986330
Merge branch 'master' into replicated-mergetree-mutations
...
Conflicts:
dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
dbms/src/Storages/StorageReplicatedMergeTree.cpp
2018-05-31 18:52:42 +03:00
