hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1446843 [1/9] - in /hive/branches/ptf-windowing: ./ metastore/if/ metastore/scripts/upgrade/mysql/ metastore/scripts/upgrade/oracle/ metastore/scripts/upgrade/postgres/ metastore/src/gen/thrift/gen-cpp/ metastore/src/gen/thrift/gen-javabea...
Date Sat, 16 Feb 2013 05:48:26 GMT
Author: hashutosh
Date: Sat Feb 16 05:48:25 2013
New Revision: 1446843

URL: http://svn.apache.org/r1446843
Log:
Merged with trunk.

Added:
    hive/branches/ptf-windowing/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
      - copied unchanged from r1446842, hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStoreWithEnvironmentContext.java
    hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde/
      - copied from r1446842, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde/
    hive/branches/ptf-windowing/serde/src/java/org/apache/hadoop/hive/serde/Constants.java
      - copied unchanged from r1446842, hive/trunk/serde/src/java/org/apache/hadoop/hive/serde/Constants.java
Modified:
    hive/branches/ptf-windowing/   (props changed)
    hive/branches/ptf-windowing/metastore/if/hive_metastore.thrift
    hive/branches/ptf-windowing/metastore/scripts/upgrade/mysql/011-HIVE-3649.mysql.sql
    hive/branches/ptf-windowing/metastore/scripts/upgrade/oracle/011-HIVE-3649.oracle.sql
    hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql
    hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/011-HIVE-3649.postgres.sql
    hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/012-HIVE-1362.postgres.sql
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
    hive/branches/ptf-windowing/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
    hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/branches/ptf-windowing/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java

Propchange: hive/branches/ptf-windowing/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1443239-1446842

Modified: hive/branches/ptf-windowing/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/if/hive_metastore.thrift?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/if/hive_metastore.thrift (original)
+++ hive/branches/ptf-windowing/metastore/if/hive_metastore.thrift Sat Feb 16 05:48:25 2013
@@ -363,6 +363,9 @@ service ThriftHiveMetastore extends fb30
   // delete data (including partitions) if deleteData is set to true
   void drop_table(1:string dbname, 2:string name, 3:bool deleteData)
                        throws(1:NoSuchObjectException o1, 2:MetaException o3)
+  void drop_table_with_environment_context(1:string dbname, 2:string name, 3:bool deleteData,
+      4:EnvironmentContext environment_context)
+                       throws(1:NoSuchObjectException o1, 2:MetaException o3)
   list<string> get_tables(1: string db_name, 2: string pattern) throws (1: MetaException
o1)
   list<string> get_all_tables(1: string db_name) throws (1: MetaException o1)
 
@@ -427,12 +430,24 @@ service ThriftHiveMetastore extends fb30
                        throws(1:InvalidObjectException o1, 2:AlreadyExistsException o2, 3:MetaException
o3)
   Partition append_partition(1:string db_name, 2:string tbl_name, 3:list<string> part_vals)
                        throws (1:InvalidObjectException o1, 2:AlreadyExistsException o2,
3:MetaException o3)
+  Partition append_partition_with_environment_context(1:string db_name, 2:string tbl_name,
+      3:list<string> part_vals, 4:EnvironmentContext environment_context)
+                       throws (1:InvalidObjectException o1, 2:AlreadyExistsException o2,
3:MetaException o3)
   Partition append_partition_by_name(1:string db_name, 2:string tbl_name, 3:string part_name)
                        throws (1:InvalidObjectException o1, 2:AlreadyExistsException o2,
3:MetaException o3)
+  Partition append_partition_by_name_with_environment_context(1:string db_name, 2:string
tbl_name,
+      3:string part_name, 4:EnvironmentContext environment_context)
+                       throws (1:InvalidObjectException o1, 2:AlreadyExistsException o2,
3:MetaException o3)
   bool drop_partition(1:string db_name, 2:string tbl_name, 3:list<string> part_vals,
4:bool deleteData)
                        throws(1:NoSuchObjectException o1, 2:MetaException o2)
+  bool drop_partition_with_environment_context(1:string db_name, 2:string tbl_name,
+      3:list<string> part_vals, 4:bool deleteData, 5:EnvironmentContext environment_context)
+                       throws(1:NoSuchObjectException o1, 2:MetaException o2)
   bool drop_partition_by_name(1:string db_name, 2:string tbl_name, 3:string part_name, 4:bool
deleteData)
-                       throws(1:NoSuchObjectException o1, 2:MetaException o2) 
+                       throws(1:NoSuchObjectException o1, 2:MetaException o2)
+  bool drop_partition_by_name_with_environment_context(1:string db_name, 2:string tbl_name,
+      3:string part_name, 4:bool deleteData, 5:EnvironmentContext environment_context)
+                       throws(1:NoSuchObjectException o1, 2:MetaException o2)
   Partition get_partition(1:string db_name, 2:string tbl_name, 3:list<string> part_vals)
                        throws(1:MetaException o1, 2:NoSuchObjectException o2)
 

Modified: hive/branches/ptf-windowing/metastore/scripts/upgrade/mysql/011-HIVE-3649.mysql.sql
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/scripts/upgrade/mysql/011-HIVE-3649.mysql.sql?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/scripts/upgrade/mysql/011-HIVE-3649.mysql.sql (original)
+++ hive/branches/ptf-windowing/metastore/scripts/upgrade/mysql/011-HIVE-3649.mysql.sql Sat
Feb 16 05:48:25 2013
@@ -1,2 +1,11 @@
 SELECT '< HIVE-3649: Support stored as directories >' AS ' ';
