diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 714ea1f3fd..ceb256701c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -2926,6 +2926,8 @@ private int showCompactions(Hive db, ShowCompactionsDesc desc) throws HiveExcept DataOutputStream os = getOutputStream(desc.getResFile()); try { // Write a header + os.writeBytes("CompactionId"); + os.write(separator); os.writeBytes("Database"); os.write(separator); os.writeBytes("Table"); @@ -2947,6 +2949,8 @@ private int showCompactions(Hive db, ShowCompactionsDesc desc) throws HiveExcept if (rsp.getCompacts() != null) { for (ShowCompactResponseElement e : rsp.getCompacts()) { + os.writeBytes(Long.toString(e.getId())); + os.write(separator); os.writeBytes(e.getDbname()); os.write(separator); os.writeBytes(e.getTablename()); diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCompactionsDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCompactionsDesc.java index dc47a38fe6..c524607cc4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCompactionsDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/ShowCompactionsDesc.java @@ -27,8 +27,9 @@ public class ShowCompactionsDesc extends DDLDesc implements Serializable { private static final long serialVersionUID = 1L; - private static final String schema = "dbname,tabname,partname,type,state,workerid," + - "starttime,duration,hadoopjobid#string:string:string:string:string:string:string:string:string"; + private static final String schema = + "compactionid,dbname,tabname,partname,type,state,workerid,starttime,duration,hadoopjobid#" + + "string:string:string:string:string:string:string:string:string:string"; private String resFile; diff --git ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out index a9814f3da0..90ab961bee 100644 --- ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out +++ ql/src/test/results/clientpositive/dbtxnmgr_showlocks.q.out @@ -67,8 +67,8 @@ PREHOOK: query: show compactions PREHOOK: type: SHOW COMPACTIONS POSTHOOK: query: show compactions POSTHOOK: type: SHOW COMPACTIONS -Database Table Partition Type State Worker Start Time Duration(ms) HadoopJobId -default partitioned_acid_table p=abc MINOR initiated --- --- --- --- +CompactionId Database Table Partition Type State Worker Start Time Duration(ms) HadoopJobId +1 default partitioned_acid_table p=abc MINOR initiated --- --- --- --- PREHOOK: query: drop table partitioned_acid_table PREHOOK: type: DROPTABLE PREHOOK: Input: default@partitioned_acid_table