Merge branch 'main' into equivalence_slice_args

.bazelrc

@@ -94,11 +94,12 @@ build:debug --@rules_rust//:extra_rustc_flag="-Csplit-debuginfo=unpacked"
 
 # TODO(parkmycar): Enable this for macOS. `toolchains_llvm` defaults to ld64 which
 # doesn't support zlib compression.
-build:linux --linkopt="-Wl,--compress-debug-sections=zstd"
-build:linux --@rules_rust//:extra_rustc_flag="-Clink-arg=-Wl,--compress-debug-sections=zstd"
-build:linux --linkopt="-Wl,-O3"
+build:linux --linkopt="-Wl,--compress-debug-sections=zlib"
+build:linux --@rules_rust//:extra_rustc_flag="-Clink-arg=-Wl,--compress-debug-sections=zlib"
+# Specifying "-O2" uses level 6 zlib compression.
+build:linux --linkopt="-Wl,-O2"
 build:linux --@rules_rust//:extra_rustc_flag="-Clink-arg=-Wl,-O2"
-build:linux --copt="-gz=zstd"
+build:linux --copt="-gz=zlib"
 
 # Match the DWARF version used by Rust
 #
@@ -128,8 +129,7 @@ build --@rules_rust//:extra_rustc_flag="-Csymbol-mangling-version=v0"
 build --@rules_rust//:extra_rustc_flag="-Ccodegen-units=64"
 # Enabling pipelined builds allows dependent libraries to begin compiling with
 # just `.rmeta` instead of the full `.rlib`.
-# TODO: Reenable when fixed, currently still sometimes fails, see for example: https://buildkite.com/materialize/test/builds/93445#0192d426-ff4e-4658-b48a-9473843ae116
-#build --@rules_rust//rust/settings:pipelined_compilation=True
+build --@rules_rust//rust/settings:pipelined_compilation=True
 
 # `cargo check` like config, still experimental!
 #
@@ -143,6 +143,8 @@ build:check --output_groups=build_metadata
 #
 # `/dev/shm` is a RAM backed temporary filesystem, it should speedup sandbox creation.
 build:ci --sandbox_base=/dev/shm
+# Always enable verbose failures in CI, makes it easier to debug failures.
+build:ci --verbose_failures
 
 # Release Build Configuration
 #

.github/workflows/slack_notify_labeled.yml

@@ -22,38 +22,20 @@
 name: Slack Label Notifications
 
 on:
-  issues:
+  pull_request:
     types:
       - labeled
 
 jobs:
   notify:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
-        if: ${{ github.event.label.name == 'P1' }}
-        with:
-          slack_token: ${{ secrets.SLACK_TOKEN }}
-          channel: github-p1
-          message: |
-            `${{ github.event.label.name }}` label has been added to "${{ github.event.issue.title }}" (${{ github.event.issue.html_url }}) (assigned to: ${{ github.event.issue.assignee.login || 'unassigned' }}).
-          color: red
-          verbose: false
-      - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
-        if: ${{ github.event.label.name == 'C-bug' }}
-        with:
-          slack_token: ${{ secrets.SLACK_TOKEN }}
-          channel: github-bugs
-          message: |
-            `${{ github.event.label.name }}` label has been added to "${{ github.event.issue.title }}" (${{ github.event.issue.html_url }}) (assigned to: ${{ github.event.issue.assignee.login || 'unassigned' }}).
-          color: red
-          verbose: false
       - uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
         if: ${{ github.event.label.name == 'release-blocker' }}
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}
           channel: release
           message: |
-            `${{ github.event.label.name }}` label has been added to "${{ github.event.issue.title }}" (${{ github.event.issue.html_url }}) (assigned to: ${{ github.event.issue.assignee.login || 'unassigned' }}).
+            `${{ github.event.label.name }}` label has been added to "${{ github.event.pull_request.title }}" (${{ github.event.pull_request.html_url }}) (assigned to: ${{ github.event.pull_request.assignee.login || 'unassigned' }}).
           color: red
           verbose: false

.github/workflows/slack_notify_sql_parser.yml

@@ -39,6 +39,7 @@ on:
       - "src/sql-parser/**"
       - "src/sql-lexer/**"
       - "src/catalog/src/builtin.rs"
+      - test/sqllogictest/mz_catalog_server_index_accounting.slt
 
 jobs:
   notify:
@@ -60,8 +61,20 @@ jobs:
               - 'src/catalog/src/builtin.rs'
               - '!**/Cargo.toml'
               - '!**/BUILD.bazel'
+            index-slt:
+              - 'test/sqllogictest/mz_catalog_server_index_accounting.slt'
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: "Check Retained Metric Changes"
+        id: check-retain-metrics
+        if: steps.filter.outputs.builtin-rs == 'true'
+        run: |
+          # Check for the text "is_retained_metrics" modified in builtin.rs in the pull request
+          if git diff ${{ github.event.pull_request.base.sha }} -- 'src/catalog/src/builtin.rs' | grep -i 'is_retained_metrics'; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
       - name: "Push to Slack"
-        if: steps.filter.outputs.sql-parser == 'true' || steps.filter.outputs.system-catalog == 'true'
+        if: steps.filter.outputs.sql-parser == 'true' || steps.filter.outputs.system-catalog == 'true' || steps.filter.outputs.index-slt == 'true'
         uses: actions-ecosystem/action-slack-notifier@fc778468d09c43a6f4d1b8cccaca59766656996a
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}

LICENSE

@@ -13,7 +13,7 @@ Business Source License 1.1
 
 Licensor:                  Materialize, Inc.
 
