Author: rhbutani
Date: Thu Mar 27 15:25:04 2014
New Revision: 1582351
URL: http://svn.apache.org/r1582351
Log:
HIVE-6129 alter exchange is implemented in inverted manner (Navis Ryu via
Harish Butani)
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q
hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q
hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out
hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out
hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
Thu Mar 27 15:25:04 2014
@@ -638,25 +638,27 @@ public class DDLSemanticAnalyzer extends
}
private void analyzeExchangePartition(ASTNode ast) throws SemanticException {
- Table sourceTable = getTable(getUnescapedName((ASTNode)ast.getChild(0)));
- Table destTable = getTable(getUnescapedName((ASTNode)ast.getChild(2)));
+ Table destTable = getTable(getUnescapedName((ASTNode)ast.getChild(0)));
+ Table sourceTable = getTable(getUnescapedName((ASTNode)ast.getChild(2)));
// Get the partition specs
Map<String, String> partSpecs = getPartSpec((ASTNode) ast.getChild(1));
validatePartitionValues(partSpecs);
boolean sameColumns = MetaStoreUtils.compareFieldColumns(
- sourceTable.getAllCols(), destTable.getAllCols());
+ destTable.getAllCols(), sourceTable.getAllCols());
boolean samePartitions = MetaStoreUtils.compareFieldColumns(
- sourceTable.getPartitionKeys(), destTable.getPartitionKeys());
+ destTable.getPartitionKeys(), sourceTable.getPartitionKeys());
if (!sameColumns || !samePartitions) {
throw new
SemanticException(ErrorMsg.TABLES_INCOMPATIBLE_SCHEMAS.getMsg());
}
- List<Partition> partitions = getPartitions(sourceTable, partSpecs, true);
+ // check if source partition exists
+ getPartitions(sourceTable, partSpecs, true);
// Verify that the partitions specified are continuous
// If a subpartition value is specified without specifying a partition's
value
// then we throw an exception
- if (!isPartitionValueContinuous(sourceTable.getPartitionKeys(),
partSpecs)) {
+ int counter = isPartitionValueContinuous(sourceTable.getPartitionKeys(),
partSpecs);
+ if (counter < 0) {
throw new SemanticException(
ErrorMsg.PARTITION_VALUE_NOT_CONTINUOUS.getMsg(partSpecs.toString()));
}
@@ -680,24 +682,20 @@ public class DDLSemanticAnalyzer extends
/**
* @param partitionKeys the list of partition keys of the table
* @param partSpecs the partition specs given by the user
- * @return true if no subpartition value is specified without a partition's
- * value being specified else it returns false
+ * @return >=0 if no subpartition value is specified without a partition's
+ * value being specified else it returns -1
*/
- private boolean isPartitionValueContinuous(List<FieldSchema> partitionKeys,
+ private int isPartitionValueContinuous(List<FieldSchema> partitionKeys,
Map<String, String> partSpecs) {
- boolean partitionMissing = false;
- for (FieldSchema partitionKey: partitionKeys) {
- if (!partSpecs.containsKey(partitionKey.getName())) {
- partitionMissing = true;
- } else {
- if (partitionMissing) {
- // A subpartition value exists after a missing partition
- // The partition value specified are not continuous, return false
- return false;
- }
+ int counter = 0;
+ for (FieldSchema partitionKey : partitionKeys) {
+ if (partSpecs.containsKey(partitionKey.getName())) {
+ counter++;
+ continue;
}
+ return partSpecs.size() == counter ? counter : -1;
}
- return true;
+ return counter;
}
private void analyzeCreateDatabase(ASTNode ast) throws SemanticException {
Modified:
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_incomplete_partition.q
Thu Mar 27 15:25:04 2014
@@ -3,8 +3,8 @@ CREATE TABLE exchange_part_test2 (f1 str
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h1');
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='h2');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='h1');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='h2');
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists.q
Thu Mar 27 15:25:04 2014
@@ -8,5 +8,5 @@ ALTER TABLE exchange_part_test2 ADD PART
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
--- exchange_part_test2 table partition (ds='2013-04-05') already exists thus
this query will fail
+-- exchange_part_test1 table partition (ds='2013-04-05') already exists thus
this query will fail
alter table exchange_part_test1 exchange partition (ds='2013-04-05') with
table exchange_part_test2;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists2.q
Thu Mar 27 15:25:04 2014
@@ -9,5 +9,5 @@ ALTER TABLE exchange_part_test2 ADD PART
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
--- exchange_part_test2 table partition (ds='2013-04-05', hr='3') already
exists thus this query will fail
+-- exchange_part_test1 table partition (ds='2013-04-05') already exists thus
this query will fail
alter table exchange_part_test1 exchange partition (ds='2013-04-05') with
table exchange_part_test2;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_exists3.q
Thu Mar 27 15:25:04 2014
@@ -9,5 +9,5 @@ ALTER TABLE exchange_part_test2 ADD PART
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
--- exchange_part_test2 table partition (ds='2013-04-05', hr='1') already
exists thus this query will fail
+-- exchange_part_test2 table partition (ds='2013-04-05') already exists thus
this query will fail
alter table exchange_part_test1 exchange partition (ds='2013-04-05') with
table exchange_part_test2;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/exchange_partition_neg_partition_missing.q
Thu Mar 27 15:25:04 2014
@@ -2,5 +2,5 @@ CREATE TABLE exchange_part_test1 (f1 str
CREATE TABLE exchange_part_test2 (f1 string) PARTITIONED BY (ds STRING);
SHOW PARTITIONS exchange_part_test1;
--- exchange_part_test1 partition (ds='2013-04-05') does not exist thus this
query will fail
+-- exchange_part_test2 partition (ds='2013-04-05') does not exist thus this
query will fail
alter table exchange_part_test1 exchange partition (ds='2013-04-05') with
table exchange_part_test2;
Modified: hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/exchange_partition.q Thu Mar
27 15:25:04 2014
@@ -3,7 +3,7 @@ CREATE TABLE exchange_part_test2 (f1 str
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05');
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
Modified: hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/exchange_partition2.q Thu Mar
27 15:25:04 2014
@@ -3,7 +3,7 @@ CREATE TABLE exchange_part_test2 (f1 str
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1');
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
Modified: hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/exchange_partition3.q Thu Mar
27 15:25:04 2014
@@ -3,8 +3,9 @@ CREATE TABLE exchange_part_test2 (f1 str
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='1');
-ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05', hr='2');
+ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2014-01-03', hr='1');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='1');
+ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05', hr='2');
SHOW PARTITIONS exchange_part_test1;
SHOW PARTITIONS exchange_part_test2;
Modified:
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
(original)
+++
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_incomplete_partition.q.out
Thu Mar 27 15:25:04 2014
@@ -20,28 +20,28 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='h1')
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='h1')
PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='h1')
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='h1')
POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=h1
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='h2')
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=h1
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='h2')
PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='h2')
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='h2')
POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=h2
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=h2
PREHOOK: query: SHOW PARTITIONS exchange_part_test1
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05/hr=h1
-ds=2013-04-05/hr=h2
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05/hr=h1
+ds=2013-04-05/hr=h2
FAILED: SemanticException [Error 10234]: Parition values specifed are not
continuous. A subpartition value is specified without specififying the parent
partition's value {hr=h1}
Modified:
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
(original)
+++
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists.q.out
Thu Mar 27 15:25:04 2014
@@ -44,4 +44,4 @@ PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
ds=2013-04-05
-FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test2(ds=2013-04-05)]
+FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test1(ds=2013-04-05)]
Modified:
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
(original)
+++
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists2.q.out
Thu Mar 27 15:25:04 2014
@@ -52,4 +52,4 @@ PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
ds=2013-04-05/hr=3
-FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test2(ds=2013-04-05/hr=3)]
+FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test1(ds=2013-04-05/hr=1),
exchange_part_test1(ds=2013-04-05/hr=2)]
Modified:
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
---
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
(original)
+++
hive/trunk/ql/src/test/results/clientnegative/exchange_partition_neg_partition_exists3.q.out
Thu Mar 27 15:25:04 2014
@@ -52,4 +52,4 @@ PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
ds=2013-04-05/hr=1
-FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test2(ds=2013-04-05/hr=1)]
+FAILED: SemanticException [Error 10118]: Partition already exists
[exchange_part_test1(ds=2013-04-05/hr=1),
exchange_part_test1(ds=2013-04-05/hr=2)]
Modified: hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/exchange_partition.q.out Thu
Mar 27 15:25:04 2014
@@ -20,22 +20,22 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION (ds='2013-04-05')
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION (ds='2013-04-05')
PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05')
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05')
POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05
PREHOOK: query: SHOW PARTITIONS exchange_part_test1
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05
PREHOOK: query: ALTER TABLE exchange_part_test1 EXCHANGE PARTITION
(ds='2013-04-05') WITH TABLE exchange_part_test2
PREHOOK: type: null
POSTHOOK: query: ALTER TABLE exchange_part_test1 EXCHANGE PARTITION
(ds='2013-04-05') WITH TABLE exchange_part_test2
@@ -44,8 +44,8 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05
Modified:
hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/exchange_partition2.q.out Thu
Mar 27 15:25:04 2014
@@ -20,22 +20,22 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='1')
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='1')
PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='1')
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='1')
POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=1
PREHOOK: query: SHOW PARTITIONS exchange_part_test1
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05/hr=1
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05/hr=1
PREHOOK: query: ALTER TABLE exchange_part_test1 EXCHANGE PARTITION
(ds='2013-04-05', hr='1') WITH TABLE exchange_part_test2
PREHOOK: type: null
POSTHOOK: query: ALTER TABLE exchange_part_test1 EXCHANGE PARTITION
(ds='2013-04-05', hr='1') WITH TABLE exchange_part_test2
@@ -44,8 +44,8 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05/hr=1
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05/hr=1
Modified:
hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out?rev=1582351&r1=1582350&r2=1582351&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/exchange_partition3.q.out Thu
Mar 27 15:25:04 2014
@@ -20,30 +20,38 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='1')
+PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2014-01-03', hr='1')
PREHOOK: type: ALTERTABLE_ADDPARTS
PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='1')
+POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2014-01-03', hr='1')
POSTHOOK: type: ALTERTABLE_ADDPARTS
POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=1
-PREHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='2')
+POSTHOOK: Output: default@exchange_part_test1@ds=2014-01-03/hr=1
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='1')
PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@exchange_part_test1
-POSTHOOK: query: ALTER TABLE exchange_part_test1 ADD PARTITION
(ds='2013-04-05', hr='2')
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='1')
POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@exchange_part_test1
-POSTHOOK: Output: default@exchange_part_test1@ds=2013-04-05/hr=2
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=1
+PREHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='2')
+PREHOOK: type: ALTERTABLE_ADDPARTS
+PREHOOK: Output: default@exchange_part_test2
+POSTHOOK: query: ALTER TABLE exchange_part_test2 ADD PARTITION
(ds='2013-04-05', hr='2')
+POSTHOOK: type: ALTERTABLE_ADDPARTS
+POSTHOOK: Output: default@exchange_part_test2
+POSTHOOK: Output: default@exchange_part_test2@ds=2013-04-05/hr=2
PREHOOK: query: SHOW PARTITIONS exchange_part_test1
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05/hr=1
-ds=2013-04-05/hr=2
+ds=2014-01-03/hr=1
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05/hr=1
+ds=2013-04-05/hr=2
PREHOOK: query: -- This will exchange both partitions hr=1 and hr=2
ALTER TABLE exchange_part_test1 EXCHANGE PARTITION (ds='2013-04-05') WITH
TABLE exchange_part_test2
PREHOOK: type: null
@@ -54,9 +62,10 @@ PREHOOK: query: SHOW PARTITIONS exchange
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test1
POSTHOOK: type: SHOWPARTITIONS
+ds=2013-04-05/hr=1
+ds=2013-04-05/hr=2
+ds=2014-01-03/hr=1
PREHOOK: query: SHOW PARTITIONS exchange_part_test2
PREHOOK: type: SHOWPARTITIONS
POSTHOOK: query: SHOW PARTITIONS exchange_part_test2
POSTHOOK: type: SHOWPARTITIONS
-ds=2013-04-05/hr=1
-ds=2013-04-05/hr=2
