cache legacy literal

apache · Jan 3, 2025 · f357b86 · f357b86
1 parent 53c3ea8
commit f357b86
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 33 deletions.
diff --git a/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/ArrayLiteral.java b/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/ArrayLiteral.java
@@ -63,7 +63,7 @@ public List<Literal> getValue() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         LiteralExpr[] itemExprs = items.stream()
                 .map(Literal::toLegacyLiteral)
                 .toArray(LiteralExpr[]::new);

diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/BigIntLiteral.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/BigIntLiteral.java
@@ -47,7 +47,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new IntLiteral(value, Type.BIGINT);
         } catch (AnalysisException e) {

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/BooleanLiteral.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/BooleanLiteral.java
@@ -65,7 +65,7 @@ public String toString() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new BoolLiteral(value);
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/CharLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/CharLiteral.java
@@ -42,7 +42,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new StringLiteral(value);
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateLiteral.java
@@ -454,7 +454,7 @@ public String toString() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.DateLiteral(year, month, day, Type.DATE);
     }
 

diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java b/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeLiteral.java
@@ -328,7 +328,7 @@ public String getStringValue() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.DateLiteral(year, month, day, hour, minute, second, Type.DATETIME);
     }
 

diff --git a/...e/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java b/...e/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateTimeV2Literal.java
@@ -102,7 +102,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.DateLiteral(year, month, day, hour, minute, second, microSecond,
                 getDataType().toCatalogDataType());
     }

diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
@@ -17,25 +17,20 @@
 
 package org.apache.doris.nereids.trees.expressions.literal;
 
+import org.apache.doris.analysis.LiteralExpr;
 import org.apache.doris.catalog.Type;
 import org.apache.doris.nereids.exceptions.AnalysisException;
 import org.apache.doris.nereids.trees.expressions.Expression;
 import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
 import org.apache.doris.nereids.types.DateTimeV2Type;
 import org.apache.doris.nereids.types.DateV2Type;
 
-import com.google.common.base.Suppliers;
-
 import java.time.LocalDateTime;
-import java.util.function.Supplier;
 
 /**
  * date v2 literal for nereids
  */
 public class DateV2Literal extends DateLiteral {
-    private final Supplier<org.apache.doris.analysis.DateLiteral> legacyLiteral = Suppliers.memoize(() ->
-            new org.apache.doris.analysis.DateLiteral(year, month, day, Type.DATEV2)
-    );
 
     public DateV2Literal(String s) throws AnalysisException {
         super(DateV2Type.INSTANCE, s);
@@ -46,8 +41,8 @@ public DateV2Literal(long year, long month, long day) {
     }
 
     @Override
-    public org.apache.doris.analysis.DateLiteral toLegacyLiteral() {
-        return legacyLiteral.get();
+    protected LiteralExpr computeLegacyLiteral() {
+        return new org.apache.doris.analysis.DateLiteral(year, month, day, Type.DATEV2);
     }
 
     @Override

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DecimalLiteral.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DecimalLiteral.java
@@ -62,7 +62,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.DecimalLiteral(value, dataType.toCatalogDataType());
     }
 

diff --git a/...re/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DecimalV3Literal.java b/...re/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DecimalV3Literal.java
@@ -68,7 +68,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.DecimalLiteral(value, getDataType().toCatalogDataType());
     }
 

diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DoubleLiteral.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DoubleLiteral.java
@@ -46,7 +46,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new FloatLiteral(value, Type.DOUBLE);
     }
 }
diff --git a/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/FloatLiteral.java b/...e-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/FloatLiteral.java
@@ -45,7 +45,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.FloatLiteral(getDouble(), Type.FLOAT);
     }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IPv4Literal.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IPv4Literal.java
@@ -55,7 +55,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.IPv4Literal(value);
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IPv6Literal.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IPv6Literal.java
@@ -53,7 +53,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new org.apache.doris.analysis.IPv6Literal(value);
         } catch (Exception e) {

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IntegerLiteral.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/IntegerLiteral.java
@@ -47,7 +47,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new IntLiteral(value, Type.INT);
         } catch (AnalysisException e) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/JsonLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/JsonLiteral.java