-Licensed Work:             Materialize Version 20241126
+Licensed Work:             Materialize Version 20241204
                            The Licensed Work is © 2024 Materialize, Inc.
 
 Additional Use Grant:      Within a single installation of Materialize, you
@@ -32,7 +32,7 @@ Additional Use Grant:      Within a single installation of Materialize, you
                            whose definitions are controlled by such third
                            parties.
 
-Change Date:               November 26, 2028
+Change Date:               December 04, 2028
 
 Change License:            Apache License, Version 2.0
 

bin/ci-annotate-errors

@@ -25,6 +25,7 @@ else
     # keep only the remaining first line because there is a further line containing the mzcompose result summary
     HOSTNAME=$(echo "$OUTPUT" | head -n 1)
   else
+    # TODO: Remove when database-issues#8592 is fixed
     echo "Failed to get cloud hostname, using fallback value"
     HOSTNAME="7vifiksqeftxc6ld3r6zvc8n2.lb.us-east-1.aws.materialize.cloud"
   fi

bin/ci-builder

@@ -103,7 +103,7 @@ fi
 # *inside* this image. See materialize.git.expand_globs in the Python code for
 # details on this computation.
 files=$(cat \
-        <(git diff --name-only -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ci/builder .bazelversion) \
+        <(git diff --name-only -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ci/builder .bazelversion WORKSPACE) \
         <(git ls-files --others --exclude-standard -z ci/builder) \
     | LC_ALL=C sort -z \
     | xargs -0 "$shasum")

bin/gen-completion

@@ -50,15 +50,15 @@ case "$cmd" in
         for name in "${python_autocompletions[@]}"; do
           for shell in "${supported_shells[@]}"; do
             if [ ! -f "$directory/../misc/completions/$shell/_$name" ]; then
-              printf "missing shell completion scripts. try running \`bin/completion generate\` and checking in the changes\n"
+              printf "missing shell completion scripts. try running \`bin/gen-completion generate\` and checking in the changes\n"
               exit 1
             fi
 
             latest=$("$directory"/pyactivate -m materialize.cli."$name" completion "$shell" | "$shasum")
             existing=$("$shasum" < "$directory"/../misc/completions/"$shell"/_"$name")
 
             if [[ "$latest" != "$existing" ]]; then
-              printf "shell completion scripts have uncommitted changes. try running \`bin/completion generate\` and checking in the changes\n"
+              printf "shell completion scripts have uncommitted changes. try running \`bin/gen-completion generate\` and checking in the changes\n"
               exit 1
             fi
           done

ci/builder/Dockerfile

@@ -203,10 +203,10 @@ RUN mkdir rust \
     && cargo install --root /usr/local --version ="0.9.28" --locked cargo-hakari \
     && cargo install --root /usr/local --version "=0.9.72" --locked cargo-nextest \
     && cargo install --root /usr/local --version "=0.6.11" --locked cargo-llvm-cov \
-    && cargo install --root /usr/local --version "=0.1.50" --features=vendored-openssl cargo-udeps \
-    && cargo install --root /usr/local --version "=0.2.15" --no-default-features --features=s3,openssl/vendored sccache \
-    && cargo install --root /usr/local --version "=0.3.6" cargo-binutils \
-    && cargo install --root /usr/local --version "=0.13.0" wasm-pack
+    && cargo install --root /usr/local --version "=0.1.50" --locked --features=vendored-openssl cargo-udeps \
+    && cargo install --root /usr/local --version "=0.2.15" --locked --no-default-features --features=s3,openssl/vendored sccache \
+    && cargo install --root /usr/local --version "=0.3.6" --locked cargo-binutils \
+    && cargo install --root /usr/local --version "=0.13.0" --locked wasm-pack
 
 # Link the system lld into the cross-compiling sysroot.
 
@@ -273,7 +273,7 @@ RUN arch_bazel=$(echo "$ARCH_GCC" | sed -e "s/aarch64/arm64/" -e "s/amd64/x86_64
     && if [ "$arch_bazel" = x86_64 ]; then echo '48ea0ff9d397a48add6369c261c5a4431fe6d5d5348cfb81411782fb80c388d3 /usr/local/bin/bazel' | sha256sum --check; fi \
     && chmod +x /usr/local/bin/bazel
 
-# Install KinD, kubectl, helm & helm-docs
+# Install KinD, kubectl, helm, helm-docs & terraform
 
 RUN curl -fsSL https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-$ARCH_GO > /usr/local/bin/kind \
     && chmod +x /usr/local/bin/kind \
@@ -305,6 +305,13 @@ RUN mkdir -p /usr/local/share/helm/plugins/unittest \
     && tar -xf helm-unittest.tar.gz -C /usr/local/share/helm/plugins/unittest \
     && rm helm-unittest.tar.gz
 
+RUN curl -fsSL https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_$ARCH_GO.zip > terraform.zip \
+    && if [ $ARCH_GO = amd64 ]; then echo '186e0145f5e5f2eb97cbd785bc78f21bae4ef15119349f6ad4fa535b83b10df8 terraform.zip' | sha256sum --check; fi \
+    && if [ $ARCH_GO = arm64 ]; then echo 'f85868798834558239f6148834884008f2722548f84034c9b0f62934b2d73ebb terraform.zip' | sha256sum --check; fi \
+    && unzip terraform.zip terraform -d /usr/local/bin \
+    && chmod +x /usr/local/bin/terraform \
+    && rm terraform.zip
+
 # Hardcode some known SSH hosts, or else SSH will ask whether the host is
 # trustworthy on the first connection.