(calcite) branch main updated: [CALCITE-7108] Upgrade aggdesigner-algorithm from 6.0 to 6.1

[jhyde]

This is an automated email from the ASF dual-hosted git repository.

jhyde pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new ca974f08ce [CALCITE-7108] Upgrade aggdesigner-algorithm from 6.0 to 6.1
ca974f08ce is described below

commit ca974f08cef081f56ad2b7056e23a13ef846c03a
Author: Julian Hyde <jh...@apache.org>
AuthorDate: Thu Jul 24 09:45:12 2025 -0700

    [CALCITE-7108] Upgrade aggdesigner-algorithm from 6.0 to 6.1
    
    Per release notes of 6.1, upgrades commons-lang3 to fix CVE-2025-48924:
    
https://github.com/julianhyde/aggdesigner/blob/main/HISTORY.md#61--2025-07-24
    
    Close apache/calcite#4477
---
 .../src/main/java/org/apache/calcite/materialize/TileSuggester.java | 6 +++---
 gradle.properties                                                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java 
b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
index 9cab6f5fcc..e5c19de719 100644
--- a/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
+++ b/core/src/main/java/org/apache/calcite/materialize/TileSuggester.java
@@ -60,11 +60,11 @@ public Iterable<? extends Lattice.Tile> tiles() {
     final double f = statisticsProvider.getFactRowCount();
     final ImmutableMap.Builder<Parameter, Object> map = ImmutableMap.builder();
     if (lattice.algorithmMaxMillis >= 0) {
-      map.put(Algorithm.ParameterEnum.timeLimitSeconds,
+      map.put(Algorithm.ParameterEnum.TIME_LIMIT_SECONDS,
           Math.max(1, (int) (lattice.algorithmMaxMillis / 1000L)));
     }
-    map.put(Algorithm.ParameterEnum.aggregateLimit, 3);
-    map.put(Algorithm.ParameterEnum.costLimit, f * 5d);
+    map.put(Algorithm.ParameterEnum.AGGREGATE_LIMIT, 3);
+    map.put(Algorithm.ParameterEnum.COST_LIMIT, f * 5d);
     final SchemaImpl schema = new SchemaImpl(lattice, statisticsProvider);
     final Result result = algorithm.run(schema, map.build(), progress);
     final ImmutableList.Builder<Lattice.Tile> tiles = ImmutableList.builder();
diff --git a/gradle.properties b/gradle.properties
index 3590f80064..876a7b3e74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -79,7 +79,7 @@ jandex.version=2.2.3.Final
 
 # We support Guava versions as old as 21.0 but prefer more recent versions.
 # elasticsearch does not like asm:6.2.1+
-aggdesigner-algorithm.version=6.0
+aggdesigner-algorithm.version=6.1
 apiguardian-api.version=1.1.2
 arrow-gandiva.version=15.0.0
 arrow.version=15.0.0