You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/05/31 02:00:57 UTC
svn commit: r1598784 [1/2] - in /hive/trunk: metastore/if/
metastore/src/gen/thrift/gen-cpp/
metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/gen/thrift/gen-py/hive_metastore/
metastore/src/gen/thrift/gen-rb/ me...
Author: hashutosh
Date: Sat May 31 00:00:56 2014
New Revision: 1598784
URL: http://svn.apache.org/r1598784
Log:
HIVE-4561 : Column stats : LOW_VALUE (or HIGH_VALUE) will always be 0.0000 ,if all the column values larger than 0.0 (or if all column values smaller than 0.0) (Navis via Asutosh Chauhan)
Modified:
hive/trunk/metastore/if/hive_metastore.thrift
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFComputeStats.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumDistinctValueEstimator.java
hive/trunk/ql/src/test/queries/clientpositive/metadata_only_queries.q
hive/trunk/ql/src/test/results/clientpositive/compute_stats_empty_table.q.out
hive/trunk/ql/src/test/results/clientpositive/compute_stats_long.q.out
hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out
hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries_with_filters.q.out
Modified: hive/trunk/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/if/hive_metastore.thrift?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/if/hive_metastore.thrift (original)
+++ hive/trunk/metastore/if/hive_metastore.thrift Sat May 31 00:00:56 2014
@@ -264,15 +264,15 @@ struct BooleanColumnStatsData {
}
struct DoubleColumnStatsData {
-1: required double lowValue,
-2: required double highValue,
+1: optional double lowValue,
+2: optional double highValue,
3: required i64 numNulls,
4: required i64 numDVs
}
struct LongColumnStatsData {
-1: required i64 lowValue,
-2: required i64 highValue,
+1: optional i64 lowValue,
+2: optional i64 highValue,
3: required i64 numNulls,
4: required i64 numDVs
}
@@ -297,8 +297,8 @@ struct Decimal {
}
struct DecimalColumnStatsData {
-1: required Decimal lowValue,
-2: required Decimal highValue,
+1: optional Decimal lowValue,
+2: optional Decimal highValue,
3: required i64 numNulls,
4: required i64 numDVs
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp Sat May 31 00:00:56 2014
@@ -3215,8 +3215,8 @@ void swap(BooleanColumnStatsData &a, Boo
swap(a.numNulls, b.numNulls);
}
-const char* DoubleColumnStatsData::ascii_fingerprint = "97F958CB0709C3B109A57EEE01946C13";
-const uint8_t DoubleColumnStatsData::binary_fingerprint[16] = {0x97,0xF9,0x58,0xCB,0x07,0x09,0xC3,0xB1,0x09,0xA5,0x7E,0xEE,0x01,0x94,0x6C,0x13};
+const char* DoubleColumnStatsData::ascii_fingerprint = "DA7C011321D74C48396AA002E61A0CBB";
+const uint8_t DoubleColumnStatsData::binary_fingerprint[16] = {0xDA,0x7C,0x01,0x13,0x21,0xD7,0x4C,0x48,0x39,0x6A,0xA0,0x02,0xE6,0x1A,0x0C,0xBB};
uint32_t DoubleColumnStatsData::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -3229,8 +3229,6 @@ uint32_t DoubleColumnStatsData::read(::a
using ::apache::thrift::protocol::TProtocolException;
- bool isset_lowValue = false;
- bool isset_highValue = false;
bool isset_numNulls = false;
bool isset_numDVs = false;
@@ -3245,7 +3243,7 @@ uint32_t DoubleColumnStatsData::read(::a
case 1:
if (ftype == ::apache::thrift::protocol::T_DOUBLE) {
xfer += iprot->readDouble(this->lowValue);
- isset_lowValue = true;
+ this->__isset.lowValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3253,7 +3251,7 @@ uint32_t DoubleColumnStatsData::read(::a
case 2:
if (ftype == ::apache::thrift::protocol::T_DOUBLE) {
xfer += iprot->readDouble(this->highValue);
- isset_highValue = true;
+ this->__isset.highValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3283,10 +3281,6 @@ uint32_t DoubleColumnStatsData::read(::a
xfer += iprot->readStructEnd();
- if (!isset_lowValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_highValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numNulls)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numDVs)
@@ -3298,14 +3292,16 @@ uint32_t DoubleColumnStatsData::write(::
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("DoubleColumnStatsData");
- xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_DOUBLE, 1);
- xfer += oprot->writeDouble(this->lowValue);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_DOUBLE, 2);
- xfer += oprot->writeDouble(this->highValue);
- xfer += oprot->writeFieldEnd();
-
+ if (this->__isset.lowValue) {
+ xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_DOUBLE, 1);
+ xfer += oprot->writeDouble(this->lowValue);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.highValue) {
+ xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_DOUBLE, 2);
+ xfer += oprot->writeDouble(this->highValue);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldBegin("numNulls", ::apache::thrift::protocol::T_I64, 3);
xfer += oprot->writeI64(this->numNulls);
xfer += oprot->writeFieldEnd();
@@ -3325,10 +3321,11 @@ void swap(DoubleColumnStatsData &a, Doub
swap(a.highValue, b.highValue);
swap(a.numNulls, b.numNulls);
swap(a.numDVs, b.numDVs);
+ swap(a.__isset, b.__isset);
}
-const char* LongColumnStatsData::ascii_fingerprint = "66C8E6F97F0275919D86FEB536251B17";
-const uint8_t LongColumnStatsData::binary_fingerprint[16] = {0x66,0xC8,0xE6,0xF9,0x7F,0x02,0x75,0x91,0x9D,0x86,0xFE,0xB5,0x36,0x25,0x1B,0x17};
+const char* LongColumnStatsData::ascii_fingerprint = "E685FC220B24E3B8B93604790DCB9AEA";
+const uint8_t LongColumnStatsData::binary_fingerprint[16] = {0xE6,0x85,0xFC,0x22,0x0B,0x24,0xE3,0xB8,0xB9,0x36,0x04,0x79,0x0D,0xCB,0x9A,0xEA};
uint32_t LongColumnStatsData::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -3341,8 +3338,6 @@ uint32_t LongColumnStatsData::read(::apa
using ::apache::thrift::protocol::TProtocolException;
- bool isset_lowValue = false;
- bool isset_highValue = false;
bool isset_numNulls = false;
bool isset_numDVs = false;
@@ -3357,7 +3352,7 @@ uint32_t LongColumnStatsData::read(::apa
case 1:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->lowValue);
- isset_lowValue = true;
+ this->__isset.lowValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3365,7 +3360,7 @@ uint32_t LongColumnStatsData::read(::apa
case 2:
if (ftype == ::apache::thrift::protocol::T_I64) {
xfer += iprot->readI64(this->highValue);
- isset_highValue = true;
+ this->__isset.highValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3395,10 +3390,6 @@ uint32_t LongColumnStatsData::read(::apa
xfer += iprot->readStructEnd();
- if (!isset_lowValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_highValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numNulls)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numDVs)
@@ -3410,14 +3401,16 @@ uint32_t LongColumnStatsData::write(::ap
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("LongColumnStatsData");
- xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_I64, 1);
- xfer += oprot->writeI64(this->lowValue);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_I64, 2);
- xfer += oprot->writeI64(this->highValue);
- xfer += oprot->writeFieldEnd();
-
+ if (this->__isset.lowValue) {
+ xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_I64, 1);
+ xfer += oprot->writeI64(this->lowValue);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.highValue) {
+ xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_I64, 2);
+ xfer += oprot->writeI64(this->highValue);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldBegin("numNulls", ::apache::thrift::protocol::T_I64, 3);
xfer += oprot->writeI64(this->numNulls);
xfer += oprot->writeFieldEnd();
@@ -3437,6 +3430,7 @@ void swap(LongColumnStatsData &a, LongCo
swap(a.highValue, b.highValue);
swap(a.numNulls, b.numNulls);
swap(a.numDVs, b.numDVs);
+ swap(a.__isset, b.__isset);
}
const char* StringColumnStatsData::ascii_fingerprint = "D017B08C3DF12C3AB98788B2E67DAAB3";
@@ -3727,8 +3721,8 @@ void swap(Decimal &a, Decimal &b) {
swap(a.scale, b.scale);
}
-const char* DecimalColumnStatsData::ascii_fingerprint = "3AE5C36598A014EE815B87600C3087B5";
-const uint8_t DecimalColumnStatsData::binary_fingerprint[16] = {0x3A,0xE5,0xC3,0x65,0x98,0xA0,0x14,0xEE,0x81,0x5B,0x87,0x60,0x0C,0x30,0x87,0xB5};
+const char* DecimalColumnStatsData::ascii_fingerprint = "B6D47E7A28922BFA93FE05E9F1B04748";
+const uint8_t DecimalColumnStatsData::binary_fingerprint[16] = {0xB6,0xD4,0x7E,0x7A,0x28,0x92,0x2B,0xFA,0x93,0xFE,0x05,0xE9,0xF1,0xB0,0x47,0x48};
uint32_t DecimalColumnStatsData::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -3741,8 +3735,6 @@ uint32_t DecimalColumnStatsData::read(::
using ::apache::thrift::protocol::TProtocolException;
- bool isset_lowValue = false;
- bool isset_highValue = false;
bool isset_numNulls = false;
bool isset_numDVs = false;
@@ -3757,7 +3749,7 @@ uint32_t DecimalColumnStatsData::read(::
case 1:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->lowValue.read(iprot);
- isset_lowValue = true;
+ this->__isset.lowValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3765,7 +3757,7 @@ uint32_t DecimalColumnStatsData::read(::
case 2:
if (ftype == ::apache::thrift::protocol::T_STRUCT) {
xfer += this->highValue.read(iprot);
- isset_highValue = true;
+ this->__isset.highValue = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -3795,10 +3787,6 @@ uint32_t DecimalColumnStatsData::read(::
xfer += iprot->readStructEnd();
- if (!isset_lowValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
- if (!isset_highValue)
- throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numNulls)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_numDVs)
@@ -3810,14 +3798,16 @@ uint32_t DecimalColumnStatsData::write(:
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("DecimalColumnStatsData");
- xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_STRUCT, 1);
- xfer += this->lowValue.write(oprot);
- xfer += oprot->writeFieldEnd();
-
- xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_STRUCT, 2);
- xfer += this->highValue.write(oprot);
- xfer += oprot->writeFieldEnd();
-
+ if (this->__isset.lowValue) {
+ xfer += oprot->writeFieldBegin("lowValue", ::apache::thrift::protocol::T_STRUCT, 1);
+ xfer += this->lowValue.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.highValue) {
+ xfer += oprot->writeFieldBegin("highValue", ::apache::thrift::protocol::T_STRUCT, 2);
+ xfer += this->highValue.write(oprot);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldBegin("numNulls", ::apache::thrift::protocol::T_I64, 3);
xfer += oprot->writeI64(this->numNulls);
xfer += oprot->writeFieldEnd();
@@ -3837,10 +3827,11 @@ void swap(DecimalColumnStatsData &a, Dec
swap(a.highValue, b.highValue);
swap(a.numNulls, b.numNulls);
swap(a.numDVs, b.numDVs);
+ swap(a.__isset, b.__isset);
}
-const char* ColumnStatisticsData::ascii_fingerprint = "343F5865568AF7DA61829A616EB8C57C";
-const uint8_t ColumnStatisticsData::binary_fingerprint[16] = {0x34,0x3F,0x58,0x65,0x56,0x8A,0xF7,0xDA,0x61,0x82,0x9A,0x61,0x6E,0xB8,0xC5,0x7C};
+const char* ColumnStatisticsData::ascii_fingerprint = "D079ACEA6EE0998D0A45CB65FF1EAADD";
+const uint8_t ColumnStatisticsData::binary_fingerprint[16] = {0xD0,0x79,0xAC,0xEA,0x6E,0xE0,0x99,0x8D,0x0A,0x45,0xCB,0x65,0xFF,0x1E,0xAA,0xDD};
uint32_t ColumnStatisticsData::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -3966,8 +3957,8 @@ void swap(ColumnStatisticsData &a, Colum
swap(a.__isset, b.__isset);
}
-const char* ColumnStatisticsObj::ascii_fingerprint = "CFDBB9DFF4F1670367EA5356861EC180";
-const uint8_t ColumnStatisticsObj::binary_fingerprint[16] = {0xCF,0xDB,0xB9,0xDF,0xF4,0xF1,0x67,0x03,0x67,0xEA,0x53,0x56,0x86,0x1E,0xC1,0x80};
+const char* ColumnStatisticsObj::ascii_fingerprint = "E49E62CFC71682004614EFEDAC3CD3F4";
+const uint8_t ColumnStatisticsObj::binary_fingerprint[16] = {0xE4,0x9E,0x62,0xCF,0xC7,0x16,0x82,0x00,0x46,0x14,0xEF,0xED,0xAC,0x3C,0xD3,0xF4};
uint32_t ColumnStatisticsObj::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -4187,8 +4178,8 @@ void swap(ColumnStatisticsDesc &a, Colum
swap(a.__isset, b.__isset);
}
-const char* ColumnStatistics::ascii_fingerprint = "37AA2F226C29DF25254CCCE6A7DDBAF3";
-const uint8_t ColumnStatistics::binary_fingerprint[16] = {0x37,0xAA,0x2F,0x22,0x6C,0x29,0xDF,0x25,0x25,0x4C,0xCC,0xE6,0xA7,0xDD,0xBA,0xF3};
+const char* ColumnStatistics::ascii_fingerprint = "6682E234199B2CD3807B1ED420C6A7F8";
+const uint8_t ColumnStatistics::binary_fingerprint[16] = {0x66,0x82,0xE2,0x34,0x19,0x9B,0x2C,0xD3,0x80,0x7B,0x1E,0xD4,0x20,0xC6,0xA7,0xF8};
uint32_t ColumnStatistics::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -4717,8 +4708,8 @@ void swap(PartitionsByExprRequest &a, Pa
swap(a.__isset, b.__isset);
}
-const char* TableStatsResult::ascii_fingerprint = "178DBEC75B48CDDEDB3B8338EF6FBF2F";
-const uint8_t TableStatsResult::binary_fingerprint[16] = {0x17,0x8D,0xBE,0xC7,0x5B,0x48,0xCD,0xDE,0xDB,0x3B,0x83,0x38,0xEF,0x6F,0xBF,0x2F};
+const char* TableStatsResult::ascii_fingerprint = "CE3E8F0D9B310B8D33CB7A89A75F3E05";
+const uint8_t TableStatsResult::binary_fingerprint[16] = {0xCE,0x3E,0x8F,0x0D,0x9B,0x31,0x0B,0x8D,0x33,0xCB,0x7A,0x89,0xA7,0x5F,0x3E,0x05};
uint32_t TableStatsResult::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -4801,8 +4792,8 @@ void swap(TableStatsResult &a, TableStat
swap(a.tableStats, b.tableStats);
}
-const char* PartitionsStatsResult::ascii_fingerprint = "0E3D549A0384CD453E2CB90C734A6245";
-const uint8_t PartitionsStatsResult::binary_fingerprint[16] = {0x0E,0x3D,0x54,0x9A,0x03,0x84,0xCD,0x45,0x3E,0x2C,0xB9,0x0C,0x73,0x4A,0x62,0x45};
+const char* PartitionsStatsResult::ascii_fingerprint = "FF175B50C5EF6F442D3AF25B06435A39";
+const uint8_t PartitionsStatsResult::binary_fingerprint[16] = {0xFF,0x17,0x5B,0x50,0xC5,0xEF,0x6F,0x44,0x2D,0x3A,0xF2,0x5B,0x06,0x43,0x5A,0x39};
uint32_t PartitionsStatsResult::read(::apache::thrift::protocol::TProtocol* iprot) {
Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h Sat May 31 00:00:56 2014
@@ -1741,12 +1741,17 @@ class BooleanColumnStatsData {
void swap(BooleanColumnStatsData &a, BooleanColumnStatsData &b);
+typedef struct _DoubleColumnStatsData__isset {
+ _DoubleColumnStatsData__isset() : lowValue(false), highValue(false) {}
+ bool lowValue;
+ bool highValue;
+} _DoubleColumnStatsData__isset;
class DoubleColumnStatsData {
public:
- static const char* ascii_fingerprint; // = "97F958CB0709C3B109A57EEE01946C13";
- static const uint8_t binary_fingerprint[16]; // = {0x97,0xF9,0x58,0xCB,0x07,0x09,0xC3,0xB1,0x09,0xA5,0x7E,0xEE,0x01,0x94,0x6C,0x13};
+ static const char* ascii_fingerprint; // = "DA7C011321D74C48396AA002E61A0CBB";
+ static const uint8_t binary_fingerprint[16]; // = {0xDA,0x7C,0x01,0x13,0x21,0xD7,0x4C,0x48,0x39,0x6A,0xA0,0x02,0xE6,0x1A,0x0C,0xBB};
DoubleColumnStatsData() : lowValue(0), highValue(0), numNulls(0), numDVs(0) {
}
@@ -1758,12 +1763,16 @@ class DoubleColumnStatsData {
int64_t numNulls;
int64_t numDVs;
+ _DoubleColumnStatsData__isset __isset;
+
void __set_lowValue(const double val) {
lowValue = val;
+ __isset.lowValue = true;
}
void __set_highValue(const double val) {
highValue = val;
+ __isset.highValue = true;
}
void __set_numNulls(const int64_t val) {
@@ -1776,9 +1785,13 @@ class DoubleColumnStatsData {
bool operator == (const DoubleColumnStatsData & rhs) const
{
- if (!(lowValue == rhs.lowValue))
+ if (__isset.lowValue != rhs.__isset.lowValue)
+ return false;
+ else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+ return false;
+ if (__isset.highValue != rhs.__isset.highValue)
return false;
- if (!(highValue == rhs.highValue))
+ else if (__isset.highValue && !(highValue == rhs.highValue))
return false;
if (!(numNulls == rhs.numNulls))
return false;
@@ -1799,12 +1812,17 @@ class DoubleColumnStatsData {
void swap(DoubleColumnStatsData &a, DoubleColumnStatsData &b);
+typedef struct _LongColumnStatsData__isset {
+ _LongColumnStatsData__isset() : lowValue(false), highValue(false) {}
+ bool lowValue;
+ bool highValue;
+} _LongColumnStatsData__isset;
class LongColumnStatsData {
public:
- static const char* ascii_fingerprint; // = "66C8E6F97F0275919D86FEB536251B17";
- static const uint8_t binary_fingerprint[16]; // = {0x66,0xC8,0xE6,0xF9,0x7F,0x02,0x75,0x91,0x9D,0x86,0xFE,0xB5,0x36,0x25,0x1B,0x17};
+ static const char* ascii_fingerprint; // = "E685FC220B24E3B8B93604790DCB9AEA";
+ static const uint8_t binary_fingerprint[16]; // = {0xE6,0x85,0xFC,0x22,0x0B,0x24,0xE3,0xB8,0xB9,0x36,0x04,0x79,0x0D,0xCB,0x9A,0xEA};
LongColumnStatsData() : lowValue(0), highValue(0), numNulls(0), numDVs(0) {
}
@@ -1816,12 +1834,16 @@ class LongColumnStatsData {
int64_t numNulls;
int64_t numDVs;
+ _LongColumnStatsData__isset __isset;
+
void __set_lowValue(const int64_t val) {
lowValue = val;
+ __isset.lowValue = true;
}
void __set_highValue(const int64_t val) {
highValue = val;
+ __isset.highValue = true;
}
void __set_numNulls(const int64_t val) {
@@ -1834,9 +1856,13 @@ class LongColumnStatsData {
bool operator == (const LongColumnStatsData & rhs) const
{
- if (!(lowValue == rhs.lowValue))
+ if (__isset.lowValue != rhs.__isset.lowValue)
+ return false;
+ else if (__isset.lowValue && !(lowValue == rhs.lowValue))
return false;
- if (!(highValue == rhs.highValue))
+ if (__isset.highValue != rhs.__isset.highValue)
+ return false;
+ else if (__isset.highValue && !(highValue == rhs.highValue))
return false;
if (!(numNulls == rhs.numNulls))
return false;
@@ -2010,12 +2036,17 @@ class Decimal {
void swap(Decimal &a, Decimal &b);
+typedef struct _DecimalColumnStatsData__isset {
+ _DecimalColumnStatsData__isset() : lowValue(false), highValue(false) {}
+ bool lowValue;
+ bool highValue;
+} _DecimalColumnStatsData__isset;
class DecimalColumnStatsData {
public:
- static const char* ascii_fingerprint; // = "3AE5C36598A014EE815B87600C3087B5";
- static const uint8_t binary_fingerprint[16]; // = {0x3A,0xE5,0xC3,0x65,0x98,0xA0,0x14,0xEE,0x81,0x5B,0x87,0x60,0x0C,0x30,0x87,0xB5};
+ static const char* ascii_fingerprint; // = "B6D47E7A28922BFA93FE05E9F1B04748";
+ static const uint8_t binary_fingerprint[16]; // = {0xB6,0xD4,0x7E,0x7A,0x28,0x92,0x2B,0xFA,0x93,0xFE,0x05,0xE9,0xF1,0xB0,0x47,0x48};
DecimalColumnStatsData() : numNulls(0), numDVs(0) {
}
@@ -2027,12 +2058,16 @@ class DecimalColumnStatsData {
int64_t numNulls;
int64_t numDVs;
+ _DecimalColumnStatsData__isset __isset;
+
void __set_lowValue(const Decimal& val) {
lowValue = val;
+ __isset.lowValue = true;
}
void __set_highValue(const Decimal& val) {
highValue = val;
+ __isset.highValue = true;
}
void __set_numNulls(const int64_t val) {
@@ -2045,9 +2080,13 @@ class DecimalColumnStatsData {
bool operator == (const DecimalColumnStatsData & rhs) const
{
- if (!(lowValue == rhs.lowValue))
+ if (__isset.lowValue != rhs.__isset.lowValue)
+ return false;
+ else if (__isset.lowValue && !(lowValue == rhs.lowValue))
+ return false;
+ if (__isset.highValue != rhs.__isset.highValue)
return false;
- if (!(highValue == rhs.highValue))
+ else if (__isset.highValue && !(highValue == rhs.highValue))
return false;
if (!(numNulls == rhs.numNulls))
return false;
@@ -2081,8 +2120,8 @@ typedef struct _ColumnStatisticsData__is
class ColumnStatisticsData {
public:
- static const char* ascii_fingerprint; // = "343F5865568AF7DA61829A616EB8C57C";
- static const uint8_t binary_fingerprint[16]; // = {0x34,0x3F,0x58,0x65,0x56,0x8A,0xF7,0xDA,0x61,0x82,0x9A,0x61,0x6E,0xB8,0xC5,0x7C};
+ static const char* ascii_fingerprint; // = "D079ACEA6EE0998D0A45CB65FF1EAADD";
+ static const uint8_t binary_fingerprint[16]; // = {0xD0,0x79,0xAC,0xEA,0x6E,0xE0,0x99,0x8D,0x0A,0x45,0xCB,0x65,0xFF,0x1E,0xAA,0xDD};
ColumnStatisticsData() {
}
@@ -2155,8 +2194,8 @@ void swap(ColumnStatisticsData &a, Colum
class ColumnStatisticsObj {
public:
- static const char* ascii_fingerprint; // = "CFDBB9DFF4F1670367EA5356861EC180";
- static const uint8_t binary_fingerprint[16]; // = {0xCF,0xDB,0xB9,0xDF,0xF4,0xF1,0x67,0x03,0x67,0xEA,0x53,0x56,0x86,0x1E,0xC1,0x80};
+ static const char* ascii_fingerprint; // = "E49E62CFC71682004614EFEDAC3CD3F4";
+ static const uint8_t binary_fingerprint[16]; // = {0xE4,0x9E,0x62,0xCF,0xC7,0x16,0x82,0x00,0x46,0x14,0xEF,0xED,0xAC,0x3C,0xD3,0xF4};
ColumnStatisticsObj() : colName(), colType() {
}
@@ -2284,8 +2323,8 @@ void swap(ColumnStatisticsDesc &a, Colum
class ColumnStatistics {
public:
- static const char* ascii_fingerprint; // = "37AA2F226C29DF25254CCCE6A7DDBAF3";
- static const uint8_t binary_fingerprint[16]; // = {0x37,0xAA,0x2F,0x22,0x6C,0x29,0xDF,0x25,0x25,0x4C,0xCC,0xE6,0xA7,0xDD,0xBA,0xF3};
+ static const char* ascii_fingerprint; // = "6682E234199B2CD3807B1ED420C6A7F8";
+ static const uint8_t binary_fingerprint[16]; // = {0x66,0x82,0xE2,0x34,0x19,0x9B,0x2C,0xD3,0x80,0x7B,0x1E,0xD4,0x20,0xC6,0xA7,0xF8};
ColumnStatistics() {
}
@@ -2544,8 +2583,8 @@ void swap(PartitionsByExprRequest &a, Pa
class TableStatsResult {
public:
- static const char* ascii_fingerprint; // = "178DBEC75B48CDDEDB3B8338EF6FBF2F";
- static const uint8_t binary_fingerprint[16]; // = {0x17,0x8D,0xBE,0xC7,0x5B,0x48,0xCD,0xDE,0xDB,0x3B,0x83,0x38,0xEF,0x6F,0xBF,0x2F};
+ static const char* ascii_fingerprint; // = "CE3E8F0D9B310B8D33CB7A89A75F3E05";
+ static const uint8_t binary_fingerprint[16]; // = {0xCE,0x3E,0x8F,0x0D,0x9B,0x31,0x0B,0x8D,0x33,0xCB,0x7A,0x89,0xA7,0x5F,0x3E,0x05};
TableStatsResult() {
}
@@ -2581,8 +2620,8 @@ void swap(TableStatsResult &a, TableStat
class PartitionsStatsResult {
public:
- static const char* ascii_fingerprint; // = "0E3D549A0384CD453E2CB90C734A6245";
- static const uint8_t binary_fingerprint[16]; // = {0x0E,0x3D,0x54,0x9A,0x03,0x84,0xCD,0x45,0x3E,0x2C,0xB9,0x0C,0x73,0x4A,0x62,0x45};
+ static const char* ascii_fingerprint; // = "FF175B50C5EF6F442D3AF25B06435A39";
+ static const uint8_t binary_fingerprint[16]; // = {0xFF,0x17,0x5B,0x50,0xC5,0xEF,0x6F,0x44,0x2D,0x3A,0xF2,0x5B,0x06,0x43,0x5A,0x39};
PartitionsStatsResult() {
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DecimalColumnStatsData.java Sat May 31 00:00:56 2014
@@ -45,8 +45,8 @@ public class DecimalColumnStatsData impl
schemes.put(TupleScheme.class, new DecimalColumnStatsDataTupleSchemeFactory());
}
- private Decimal lowValue; // required
- private Decimal highValue; // required
+ private Decimal lowValue; // optional
+ private Decimal highValue; // optional
private long numNulls; // required
private long numDVs; // required
@@ -121,12 +121,13 @@ public class DecimalColumnStatsData impl
private static final int __NUMNULLS_ISSET_ID = 0;
private static final int __NUMDVS_ISSET_ID = 1;
private byte __isset_bitfield = 0;
+ private _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Decimal.class)));
- tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Decimal.class)));
tmpMap.put(_Fields.NUM_NULLS, new org.apache.thrift.meta_data.FieldMetaData("numNulls", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
@@ -140,14 +141,10 @@ public class DecimalColumnStatsData impl
}
public DecimalColumnStatsData(
- Decimal lowValue,
- Decimal highValue,
long numNulls,
long numDVs)
{
this();
- this.lowValue = lowValue;
- this.highValue = highValue;
this.numNulls = numNulls;
setNumNullsIsSet(true);
this.numDVs = numDVs;
@@ -494,21 +491,25 @@ public class DecimalColumnStatsData impl
StringBuilder sb = new StringBuilder("DecimalColumnStatsData(");
boolean first = true;
- sb.append("lowValue:");
- if (this.lowValue == null) {
- sb.append("null");
- } else {
- sb.append(this.lowValue);
+ if (isSetLowValue()) {
+ sb.append("lowValue:");
+ if (this.lowValue == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.lowValue);
+ }
+ first = false;
}
- first = false;
- if (!first) sb.append(", ");
- sb.append("highValue:");
- if (this.highValue == null) {
- sb.append("null");
- } else {
- sb.append(this.highValue);
+ if (isSetHighValue()) {
+ if (!first) sb.append(", ");
+ sb.append("highValue:");
+ if (this.highValue == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.highValue);
+ }
+ first = false;
}
- first = false;
if (!first) sb.append(", ");
sb.append("numNulls:");
sb.append(this.numNulls);
@@ -523,14 +524,6 @@ public class DecimalColumnStatsData impl
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetLowValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'lowValue' is unset! Struct:" + toString());
- }
-
- if (!isSetHighValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'highValue' is unset! Struct:" + toString());
- }
-
if (!isSetNumNulls()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'numNulls' is unset! Struct:" + toString());
}
@@ -632,14 +625,18 @@ public class DecimalColumnStatsData impl
oprot.writeStructBegin(STRUCT_DESC);
if (struct.lowValue != null) {
- oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
- struct.lowValue.write(oprot);
- oprot.writeFieldEnd();
+ if (struct.isSetLowValue()) {
+ oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
+ struct.lowValue.write(oprot);
+ oprot.writeFieldEnd();
+ }
}
if (struct.highValue != null) {
- oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
- struct.highValue.write(oprot);
- oprot.writeFieldEnd();
+ if (struct.isSetHighValue()) {
+ oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
+ struct.highValue.write(oprot);
+ oprot.writeFieldEnd();
+ }
}
oprot.writeFieldBegin(NUM_NULLS_FIELD_DESC);
oprot.writeI64(struct.numNulls);
@@ -664,25 +661,42 @@ public class DecimalColumnStatsData impl
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DecimalColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- struct.lowValue.write(oprot);
- struct.highValue.write(oprot);
oprot.writeI64(struct.numNulls);
oprot.writeI64(struct.numDVs);
+ BitSet optionals = new BitSet();
+ if (struct.isSetLowValue()) {
+ optionals.set(0);
+ }
+ if (struct.isSetHighValue()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetLowValue()) {
+ struct.lowValue.write(oprot);
+ }
+ if (struct.isSetHighValue()) {
+ struct.highValue.write(oprot);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DecimalColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.lowValue = new Decimal();
- struct.lowValue.read(iprot);
- struct.setLowValueIsSet(true);
- struct.highValue = new Decimal();
- struct.highValue.read(iprot);
- struct.setHighValueIsSet(true);
struct.numNulls = iprot.readI64();
struct.setNumNullsIsSet(true);
struct.numDVs = iprot.readI64();
struct.setNumDVsIsSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.lowValue = new Decimal();
+ struct.lowValue.read(iprot);
+ struct.setLowValueIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.highValue = new Decimal();
+ struct.highValue.read(iprot);
+ struct.setHighValueIsSet(true);
+ }
}
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DoubleColumnStatsData.java Sat May 31 00:00:56 2014
@@ -45,8 +45,8 @@ public class DoubleColumnStatsData imple
schemes.put(TupleScheme.class, new DoubleColumnStatsDataTupleSchemeFactory());
}
- private double lowValue; // required
- private double highValue; // required
+ private double lowValue; // optional
+ private double highValue; // optional
private long numNulls; // required
private long numDVs; // required
@@ -123,12 +123,13 @@ public class DoubleColumnStatsData imple
private static final int __NUMNULLS_ISSET_ID = 2;
private static final int __NUMDVS_ISSET_ID = 3;
private byte __isset_bitfield = 0;
+ private _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
- tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
tmpMap.put(_Fields.NUM_NULLS, new org.apache.thrift.meta_data.FieldMetaData("numNulls", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
@@ -142,16 +143,10 @@ public class DoubleColumnStatsData imple
}
public DoubleColumnStatsData(
- double lowValue,
- double highValue,
long numNulls,
long numDVs)
{
this();
- this.lowValue = lowValue;
- setLowValueIsSet(true);
- this.highValue = highValue;
- setHighValueIsSet(true);
this.numNulls = numNulls;
setNumNullsIsSet(true);
this.numDVs = numDVs;
@@ -360,8 +355,8 @@ public class DoubleColumnStatsData imple
if (that == null)
return false;
- boolean this_present_lowValue = true;
- boolean that_present_lowValue = true;
+ boolean this_present_lowValue = true && this.isSetLowValue();
+ boolean that_present_lowValue = true && that.isSetLowValue();
if (this_present_lowValue || that_present_lowValue) {
if (!(this_present_lowValue && that_present_lowValue))
return false;
@@ -369,8 +364,8 @@ public class DoubleColumnStatsData imple
return false;
}
- boolean this_present_highValue = true;
- boolean that_present_highValue = true;
+ boolean this_present_highValue = true && this.isSetHighValue();
+ boolean that_present_highValue = true && that.isSetHighValue();
if (this_present_highValue || that_present_highValue) {
if (!(this_present_highValue && that_present_highValue))
return false;
@@ -403,12 +398,12 @@ public class DoubleColumnStatsData imple
public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder();
- boolean present_lowValue = true;
+ boolean present_lowValue = true && (isSetLowValue());
builder.append(present_lowValue);
if (present_lowValue)
builder.append(lowValue);
- boolean present_highValue = true;
+ boolean present_highValue = true && (isSetHighValue());
builder.append(present_highValue);
if (present_highValue)
builder.append(highValue);
@@ -494,13 +489,17 @@ public class DoubleColumnStatsData imple
StringBuilder sb = new StringBuilder("DoubleColumnStatsData(");
boolean first = true;
- sb.append("lowValue:");
- sb.append(this.lowValue);
- first = false;
- if (!first) sb.append(", ");
- sb.append("highValue:");
- sb.append(this.highValue);
- first = false;
+ if (isSetLowValue()) {
+ sb.append("lowValue:");
+ sb.append(this.lowValue);
+ first = false;
+ }
+ if (isSetHighValue()) {
+ if (!first) sb.append(", ");
+ sb.append("highValue:");
+ sb.append(this.highValue);
+ first = false;
+ }
if (!first) sb.append(", ");
sb.append("numNulls:");
sb.append(this.numNulls);
@@ -515,14 +514,6 @@ public class DoubleColumnStatsData imple
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetLowValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'lowValue' is unset! Struct:" + toString());
- }
-
- if (!isSetHighValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'highValue' is unset! Struct:" + toString());
- }
-
if (!isSetNumNulls()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'numNulls' is unset! Struct:" + toString());
}
@@ -615,12 +606,16 @@ public class DoubleColumnStatsData imple
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
- oprot.writeDouble(struct.lowValue);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
- oprot.writeDouble(struct.highValue);
- oprot.writeFieldEnd();
+ if (struct.isSetLowValue()) {
+ oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
+ oprot.writeDouble(struct.lowValue);
+ oprot.writeFieldEnd();
+ }
+ if (struct.isSetHighValue()) {
+ oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
+ oprot.writeDouble(struct.highValue);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldBegin(NUM_NULLS_FIELD_DESC);
oprot.writeI64(struct.numNulls);
oprot.writeFieldEnd();
@@ -644,23 +639,40 @@ public class DoubleColumnStatsData imple
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, DoubleColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeDouble(struct.lowValue);
- oprot.writeDouble(struct.highValue);
oprot.writeI64(struct.numNulls);
oprot.writeI64(struct.numDVs);
+ BitSet optionals = new BitSet();
+ if (struct.isSetLowValue()) {
+ optionals.set(0);
+ }
+ if (struct.isSetHighValue()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetLowValue()) {
+ oprot.writeDouble(struct.lowValue);
+ }
+ if (struct.isSetHighValue()) {
+ oprot.writeDouble(struct.highValue);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, DoubleColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.lowValue = iprot.readDouble();
- struct.setLowValueIsSet(true);
- struct.highValue = iprot.readDouble();
- struct.setHighValueIsSet(true);
struct.numNulls = iprot.readI64();
struct.setNumNullsIsSet(true);
struct.numDVs = iprot.readI64();
struct.setNumDVsIsSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.lowValue = iprot.readDouble();
+ struct.setLowValueIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.highValue = iprot.readDouble();
+ struct.setHighValueIsSet(true);
+ }
}
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LongColumnStatsData.java Sat May 31 00:00:56 2014
@@ -45,8 +45,8 @@ public class LongColumnStatsData impleme
schemes.put(TupleScheme.class, new LongColumnStatsDataTupleSchemeFactory());
}
- private long lowValue; // required
- private long highValue; // required
+ private long lowValue; // optional
+ private long highValue; // optional
private long numNulls; // required
private long numDVs; // required
@@ -123,12 +123,13 @@ public class LongColumnStatsData impleme
private static final int __NUMNULLS_ISSET_ID = 2;
private static final int __NUMDVS_ISSET_ID = 3;
private byte __isset_bitfield = 0;
+ private _Fields optionals[] = {_Fields.LOW_VALUE,_Fields.HIGH_VALUE};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.LOW_VALUE, new org.apache.thrift.meta_data.FieldMetaData("lowValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ tmpMap.put(_Fields.HIGH_VALUE, new org.apache.thrift.meta_data.FieldMetaData("highValue", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.NUM_NULLS, new org.apache.thrift.meta_data.FieldMetaData("numNulls", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
@@ -142,16 +143,10 @@ public class LongColumnStatsData impleme
}
public LongColumnStatsData(
- long lowValue,
- long highValue,
long numNulls,
long numDVs)
{
this();
- this.lowValue = lowValue;
- setLowValueIsSet(true);
- this.highValue = highValue;
- setHighValueIsSet(true);
this.numNulls = numNulls;
setNumNullsIsSet(true);
this.numDVs = numDVs;
@@ -360,8 +355,8 @@ public class LongColumnStatsData impleme
if (that == null)
return false;
- boolean this_present_lowValue = true;
- boolean that_present_lowValue = true;
+ boolean this_present_lowValue = true && this.isSetLowValue();
+ boolean that_present_lowValue = true && that.isSetLowValue();
if (this_present_lowValue || that_present_lowValue) {
if (!(this_present_lowValue && that_present_lowValue))
return false;
@@ -369,8 +364,8 @@ public class LongColumnStatsData impleme
return false;
}
- boolean this_present_highValue = true;
- boolean that_present_highValue = true;
+ boolean this_present_highValue = true && this.isSetHighValue();
+ boolean that_present_highValue = true && that.isSetHighValue();
if (this_present_highValue || that_present_highValue) {
if (!(this_present_highValue && that_present_highValue))
return false;
@@ -403,12 +398,12 @@ public class LongColumnStatsData impleme
public int hashCode() {
HashCodeBuilder builder = new HashCodeBuilder();
- boolean present_lowValue = true;
+ boolean present_lowValue = true && (isSetLowValue());
builder.append(present_lowValue);
if (present_lowValue)
builder.append(lowValue);
- boolean present_highValue = true;
+ boolean present_highValue = true && (isSetHighValue());
builder.append(present_highValue);
if (present_highValue)
builder.append(highValue);
@@ -494,13 +489,17 @@ public class LongColumnStatsData impleme
StringBuilder sb = new StringBuilder("LongColumnStatsData(");
boolean first = true;
- sb.append("lowValue:");
- sb.append(this.lowValue);
- first = false;
- if (!first) sb.append(", ");
- sb.append("highValue:");
- sb.append(this.highValue);
- first = false;
+ if (isSetLowValue()) {
+ sb.append("lowValue:");
+ sb.append(this.lowValue);
+ first = false;
+ }
+ if (isSetHighValue()) {
+ if (!first) sb.append(", ");
+ sb.append("highValue:");
+ sb.append(this.highValue);
+ first = false;
+ }
if (!first) sb.append(", ");
sb.append("numNulls:");
sb.append(this.numNulls);
@@ -515,14 +514,6 @@ public class LongColumnStatsData impleme
public void validate() throws org.apache.thrift.TException {
// check for required fields
- if (!isSetLowValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'lowValue' is unset! Struct:" + toString());
- }
-
- if (!isSetHighValue()) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'highValue' is unset! Struct:" + toString());
- }
-
if (!isSetNumNulls()) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'numNulls' is unset! Struct:" + toString());
}
@@ -615,12 +606,16 @@ public class LongColumnStatsData impleme
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
- oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
- oprot.writeI64(struct.lowValue);
- oprot.writeFieldEnd();
- oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
- oprot.writeI64(struct.highValue);
- oprot.writeFieldEnd();
+ if (struct.isSetLowValue()) {
+ oprot.writeFieldBegin(LOW_VALUE_FIELD_DESC);
+ oprot.writeI64(struct.lowValue);
+ oprot.writeFieldEnd();
+ }
+ if (struct.isSetHighValue()) {
+ oprot.writeFieldBegin(HIGH_VALUE_FIELD_DESC);
+ oprot.writeI64(struct.highValue);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldBegin(NUM_NULLS_FIELD_DESC);
oprot.writeI64(struct.numNulls);
oprot.writeFieldEnd();
@@ -644,23 +639,40 @@ public class LongColumnStatsData impleme
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, LongColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
- oprot.writeI64(struct.lowValue);
- oprot.writeI64(struct.highValue);
oprot.writeI64(struct.numNulls);
oprot.writeI64(struct.numDVs);
+ BitSet optionals = new BitSet();
+ if (struct.isSetLowValue()) {
+ optionals.set(0);
+ }
+ if (struct.isSetHighValue()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetLowValue()) {
+ oprot.writeI64(struct.lowValue);
+ }
+ if (struct.isSetHighValue()) {
+ oprot.writeI64(struct.highValue);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, LongColumnStatsData struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- struct.lowValue = iprot.readI64();
- struct.setLowValueIsSet(true);
- struct.highValue = iprot.readI64();
- struct.setHighValueIsSet(true);
struct.numNulls = iprot.readI64();
struct.setNumNullsIsSet(true);
struct.numDVs = iprot.readI64();
struct.setNumDVsIsSet(true);
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ struct.lowValue = iprot.readI64();
+ struct.setLowValueIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.highValue = iprot.readI64();
+ struct.setHighValueIsSet(true);
+ }
}
}
Modified: hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py Sat May 31 00:00:56 2014
@@ -2877,10 +2877,6 @@ class DoubleColumnStatsData:
oprot.writeStructEnd()
def validate(self):
- if self.lowValue is None:
- raise TProtocol.TProtocolException(message='Required field lowValue is unset!')
- if self.highValue is None:
- raise TProtocol.TProtocolException(message='Required field highValue is unset!')
if self.numNulls is None:
raise TProtocol.TProtocolException(message='Required field numNulls is unset!')
if self.numDVs is None:
@@ -2981,10 +2977,6 @@ class LongColumnStatsData:
oprot.writeStructEnd()
def validate(self):
- if self.lowValue is None:
- raise TProtocol.TProtocolException(message='Required field lowValue is unset!')
- if self.highValue is None:
- raise TProtocol.TProtocolException(message='Required field highValue is unset!')
if self.numNulls is None:
raise TProtocol.TProtocolException(message='Required field numNulls is unset!')
if self.numDVs is None:
@@ -3358,10 +3350,6 @@ class DecimalColumnStatsData:
oprot.writeStructEnd()
def validate(self):
- if self.lowValue is None:
- raise TProtocol.TProtocolException(message='Required field lowValue is unset!')
- if self.highValue is None:
- raise TProtocol.TProtocolException(message='Required field highValue is unset!')
if self.numNulls is None:
raise TProtocol.TProtocolException(message='Required field numNulls is unset!')
if self.numDVs is None:
Modified: hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb Sat May 31 00:00:56 2014
@@ -651,8 +651,8 @@ class DoubleColumnStatsData
NUMDVS = 4
FIELDS = {
- LOWVALUE => {:type => ::Thrift::Types::DOUBLE, :name => 'lowValue'},
- HIGHVALUE => {:type => ::Thrift::Types::DOUBLE, :name => 'highValue'},
+ LOWVALUE => {:type => ::Thrift::Types::DOUBLE, :name => 'lowValue', :optional => true},
+ HIGHVALUE => {:type => ::Thrift::Types::DOUBLE, :name => 'highValue', :optional => true},
NUMNULLS => {:type => ::Thrift::Types::I64, :name => 'numNulls'},
NUMDVS => {:type => ::Thrift::Types::I64, :name => 'numDVs'}
}
@@ -660,8 +660,6 @@ class DoubleColumnStatsData
def struct_fields; FIELDS; end
def validate
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lowValue is unset!') unless @lowValue
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field highValue is unset!') unless @highValue
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
end
@@ -677,8 +675,8 @@ class LongColumnStatsData
NUMDVS = 4
FIELDS = {
- LOWVALUE => {:type => ::Thrift::Types::I64, :name => 'lowValue'},
- HIGHVALUE => {:type => ::Thrift::Types::I64, :name => 'highValue'},
+ LOWVALUE => {:type => ::Thrift::Types::I64, :name => 'lowValue', :optional => true},
+ HIGHVALUE => {:type => ::Thrift::Types::I64, :name => 'highValue', :optional => true},
NUMNULLS => {:type => ::Thrift::Types::I64, :name => 'numNulls'},
NUMDVS => {:type => ::Thrift::Types::I64, :name => 'numDVs'}
}
@@ -686,8 +684,6 @@ class LongColumnStatsData
def struct_fields; FIELDS; end
def validate
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lowValue is unset!') unless @lowValue
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field highValue is unset!') unless @highValue
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
end
@@ -772,8 +768,8 @@ class DecimalColumnStatsData
NUMDVS = 4
FIELDS = {
- LOWVALUE => {:type => ::Thrift::Types::STRUCT, :name => 'lowValue', :class => ::Decimal},
- HIGHVALUE => {:type => ::Thrift::Types::STRUCT, :name => 'highValue', :class => ::Decimal},
+ LOWVALUE => {:type => ::Thrift::Types::STRUCT, :name => 'lowValue', :class => ::Decimal, :optional => true},
+ HIGHVALUE => {:type => ::Thrift::Types::STRUCT, :name => 'highValue', :class => ::Decimal, :optional => true},
NUMNULLS => {:type => ::Thrift::Types::I64, :name => 'numNulls'},
NUMDVS => {:type => ::Thrift::Types::I64, :name => 'numDVs'}
}
@@ -781,8 +777,6 @@ class DecimalColumnStatsData
def struct_fields; FIELDS; end
def validate
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field lowValue is unset!') unless @lowValue
- raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field highValue is unset!') unless @highValue
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numNulls is unset!') unless @numNulls
raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field numDVs is unset!') unless @numDVs
end
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/StatObjectConverter.java Sat May 31 00:00:56 2014
@@ -21,12 +21,9 @@ package org.apache.hadoop.hive.metastore
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.hadoop.hive.metastore.api.BinaryColumnStatsData;
import org.apache.hadoop.hive.metastore.api.BooleanColumnStatsData;
-import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsDesc;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
@@ -38,10 +35,8 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
import org.apache.hadoop.hive.metastore.api.StringColumnStatsData;
-import org.apache.hadoop.hive.metastore.model.MFieldSchema;
import org.apache.hadoop.hive.metastore.model.MPartition;
import org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics;
-import org.apache.hadoop.hive.metastore.model.MStorageDescriptor;
import org.apache.hadoop.hive.metastore.model.MTable;
import org.apache.hadoop.hive.metastore.model.MTableColumnStatistics;
@@ -74,15 +69,17 @@ public class StatObjectConverter {
} else if (statsObj.getStatsData().isSetLongStats()) {
LongColumnStatsData longStats = statsObj.getStatsData().getLongStats();
mColStats.setLongStats(longStats.getNumNulls(), longStats.getNumDVs(),
- longStats.getLowValue(), longStats.getHighValue());
+ longStats.isSetLowValue() ? longStats.getLowValue() : null,
+ longStats.isSetHighValue() ? longStats.getHighValue() : null);
} else if (statsObj.getStatsData().isSetDoubleStats()) {
DoubleColumnStatsData doubleStats = statsObj.getStatsData().getDoubleStats();
mColStats.setDoubleStats(doubleStats.getNumNulls(), doubleStats.getNumDVs(),
- doubleStats.getLowValue(), doubleStats.getHighValue());
+ doubleStats.isSetLowValue() ? doubleStats.getLowValue() : null,
+ doubleStats.isSetHighValue() ? doubleStats.getHighValue() : null);
} else if (statsObj.getStatsData().isSetDecimalStats()) {
DecimalColumnStatsData decimalStats = statsObj.getStatsData().getDecimalStats();
- String low = createJdoDecimalString(decimalStats.getLowValue()),
- high = createJdoDecimalString(decimalStats.getHighValue());
+ String low = decimalStats.isSetLowValue() ? createJdoDecimalString(decimalStats.getLowValue()) : null;
+ String high = decimalStats.isSetHighValue() ? createJdoDecimalString(decimalStats.getHighValue()) : null;
mColStats.setDecimalStats(decimalStats.getNumNulls(), decimalStats.getNumDVs(), low, high);
} else if (statsObj.getStatsData().isSetStringStats()) {
StringColumnStatsData stringStats = statsObj.getStatsData().getStringStats();
@@ -99,18 +96,30 @@ public class StatObjectConverter {
public static void setFieldsIntoOldStats(
MTableColumnStatistics mStatsObj, MTableColumnStatistics oldStatsObj) {
oldStatsObj.setAvgColLen(mStatsObj.getAvgColLen());
- oldStatsObj.setLongHighValue(mStatsObj.getLongHighValue());
- oldStatsObj.setDoubleHighValue(mStatsObj.getDoubleHighValue());
- oldStatsObj.setLastAnalyzed(mStatsObj.getLastAnalyzed());
- oldStatsObj.setLongLowValue(mStatsObj.getLongLowValue());
- oldStatsObj.setDoubleLowValue(mStatsObj.getDoubleLowValue());
- oldStatsObj.setDecimalLowValue(mStatsObj.getDecimalLowValue());
- oldStatsObj.setDecimalHighValue(mStatsObj.getDecimalHighValue());
+ if (mStatsObj.getLongHighValue() != null) {
+ oldStatsObj.setLongHighValue(mStatsObj.getLongHighValue());
+ }
+ if (mStatsObj.getLongLowValue() != null) {
+ oldStatsObj.setLongLowValue(mStatsObj.getLongLowValue());
+ }
+ if (mStatsObj.getDoubleLowValue() != null) {
+ oldStatsObj.setDoubleLowValue(mStatsObj.getDoubleLowValue());
+ }
+ if (mStatsObj.getDoubleHighValue() != null) {
+ oldStatsObj.setDoubleHighValue(mStatsObj.getDoubleHighValue());
+ }
+ if (mStatsObj.getDecimalLowValue() != null) {
+ oldStatsObj.setDecimalLowValue(mStatsObj.getDecimalLowValue());
+ }
+ if (mStatsObj.getDecimalHighValue() != null) {
+ oldStatsObj.setDecimalHighValue(mStatsObj.getDecimalHighValue());
+ }
oldStatsObj.setMaxColLen(mStatsObj.getMaxColLen());
oldStatsObj.setNumDVs(mStatsObj.getNumDVs());
oldStatsObj.setNumFalses(mStatsObj.getNumFalses());
oldStatsObj.setNumTrues(mStatsObj.getNumTrues());
oldStatsObj.setNumNulls(mStatsObj.getNumNulls());
+ oldStatsObj.setLastAnalyzed(mStatsObj.getLastAnalyzed());
}
public static void setFieldsIntoOldStats(
@@ -163,22 +172,40 @@ public class StatObjectConverter {
colType.equals("timestamp")) {
LongColumnStatsData longStats = new LongColumnStatsData();
longStats.setNumNulls(mStatsObj.getNumNulls());
- longStats.setHighValue(mStatsObj.getLongHighValue());
- longStats.setLowValue(mStatsObj.getLongLowValue());
+ Long longHighValue = mStatsObj.getLongHighValue();
+ if (longHighValue != null) {
+ longStats.setHighValue(longHighValue);
+ }
+ Long longLowValue = mStatsObj.getLongLowValue();
+ if (longLowValue != null) {
+ longStats.setLowValue(longLowValue);
+ }
longStats.setNumDVs(mStatsObj.getNumDVs());
colStatsData.setLongStats(longStats);
} else if (colType.equals("double") || colType.equals("float")) {
DoubleColumnStatsData doubleStats = new DoubleColumnStatsData();
doubleStats.setNumNulls(mStatsObj.getNumNulls());
- doubleStats.setHighValue(mStatsObj.getDoubleHighValue());
- doubleStats.setLowValue(mStatsObj.getDoubleLowValue());
+ Double doubleHighValue = mStatsObj.getDoubleHighValue();
+ if (doubleHighValue != null) {
+ doubleStats.setHighValue(doubleHighValue);
+ }
+ Double doubleLowValue = mStatsObj.getDoubleLowValue();
+ if (doubleLowValue != null) {
+ doubleStats.setLowValue(doubleLowValue);
+ }
doubleStats.setNumDVs(mStatsObj.getNumDVs());
colStatsData.setDoubleStats(doubleStats);
} else if (colType.equals("decimal")) {
DecimalColumnStatsData decimalStats = new DecimalColumnStatsData();
decimalStats.setNumNulls(mStatsObj.getNumNulls());
- decimalStats.setHighValue(createThriftDecimal(mStatsObj.getDecimalHighValue()));
- decimalStats.setLowValue(createThriftDecimal(mStatsObj.getDecimalLowValue()));
+ String decimalHighValue = mStatsObj.getDecimalHighValue();
+ if (decimalHighValue != null) {
+ decimalStats.setHighValue(createThriftDecimal(decimalHighValue));
+ }
+ String decimalLowValue = mStatsObj.getDecimalLowValue();
+ if (decimalLowValue != null) {
+ decimalStats.setLowValue(createThriftDecimal(decimalLowValue));
+ }
decimalStats.setNumDVs(mStatsObj.getNumDVs());
colStatsData.setDecimalStats(decimalStats);
}
@@ -219,15 +246,17 @@ public class StatObjectConverter {
} else if (statsObj.getStatsData().isSetLongStats()) {
LongColumnStatsData longStats = statsObj.getStatsData().getLongStats();
mColStats.setLongStats(longStats.getNumNulls(), longStats.getNumDVs(),
- longStats.getLowValue(), longStats.getHighValue());
+ longStats.isSetLowValue() ? longStats.getLowValue() : null,
+ longStats.isSetHighValue() ? longStats.getHighValue() : null);
} else if (statsObj.getStatsData().isSetDoubleStats()) {
DoubleColumnStatsData doubleStats = statsObj.getStatsData().getDoubleStats();
mColStats.setDoubleStats(doubleStats.getNumNulls(), doubleStats.getNumDVs(),
- doubleStats.getLowValue(), doubleStats.getHighValue());
+ doubleStats.isSetLowValue() ? doubleStats.getLowValue() : null,
+ doubleStats.isSetHighValue() ? doubleStats.getHighValue() : null);
} else if (statsObj.getStatsData().isSetDecimalStats()) {
DecimalColumnStatsData decimalStats = statsObj.getStatsData().getDecimalStats();
- String low = createJdoDecimalString(decimalStats.getLowValue()),
- high = createJdoDecimalString(decimalStats.getHighValue());
+ String low = decimalStats.isSetLowValue() ? createJdoDecimalString(decimalStats.getLowValue()) : null;
+ String high = decimalStats.isSetHighValue() ? createJdoDecimalString(decimalStats.getHighValue()) : null;
mColStats.setDecimalStats(decimalStats.getNumNulls(), decimalStats.getNumDVs(), low, high);
} else if (statsObj.getStatsData().isSetStringStats()) {
StringColumnStatsData stringStats = statsObj.getStatsData().getStringStats();
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnStatistics.java Sat May 31 00:00:56 2014
@@ -40,10 +40,10 @@ public class MPartitionColumnStatistics
private String colName;
private String colType;
- private long longLowValue;
- private long longHighValue;
- private double doubleLowValue;
- private double doubleHighValue;
+ private Long longLowValue;
+ private Long longHighValue;
+ private Double doubleLowValue;
+ private Double doubleHighValue;
private String decimalLowValue;
private String decimalHighValue;
private long numNulls;
@@ -166,14 +166,14 @@ public class MPartitionColumnStatistics
this.numNulls = numNulls;
}
- public void setLongStats(long numNulls, long numNDVs, long lowValue, long highValue) {
+ public void setLongStats(long numNulls, long numNDVs, Long lowValue, Long highValue) {
this.numNulls = numNulls;
this.numDVs = numNDVs;
this.longLowValue = lowValue;
this.longHighValue = highValue;
}
- public void setDoubleStats(long numNulls, long numNDVs, double lowValue, double highValue) {
+ public void setDoubleStats(long numNulls, long numNDVs, Double lowValue, Double highValue) {
this.numNulls = numNulls;
this.numDVs = numNDVs;
this.doubleLowValue = lowValue;
@@ -200,7 +200,7 @@ public class MPartitionColumnStatistics
this.maxColLen = maxColLen;
this.avgColLen = avgColLen;
}
- public long getLongLowValue() {
+ public Long getLongLowValue() {
return longLowValue;
}
@@ -208,7 +208,7 @@ public class MPartitionColumnStatistics
this.longLowValue = longLowValue;
}
- public long getLongHighValue() {
+ public Long getLongHighValue() {
return longHighValue;
}
@@ -216,7 +216,7 @@ public class MPartitionColumnStatistics
this.longHighValue = longHighValue;
}
- public double getDoubleLowValue() {
+ public Double getDoubleLowValue() {
return doubleLowValue;
}
@@ -224,7 +224,7 @@ public class MPartitionColumnStatistics
this.doubleLowValue = doubleLowValue;
}
- public double getDoubleHighValue() {
+ public Double getDoubleHighValue() {
return doubleHighValue;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnStatistics.java Sat May 31 00:00:56 2014
@@ -38,10 +38,10 @@ public class MTableColumnStatistics {
private String colName;
private String colType;
- private long longLowValue;
- private long longHighValue;
- private double doubleLowValue;
- private double doubleHighValue;
+ private Long longLowValue;
+ private Long longHighValue;
+ private Double doubleLowValue;
+ private Double doubleHighValue;
private String decimalLowValue;
private String decimalHighValue;
private long numNulls;
@@ -156,14 +156,14 @@ public class MTableColumnStatistics {
this.numNulls = numNulls;
}
- public void setLongStats(long numNulls, long numNDVs, long lowValue, long highValue) {
+ public void setLongStats(long numNulls, long numNDVs, Long lowValue, Long highValue) {
this.numNulls = numNulls;
this.numDVs = numNDVs;
this.longLowValue = lowValue;
this.longHighValue = highValue;
}
- public void setDoubleStats(long numNulls, long numNDVs, double lowValue, double highValue) {
+ public void setDoubleStats(long numNulls, long numNDVs, Double lowValue, Double highValue) {
this.numNulls = numNulls;
this.numDVs = numNDVs;
this.doubleLowValue = lowValue;
@@ -191,7 +191,7 @@ public class MTableColumnStatistics {
this.avgColLen = avgColLen;
}
- public long getLongLowValue() {
+ public Long getLongLowValue() {
return longLowValue;
}
@@ -199,7 +199,7 @@ public class MTableColumnStatistics {
this.longLowValue = longLowValue;
}
- public long getLongHighValue() {
+ public Long getLongHighValue() {
return longHighValue;
}
@@ -207,7 +207,7 @@ public class MTableColumnStatistics {
this.longHighValue = longHighValue;
}
- public double getDoubleLowValue() {
+ public Double getDoubleLowValue() {
return doubleLowValue;
}
@@ -215,7 +215,7 @@ public class MTableColumnStatistics {
this.doubleLowValue = doubleLowValue;
}
- public double getDoubleHighValue() {
+ public Double getDoubleHighValue() {
return doubleHighValue;
}
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ColumnStatsTask.java Sat May 31 00:00:56 2014
@@ -20,8 +20,6 @@ package org.apache.hadoop.hive.ql.exec;
import java.io.IOException;
import java.io.Serializable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
@@ -188,6 +186,9 @@ public class ColumnStatsTask extends Tas
private void unpackPrimitiveObject (ObjectInspector oi, Object o, String fieldName,
ColumnStatisticsObj statsObj) {
+ if (o == null) {
+ return;
+ }
// First infer the type of object
if (fieldName.equals("columntype")) {
PrimitiveObjectInspector poi = (PrimitiveObjectInspector) oi;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java?rev=1598784&r1=1598783&r2=1598784&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java Sat May 31 00:00:56 2014
@@ -31,6 +31,8 @@ import org.apache.hadoop.hive.common.Sta
import org.apache.hadoop.hive.common.type.HiveDecimal;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
+import org.apache.hadoop.hive.metastore.api.DoubleColumnStatsData;
+import org.apache.hadoop.hive.metastore.api.LongColumnStatsData;
import org.apache.hadoop.hive.ql.exec.ColumnInfo;
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.FetchTask;
@@ -342,12 +344,14 @@ public class StatsOptimizer implements T
ColumnStatisticsData statData = stats.get(0).getStatsData();
switch (type) {
case Integeral:
- oneRow.add(statData.getLongStats().getHighValue());
+ LongColumnStatsData lstats = statData.getLongStats();
+ oneRow.add(lstats.isSetHighValue() ? lstats.getHighValue() : null);
ois.add(PrimitiveObjectInspectorFactory.
getPrimitiveJavaObjectInspector(PrimitiveCategory.LONG));
break;
case Double:
- oneRow.add(statData.getDoubleStats().getHighValue());
+ DoubleColumnStatsData dstats = statData.getDoubleStats();
+ oneRow.add(dstats.isSetHighValue() ? dstats.getHighValue() : null);
ois.add(PrimitiveObjectInspectorFactory.
getPrimitiveJavaObjectInspector(PrimitiveCategory.DOUBLE));
break;
@@ -362,7 +366,7 @@ public class StatsOptimizer implements T
tsOp.getConf().getAlias(), tsOp).getPartitions();
switch (type) {
case Integeral: {
- long maxVal = Long.MIN_VALUE;
+ Long maxVal = null;
Collection<List<ColumnStatisticsObj>> result =
verifyAndGetPartStats(hive, tbl, colName, parts);
if (result == null) {
@@ -371,8 +375,12 @@ public class StatsOptimizer implements T
for (List<ColumnStatisticsObj> statObj : result) {
ColumnStatisticsData statData = validateSingleColStat(statObj);
if (statData == null) return null;
- long curVal = statData.getLongStats().getHighValue();
- maxVal = Math.max(maxVal, curVal);
+ LongColumnStatsData lstats = statData.getLongStats();
+ if (!lstats.isSetHighValue()) {
+ continue;
+ }
+ long curVal = lstats.getHighValue();
+ maxVal = maxVal == null ? curVal : Math.max(maxVal, curVal);
}
oneRow.add(maxVal);
ois.add(PrimitiveObjectInspectorFactory.
@@ -380,7 +388,7 @@ public class StatsOptimizer implements T
break;
}
case Double: {
- double maxVal = Double.MIN_VALUE;
+ Double maxVal = null;
Collection<List<ColumnStatisticsObj>> result =
verifyAndGetPartStats(hive, tbl, colName, parts);
if (result == null) {
@@ -389,8 +397,12 @@ public class StatsOptimizer implements T
for (List<ColumnStatisticsObj> statObj : result) {
ColumnStatisticsData statData = validateSingleColStat(statObj);
if (statData == null) return null;
+ DoubleColumnStatsData dstats = statData.getDoubleStats();
+ if (!dstats.isSetHighValue()) {
+ continue;
+ }
double curVal = statData.getDoubleStats().getHighValue();
- maxVal = Math.max(maxVal, curVal);
+ maxVal = maxVal == null ? curVal : Math.max(maxVal, curVal);
}
oneRow.add(maxVal);
ois.add(PrimitiveObjectInspectorFactory.
@@ -418,12 +430,14 @@ public class StatsOptimizer implements T
.get(0).getStatsData();
switch (type) {
case Integeral:
- oneRow.add(statData.getLongStats().getLowValue());
+ LongColumnStatsData lstats = statData.getLongStats();
+ oneRow.add(lstats.isSetLowValue() ? lstats.getLowValue() : null);
ois.add(PrimitiveObjectInspectorFactory.
getPrimitiveJavaObjectInspector(PrimitiveCategory.LONG));
break;
case Double:
- oneRow.add(statData.getDoubleStats().getLowValue());
+ DoubleColumnStatsData dstats = statData.getDoubleStats();
+ oneRow.add(dstats.isSetLowValue() ? dstats.getLowValue() : null);
ois.add(PrimitiveObjectInspectorFactory.
getPrimitiveJavaObjectInspector(PrimitiveCategory.DOUBLE));
break;
@@ -436,7 +450,7 @@ public class StatsOptimizer implements T
Set<Partition> parts = pctx.getPrunedPartitions(tsOp.getConf().getAlias(), tsOp).getPartitions();
switch(type) {
case Integeral: {
- long minVal = Long.MAX_VALUE;
+ Long minVal = null;
Collection<List<ColumnStatisticsObj>> result =
verifyAndGetPartStats(hive, tbl, colName, parts);
if (result == null) {
@@ -445,8 +459,12 @@ public class StatsOptimizer implements T
for (List<ColumnStatisticsObj> statObj : result) {
ColumnStatisticsData statData = validateSingleColStat(statObj);
if (statData == null) return null;
- long curVal = statData.getLongStats().getLowValue();
- minVal = Math.min(minVal, curVal);
+ LongColumnStatsData lstats = statData.getLongStats();
+ if (!lstats.isSetLowValue()) {
+ continue;
+ }
+ long curVal = lstats.getLowValue();
+ minVal = minVal == null ? curVal : Math.min(minVal, curVal);
}
oneRow.add(minVal);
ois.add(PrimitiveObjectInspectorFactory.
@@ -454,7 +472,7 @@ public class StatsOptimizer implements T
break;
}
case Double: {
- double minVal = Double.MAX_VALUE;
+ Double minVal = null;
Collection<List<ColumnStatisticsObj>> result =
verifyAndGetPartStats(hive, tbl, colName, parts);
if (result == null) {
@@ -463,8 +481,12 @@ public class StatsOptimizer implements T
for (List<ColumnStatisticsObj> statObj : result) {
ColumnStatisticsData statData = validateSingleColStat(statObj);
if (statData == null) return null;
+ DoubleColumnStatsData dstats = statData.getDoubleStats();
+ if (!dstats.isSetLowValue()) {
+ continue;
+ }
double curVal = statData.getDoubleStats().getLowValue();
- minVal = Math.min(minVal, curVal);
+ minVal = minVal == null ? curVal : Math.min(minVal, curVal);
}
oneRow.add(minVal);
ois.add(PrimitiveObjectInspectorFactory.