Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions ql/src/java/org/apache/hadoop/hive/ql/ddl/ShowUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.apache.hadoop.hive.metastore.api.LongColumnStatsData;
import org.apache.hadoop.hive.metastore.api.StringColumnStatsData;
import org.apache.hadoop.hive.metastore.api.TimestampColumnStatsData;
import org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils;
import org.apache.hadoop.hive.ql.exec.Utilities;
import org.apache.hadoop.hive.ql.metadata.HiveException;
import org.apache.hadoop.hive.ql.session.SessionState;
Expand All @@ -54,7 +55,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.math.BigInteger;
import java.nio.charset.StandardCharsets;
import java.time.ZoneId;
import java.util.ArrayList;
Expand Down Expand Up @@ -233,12 +233,7 @@ public static String[] extractColumnValues(FieldSchema column, boolean isColumnS
}

public static String convertToString(Decimal val) {
if (val == null) {
return "";
}

HiveDecimal result = HiveDecimal.create(new BigInteger(val.getUnscaled()), val.getScale());
return (result != null) ? result.toString() : "";
return MetaStoreServerUtils.decimalToString(val);
}

public static String convertToString(org.apache.hadoop.hive.metastore.api.Date val) {
Expand Down
28 changes: 14 additions & 14 deletions ql/src/test/results/clientpositive/llap/llap_decimal64_reader.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -136,25 +136,25 @@ STAGE PLANS:
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
Filter Operator
predicate: (cdecimal1) IN (3.35, 4.46) (type: boolean)
Statistics: Num rows: 12288 Data size: 2752512 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
Top N Key Operator
sort order: ++
keys: cdecimal1 (type: decimal(10,2)), cdecimal2 (type: decimal(38,5))
null sort order: zz
Statistics: Num rows: 12288 Data size: 2752512 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
top n: 2
Group By Operator
keys: cdecimal1 (type: decimal(10,2)), cdecimal2 (type: decimal(38,5))
minReductionHashAggr: 0.99
mode: hash
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
key expressions: _col0 (type: decimal(10,2)), _col1 (type: decimal(38,5))
null sort order: zz
sort order: ++
Map-reduce partition columns: _col0 (type: decimal(10,2)), _col1 (type: decimal(38,5))
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Execution mode: vectorized, llap
LLAP IO: all inputs
Map Vectorization:
Expand All @@ -179,13 +179,13 @@ STAGE PLANS:
keys: KEY._col0 (type: decimal(10,2)), KEY._col1 (type: decimal(38,5))
mode: mergepartial
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Limit
Number of rows: 2
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
Expand Down Expand Up @@ -243,25 +243,25 @@ STAGE PLANS:
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
Filter Operator
predicate: (cdecimal1) IN (3.35, 4.46) (type: boolean)
Statistics: Num rows: 12288 Data size: 2752512 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
Top N Key Operator
sort order: ++
keys: cdecimal1 (type: decimal(10,2)), cdecimal2 (type: decimal(38,5))
null sort order: zz
Statistics: Num rows: 12288 Data size: 2752512 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 24576 Data size: 5505024 Basic stats: COMPLETE Column stats: COMPLETE
top n: 2
Group By Operator
keys: cdecimal1 (type: decimal(10,2)), cdecimal2 (type: decimal(38,5))
minReductionHashAggr: 0.99
mode: hash
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Reduce Output Operator
key expressions: _col0 (type: decimal(10,2)), _col1 (type: decimal(38,5))
null sort order: zz
sort order: ++
Map-reduce partition columns: _col0 (type: decimal(10,2)), _col1 (type: decimal(38,5))
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Execution mode: vectorized, llap
LLAP IO: all inputs
Map Vectorization:
Expand All @@ -287,13 +287,13 @@ STAGE PLANS:
keys: KEY._col0 (type: decimal(10,2)), KEY._col1 (type: decimal(38,5))
mode: mergepartial
outputColumnNames: _col0, _col1
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
Limit
Number of rows: 2
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
File Output Operator
compressed: false
Statistics: Num rows: 1 Data size: 224 Basic stats: COMPLETE Column stats: COMPLETE
Statistics: Num rows: 2 Data size: 448 Basic stats: COMPLETE Column stats: COMPLETE
table:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_stats
col_name e
data_type decimal(5,2)
min -10.2
min -123.2
max 12.2
num_nulls 1
distinct_count 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@test_stats
col_name e
data_type decimal(5,2)
min -12.3
min -123.2
max 12.2
num_nulls 1
distinct_count 15
Expand Down
Loading