hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ser...@apache.org
Subject [23/50] [abbrv] hive git commit: HIVE-16088: Fix hive conf property name introduced in HIVE-12767 (Barna Zsombor Klara, reviewed by Sergio Pena)
Date Wed, 08 Mar 2017 03:29:01 GMT
HIVE-16088: Fix hive conf property name introduced in HIVE-12767 (Barna Zsombor Klara, reviewed
by Sergio Pena)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2dfcea5a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2dfcea5a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2dfcea5a

Branch: refs/heads/hive-14535
Commit: 2dfcea5a95b7d623484b8be50755b817fbc91ce0
Parents: 47d06fe
Author: Barna Zsombor Klara <zsombor.klara@cloudera.com>
Authored: Thu Mar 2 13:31:19 2017 -0600
Committer: Sergio Pena <sergio.pena@cloudera.com>
Committed: Thu Mar 2 13:31:19 2017 -0600

----------------------------------------------------------------------
 common/src/java/org/apache/hadoop/hive/conf/HiveConf.java    | 2 +-
 ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java      | 4 ++--
 ql/src/test/queries/clientpositive/parquet_int96_timestamp.q | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/2dfcea5a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index d13e03d..0475042 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -1322,7 +1322,7 @@ public class HiveConf extends Configuration {
     HIVE_PARQUET_TIMESTAMP_SKIP_CONVERSION("hive.parquet.timestamp.skip.conversion", true,
         "Current Hive implementation of parquet stores timestamps to UTC, this flag allows
skipping of the conversion" +
             "on reading parquet files from other tools"),
-    PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE("parquet.mr.int96.enable.utc.write.zone", false,
+    HIVE_PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE("hive.parquet.mr.int96.enable.utc.write.zone",
false,
         "Enable this variable to use UTC as the default timezone for new Parquet tables."),
     HIVE_INT_TIMESTAMP_CONVERSION_IN_SECONDS("hive.int.timestamp.conversion.in.seconds",
false,
         "Boolean/tinyint/smallint/int/bigint value is interpreted as milliseconds during
the timestamp conversion.\n" +

http://git-wip-us.apache.org/repos/asf/hive/blob/2dfcea5a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
----------------------------------------------------------------------
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
index 641e9d9..c11ba97 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
@@ -4224,11 +4224,11 @@ public class DDLTask extends Task<DDLWork> implements Serializable
{
       }
     }
 
-    // If PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE is set to True, then set new Parquet tables
timezone
+    // If HIVE_PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE is set to True, then set new Parquet
tables timezone
     // to UTC by default (only if the table property is not set)
     if (tbl.getSerializationLib().equals(ParquetHiveSerDe.class.getName())) {
       SessionState ss = SessionState.get();
-      if (ss.getConf().getBoolVar(ConfVars.PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE)) {
+      if (ss.getConf().getBoolVar(ConfVars.HIVE_PARQUET_INT96_DEFAULT_UTC_WRITE_ZONE)) {
         String parquetTimezone = tbl.getProperty(ParquetTableUtils.PARQUET_INT96_WRITE_ZONE_PROPERTY);
         if (parquetTimezone == null || parquetTimezone.isEmpty()) {
           tbl.setProperty(ParquetTableUtils.PARQUET_INT96_WRITE_ZONE_PROPERTY, ParquetTableUtils.PARQUET_INT96_NO_ADJUSTMENT_ZONE);

http://git-wip-us.apache.org/repos/asf/hive/blob/2dfcea5a/ql/src/test/queries/clientpositive/parquet_int96_timestamp.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/parquet_int96_timestamp.q b/ql/src/test/queries/clientpositive/parquet_int96_timestamp.q
index e5eb610..5de2c3f 100644
--- a/ql/src/test/queries/clientpositive/parquet_int96_timestamp.q
+++ b/ql/src/test/queries/clientpositive/parquet_int96_timestamp.q
@@ -1,7 +1,7 @@
 create table dummy (id int);
 insert into table dummy values (1);
 
-set parquet.mr.int96.enable.utc.write.zone=true;
+set hive.parquet.mr.int96.enable.utc.write.zone=true;
 set hive.parquet.timestamp.skip.conversion=false;
 
 -- read/write timestamps using UTC as default write zone
@@ -18,7 +18,7 @@ select * from timestamps;
 describe formatted timestamps;
 drop table timestamps;
 
-set parquet.mr.int96.enable.utc.write.zone=false;
+set hive.parquet.mr.int96.enable.utc.write.zone=false;
 
 -- read/write timestamps using local timezone
 create table timestamps (ts timestamp) stored as parquet;


Mime
View raw message