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.

Sign up for GitHub

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

Jump to bottom

22.8 Backport of #60768 - Update tzdata to 2024a #398

Open
wants to merge 2 commits into
base: customizations/22.8.21
Choose a base branch
from
Open

22.8 Backport of #60768 - Update tzdata to 2024a #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14dbaf9
Updated checkout action and runner tags
Enmk May 8, 2024
3b40f10
Merge pull request #60768 from Algunenano/2024a
alexey-milovidov Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 44 additions & 43 deletions .github/workflows/release_branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ on: # yamllint disable-line rule:truthy

jobs:
# DockerHubPushAarch64:
# runs-on: [self-hosted, style-checker-aarch64]
# runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86-aarch64]
# steps:
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# - name: Images check
# run: |
# cd "$GITHUB_WORKSPACE/tests/ci"
Expand All @@ -46,10 +46,10 @@ jobs:
# path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
# Former DockerHubPushAmd64
DockerHubPush:
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Images check
Expand All @@ -68,10 +68,10 @@ jobs:
path: ${{ runner.temp }}/docker_images_check/changed_images.json
# DockerHubPush:
# needs: [DockerHubPushAmd64, DockerHubPushAarch64]
# runs-on: [self-hosted, style-checker]
# runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
# steps:
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# - name: Download changed aarch64 images
# uses: actions/download-artifact@v2
# with:
Expand All @@ -93,7 +93,7 @@ jobs:
# path: ${{ runner.temp }}/changed_images.json
CompatibilityCheck:
needs: [BuilderDebRelease]
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Set envs
run: |
Expand All @@ -103,7 +103,7 @@ jobs:
REPORTS_PATH=${{runner.temp}}/reports_dir
EOF
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Download json reports
Expand All @@ -129,7 +129,7 @@ jobs:
#########################################################################################
BuilderDebRelease:
needs: [DockerHubPush]
runs-on: [self-hosted, builder]
runs-on: [self-hosted, altinity-on-demand, altinity-setup-builder, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Set envs
run: |
Expand All @@ -149,7 +149,7 @@ jobs:
- name: Trust My Directory
run: git config --global --add safe.directory * # https://stackoverflow.com/a/71940133
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
submodules: true
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
# name: changed_images
# path: ${{ runner.temp }}/images_path
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# with:
# fetch-depth: 0 # otherwise we will have no info about contributors
# - name: Build
Expand Down Expand Up @@ -225,10 +225,10 @@ jobs:
needs:
- BuilderDebRelease
# - BuilderDebAarch64
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
fetch-depth: 0 # It MUST BE THE SAME for all dependencies and the job itself
Expand All @@ -251,10 +251,11 @@ jobs:
##################################### BUILD REPORTER #######################################
############################################################################################
BuilderReport:
if: ${{ success() || failure() }}
needs:
- BuilderDebRelease
# - BuilderDebAarch64
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
if: ${{ success() || failure() }}
steps:
- name: Set envs
Expand All @@ -271,7 +272,7 @@ jobs:
with:
path: ${{ env.REPORTS_PATH }}
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Report Builder
Expand All @@ -295,7 +296,7 @@ jobs:
# needs:
# # - BuilderBinDarwin
# - BuilderBinDarwinAarch64
# runs-on: [self-hosted, style-checker]
# runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
# if: ${{ success() || failure() }}
# steps:
# - name: Set envs
Expand All @@ -311,7 +312,7 @@ jobs:
# with:
# path: ${{ env.REPORTS_PATH }}
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# with:
# clear-repository: true
# - name: Report Builder
Expand All @@ -337,10 +338,10 @@ jobs:
# - BuilderBinDarwinAarch64
- BuilderDebRelease
# - BuilderDebAarch64
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Mark Commit Release Ready
Expand All @@ -352,7 +353,7 @@ jobs:
##############################################################################################
FunctionalStatelessTestRelease:
needs: [BuilderDebRelease]
runs-on: [self-hosted, func-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
steps:
- name: Set envs
run: |
Expand All @@ -368,7 +369,7 @@ jobs:
with:
path: ${{ env.REPORTS_PATH }}
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Functional test
Expand All @@ -388,7 +389,7 @@ jobs:
sudo rm -fr "$TEMP_PATH"
# FunctionalStatelessTestAarch64:
# needs: [BuilderDebAarch64]
# runs-on: [self-hosted, func-tester-aarch64]
# runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86-aarch64]
# steps:
# - name: Set envs
# run: |
Expand All @@ -404,7 +405,7 @@ jobs:
# with:
# path: ${{ env.REPORTS_PATH }}
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# with:
# clear-repository: true
# - name: Functional test
Expand All @@ -427,7 +428,7 @@ jobs:
##############################################################################################
FunctionalStatefulTestRelease:
needs: [BuilderDebRelease]
runs-on: [self-hosted, func-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
steps:
- name: Set envs
run: |
Expand All @@ -443,7 +444,7 @@ jobs:
with:
path: ${{ env.REPORTS_PATH }}
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Functional test
Expand All @@ -463,7 +464,7 @@ jobs:
sudo rm -fr "$TEMP_PATH"
# FunctionalStatefulTestAarch64:
# needs: [BuilderDebAarch64]
# runs-on: [self-hosted, func-tester-aarch64]
# runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86-aarch64]
# steps:
# - name: Set envs
# run: |
Expand All @@ -479,7 +480,7 @@ jobs:
# with:
# path: ${{ env.REPORTS_PATH }}
# - name: Check out repository code
# uses: ClickHouse/checkout@v1
# uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
# with:
# clear-repository: true
# - name: Functional test
Expand All @@ -502,7 +503,7 @@ jobs:
#############################################################################################
IntegrationTestsRelease0:
needs: [BuilderDebRelease]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Set envs
run: |
Expand All @@ -519,7 +520,7 @@ jobs:
with:
path: ${{ env.REPORTS_PATH }}
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Integration test
Expand All @@ -539,7 +540,7 @@ jobs:
sudo rm -fr "$TEMP_PATH"
IntegrationTestsRelease1:
needs: [BuilderDebRelease]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
steps:
- name: Set envs
run: |
Expand All @@ -556,7 +557,7 @@ jobs:
with:
path: ${{ env.REPORTS_PATH }}
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Integration test
Expand Down Expand Up @@ -590,7 +591,7 @@ jobs:
matrix:
SUITE: [aes_encryption, aggregate_functions, atomic_insert, base_58, clickhouse_keeper, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, kafka, kerberos, lightweight_delete, data_types, part_moves_between_shards, rbac, selects, session_timezone, ssl_server, tiered_storage, window_functions]
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -650,7 +651,7 @@ jobs:
matrix:
STORAGE: [minio, aws_s3, gcs]
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -715,7 +716,7 @@ jobs:

clickhouse_keeper_ssl:
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -772,7 +773,7 @@ jobs:
./*/*/_instances/*.log
key_value:
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -832,7 +833,7 @@ jobs:
matrix:
SUITE: [authentication, external_user_directory, role_mapping]
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -888,7 +889,7 @@ jobs:

parquet:
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -945,7 +946,7 @@ jobs:

parquet_minio:
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -1003,7 +1004,7 @@ jobs:

parquet_aws:
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -1069,7 +1070,7 @@ jobs:
matrix:
STORAGE: [minio, aws_s3, gcs]
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -1138,7 +1139,7 @@ jobs:
matrix:
STORAGE: [minio, s3amazon, s3gcs]
needs: [regression_start]
runs-on: [self-hosted, stress-tester]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_REPORT_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_REPORT_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -1266,10 +1267,10 @@ jobs:
- parquet_aws
- s3
- tiered_storage_s3
runs-on: [self-hosted, style-checker]
runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86]
steps:
- name: Check out repository code
uses: ClickHouse/checkout@v1
uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
with:
clear-repository: true
- name: Finish label
Expand Down
2 changes: 1 addition & 1 deletion contrib/cctz
Open in desktop
Submodule cctz updated 77 files
+16 −4 BUILD
+3 −1 CMakeLists.txt
+2 −2 include/cctz/civil_time_detail.h
+1 −0 include/cctz/time_zone.h
+1 −112 src/cctz_benchmark.cc
+1 −1 src/time_zone_fixed.cc
+4 −4 src/time_zone_format.cc
+199 −187 src/time_zone_format_test.cc
+10 −6 src/time_zone_if.cc
+6 −3 src/time_zone_if.h
+4 −2 src/time_zone_impl.cc
+4 −0 src/time_zone_impl.h
+358 −331 src/time_zone_info.cc
+8 −17 src/time_zone_info.h
+51 −33 src/time_zone_libc.cc
+7 −2 src/time_zone_libc.h
+121 −24 src/time_zone_lookup.cc
+47 −135 src/time_zone_lookup_test.cc
+1 −1 src/time_zone_posix.h
+3 −11 src/tzfile.h
+1 −1 testdata/README.zoneinfo
+1 −1 testdata/version
+ − testdata/zoneinfo/America/Ensenada
+ − testdata/zoneinfo/America/Godthab
+ − testdata/zoneinfo/America/Goose_Bay
+ − testdata/zoneinfo/America/Indiana/Winamac
+ − testdata/zoneinfo/America/Matamoros
+ − testdata/zoneinfo/America/Metlakatla
+ − testdata/zoneinfo/America/Miquelon
+ − testdata/zoneinfo/America/Moncton
+ − testdata/zoneinfo/America/Montreal
+ − testdata/zoneinfo/America/Nipigon
+ − testdata/zoneinfo/America/Nuuk
+ − testdata/zoneinfo/America/Ojinaga
+ − testdata/zoneinfo/America/Santa_Isabel
+ − testdata/zoneinfo/America/Scoresbysund
+ − testdata/zoneinfo/America/St_Johns
+ − testdata/zoneinfo/America/Thunder_Bay
+ − testdata/zoneinfo/America/Tijuana
+ − testdata/zoneinfo/America/Toronto
+ − testdata/zoneinfo/Antarctica/Casey
+ − testdata/zoneinfo/Antarctica/Macquarie
+ − testdata/zoneinfo/Antarctica/Troll
+ − testdata/zoneinfo/Antarctica/Vostok
+ − testdata/zoneinfo/Asia/Almaty
+ − testdata/zoneinfo/Asia/Gaza
+ − testdata/zoneinfo/Asia/Hebron
+ − testdata/zoneinfo/Asia/Ho_Chi_Minh
+ − testdata/zoneinfo/Asia/Nicosia
+ − testdata/zoneinfo/Asia/Qostanay
+ − testdata/zoneinfo/Asia/Saigon
+ − testdata/zoneinfo/Canada/Eastern
+ − testdata/zoneinfo/Canada/Newfoundland
+ − testdata/zoneinfo/Europe/Belfast
+ − testdata/zoneinfo/Europe/Bucharest
+ − testdata/zoneinfo/Europe/Chisinau
+ − testdata/zoneinfo/Europe/Guernsey
+ − testdata/zoneinfo/Europe/Isle_of_Man
+ − testdata/zoneinfo/Europe/Jersey
+ − testdata/zoneinfo/Europe/Kiev
+ − testdata/zoneinfo/Europe/Kyiv
+ − testdata/zoneinfo/Europe/London
+ − testdata/zoneinfo/Europe/Nicosia
+ − testdata/zoneinfo/Europe/Riga
+ − testdata/zoneinfo/Europe/Sofia
+ − testdata/zoneinfo/Europe/Tallinn
+ − testdata/zoneinfo/Europe/Tiraspol
+ − testdata/zoneinfo/Europe/Uzhgorod
+ − testdata/zoneinfo/Europe/Vilnius
+ − testdata/zoneinfo/Europe/Zaporozhye
+ − testdata/zoneinfo/GB
+ − testdata/zoneinfo/GB-Eire
+ − testdata/zoneinfo/Mexico/BajaNorte
+ − testdata/zoneinfo/Pacific/Norfolk
+11 −6 testdata/zoneinfo/iso3166.tab
+15 −14 testdata/zoneinfo/zone1970.tab
+303 −0 testdata/zoneinfo/zonenow.tab
9 changes: 9 additions & 0 deletions src/Core/SettingsFields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
#include <IO/ReadHelpers.h>
#include <IO/ReadBufferFromString.h>
#include <IO/WriteHelpers.h>

#include <boost/algorithm/string/predicate.hpp>
#include <cctz/time_zone.h>

#include <cmath>

Expand Down Expand Up @@ -441,6 +443,13 @@ String SettingFieldEnumHelpers::readBinary(ReadBuffer & in)
}


void SettingFieldTimezone::validateTimezone(const std::string & tz_str)
{
cctz::time_zone validated_tz;
if (!tz_str.empty() && !cctz::load_time_zone(tz_str, &validated_tz))
throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid time zone: {}", tz_str);
}

String SettingFieldCustom::toString() const
{
return value.dump();
Expand Down
Loading
Loading