Merge pull request #38081 from ahmedabu98/cp_38077

CP portable date java and model changes

Author: Amar3tto

.github/trigger_files/beam_PostCommit_SQL.json

@@ -1,4 +1,4 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run ",
-  "modification": 0
+  "modification": 1
 }

model/pipeline/src/main/proto/org/apache/beam/model/pipeline/v1/schema.proto

@@ -174,6 +174,13 @@ message LogicalTypes {
     //     A variable-length string with its maximum length as the argument.
     VAR_CHAR = 7 [(org.apache.beam.model.pipeline.v1.beam_urn) =
       "beam:logical_type:var_char:v1"];
+
+    // A URN for Date type
+    //   - Representation type: INT64
+    //   - A date without a timezone, represented by the number of days
+    //     since the epoch.
+    DATE = 8 [(org.apache.beam.model.pipeline.v1.beam_urn) =
+      "beam:logical_type:date:v1"];
   }
 }
 

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/Schema.java

@@ -974,7 +974,8 @@ public boolean typesEqual(FieldType other) {
             getLogicalType().getIdentifier(), other.getLogicalType().getIdentifier())) {
           return false;
         }
-        if (!getLogicalType().getArgumentType().equals(other.getLogicalType().getArgumentType())) {
+        if (!Objects.equals(
+            getLogicalType().getArgumentType(), other.getLogicalType().getArgumentType())) {
           return false;
         }
         if (!Row.Equals.deepEquals(

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/SchemaTranslation.java

@@ -43,6 +43,7 @@
 import org.apache.beam.sdk.schemas.Schema.FieldType;
 import org.apache.beam.sdk.schemas.Schema.LogicalType;
 import org.apache.beam.sdk.schemas.Schema.TypeName;
+import org.apache.beam.sdk.schemas.logicaltypes.Date;
 import org.apache.beam.sdk.schemas.logicaltypes.FixedBytes;
 import org.apache.beam.sdk.schemas.logicaltypes.FixedPrecisionNumeric;
 import org.apache.beam.sdk.schemas.logicaltypes.FixedString;
@@ -113,6 +114,7 @@ private static String getLogicalTypeUrn(String identifier) {
           .put(VariableBytes.IDENTIFIER, VariableBytes.class)
           .put(FixedString.IDENTIFIER, FixedString.class)
           .put(VariableString.IDENTIFIER, VariableString.class)
+          .put(Date.IDENTIFIER, Date.class)
           .build();
 
   public static SchemaApi.Schema schemaToProto(Schema schema, boolean serializeLogicalType) {

sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/logicaltypes/Date.java

@@ -18,7 +18,10 @@
 package org.apache.beam.sdk.schemas.logicaltypes;
 
 import java.time.LocalDate;
+import org.apache.beam.model.pipeline.v1.RunnerApi;
+import org.apache.beam.model.pipeline.v1.SchemaApi;
 import org.apache.beam.sdk.schemas.Schema;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
  * A date without a time-zone.
@@ -30,23 +33,20 @@
  * incrementing count of days where day 0 is 1970-01-01 (ISO).
  */
 public class Date implements Schema.LogicalType<LocalDate, Long> {
-  public static final String IDENTIFIER = "beam:logical_type:date:v1";
+  public static final String IDENTIFIER =
+      SchemaApi.LogicalTypes.Enum.DATE
+          .getValueDescriptor()
+          .getOptions()
+          .getExtension(RunnerApi.beamUrn);
 
   @Override
   public String getIdentifier() {
     return IDENTIFIER;
   }
 
-  // unused
   @Override
-  public Schema.FieldType getArgumentType() {
-    return Schema.FieldType.STRING;
-  }
-
-  // unused
-  @Override
-  public String getArgument() {
-    return "";
+  public Schema.@Nullable FieldType getArgumentType() {
+    return null;
   }
 
   @Override

sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/SchemaTranslationTest.java

@@ -25,6 +25,7 @@
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -142,6 +143,7 @@ public static Iterable<Schema> data() {
                   Field.of("decimal", FieldType.DECIMAL), Field.of("datetime", FieldType.DATETIME)))
           .add(Schema.of(Field.of("fixed_bytes", FieldType.logicalType(FixedBytes.of(24)))))
           .add(Schema.of(Field.of("micros_instant", FieldType.logicalType(new MicrosInstant()))))
+          .add(Schema.of(Field.of("date", FieldType.logicalType(SqlTypes.DATE))))
           .add(Schema.of(Field.of("python_callable", FieldType.logicalType(new PythonCallable()))))
           .add(
               Schema.of(
@@ -388,6 +390,7 @@ public static Iterable<Row> data() {
           .add(simpleRow(FieldType.DECIMAL, BigDecimal.valueOf(100000)))
           .add(simpleRow(FieldType.logicalType(new PortableNullArgLogicalType()), "str"))
           .add(simpleRow(FieldType.logicalType(new DateTime()), LocalDateTime.of(2000, 1, 3, 3, 1)))
+          .add(simpleRow(FieldType.logicalType(SqlTypes.DATE), LocalDate.of(2000, 1, 3)))
           .add(simpleNullRow(FieldType.STRING))
           .add(simpleNullRow(FieldType.INT32))
           .add(simpleNullRow(FieldType.map(FieldType.STRING, FieldType.INT32)))

sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/JdbcUtil.java

@@ -38,6 +38,7 @@
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -294,6 +295,13 @@ static JdbcIO.PreparedStatementSetCaller getPreparedStatementSetCaller(
             return (element, ps, i, fieldWithIndex) -> {
               ps.setBigDecimal(i + 1, element.getDecimal(fieldWithIndex.getIndex()));
             };
+          } else if (logicalTypeName.equals(
+              org.apache.beam.sdk.schemas.logicaltypes.Date.IDENTIFIER)) {
+            return (element, ps, i, fieldWithIndex) -> {
+              LocalDate value =
+                  element.getLogicalTypeValue(fieldWithIndex.getIndex(), LocalDate.class);
+              ps.setDate(i + 1, value == null ? null : Date.valueOf(value));
+            };
           } else if (logicalTypeName.equals("DATE")) {
             return (element, ps, i, fieldWithIndex) -> {
               ReadableDateTime value = element.getDateTime(fieldWithIndex.getIndex());