-ALTER TABLE `SDS` ADD `IS_STOREDASSUBDIRECTORIES` bit(1) ;
+-- Add new not null column into SDS table in three steps
+
+-- Step 1: Add the column allowing null
+ALTER TABLE `SDS` ADD `IS_STOREDASSUBDIRECTORIES` bit(1);
+
+ -- Step 2: Replace the null with default value (false)
+UPDATE `SDS` SET `IS_STOREDASSUBDIRECTORIES` = false;
+
+-- Step 3: Alter the column to disallow null values
+ALTER TABLE `SDS` MODIFY COLUMN `IS_STOREDASSUBDIRECTORIES` bit(1) NOT NULL;

Modified: hive/branches/ptf-windowing/metastore/scripts/upgrade/oracle/011-HIVE-3649.oracle.sql
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/scripts/upgrade/oracle/011-HIVE-3649.oracle.sql?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/scripts/upgrade/oracle/011-HIVE-3649.oracle.sql
(original)
+++ hive/branches/ptf-windowing/metastore/scripts/upgrade/oracle/011-HIVE-3649.oracle.sql
Sat Feb 16 05:48:25 2013
@@ -1 +1,10 @@
-alter table  SDS add IS_STOREDASSUBDIRECTORIES NUMBER(1) NOT NULL;
+-- Add new not null column into SDS table in three steps
+
+-- Step 1: Add the column allowing null
+ALTER TABLE  SDS ADD IS_STOREDASSUBDIRECTORIES NUMBER(1) NULL;
+
+ -- Step 2: Replace the null with default value (false)
+UPDATE SDS SET IS_STOREDASSUBDIRECTORIES = 0;
+
+-- Step 3: Alter the column to disallow null values
+ALTER TABLE SDS MODIFY(IS_STOREDASSUBDIRECTORIES NOT NULL);

Modified: hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql
(original)
+++ hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/010-HIVE-3072.postgres.sql
Sat Feb 16 05:48:25 2013
@@ -13,7 +13,7 @@ CREATE TABLE "SKEWED_STRING_LIST_VALUES"
     "INTEGER_IDX" bigint NOT NULL
 );
 
-ALTER TABLE ONLY SKEWED_STRING_LIST_VALUES"
+ALTER TABLE ONLY "SKEWED_STRING_LIST_VALUES"
     ADD CONSTRAINT "SKEWED_STRING_LIST_VALUES_pkey" PRIMARY KEY ("STRING_LIST_ID", "INTEGER_IDX");
 
 ALTER TABLE ONLY "SKEWED_STRING_LIST_VALUES"

Modified: hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/011-HIVE-3649.postgres.sql
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/011-HIVE-3649.postgres.sql?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/011-HIVE-3649.postgres.sql
(original)
+++ hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/011-HIVE-3649.postgres.sql
Sat Feb 16 05:48:25 2013
@@ -1 +1,10 @@
-ALTER TABLE "SDS" ADD COLUMN "IS_STOREDASSUBDIRECTORIES" boolean NOT NULL;
+-- Add new not null column into SDS table in three steps
+
+-- Step 1: Add the column allowing null
+ALTER TABLE "SDS" ADD COLUMN "IS_STOREDASSUBDIRECTORIES" boolean NULL;
+
+ -- Step 2: Replace the null with default value (false)
+UPDATE "SDS" SET "IS_STOREDASSUBDIRECTORIES" = false;
+
+-- Step 3: Alter the column to disallow null values
+ALTER TABLE "SDS" ALTER COLUMN "IS_STOREDASSUBDIRECTORIES" SET NOT NULL;

Modified: hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/012-HIVE-1362.postgres.sql
URL: http://svn.apache.org/viewvc/hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/012-HIVE-1362.postgres.sql?rev=1446843&r1=1446842&r2=1446843&view=diff
==============================================================================
--- hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/012-HIVE-1362.postgres.sql
(original)
+++ hive/branches/ptf-windowing/metastore/scripts/upgrade/postgres/012-HIVE-1362.postgres.sql
Sat Feb 16 05:48:25 2013
@@ -9,8 +9,8 @@ CREATE TABLE "TAB_COL_STATS" (
  "TBL_ID" bigint NOT NULL,
  "LONG_LOW_VALUE" bigint,
  "LONG_HIGH_VALUE" bigint,
- "DOUBLE_LOW_VALUE", double precision,
- "DOUBLE_HIGH_VALUES", double precision,
+ "DOUBLE_LOW_VALUE" double precision,
+ "DOUBLE_HIGH_VALUES" double precision,
  "BIG_DECIMAL_LOW_VALUE" character varying(4000) DEFAULT NULL::character varying,
  "BIG_DECIMAL_HIGH_VALUE" character varying(4000) DEFAULT NULL::character varying,
  "NUM_NULLS" bigint NOT NULL,
@@ -37,8 +37,8 @@ CREATE TABLE "PART_COL_STATS" (
  "PART_ID" bigint NOT NULL,
  "LONG_LOW_VALUE" bigint,
  "LONG_HIGH_VALUE" bigint,
- "DOUBLE_LOW_VALUE", double precision,
- "DOUBLE_HIGH_VALUES", double precision,
+ "DOUBLE_LOW_VALUE" double precision,
+ "DOUBLE_HIGH_VALUES" double precision,
  "BIG_DECIMAL_LOW_VALUE" character varying(4000) DEFAULT NULL::character varying,
  "BIG_DECIMAL_HIGH_VALUE" character varying(4000) DEFAULT NULL::character varying,
  "NUM_NULLS" bigint NOT NULL,



Mime
View raw message