Update joda-time to 2.10.0

Get America/Nuuk alike timezone. This version is required by trino. See also https://twitter.com/raphaelschaad/status/1488584437197586432. Signed-off-by: tison <wander4096@gmail.com>
apache · Jul 21, 2022 · 848e66f · 848e66f
1 parent 2605a5f
commit 848e66f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -155,7 +155,7 @@ flexible messaging model and an intuitive client API.</description>
     <rabbitmq-client.version>5.5.3</rabbitmq-client.version>
     <aws-sdk.version>1.11.774</aws-sdk.version>
     <avro.version>1.10.2</avro.version>
-    <joda.version>2.10.5</joda.version>
+    <joda.version>2.10.10</joda.version>
     <jclouds.version>2.5.0</jclouds.version>
     <guice.version>5.1.0</guice.version>
     <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>

diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
@@ -271,7 +271,7 @@ The Apache Software License, Version 2.0
     - jetcd-core-0.5.11.jar
 
  * Joda Time
-    - joda-time-2.10.5.jar
+    - joda-time-2.10.10.jar
     - failsafe-2.4.4.jar
   * Jetty
     - http2-client-9.4.48.v20220622.jar

diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
@@ -41,7 +41,6 @@
 import io.trino.spi.predicate.TupleDomain;
 import io.trino.spi.predicate.Utils;
 import java.io.IOException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -386,15 +385,13 @@ public static PredicatePushdownInfo getPredicatePushdownInfo(String connectorId,
                             if (!range.isHighUnbounded()) {
                                 Block block = Utils.nativeValueToBlock(range.getType(), range.getHighBoundedValue());
                                 // Trino timestamp payload is in micros
-                                long millis = block.getLong(0, 0) / 1000;
-                                upperBoundTs = new Timestamp(millis).getTime();
+                                upperBoundTs = block.getLong(0, 0) / 1000;
                             }
 
                             if (!range.isLowUnbounded()) {
                                 Block block = Utils.nativeValueToBlock(range.getType(), range.getLowBoundedValue());
                                 // Trino timestamp payload is in micros
-                                long millis = block.getLong(0, 0) / 1000;
-                                lowerBoundTs = new Timestamp(millis).getTime();
+                                lowerBoundTs = block.getLong(0, 0) / 1000;
                             }
 
                             PositionImpl overallStartPos;

diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
@@ -91,7 +91,7 @@
 
 public abstract class TestPulsarConnector {
 
-    protected static final long currentTimeMs = 1534806330000L;
+    protected static final long currentTimeMicros = 1534806330000000L;
 
     protected PulsarConnectorConfig pulsarConnectorConfig;
 
@@ -405,7 +405,7 @@ private static List<Entry> getTopicEntries(String topicSchemaName) {
 
             MessageMetadata messageMetadata = new MessageMetadata()
                     .setProducerName("test-producer").setSequenceId(i)
-                    .setPublishTime(currentTimeMs + i);
+                    .setPublishTime(currentTimeMicros / 1000 + i);
 
             Schema schema = topicsToSchemas.get(topicSchemaName).getType() == SchemaType.AVRO ? AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build()) : JSONSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
 

diff --git a/...-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java b/...-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
@@ -201,8 +201,8 @@ public void testPublishTimePredicatePushdown(String delimiter) throws Exception
 
 
         Map<ColumnHandle, Domain> domainMap = new HashMap<>();
-        Domain domain = Domain.create(ValueSet.ofRanges(Range.range(TIMESTAMP, currentTimeMs + 1L, true,
-                currentTimeMs + 50L, true)), false);
+        Domain domain = Domain.create(ValueSet.ofRanges(Range.range(TIMESTAMP, currentTimeMicros + 1000L, true,
+                currentTimeMicros + 50000L, true)), false);
         domainMap.put(PulsarInternalColumn.PUBLISH_TIME.getColumnHandle(pulsarConnectorId.toString(), false), domain);
         TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(domainMap);
 
@@ -258,8 +258,8 @@ public void testPublishTimePredicatePushdownPartitionedTopic(String delimiter) t
 
 
         Map<ColumnHandle, Domain> domainMap = new HashMap<>();
-        Domain domain = Domain.create(ValueSet.ofRanges(Range.range(TIMESTAMP, currentTimeMs + 1L, true,
-                currentTimeMs + 50L, true)), false);
+        Domain domain = Domain.create(ValueSet.ofRanges(Range.range(TIMESTAMP, currentTimeMicros + 1000L, true,
+                currentTimeMicros + 50000L, true)), false);
         domainMap.put(PulsarInternalColumn.PUBLISH_TIME.getColumnHandle(pulsarConnectorId.toString(), false), domain);
         TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(domainMap);
 

diff --git a/...ar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java b/...ar/src/test/java/org/apache/pulsar/sql/presto/decoder/primitive/TestPrimitiveDecoder.java
@@ -224,9 +224,10 @@ public void testPrimitiveType() {
         Map<DecoderColumnHandle, FieldValueProvider> decodedRowTimestamp =
                 pulsarRowDecoderTimestamp.decodeRow(io.netty.buffer.Unpooled
                         .copiedBuffer(schemaTimestamp.encode(timestampValue))).get();
+        long timestampValueInMicros = timestampValue.getTime() * 1000;
         checkValue(decodedRowTimestamp, new PulsarColumnHandle(getPulsarConnectorId().toString(),
                 PRIMITIVE_COLUMN_NAME, TIMESTAMP, false, false, PRIMITIVE_COLUMN_NAME, null, null,
-                PulsarColumnHandle.HandleKeyValueType.NONE), timestampValue.getTime());
+                PulsarColumnHandle.HandleKeyValueType.NONE), timestampValueInMicros);
 
     }