diff --git itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java index 4c9f60c58e..1c0c62fb13 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java +++ itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java @@ -70,7 +70,6 @@ public CliConfig() { excludeQuery("udaf_corr.q"); // disabled in HIVE-20741 excludeQuery("udaf_histogram_numeric.q"); // disabled in HIVE-20715 excludeQuery("vector_groupby_reduce.q"); // Disabled in HIVE-21396 - excludeQuery("timestamptz_2.q"); // Disabled in HIVE-22722 excludeQuery("constprog_cast.q"); // TODO: Enable when we move to Calcite 1.23 setResultsDir("ql/src/test/results/clientpositive"); diff --git serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampLocalTZWritable.java serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampLocalTZWritable.java index 3ffcb7a425..16af2f2645 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampLocalTZWritable.java +++ serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampLocalTZWritable.java @@ -100,7 +100,7 @@ public void set(TimestampTZ tstz) { timestampTZ.setZonedDateTime(null); return; } - timestampTZ = tstz; + timestampTZ = new TimestampTZ(tstz.getZonedDateTime()); timeZone = timestampTZ.getZonedDateTime().getZone(); bytesEmpty = true; timestampTZEmpty = false; @@ -130,7 +130,7 @@ public ZoneId getTimeZone() { public TimestampTZ getTimestampTZ() { populateTimestampTZ(); - return timestampTZ; + return new TimestampTZ(timestampTZ.getZonedDateTime()); } /**