Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove explicit enable_dictionaries files in integration tests #24728

Merged
merged 20 commits into from Jun 11, 2021

Conversation

qoega
Copy link
Member

@qoega qoega commented May 28, 2021

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Build/Testing/Packaging Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Integration tests configuration has special treatment for dictionaries. Removed remaining dictionaries manual setup.

Detailed description / Documentation draft:

We add 0_common_enable_dictionaries if dictionaries are set for node.

By adding documentation, you'll allow users to try your new feature immediately, not when someone else will have time to document it later. Documentation is necessary for all features that affect user experience in any way. You can add brief documentation draft above, or add documentation right into your patch as Markdown files in docs folder.

If you are doing this for the first time, it's recommended to read the lightweight Contributing to ClickHouse Documentation guide first.

Information about CI checks: https://clickhouse.tech/docs/en/development/continuous-integration/

@robot-clickhouse robot-clickhouse added the pr-build Pull request with build/testing/packaging improvement label May 28, 2021
@alexey-milovidov
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 6, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

Rebasing (1/2)

error: could not apply cb22773... try remove

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply cb22773... try remove
Auto-merging tests/integration/test_odbc_interaction/test.py
CONFLICT (content): Merge conflict in tests/integration/test_odbc_interaction/test.py
Removing tests/integration/test_odbc_interaction/configs/enable_dictionaries.xml
Removing tests/integration/test_library_bridge/configs/enable_dict.xml
Removing tests/integration/test_dictionary_custom_settings/configs/enable_dictionaries.xml
Auto-merging tests/integration/test_dictionary_allow_read_expired_keys/test_dict_get_or_default.py
Auto-merging tests/integration/test_dictionary_allow_read_expired_keys/test_default_string.py
Auto-merging tests/integration/test_dictionary_allow_read_expired_keys/test_default_reading.py
Removing tests/integration/test_dictionary_allow_read_expired_keys/configs/enable_dictionaries.xml
Auto-merging tests/integration/test_dictionaries_update_and_reload/test.py
Removing tests/integration/test_dictionaries_update_and_reload/configs/enable_dictionaries.xml
Removing tests/integration/test_dictionaries_select_all/configs/enable_dictionaries.xml
Removing tests/integration/test_dictionaries_null_value/configs/enable_dictionaries.xml
Auto-merging tests/integration/test_dictionaries_mysql/test.py
Removing tests/integration/test_dictionaries_mysql/configs/enable_dictionaries.xml
Removing tests/integration/test_dictionaries_dependency_xml/configs/enable_dictionaries.xml
Auto-merging tests/integration/test_dictionaries_complex_key_cache_string/test.py
CONFLICT (content): Merge conflict in tests/integration/test_dictionaries_complex_key_cache_string/test.py
CONFLICT (modify/delete): tests/integration/test_dictionaries_complex_key_cache_string/configs/enable_dictionaries.xml deleted in cb22773 (try remove) and modified in HEAD. Version HEAD of tests/integration/test_dictionaries_complex_key_cache_string/configs/enable_dictionaries.xml left in tree.
Removing tests/integration/test_dictionaries_all_layouts_separate_sources/configs/enable_dictionaries.xml


err-code: 099FE

@alexey-milovidov
Copy link
Member

@Mergifyio update

@alexey-milovidov alexey-milovidov self-assigned this Jun 6, 2021
@mergify
Copy link
Contributor

mergify bot commented Jun 6, 2021

Command update: success

Branch has been successfully updated

@alexey-milovidov
Copy link
Member

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Jun 9, 2021

Command update: success

Branch has been successfully updated

@qoega qoega force-pushed the remove-enable-dictionaries branch from 9793bc7 to 035df8b Compare June 9, 2021 19:35
@alexey-milovidov alexey-milovidov merged commit f96b512 into ClickHouse:master Jun 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-build Pull request with build/testing/packaging improvement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants