diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java index 9257375786..99bd84976a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java @@ -407,7 +407,7 @@ public boolean isOrdering() { * of the same length as key columns, that consists of only "a" * (null first) and "z" (null last). */ - @Explain(displayName = "null sort order", explainLevels = { Level.EXTENDED }) + @Explain(displayName = "null sort order") public String getNullOrder() { return keySerializeInfo.getProperties().getProperty( org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_NULL_SORT_ORDER); diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java index 84e6149a0e..bdb554421e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java @@ -51,7 +51,7 @@ public TopNKeyDesc( this.keyColumns = keyColumns; } - @Explain(displayName = "top n", explainLevels = { Level.DEFAULT, Level.EXTENDED, Level.USER }) + @Explain(displayName = "top n") public int getTopN() { return topN; } @@ -60,7 +60,7 @@ public void setTopN(int topN) { this.topN = topN; } - @Explain(displayName = "sort order", explainLevels = { Level.DEFAULT, Level.EXTENDED, Level.USER }) + @Explain(displayName = "sort order") public String getColumnSortOrder() { return columnSortOrder; } @@ -69,7 +69,7 @@ public void setColumnSortOrder(String columnSortOrder) { this.columnSortOrder = columnSortOrder; } - @Explain(displayName = "null sort order", explainLevels = { Level.EXTENDED }) + @Explain(displayName = "null sort order") public String getNullOrder() { return nullOrder; } diff --git ql/src/test/results/clientpositive/llap/topnkey.q.out ql/src/test/results/clientpositive/llap/topnkey.q.out index cd47e9d223..ea7354749d 100644 --- ql/src/test/results/clientpositive/llap/topnkey.q.out +++ ql/src/test/results/clientpositive/llap/topnkey.q.out @@ -223,6 +223,7 @@ STAGE PLANS: Top N Key Operator sort order: + keys: key (type: string) + null sort order: z Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE top n: 5 Group By Operator @@ -233,6 +234,7 @@ STAGE PLANS: Statistics: Num rows: 250 Data size: 21750 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) + null sort order: z sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 250 Data size: 21750 Basic stats: COMPLETE Column stats: COMPLETE @@ -249,6 +251,7 @@ STAGE PLANS: Statistics: Num rows: 250 Data size: 21750 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) + null sort order: z sort order: + Statistics: Num rows: 250 Data size: 21750 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 @@ -331,6 +334,7 @@ STAGE PLANS: Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) + null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 500 Data size: 43500 Basic stats: COMPLETE Column stats: COMPLETE @@ -351,6 +355,7 @@ STAGE PLANS: Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) + null sort order: a sort order: + Map-reduce partition columns: _col0 (type: string) Statistics: Num rows: 500 Data size: 89000 Basic stats: COMPLETE Column stats: COMPLETE @@ -374,6 +379,7 @@ STAGE PLANS: Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: string) + null sort order: z sort order: + Statistics: Num rows: 791 Data size: 140798 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 @@ -493,6 +499,7 @@ STAGE PLANS: Top N Key Operator sort order: ++ keys: a (type: int), b (type: int) + null sort order: zz Statistics: Num rows: 12 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE top n: 3 Group By Operator @@ -503,6 +510,7 @@ STAGE PLANS: Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: int) + null sort order: zz sort order: ++ Map-reduce partition columns: _col0 (type: int), _col1 (type: int) Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE @@ -519,6 +527,7 @@ STAGE PLANS: Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int), _col1 (type: int) + null sort order: zz sort order: ++ Statistics: Num rows: 6 Data size: 24 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1 @@ -592,6 +601,7 @@ STAGE PLANS: Top N Key Operator sort order: + keys: a (type: int) + null sort order: z Statistics: Num rows: 12 Data size: 72 Basic stats: COMPLETE Column stats: COMPLETE top n: 2 Group By Operator @@ -603,6 +613,7 @@ STAGE PLANS: Statistics: Num rows: 4 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) + null sort order: z sort order: + Map-reduce partition columns: _col0 (type: int) Statistics: Num rows: 4 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE @@ -621,6 +632,7 @@ STAGE PLANS: Statistics: Num rows: 4 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) + null sort order: z sort order: + Statistics: Num rows: 4 Data size: 40 Basic stats: COMPLETE Column stats: COMPLETE TopN Hash Memory Usage: 0.1