fix according review

Signed-off-by: Weihao Li <18110526956@163.com>

Author: Wei-hao-Li

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/extract/IoTDBExtractTableIT.java

@@ -285,6 +285,28 @@ public void extractTimeFilterPushDownTest() {
         DATABASE_NAME);
   }
 
+  @Test
+  public void testExtractFromComplexExpression() {
+    String[] expectedHeader = new String[] {"_col0"};
+    String[] retArray = new String[] {"0,"};
+    tableResultSetEqualTest(
+        "SELECT extract(hour from cast(s1 AS TIMESTAMP))" + " FROM table1 order by time limit 1",
+        expectedHeader,
+        retArray,
+        DATABASE_NAME);
+  }
+
+  @Test
+  public void testExtractFromConstant() {
+    String[] expectedHeader = new String[] {"_col0"};
+    String[] retArray = new String[] {"1,"};
+    tableResultSetEqualTest(
+        "SELECT extract(hour from 2025/07/08 01:18:51)" + " FROM table1 order by time limit 1",
+        expectedHeader,
+        retArray,
+        DATABASE_NAME);
+  }
+
   protected String getTimeStrUTC(String time) {
     return time + "." + decimal + 'Z';
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrExpressionInterpreter.java

@@ -37,6 +37,7 @@
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.CoalesceExpression;
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression;
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Extract;
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall;
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.IfExpression;
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.InListExpression;
@@ -80,6 +81,7 @@
 import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.MINUS;
 import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ArithmeticUnaryExpression.Sign.PLUS;
 import static org.apache.iotdb.db.queryengine.plan.relational.type.TypeSignatureTranslator.toTypeSignature;
+import static org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar.ExtractTransformer.constructEvaluateFunction;
 
 public class IrExpressionInterpreter {
 
@@ -916,6 +918,23 @@ public Object visitCast(Cast node, Object context) {
       }
     }
 
+    @Override
+    protected Object visitExtract(Extract node, Object context) {
+      Object value = processWithExceptionHandling(node.getExpression(), context);
+      if (value == null) {
+        return null;
+      }
+
+      // if is Extract from constant, the constant must be INT64 type, so it will be Long after the
+      // process
+      if (value instanceof Long) {
+        return constructEvaluateFunction(node.getField(), session.getZoneId()).apply((Long) value);
+      }
+
+      checkState(value instanceof Expression, "Value reach here must be Expression");
+      return new Extract((Expression) value, node.getField());
+    }
+
     @Override
     protected Object visitExpression(Expression node, Object context) {
       throw new SemanticException("not yet implemented: " + node.getClass().getName());

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/IrTypeAnalyzer.java

@@ -309,6 +309,7 @@ protected Type visitArithmeticUnary(ArithmeticUnaryExpression node, Context cont
 
     @Override
     protected Type visitExtract(Extract node, Context context) {
+      process(node.getExpression(), context);
       return setExpressionType(node, INT64);
     }
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/GlobalTimePredicateExtractVisitor.java

@@ -273,6 +273,7 @@ public static boolean isTimeColumn(Expression e, String timeColumnName) {
 
   public static boolean isExtractTimeColumn(Expression e, String timeColumnName) {
     return e instanceof Extract
+        && ((Extract) e).getExpression() instanceof SymbolReference
         && ((SymbolReference) ((Extract) e).getExpression())
             .getName()
             .equalsIgnoreCase(timeColumnName);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ExtractTransformer.java

@@ -45,7 +45,7 @@ public ExtractTransformer(
     this.evaluateFunction = constructEvaluateFunction(field, zoneId);
   }
 
-  private Function<Long, Long> constructEvaluateFunction(Extract.Field field, ZoneId zoneId) {
+  public static Function<Long, Long> constructEvaluateFunction(Extract.Field field, ZoneId zoneId) {
     switch (field) {
       case YEAR:
         return timestamp -> (long) convertToZonedDateTime(timestamp, zoneId).getYear();

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ExtractExpressionTest.java

@@ -20,12 +20,16 @@
 package org.apache.iotdb.db.queryengine.plan.relational.analyzer;
 
 import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral;
 
+import com.google.common.collect.ImmutableMap;
 import org.junit.Test;
 
 import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestUtils.assertAnalyzeSemanticException;
 import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.expression;
 import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.output;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.project;
 import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.tableScan;
 
 public class ExtractExpressionTest {
@@ -38,6 +42,17 @@ public void pushDownTest() {
         output(tableScan("testdb.table1")));
   }
 
+  @Test
+  public void constantFoldTest() {
+    PlanTester planTester = new PlanTester();
+    assertPlan(
+        planTester.createPlan("select extract(hour from 2025/07/08 01:18:51) from table1"),
+        output(
+            project(
+                ImmutableMap.of("expr", expression(new LongLiteral("1"))),
+                tableScan("testdb.table1"))));
+  }
+
   @Test
   public void exceptionTest() {
     String errMsg = "Invalid EXTRACT field: s";