Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FDG-10213 : backporting hive-21215 #29

Open
wants to merge 3 commits into
base: fdp-master-3.1.2
Choose a base branch
from
Open

FDG-10213 : backporting hive-21215 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68060ff
backport HIVE-21215
kuczoram Feb 4, 2020
2cd88c5
backport HIVE-21215
flipjoshi Jan 19, 2024
6465851
backport HIVE-21215
flipjoshi Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions accumulo-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>

Expand Down
4 changes: 2 additions & 2 deletions beeline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions classification/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
12 changes: 12 additions & 0 deletions common/src/java/org/apache/hadoop/hive/common/type/Timestamp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
package org.apache.hadoop.hive.common.type;

import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;
Expand Down Expand Up @@ -166,6 +169,11 @@ public static Timestamp valueOf(String s) {
return new Timestamp(localDateTime);
}

public static Timestamp getTimestampFromTime(String s) {
return new Timestamp(LocalDateTime.of(LocalDate.now(),
LocalTime.parse(s, DateTimeFormatter.ISO_LOCAL_TIME)));
}

public static Timestamp ofEpochSecond(long epochSecond) {
return ofEpochSecond(epochSecond, 0);
}
Expand All @@ -175,6 +183,10 @@ public static Timestamp ofEpochSecond(long epochSecond, int nanos) {
LocalDateTime.ofEpochSecond(epochSecond, nanos, ZoneOffset.UTC));
}

public static Timestamp ofEpochSecond(long epochSecond, long nanos, ZoneId zone) {
return new Timestamp(LocalDateTime.ofInstant(Instant.ofEpochSecond(epochSecond, nanos), zone));
}

public static Timestamp ofEpochMilli(long epochMilli) {
return new Timestamp(LocalDateTime
.ofInstant(Instant.ofEpochMilli(epochMilli), ZoneOffset.UTC));
Expand Down
4 changes: 2 additions & 2 deletions contrib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions druid-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions hbase-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions hcatalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions hplsql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions jdbc-handler/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions kryo-registrator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions llap-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions llap-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,12 +266,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions llap-ext-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions llap-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,12 +418,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions llap-tez/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions metastore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions packaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
<mina.version>2.0.0-M5</mina.version>
<netty.version>4.1.17.Final</netty.version>
<netty3.version>3.10.5.Final</netty3.version>
<parquet.version>1.10.0</parquet.version>
<parquet.version>1.13.0</parquet.version>
<pig.version>0.16.0</pig.version>
<plexus.version>1.5.6</plexus.version>
<protobuf.version>2.5.0</protobuf.version>
Expand Down Expand Up @@ -219,12 +219,12 @@
<repository>
<id>fk-art-snapshot</id>
<name>Flipkart-Artifactory</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</repository>
<repository>
<id>fk-art-release</id>
<name>Flipkart-Artifactory</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>

<repository>
Expand Down Expand Up @@ -1557,12 +1557,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>
</project>
4 changes: 2 additions & 2 deletions ql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,12 +1014,12 @@
<snapshotRepository>
<id>fk-art-snapshot</id>
<name>libs-snapshot</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-snapshots-local</url>
<url>http://jfrog.fkinternal.com/maven_virtual</url>
</snapshotRepository>
<repository>
<id>fk-art-release</id>
<name>libs-rel</name>
<url>http://artifactory.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
<url>http://jfrog.fkinternal.com/artifactory/v1.0/artifacts/libs-release-local</url>
</repository>
</distributionManagement>

Expand Down