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

Backporting Two Fixes To Release12.1 #7628

Closed
wants to merge 5 commits into from

Commits on Jun 17, 2024

  1. Fix CI issues after Github Actions networking changes (citusdata#7624)

    For some reason using localhost in our hba file doesn't have the
    intended effect anymore in our Github Actions runners. Probably because
    of some networking change (IPv6 maybe) or some change in the
    `/etc/hosts` file.
    
    Replacing localhost with the equivalent loopback IPv4 and IPv6 addresses
    resolved this issue.
    
    (cherry picked from commit 8c9de08)
    JelteF authored and paragikjain committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    de1cb0b View commit details
    Browse the repository at this point in the history
  2. Redo citusdata#7620: Fix merge command when insert value does not hav…

    …e source distributed column (citusdata#7627)
    
    Related to issue citusdata#7619, citusdata#7620
    Merge command fails when source query is single sharded and source and
    target are co-located and insert is not using distribution key of
    source.
    
    Example
    ```
    CREATE TABLE source (id integer);
    CREATE TABLE target (id integer );
    
    -- let's distribute both table on id field
    SELECT create_distributed_table('source', 'id');
    SELECT create_distributed_table('target', 'id');
    
    MERGE INTO target t
      USING ( SELECT 1 AS somekey
              FROM source
            WHERE source.id = 1) s
      ON t.id = s.somekey
      WHEN NOT MATCHED
      THEN INSERT (id)
        VALUES (s.somekey)
    
    ERROR:  MERGE INSERT must use the source table distribution column value
    HINT:  MERGE INSERT must use the source table distribution column value
    ```
    
    Author's Opinion: If join is not between source and target distributed
    column, we should not force user to use source distributed column while
    inserting value of target distributed column.
    
    Fix: If user is not using distributed key of source for insertion let's
    not push down query to workers and don't force user to use source
    distributed column if it is not part of join.
    
    This reverts commit fa4fc0b.
    
    Co-authored-by: paragjain <[email protected]>
    (cherry picked from commit aaaf637)
    JelteF authored and paragikjain committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    3af922e View commit details
    Browse the repository at this point in the history
  3. Enforce using werkzeug 2.3.7 for failure tests and update Postgres ve…

    …rsions to latest minors (citusdata#7491)
    
    Let's use version 2.3.7 to fix the following error as we do in docker
    images created in https://github.com/citusdata/the-process/ repo.
    ```
    ImportError: cannot import name 'url_quote' from 'werkzeug.urls' (/home/onurctirtir/.local/share/virtualenvs/regress-ffZKpSmO/lib/python3.9/site-packages/werkzeug/urls.py)
    ```
    
    And changing werkzeug version required rebuilding Pipfile.lock file in
    src/test/regress. Before updating this Pipfile.lock file, we want to
    make sure that versions specified there don't break any tests. And to
    ensure that this is the case,
    citusdata/the-process#155 synchronizes
    requirements.txt file based on new Pipfile.lock and hence this PR
    updates test image suffix accordingly.
    
    Also, while updating citusdata/the-process#155,
    I also had to update Postgres versions to latest minors to make image
    builds passing again and updating Postgres versions in images requires
    updating Postgres versions in this repo too. While doing that, we also
    update Postgres version used in devcontainer too.
    
    (cherry picked from commit 74b55d0)
    naisila authored and paragikjain committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9c39e00 View commit details
    Browse the repository at this point in the history
  4. Enforce using werkzeug 2.3.7 for failure tests and update Postgres ve…

    …rsions to latest minors (citusdata#7491)
    
    Let's use version 2.3.7 to fix the following error as we do in docker
    images created in https://github.com/citusdata/the-process/ repo.
    ```
    ImportError: cannot import name 'url_quote' from 'werkzeug.urls' (/home/onurctirtir/.local/share/virtualenvs/regress-ffZKpSmO/lib/python3.9/site-packages/werkzeug/urls.py)
    ```
    
    And changing werkzeug version required rebuilding Pipfile.lock file in
    src/test/regress. Before updating this Pipfile.lock file, we want to
    make sure that versions specified there don't break any tests. And to
    ensure that this is the case,
    citusdata/the-process#155 synchronizes
    requirements.txt file based on new Pipfile.lock and hence this PR
    updates test image suffix accordingly.
    
    Also, while updating citusdata/the-process#155,
    I also had to update Postgres versions to latest minors to make image
    builds passing again and updating Postgres versions in images requires
    updating Postgres versions in this repo too. While doing that, we also
    update Postgres version used in devcontainer too.
    
    (cherry picked from commit 74b55d0)
    onurctirtir authored and paragikjain committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    4838c65 View commit details
    Browse the repository at this point in the history
  5. Updates github checkout actions to v4 (citusdata#7611)

    Updates checkout plugin for github actions to v4. Can not update the
    version for check-sql-snapshots since new plugin causes below error in
    the docker image this step is using . Please refer to:
    https://github.com/citusdata/citus/actions/runs/9286197994/job/25552373953
    Error:
    ```
    /__e/node20/bin/node: /lib/x86_64-linux-gnu/libm.so.6: version `GLIBC_2.27' not found (required by /__e/node20/bin/node)
    /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found (required by /__e/node20/bin/node)
    /__e/node20/bin/node: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.25' not found (required by /__e/node20/bin/node)
    ```
    
    (cherry picked from commit 2874d7a)
    gurkanindibay authored and paragikjain committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    810f06f View commit details
    Browse the repository at this point in the history