@@ -63,7 +63,7 @@ public String getValue() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new org.apache.doris.analysis.JsonLiteral(value);
         } catch (Throwable t) {

diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/LargeIntLiteral.java b/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/LargeIntLiteral.java
@@ -48,7 +48,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new org.apache.doris.analysis.LargeIntLiteral(value.toString());
         } catch (AnalysisException e) {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/Literal.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/Literal.java
@@ -17,6 +17,7 @@
 
 package org.apache.doris.nereids.trees.expressions.literal;
 
+import com.google.common.base.Suppliers;
 import org.apache.doris.analysis.BoolLiteral;
 import org.apache.doris.analysis.LiteralExpr;
 import org.apache.doris.catalog.MysqlColType;
@@ -49,6 +50,7 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * All data type literal expression in Nereids.
@@ -58,6 +60,10 @@ public abstract class Literal extends Expression implements LeafExpression, Comp
 
     protected final DataType dataType;
 
+    // as 'https://github.com/apache/doris/pull/45181' test,
+    // toLegacyLiteral cost a lot of time when sort literals, so cache the legacy literal.
+    private final Supplier<LiteralExpr> legacyLiteral = Suppliers.memoize(this::computeLegacyLiteral);
+
     /**
      * Constructor for Literal.
      *
@@ -375,7 +381,11 @@ public String toString() {
         return String.valueOf(getValue());
     }
 
-    public abstract LiteralExpr toLegacyLiteral();
+    public final LiteralExpr toLegacyLiteral() {
+        return legacyLiteral.get();
+    }
+
+    protected abstract LiteralExpr computeLegacyLiteral();
 
     public boolean isStringLikeLiteral() {
         return dataType.isStringLikeType();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/MapLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/MapLiteral.java
@@ -89,7 +89,7 @@ protected Expression uncheckedCastTo(DataType targetType) throws AnalysisExcepti
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         List<LiteralExpr> keyExprs = keys.stream()
                 .map(Literal::toLegacyLiteral)
                 .collect(Collectors.toList());

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/MaxLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/MaxLiteral.java
@@ -33,7 +33,7 @@ public Object getValue() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return org.apache.doris.analysis.MaxLiteral.MAX_VALUE;
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/NullLiteral.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/NullLiteral.java
@@ -55,7 +55,7 @@ public String toString() {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return org.apache.doris.analysis.NullLiteral.create(dataType.toCatalogDataType());
     }
 

diff --git a/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/SmallIntLiteral.java b/...ore/src/main/java/org/apache/doris/nereids/trees/expressions/literal/SmallIntLiteral.java
@@ -47,7 +47,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new IntLiteral(value, Type.SMALLINT);
         } catch (AnalysisException e) {

diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/StringLiteral.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/StringLiteral.java
@@ -49,7 +49,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new org.apache.doris.analysis.StringLiteral(value);
     }
 }
diff --git a/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/StructLiteral.java b/...-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/StructLiteral.java
@@ -88,7 +88,7 @@ protected Expression uncheckedCastTo(DataType targetType) throws AnalysisExcepti
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new org.apache.doris.analysis.StructLiteral(dataType.toCatalogDataType(),
                     fields.stream().map(Literal::toLegacyLiteral).toArray(LiteralExpr[]::new)

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/TinyIntLiteral.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/TinyIntLiteral.java
@@ -47,7 +47,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         try {
             return new IntLiteral(value, Type.TINYINT);
         } catch (AnalysisException e) {

diff --git a/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/VarcharLiteral.java b/...core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/VarcharLiteral.java
@@ -47,7 +47,7 @@ public <R, C> R accept(ExpressionVisitor<R, C> visitor, C context) {
     }
 
     @Override
-    public LiteralExpr toLegacyLiteral() {
+    protected LiteralExpr computeLegacyLiteral() {
         return new StringLiteral(value);
     }
 }