GH-838: Guard stale raw timestamps and add overwrite tests.

Author: dmitry-chirkov-dremio

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverter.java

@@ -29,6 +29,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.calcite.avatica.AvaticaParameter;
+import org.apache.calcite.avatica.ColumnMetaData;
 import org.apache.calcite.avatica.remote.TypedValue;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
@@ -93,7 +94,8 @@ private long convertFromMillis(long epochMillis) {
   public boolean bindParameter(
       FieldVector vector, TypedValue typedValue, int index, @Nullable Timestamp rawTimestamp) {
     long value;
-    if (rawTimestamp != null) {
+    // Only use the raw timestamp if the TypedValue actually represents a timestamp.
+    if (rawTimestamp != null && typedValue.type == ColumnMetaData.Rep.JAVA_SQL_TIMESTAMP) {
       value = convertFromTimestamp(rawTimestamp);
     } else {
       value = convertFromMillis((long) typedValue.toLocal());

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java

@@ -388,6 +388,33 @@ public void testSetObjectAfterSetTimestampClearsRawTimestamp() throws SQLExcepti
     }
   }
 
+  @Test
+  public void testSetLongAfterSetTimestampIgnoresRawTimestamp() throws SQLException {
+    String query = "Fake timestamp setLong after setTimestamp";
+    Schema parameterSchema =
+        new Schema(
+            Collections.singletonList(
+                Field.nullable("ts", new ArrowType.Timestamp(TimeUnit.MICROSECOND, "UTC"))));
+
+    // setLong replaces the timestamp TypedValue with millis. The stale raw timestamp must be
+    // ignored, so the long value 1000L becomes 1000000 epoch micros.
+    List<List<Object>> expected = Collections.singletonList(Collections.singletonList(1000000L));
+
+    PRODUCER.addUpdateQuery(query, 1);
+    PRODUCER.addExpectedParameters(query, parameterSchema, expected);
+
+    try (PreparedStatement stmt = connection.prepareStatement(query)) {
+      Timestamp ts = new Timestamp(1730637909869L);
+      ts.setNanos(869885001);
+      stmt.setTimestamp(1, ts);
+
+      stmt.setLong(1, 1000L);
+
+      int updated = stmt.executeUpdate();
+      assertEquals(1, updated);
+    }
+  }
+
   @Test
   public void testSetTimestampAfterSetObjectPreservesSubMillis() throws SQLException {
     String query = "Fake timestamp setTimestamp after setObject";

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverterTest.java

@@ -246,6 +246,30 @@ public void testNegativeEpochRawTimestampPreservesSubMillis() {
     }
   }
 
+  @Test
+  public void testStaleRawTimestampIgnoredWhenTypedValueIsNotTimestamp() {
+    BufferAllocator allocator = rootAllocatorTestExtension.getRootAllocator();
+    ArrowType.Timestamp type = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null);
+    TimestampAvaticaParameterConverter converter = new TimestampAvaticaParameterConverter(type);
+
+    // Simulate stale map: rawTimestamp is present but TypedValue was set via setLong()
+    Timestamp staleTs = new Timestamp(TEST_EPOCH_MILLIS_WITH_FRACTIONAL_SECONDS);
+    staleTs.setNanos(869885001);
+
+    // A different value set via setLong — TypedValue type will be PRIMITIVE_LONG, not
+    // JAVA_SQL_TIMESTAMP
+    long longValue = 1774261392L;
+
+    try (TimeStampMicroVector vector = new TimeStampMicroVector("ts", allocator)) {
+      vector.allocateNew(1);
+      TypedValue typedValue = TypedValue.ofLocal(ColumnMetaData.Rep.LONG, longValue);
+      // Even though staleTs is provided, the converter should ignore it because
+      // typedValue.type != JAVA_SQL_TIMESTAMP, and fall back to convertFromMillis
+      assertTrue(converter.bindParameter(vector, typedValue, 0, staleTs));
+      assertEquals(longValue * 1_000L, vector.get(0));
+    }
+  }
+
   private void assertBindConvertsMillis(TimeUnit unit, String tz, long expectedValue) {
     BufferAllocator allocator = rootAllocatorTestExtension.getRootAllocator();
     ArrowType.Timestamp type = new ArrowType.Timestamp(unit, tz);