Skip to content

Commit 9a07aaf

Browse files
committed
Bump to 1.38
1 parent b4246ca commit 9a07aaf

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.calcite.rex.RexBuilder;
3838
import org.apache.calcite.rex.RexLiteral;
3939
import org.apache.calcite.rex.RexNode;
40+
import org.apache.calcite.rex.RexWindowExclusion;
4041
import org.apache.calcite.sql.SqlAggFunction;
4142
import org.apache.calcite.sql.SqlKind;
4243
import org.apache.calcite.sql.SqlOperator;
@@ -820,6 +821,7 @@ public void onMatch(RelOptRuleCall call) {
820821
group.isRows,
821822
group.lowerBound,
822823
group.upperBound,
824+
RexWindowExclusion.EXCLUDE_NO_OTHER, // Default: no exclusion (Calcite 1.38+)
823825
group.orderKeys,
824826
aggCalls);
825827
builder.add(newGroup);

exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.apache.calcite.rel.type.RelRecordType;
4242
import org.apache.calcite.rex.RexInputRef;
4343
import org.apache.calcite.rex.RexNode;
44+
import org.apache.calcite.rex.RexWindowExclusion;
4445
import org.apache.calcite.sql.SqlAggFunction;
4546

4647
import java.util.List;
@@ -168,6 +169,7 @@ public boolean apply(RelDataTypeField relDataTypeField) {
168169
windowBase.isRows,
169170
windowBase.lowerBound,
170171
windowBase.upperBound,
172+
RexWindowExclusion.EXCLUDE_NO_OTHER, // Default: no exclusion (Calcite 1.38+)
171173
windowBase.orderKeys,
172174
newWinAggCalls
173175
);

exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,19 @@ public int getDefaultPrecision(SqlTypeName typeName) {
4343
}
4444

4545
@Override
46-
public int getMaxNumericScale() {
47-
return 38;
46+
public int getMaxScale(SqlTypeName typeName) {
47+
if (typeName == SqlTypeName.DECIMAL) {
48+
return 38;
49+
}
50+
return super.getMaxScale(typeName);
4851
}
4952

5053
@Override
51-
public int getMaxNumericPrecision() {
52-
return 38;
54+
public int getMaxPrecision(SqlTypeName typeName) {
55+
if (typeName == SqlTypeName.DECIMAL) {
56+
return 38;
57+
}
58+
return super.getMaxPrecision(typeName);
5359
}
5460

5561
@Override

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<bouncycastle.version>1.78.1</bouncycastle.version>
5858
<caffeine.version>2.9.3</caffeine.version>
5959
<calcite.groupId>org.apache.calcite</calcite.groupId>
60-
<calcite.version>1.37.0</calcite.version>
60+
<calcite.version>1.38.0</calcite.version>
6161
<codemodel.version>2.6</codemodel.version>
6262
<commons.beanutils.version>1.11.0</commons.beanutils.version>
6363
<commons.cli.version>1.4</commons.cli.version>

0 commit comments

Comments
 (0)