Fix segfault with -StateResample combinators#12092
Merged
alexey-milovidov merged 2 commits intoClickHouse:masterfrom Jul 6, 2020
Merged
Fix segfault with -StateResample combinators#12092alexey-milovidov merged 2 commits intoClickHouse:masterfrom
alexey-milovidov merged 2 commits intoClickHouse:masterfrom
Conversation
alexey-milovidov
requested changes
Jul 4, 2020
src/Interpreters/Aggregator.cpp
Outdated
| ColumnAggregateFunction & column_aggregate_func = assert_cast<ColumnAggregateFunction &>(*final_aggregate_columns[i]); | ||
| ColumnAggregateFunction * column_aggregate_func = nullptr; | ||
| /// Aggregate state can be wrapped into array if aggregate function ends with -Resample combinator. | ||
| if (auto * column_array = typeid_cast<ColumnArray *>(final_aggregate_columns[i].get())) |
Member
There was a problem hiding this comment.
Is it possible with other columns? Why don't use IColumn::forEachSubcolumn?
Member
Author
There was a problem hiding this comment.
Now it's impossible, but I agree, that forEachSubcolumn is better.
Member
|
PS. I see three invocations of |
Member
Author
|
Other invocations are done at intermidiate aggregation step and the columns are always |
alexey-milovidov
approved these changes
Jul 6, 2020
robot-clickhouse
added a commit
that referenced
this pull request
Jul 7, 2020
…ab8498a78020ec907afe13178dcf4 Cherry pick #12092 to 20.5: Fix segfault with -StateResample combinators
alexey-milovidov
added a commit
that referenced
this pull request
Jul 7, 2020
…#12240) * Fixup * DOCS-636 Synchronized some edits from EN to RU (#11941) * [review][clickhousedocs][translate] DOCSUP-1351: Edit and translate to Russian (#129) * DOCSUP-1351: Add blockSerializedSize (RU) * DOCSUP-1351: Fix blockSerializedSize description by function description template. * DOCSUP-1351: PR8756- Update Distributed engine section. * DOCSUP-1351: PR9076-Show Queries more like MySQL did. * DOCSUP-1351: PR#9919-system.tables improvements (total_rows/total_bytes/storage_policy) * DOCSUP-1351: (ru) blockSerializedSize remake by template. * DOCSUP-1351: PR#9598-Add function arrayReduceInRange and update arrayReduce function. * DOCSUP-1351: PR#9598 Fix arrayReduce and arrayReduceInRanges sections by template. * DOCSUP-1351: Some fixes. * DOCSUP-1351: Some fixes. Co-authored-by: romanzhukov <[email protected]> * CLICKHOUSEDOCS-636: Minor changes. Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: Roman Bug <[email protected]> Co-authored-by: romanzhukov <[email protected]> * Use ConcurentBoundedQueue instead of vector * Temporary enable debug logs when releasing docs * Better docker images list * [docs] improve stable releases discovery * Update contrib/jemalloc-cmake/CMakeLists.txt * Remove libevent library * Automated backporting machinery (#12029) * Add automated cherry-pick machinery * Added script for backporting machinery * Implement dry-run mode * Comment old methods * Fix python2 * Add ya.make for sandbox tasks * Remove old stuff * Move writing to RabbitMQ into background task * Add TLB misses perf counters. * Update ThreadProfileEvents.cpp * Fake change in dockerfile * Fix tuple nullable comparison. * Fix access rights: cannot grant INTROSPECTION when allow_introspection_functions=0. * fixup * Update ThreadProfileEvents.cpp * Fix test. * Added test. * Fix and simplify code * Fix test. * Update ITransformingStep.h * Fix "Sharding key is not deterministic" message * Do not check *optimize_skip_unused_shards_nesting w/o *optimize_skip_unused_shards This will avoid supperior log message in case of *optimize_skip_unused_shards_nesting already disables it. And also it is logical. * Fix function if with FixedString arguments of different sizes * Add multiIf * Fix error * Remove test that is not supported by "Arcadia" build system * Fix constraints check for constant columns * Make topK return Enum for Enum types * parse metadata in parallel when loading tables * Fix error * Fix build * fixup * Update ThreadProfileEvents.cpp * Update browse-code.md (#12047) * Update browse-code.md 纠正了一些翻译错误。 * Update browse-code.md Co-authored-by: Ivan Blinkov <[email protected]> * Bump python-slugify from 1.2.6 to 4.0.1 in /docs/tools Bumps [python-slugify](https://github.com/un33k/python-slugify) from 1.2.6 to 4.0.1. - [Release notes](https://github.com/un33k/python-slugify/releases) - [Changelog](https://github.com/un33k/python-slugify/blob/master/CHANGELOG.md) - [Commits](un33k/python-slugify@1.2.6...4.0.1) Signed-off-by: dependabot-preview[bot] <[email protected]> * Update ThreadProfileEvents.cpp * Update README.md * Fix typo (#12046) * Fix test_allow_introspection. * Try fix labda tuple(LC) argument. * Test image changes * Try fix labda tuple(LC) argument. * Add pvs studio to images * Added test. * fix low card types in merge join (#12035) * Update contrib/poco to ClickHouse-Extras/poco #22 (#12037) * Updated ClickHouse-Extras/poco #22 * Fix defaultValueOfArgumentType * Added test. * Update cpu_synthetic.xml * Moves task shall be started if new storage policy needs them. * Added test for automatic start of background move task. * Add ability to run any image version from packager and runner * Check type of filter for prewhere. * Check type of filter for prewhere. * Check type of filter for prewhere. * Check type of filter for prewhere. * Added test. * Try fix pk in tuple performance Possible approach for fixing #10574 The problem is that prepared sets are built correctly, it is a hash map of key -> set where key is a hash of AST and list of data types (when we a list of tuples of literals). However, when the key is built from the index to try and find if there exists a prepared set that would match it looks for data types of the primary key (see how data_types is populated) because the primary key has only one field (v in my example) it can not find the prepared set. The patch looks for any prepared indexes where data types match for the subset of fields found in primary key, we are not interested in other fields anyway for the purpose of primary key pruning. * Fix partial revokes (complex cases). * Changelog for 20.3.11, 12 * simple changelog script * bump CI * Fix tests. * Add explicit test for a case where AST hashes collide for different prepared sets * [blog] add RSS feed (#12064) * [blog] add rss feed * better title * Update CHANGELOG.md Co-authored-by: Ivan Blinkov <[email protected]> * bump ci * Moved useless S3 logging to TRACE level. * Add a test to cover non-const tuple elemenets (just in case) * Bump * Update query-complexity.md Remove a note about read limits applied on threads level. * Update query-complexity.md * Update query-complexity.md * Update query-complexity.md * DOCS-609: max_server_memory_usage (#11771) * Revolg DOCSUP-1000 add max server memory usage setting (#125) * Add max_server_memory_usage setting, delete max_memory_usage_for_all_queries setting. * Syntax fixed * Apply suggestions from code review Co-authored-by: BayoNet <[email protected]> * Doc for the max_server_memory_usage setting. Updates. Co-authored-by: Olga Revyakina <[email protected]> Co-authored-by: BayoNet <[email protected]> * CLICKHOUSEDOCS-609: Minor fixes. * CLICKHOUSEDOCS-609: Actualized position of the setting. Co-authored-by: olgarev <[email protected]> Co-authored-by: Olga Revyakina <[email protected]> Co-authored-by: Sergei Shtykov <[email protected]> * Add force_primary_key to a pk in tuple test * DOCS-510: runningAccumulate (#12061) * asiana21-DOCSUP-797 (#117) * docs(runningAccumulate): the function description is added * docs(runningAccumulate): the function description is modified * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * docs(runningAccumulate): some changes * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: BayoNet <[email protected]> * docs(runningAccumulate): added ru translation Co-authored-by: asiana21 <[email protected]> Co-authored-by: BayoNet <[email protected]> * CLICKHOUSEDOCS-510: Minor fix. * Update docs/en/sql-reference/functions/other-functions.md Co-authored-by: Ivan Blinkov <[email protected]> * CLICKHOUSEDOCS-510: Fixed links. Co-authored-by: AsiaKorushkina <[email protected]> Co-authored-by: asiana21 <[email protected]> Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: Ivan Blinkov <[email protected]> * Remove const specifier to allow auto-move (clangtidy) * Rewrite Set lookup to make it more readable * [docs] Sync zh/development/build-osx.md from EN (#12071) * ISSUES-4006 support first for ALTER ADD|MODIFY COLUMN * Update deb image * Don't download image twice * Remove garbage from images * bump ci * Changelog for 20.1, 20.4 * fixup * DOCS-635: Translated the EN version of the AvroConfluent format description (#11930) * DOCSUP-1350 (#128) * edited EN version * add EN and RU translation * minor changes * CLICKHOUSEDOCS-635: Updated the description. Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: Evgenia Sudarikova <[email protected]> * Fix tests. * Better PVS image * DOCS-605: Description for the always_fetch_merged_part setting (#11921) * Revolg DOCSUP-998 Document the always_fetch_merged_part setting (#123) * Add always_fetch_merged_part setting * revolg-DOCSUP-998-add_always_fetch_merged_part_setting link fixed * Apply suggestions from code review Co-authored-by: BayoNet <[email protected]> * Add always_fetch_merged_part setting. Updates. * Update docs/en/operations/settings/settings.md Co-authored-by: BayoNet <[email protected]> * Add always_fetch_merged_part setting. Updates. Co-authored-by: Olga Revyakina <[email protected]> Co-authored-by: BayoNet <[email protected]> * CLICKHOUSEDOCS-605: Minor fixes. * CLICKHOUSEDOCS-605: Added Plausible to Adopters. * Update docs/ru/operations/settings/settings.md Co-authored-by: alesapin <[email protected]> * Update docs/en/operations/settings/settings.md Co-authored-by: alesapin <[email protected]> * CLICKHOUSEDOCS-605: Fixed access rights description. Co-authored-by: olgarev <[email protected]> Co-authored-by: Olga Revyakina <[email protected]> Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: alesapin <[email protected]> * Update Dockerfile * revert e9d3c48 * [blog] 'Package Repository Behind CDN' post (#12082) * support iframes from DataLens * initial blog post text * Improve REVOKE command: now it requires only grant/admin option for only access which will be revoked. REVOKE ALL FROM user1 now revokes all granted roles. * Fix limiting the number of threads for VIEW. * Update tips.md * Added test. * Remove pvs studio from images list * Better shutdown and conversion * Reverse arguments * Fix result_rows and result_bytes metrics for selects. * Fix result_rows and result_bytes metrics for selects. * improve breadcrumbs markup * Fix tests. * fix segfault with -StateResample combinators * Less race conditions * [docker] install ca-certificates before the first apt-get update (#12095) * [docker] install ca-certificates before first apt-get update * Update Dockerfile * DOCS-522: max_parser_depth (#12097) * asiana21-DOCSUP-925-max_parser_depth (#132) * docs(max_parser_depth): added the setting description * docs(max_parser_depth): some changes * Update docs/en/operations/settings/settings.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/operations/settings/settings.md Co-authored-by: BayoNet <[email protected]> * Update docs/en/operations/settings/settings.md Co-authored-by: BayoNet <[email protected]> * docs(max_parser_depth): added ru translation * docs(max_parser_depth): removed quotation marks Co-authored-by: asiana21 <[email protected]> Co-authored-by: BayoNet <[email protected]> * CLICKHOUSEDOCS-522: Fixed the link. Co-authored-by: AsiaKorushkina <[email protected]> Co-authored-by: asiana21 <[email protected]> Co-authored-by: Sergei Shtykov <[email protected]> * Rewrite curl dependency in a more ch compatible way - add support of unbundled curl - add CURL::libcurl libraries - avoid explicit linkage of daemon with curl (added with sentry) - set CACHE variables for non-direct users: - mariadb-connector-c - aws-s3-cmake - sentry-native Cc: @alexey-milovidov Cc: @alesapin (requires docker image update) Cc: @abyss7 Refs: #11300 Refs: #8011 Refs: #8905 v2: replace cmake/find/curl.cmake with proper contrib/curl-cmake (as pointed by @abyss7, cmake/find/*.cmake is deprecated) * Added results for AWS Lightsail * (typo) in doc (#12099) * Added test. * Create codeql-analysis.yml * Tiny fixes * Create anchore-analysis.yml * Changelog for 20.5 * Update CHANGELOG.md * Update README.md * Fix test (#12088) * Test for a fixed issue #10668, related to input_format_allow_errors_num in CSV * Add unbundled mode flag * Remove LC converting to Arrow. * Remove LC converting to Arrow. * Move skip lists to clickhouse-test * Remove LC converting to Arrow. * More verbose message about skip * Make skip-list optional * Added test. * Add type column in system.disks * Update clickhouse-test * Fix handling dependency of table with ENGINE=Dictionary on dictionary. * Add test. * Update 01355_CSV_input_format_allow_errors.sh * Update CHANGELOG.md * Added a showcase of minimal Docker image * Added a comment * Added a comment * Added a comment * Formatting * contrib/unixodbc-cmake: Fix build when UNBUNDLED target_compile_definitions may only set INTERFACE properties on IMPORTED targets * Fix version column in replicated version collapsing merge tree (#12121) * poco-cmake: Fix Poco::Data::ODBC target when UNBUNDLED By default IMPORTED target has a scope in the directory in which it is created and below. This leads to the following issues when building UNBUNDLED: Target "clickhouse" links to target "Poco::Data::ODBC" but the target was not found. Perhaps a find_package() call is missing for an IMPORTED target, or an ALIAS target is missing? * Add missed <atomic> include in ProxyListConfiguration * Improve performace of reading in order of sorting key. (#11696) * simplify reading in order of sorting key * add perf test for reading many parts * Revert "simplify reading in order of sorting key" This reverts commit 7267d7c. * add threshold for preliminary merge for reading in order * better threshold * limit threads in test * Do not enable sentry if ENABLE_LIBRARIES is not set * Fail if curl library was enabled and was not found in case of unbundled build * Normalize "pid" file handling #3501 * Update StatusFile.cpp * New ISO8601 year modificators for formatDateTime * Added a test * Include libcurl4-openssl-dev into yandex/clickhouse-deb-builder * Remove harmful code from "geoDistance" #12117 * Update formatDateTime.cpp * Fix warnings from CodeQL * Added a test * Minor modification * Update libdivide to the latest master * Replace exit to abort in libdivide * Fix potential overflow in integer division #12119 * Added a test * Whitespace * Added a test for #4211 * Attempt to fix "Arcadia" build * Rename test * Update arraySum.cpp * Make code clearer: use enum instead of `bool internal`. * Update StorageDictionary.h * Update StorageDictionary.h * ILIKE operator (#12125) * Integrated CachingAllocator into MarkCache * fixed build errors * reset func hotfix * upd: Fixing build * updated submodules links * fix 2 * updating grabber allocator proto * updating lost work * updating CMake to use concepts * some other changes to get it building (integration into MarkCache) * further integration into caches * updated Async metrics, fixed some build errors * and some other errors revealing * added perfect forwarding to some functions * fix: forward template * fix: constexpr modifier * fix: FakePODAllocator missing member func * updated PODArray constructor taking alloc params * fix: PODArray overload with n restored * fix: FakePODAlloc duplicating alloc() func * added constexpr variable for alloc_tag_t * split cache values by allocators, provided updates * fix: memcpy * fix: constexpr modifier * fix: noexcept modifier * fix: alloc_tag_t for PODArray constructor * fix: PODArray copy ctor with different alloc * fix: resize() signature * updating to lastest working master * syncing with 273267 * first draft version * fix: update Searcher to case-insensitive * added ILIKE test * fixed style errors, updated test, split like and ilike, added notILike * replaced inconsistent comments * fixed show tables ilike * updated missing test cases * regenerated ya.make * Update 01355_ilike.sql Co-authored-by: myrrc <[email protected]> Co-authored-by: alexey-milovidov <[email protected]> * add parseDateTimeBestEffortUS function (#12028) * add function parseDateTimeBestEffortUS * add test * add doc Co-authored-by: alexey-milovidov <[email protected]> * Cleanup changelog (half done). Now it is acceptable #12104 * Cleanup changelog (half done). Now it is more acceptable #12104 * Cleanup changelog (half done). Now it is more acceptable #12104 * Cleanup changelog (half done). Additions requested by @filimonov #12104 * fix segfault with -StateResample combinators * Whitespace * Style Co-authored-by: Nikolai Kochetov <[email protected]> Co-authored-by: Ivan Blinkov <[email protected]> Co-authored-by: Alexander Kuzmenkov <[email protected]> Co-authored-by: alesapin <[email protected]> Co-authored-by: BayoNet <[email protected]> Co-authored-by: Sergei Shtykov <[email protected]> Co-authored-by: Roman Bug <[email protected]> Co-authored-by: romanzhukov <[email protected]> Co-authored-by: kssenii <[email protected]> Co-authored-by: tavplubix <[email protected]> Co-authored-by: Alexander Kuzmenkov <[email protected]> Co-authored-by: Ivan <[email protected]> Co-authored-by: Vitaly Baranov <[email protected]> Co-authored-by: alexey-milovidov <[email protected]> Co-authored-by: Nikita Mikhaylov <[email protected]> Co-authored-by: Azat Khuzhin <[email protected]> Co-authored-by: chengy8934 <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: MicrochipQ <[email protected]> Co-authored-by: Artem Zuikov <[email protected]> Co-authored-by: Alexander Kazakov <[email protected]> Co-authored-by: Vladimir Chebotarev <[email protected]> Co-authored-by: Nicolae Vartolomei <[email protected]> Co-authored-by: filimonov <[email protected]> Co-authored-by: olgarev <[email protected]> Co-authored-by: Olga Revyakina <[email protected]> Co-authored-by: AsiaKorushkina <[email protected]> Co-authored-by: asiana21 <[email protected]> Co-authored-by: BohuTANG <[email protected]> Co-authored-by: zhang2014 <[email protected]> Co-authored-by: Evgenia Sudarikova <[email protected]> Co-authored-by: Anton Popov <[email protected]> Co-authored-by: manmitya <[email protected]> Co-authored-by: Nikolai Kochetov <[email protected]> Co-authored-by: Mikhail Filimonov <[email protected]> Co-authored-by: Anton Ivashkin <[email protected]> Co-authored-by: Ilya Yatsishin <[email protected]> Co-authored-by: tavplubix <[email protected]> Co-authored-by: Matwey V. Kornilov <[email protected]> Co-authored-by: vivarum <[email protected]> Co-authored-by: myrrc <[email protected]> Co-authored-by: myrrc <[email protected]> Co-authored-by: flynn <[email protected]>
alesapin
pushed a commit
that referenced
this pull request
Jul 10, 2020
Fix segfault with -StateResample combinators (cherry picked from commit 3aad122)
alesapin
pushed a commit
that referenced
this pull request
Jul 10, 2020
Fix segfault with -StateResample combinators (cherry picked from commit 3aad122)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix segfault with
-StateResamplecombinators.Detailed description / Documentation draft:
Fixes #12044.