NIFI-13529: Update the Calcite Connection properties to indicate that…

… timezone is UTC timezone. We do this because we already take care to ensure that timestamps, etc. are normalized to UTC timezone before passing them in. We do not want the Avatica ResultSet then treating Timestamp objects as local timestamps. We want them treated as UTC timestamps.

nifi-commons/nifi-calcite-utils/src/main/java/org/apache/nifi/sql/CalciteDatabase.java

@@ -193,6 +193,10 @@ private CalciteConnection createConnection(final Properties properties) throws S
             calciteProperties = properties;
         }
 
+        // If not explicitly set, default timezone to UTC. We ensure that when we provide timestamps, we convert them to UTC. We don't want
+        // Calcite trying to convert them again.
+        calciteProperties.putIfAbsent("timeZone", "UTC");
+
         final Connection sqlConnection = DriverManager.getConnection("jdbc:calcite:", calciteProperties);
         final CalciteConnection connection = sqlConnection.unwrap(CalciteConnection.class);
         connection.getRootSchema().setCacheEnabled(false);

nifi-commons/nifi-calcite-utils/src/test/java/org/apache/nifi/sql/TestCalciteDatabase.java

@@ -24,6 +24,8 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -85,6 +87,25 @@ public void testAddFunction() throws SQLException, NoSuchMethodException, IOExce
         }
     }
 
+    @Test
+    public void testWithTimestamp() throws SQLException, IOException {
+        final String query = "SELECT * FROM CANNED_DATA";
+
+        try (final CalciteDatabase database = createNameTimestampDatabase();
+                     final PreparedStatement stmt = database.getConnection().prepareStatement(query);
+                     final ResultSet resultSet = stmt.executeQuery()) {
+
+            assertTrue(resultSet.next());
+
+            // We should get the same result whether we call getTimestamp() or getObject(). We should also get back the same original Long value.
+            final Timestamp timestamp = resultSet.getTimestamp(2);
+            assertEquals(timestamp, resultSet.getObject(2));
+            assertEquals(1704056400000L, timestamp.getTime());
+
+            assertFalse(resultSet.next());
+        }
+    }
+
     public static class ToUpperCase {
         public String invoke(final String value) {
             return value.toUpperCase();
@@ -113,6 +134,25 @@ private CalciteDatabase createNameNumberDatabase() throws SQLException {
         return database;
     }
 
+    private CalciteDatabase createNameTimestampDatabase() throws SQLException {
+        final CalciteDatabase database = new CalciteDatabase();
+
+        final NiFiTableSchema tableSchema = new NiFiTableSchema(List.of(
+            new ColumnSchema("name", String.class, false),
+            new ColumnSchema("dob", Timestamp.class, false)
+        ));
+
+        final List<Object[]> rows = new ArrayList<>();
+        rows.add(new Object[] {"Mark", new Timestamp(1704056400000L)});
+
+        final ListDataSource arrayListDataSource = new ListDataSource(tableSchema, rows);
+
+        final NiFiTable table = new NiFiTable("CANNED_DATA", arrayListDataSource, mock(ComponentLog.class));
+        database.addTable(table);
+
+        return database;
+    }
+
 
     private static class ListDataSource implements ResettableDataSource {
         private final NiFiTableSchema schema;