parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject [1/2] parquet-cpp git commit: PARQUET-469: Roll back Thrift thirdparty and compiled sources to 0.9.0
Date Tue, 26 Jan 2016 22:07:50 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master b31baa0b0 -> 7555cff7d


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7555cff7/src/parquet/thrift/parquet_types.h
----------------------------------------------------------------------
diff --git a/src/parquet/thrift/parquet_types.h b/src/parquet/thrift/parquet_types.h
index 5da94c8..466daf4 100644
--- a/src/parquet/thrift/parquet_types.h
+++ b/src/parquet/thrift/parquet_types.h
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,14 +7,11 @@
 #ifndef parquet_TYPES_H
 #define parquet_TYPES_H
 
-#include <iosfwd>
-
 #include <thrift/Thrift.h>
 #include <thrift/TApplicationException.h>
 #include <thrift/protocol/TProtocol.h>
 #include <thrift/transport/TTransport.h>
 
-#include <thrift/cxxfunctional.h>
 
 
 namespace parquet {
@@ -108,51 +105,25 @@ struct PageType {
 
 extern const std::map<int, const char*> _PageType_VALUES_TO_NAMES;
 
-class Statistics;
-
-class SchemaElement;
-
-class DataPageHeader;
-
-class IndexPageHeader;
-
-class DictionaryPageHeader;
-
-class DataPageHeaderV2;
-
-class PageHeader;
-
-class KeyValue;
-
-class SortingColumn;
-
-class PageEncodingStats;
-
-class ColumnMetaData;
-
-class ColumnChunk;
-
-class RowGroup;
-
-class FileMetaData;
-
 typedef struct _Statistics__isset {
   _Statistics__isset() : max(false), min(false), null_count(false), distinct_count(false)
{}
-  bool max :1;
-  bool min :1;
-  bool null_count :1;
-  bool distinct_count :1;
+  bool max;
+  bool min;
+  bool null_count;
+  bool distinct_count;
 } _Statistics__isset;
 
 class Statistics {
  public:
 
-  Statistics(const Statistics&);
-  Statistics& operator=(const Statistics&);
+  static const char* ascii_fingerprint; // = "CE004821871820DD79A8FD98BB101F6D";
+  static const uint8_t binary_fingerprint[16]; // = {0xCE,0x00,0x48,0x21,0x87,0x18,0x20,0xDD,0x79,0xA8,0xFD,0x98,0xBB,0x10,0x1F,0x6D};
+
   Statistics() : max(), min(), null_count(0), distinct_count(0) {
   }
 
-  virtual ~Statistics() throw();
+  virtual ~Statistics() throw() {}
+
   std::string max;
   std::string min;
   int64_t null_count;
@@ -160,13 +131,25 @@ class Statistics {
 
   _Statistics__isset __isset;
 
-  void __set_max(const std::string& val);
+  void __set_max(const std::string& val) {
+    max = val;
+    __isset.max = true;
+  }
 
-  void __set_min(const std::string& val);
+  void __set_min(const std::string& val) {
+    min = val;
+    __isset.min = true;
+  }
 
-  void __set_null_count(const int64_t val);
+  void __set_null_count(const int64_t val) {
+    null_count = val;
+    __isset.null_count = true;
+  }
 
-  void __set_distinct_count(const int64_t val);
+  void __set_distinct_count(const int64_t val) {
+    distinct_count = val;
+    __isset.distinct_count = true;
+  }
 
   bool operator == (const Statistics & rhs) const
   {
@@ -197,38 +180,33 @@ class Statistics {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(Statistics &a, Statistics &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Statistics& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _SchemaElement__isset {
   _SchemaElement__isset() : type(false), type_length(false), repetition_type(false), num_children(false),
converted_type(false), scale(false), precision(false), field_id(false) {}
-  bool type :1;
-  bool type_length :1;
-  bool repetition_type :1;
-  bool num_children :1;
-  bool converted_type :1;
-  bool scale :1;
-  bool precision :1;
-  bool field_id :1;
+  bool type;
+  bool type_length;
+  bool repetition_type;
+  bool num_children;
+  bool converted_type;
+  bool scale;
+  bool precision;
+  bool field_id;
 } _SchemaElement__isset;
 
 class SchemaElement {
  public:
 
-  SchemaElement(const SchemaElement&);
-  SchemaElement& operator=(const SchemaElement&);
+  static const char* ascii_fingerprint; // = "22DC89BFD9E48E604F01FB8CFDFB8229";
+  static const uint8_t binary_fingerprint[16]; // = {0x22,0xDC,0x89,0xBF,0xD9,0xE4,0x8E,0x60,0x4F,0x01,0xFB,0x8C,0xFD,0xFB,0x82,0x29};
+
   SchemaElement() : type((Type::type)0), type_length(0), repetition_type((FieldRepetitionType::type)0),
name(), num_children(0), converted_type((ConvertedType::type)0), scale(0), precision(0), field_id(0)
{
   }
 
-  virtual ~SchemaElement() throw();
+  virtual ~SchemaElement() throw() {}
+
   Type::type type;
   int32_t type_length;
   FieldRepetitionType::type repetition_type;
@@ -241,23 +219,49 @@ class SchemaElement {
 
   _SchemaElement__isset __isset;
 
-  void __set_type(const Type::type val);
+  void __set_type(const Type::type val) {
+    type = val;
+    __isset.type = true;
+  }
 
-  void __set_type_length(const int32_t val);
+  void __set_type_length(const int32_t val) {
+    type_length = val;
+    __isset.type_length = true;
+  }
 
-  void __set_repetition_type(const FieldRepetitionType::type val);
+  void __set_repetition_type(const FieldRepetitionType::type val) {
+    repetition_type = val;
+    __isset.repetition_type = true;
+  }
 
-  void __set_name(const std::string& val);
+  void __set_name(const std::string& val) {
+    name = val;
+  }
 
-  void __set_num_children(const int32_t val);
+  void __set_num_children(const int32_t val) {
+    num_children = val;
+    __isset.num_children = true;
+  }
 
-  void __set_converted_type(const ConvertedType::type val);
+  void __set_converted_type(const ConvertedType::type val) {
+    converted_type = val;
+    __isset.converted_type = true;
+  }
 
-  void __set_scale(const int32_t val);
+  void __set_scale(const int32_t val) {
+    scale = val;
+    __isset.scale = true;
+  }
 
-  void __set_precision(const int32_t val);
+  void __set_precision(const int32_t val) {
+    precision = val;
+    __isset.precision = true;
+  }
 
-  void __set_field_id(const int32_t val);
+  void __set_field_id(const int32_t val) {
+    field_id = val;
+    __isset.field_id = true;
+  }
 
   bool operator == (const SchemaElement & rhs) const
   {
@@ -306,31 +310,26 @@ class SchemaElement {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(SchemaElement &a, SchemaElement &b);
 
-inline std::ostream& operator<<(std::ostream& out, const SchemaElement&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _DataPageHeader__isset {
   _DataPageHeader__isset() : statistics(false) {}
-  bool statistics :1;
+  bool statistics;
 } _DataPageHeader__isset;
 
 class DataPageHeader {
  public:
 
-  DataPageHeader(const DataPageHeader&);
-  DataPageHeader& operator=(const DataPageHeader&);
+  static const char* ascii_fingerprint; // = "5FC1792B0483E9C984475384165040B1";
+  static const uint8_t binary_fingerprint[16]; // = {0x5F,0xC1,0x79,0x2B,0x04,0x83,0xE9,0xC9,0x84,0x47,0x53,0x84,0x16,0x50,0x40,0xB1};
+
   DataPageHeader() : num_values(0), encoding((Encoding::type)0), definition_level_encoding((Encoding::type)0),
repetition_level_encoding((Encoding::type)0) {
   }
 
-  virtual ~DataPageHeader() throw();
+  virtual ~DataPageHeader() throw() {}
+
   int32_t num_values;
   Encoding::type encoding;
   Encoding::type definition_level_encoding;
@@ -339,15 +338,26 @@ class DataPageHeader {
 
   _DataPageHeader__isset __isset;
 
-  void __set_num_values(const int32_t val);
+  void __set_num_values(const int32_t val) {
+    num_values = val;
+  }
 
-  void __set_encoding(const Encoding::type val);
+  void __set_encoding(const Encoding::type val) {
+    encoding = val;
+  }
 
-  void __set_definition_level_encoding(const Encoding::type val);
+  void __set_definition_level_encoding(const Encoding::type val) {
+    definition_level_encoding = val;
+  }
 
-  void __set_repetition_level_encoding(const Encoding::type val);
+  void __set_repetition_level_encoding(const Encoding::type val) {
+    repetition_level_encoding = val;
+  }
 
-  void __set_statistics(const Statistics& val);
+  void __set_statistics(const Statistics& val) {
+    statistics = val;
+    __isset.statistics = true;
+  }
 
   bool operator == (const DataPageHeader & rhs) const
   {
@@ -374,27 +384,22 @@ class DataPageHeader {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(DataPageHeader &a, DataPageHeader &b);
 
-inline std::ostream& operator<<(std::ostream& out, const DataPageHeader&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 
 class IndexPageHeader {
  public:
 
-  IndexPageHeader(const IndexPageHeader&);
-  IndexPageHeader& operator=(const IndexPageHeader&);
+  static const char* ascii_fingerprint; // = "99914B932BD37A50B983C5E7C90AE93B";
+  static const uint8_t binary_fingerprint[16]; // = {0x99,0x91,0x4B,0x93,0x2B,0xD3,0x7A,0x50,0xB9,0x83,0xC5,0xE7,0xC9,0x0A,0xE9,0x3B};
+
   IndexPageHeader() {
   }
 
-  virtual ~IndexPageHeader() throw();
+  virtual ~IndexPageHeader() throw() {}
+
 
   bool operator == (const IndexPageHeader & /* rhs */) const
   {
@@ -409,42 +414,44 @@ class IndexPageHeader {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(IndexPageHeader &a, IndexPageHeader &b);
 
-inline std::ostream& operator<<(std::ostream& out, const IndexPageHeader&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _DictionaryPageHeader__isset {
   _DictionaryPageHeader__isset() : is_sorted(false) {}
-  bool is_sorted :1;
+  bool is_sorted;
 } _DictionaryPageHeader__isset;
 
 class DictionaryPageHeader {
  public:
 
-  DictionaryPageHeader(const DictionaryPageHeader&);
-  DictionaryPageHeader& operator=(const DictionaryPageHeader&);
+  static const char* ascii_fingerprint; // = "B149E4528254D495610C22AE4BD539C5";
+  static const uint8_t binary_fingerprint[16]; // = {0xB1,0x49,0xE4,0x52,0x82,0x54,0xD4,0x95,0x61,0x0C,0x22,0xAE,0x4B,0xD5,0x39,0xC5};
+
   DictionaryPageHeader() : num_values(0), encoding((Encoding::type)0), is_sorted(0) {
   }
 
-  virtual ~DictionaryPageHeader() throw();
+  virtual ~DictionaryPageHeader() throw() {}
+
   int32_t num_values;
   Encoding::type encoding;
   bool is_sorted;
 
   _DictionaryPageHeader__isset __isset;
 
-  void __set_num_values(const int32_t val);
+  void __set_num_values(const int32_t val) {
+    num_values = val;
+  }
 
-  void __set_encoding(const Encoding::type val);
+  void __set_encoding(const Encoding::type val) {
+    encoding = val;
+  }
 
-  void __set_is_sorted(const bool val);
+  void __set_is_sorted(const bool val) {
+    is_sorted = val;
+    __isset.is_sorted = true;
+  }
 
   bool operator == (const DictionaryPageHeader & rhs) const
   {
@@ -467,32 +474,27 @@ class DictionaryPageHeader {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(DictionaryPageHeader &a, DictionaryPageHeader &b);
 
-inline std::ostream& operator<<(std::ostream& out, const DictionaryPageHeader&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _DataPageHeaderV2__isset {
   _DataPageHeaderV2__isset() : is_compressed(true), statistics(false) {}
-  bool is_compressed :1;
-  bool statistics :1;
+  bool is_compressed;
+  bool statistics;
 } _DataPageHeaderV2__isset;
 
 class DataPageHeaderV2 {
  public:
 
-  DataPageHeaderV2(const DataPageHeaderV2&);
-  DataPageHeaderV2& operator=(const DataPageHeaderV2&);
+  static const char* ascii_fingerprint; // = "69FF2F6BD1A443440D5E46ABA5A3A919";
+  static const uint8_t binary_fingerprint[16]; // = {0x69,0xFF,0x2F,0x6B,0xD1,0xA4,0x43,0x44,0x0D,0x5E,0x46,0xAB,0xA5,0xA3,0xA9,0x19};
+
   DataPageHeaderV2() : num_values(0), num_nulls(0), num_rows(0), encoding((Encoding::type)0),
definition_levels_byte_length(0), repetition_levels_byte_length(0), is_compressed(true) {
   }
 
-  virtual ~DataPageHeaderV2() throw();
+  virtual ~DataPageHeaderV2() throw() {}
+
   int32_t num_values;
   int32_t num_nulls;
   int32_t num_rows;
@@ -504,21 +506,39 @@ class DataPageHeaderV2 {
 
   _DataPageHeaderV2__isset __isset;
 
-  void __set_num_values(const int32_t val);
+  void __set_num_values(const int32_t val) {
+    num_values = val;
+  }
 
-  void __set_num_nulls(const int32_t val);
+  void __set_num_nulls(const int32_t val) {
+    num_nulls = val;
+  }
 
-  void __set_num_rows(const int32_t val);
+  void __set_num_rows(const int32_t val) {
+    num_rows = val;
+  }
 
-  void __set_encoding(const Encoding::type val);
+  void __set_encoding(const Encoding::type val) {
+    encoding = val;
+  }
 
-  void __set_definition_levels_byte_length(const int32_t val);
+  void __set_definition_levels_byte_length(const int32_t val) {
+    definition_levels_byte_length = val;
+  }
 
-  void __set_repetition_levels_byte_length(const int32_t val);
+  void __set_repetition_levels_byte_length(const int32_t val) {
+    repetition_levels_byte_length = val;
+  }
 
-  void __set_is_compressed(const bool val);
+  void __set_is_compressed(const bool val) {
+    is_compressed = val;
+    __isset.is_compressed = true;
+  }
 
-  void __set_statistics(const Statistics& val);
+  void __set_statistics(const Statistics& val) {
+    statistics = val;
+    __isset.statistics = true;
+  }
 
   bool operator == (const DataPageHeaderV2 & rhs) const
   {
@@ -553,35 +573,30 @@ class DataPageHeaderV2 {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(DataPageHeaderV2 &a, DataPageHeaderV2 &b);
 
-inline std::ostream& operator<<(std::ostream& out, const DataPageHeaderV2&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _PageHeader__isset {
   _PageHeader__isset() : crc(false), data_page_header(false), index_page_header(false), dictionary_page_header(false),
data_page_header_v2(false) {}
-  bool crc :1;
-  bool data_page_header :1;
-  bool index_page_header :1;
-  bool dictionary_page_header :1;
-  bool data_page_header_v2 :1;
+  bool crc;
+  bool data_page_header;
+  bool index_page_header;
+  bool dictionary_page_header;
+  bool data_page_header_v2;
 } _PageHeader__isset;
 
 class PageHeader {
  public:
 
-  PageHeader(const PageHeader&);
-  PageHeader& operator=(const PageHeader&);
+  static const char* ascii_fingerprint; // = "B5BD2BDF3756C883A58B30B9C9F204A0";
+  static const uint8_t binary_fingerprint[16]; // = {0xB5,0xBD,0x2B,0xDF,0x37,0x56,0xC8,0x83,0xA5,0x8B,0x30,0xB9,0xC9,0xF2,0x04,0xA0};
+
   PageHeader() : type((PageType::type)0), uncompressed_page_size(0), compressed_page_size(0),
crc(0) {
   }
 
-  virtual ~PageHeader() throw();
+  virtual ~PageHeader() throw() {}
+
   PageType::type type;
   int32_t uncompressed_page_size;
   int32_t compressed_page_size;
@@ -593,21 +608,42 @@ class PageHeader {
 
   _PageHeader__isset __isset;
 
-  void __set_type(const PageType::type val);
+  void __set_type(const PageType::type val) {
+    type = val;
+  }
 
-  void __set_uncompressed_page_size(const int32_t val);
+  void __set_uncompressed_page_size(const int32_t val) {
+    uncompressed_page_size = val;
+  }
 
-  void __set_compressed_page_size(const int32_t val);
+  void __set_compressed_page_size(const int32_t val) {
+    compressed_page_size = val;
+  }
 
-  void __set_crc(const int32_t val);
+  void __set_crc(const int32_t val) {
+    crc = val;
+    __isset.crc = true;
+  }
 
-  void __set_data_page_header(const DataPageHeader& val);
+  void __set_data_page_header(const DataPageHeader& val) {
+    data_page_header = val;
+    __isset.data_page_header = true;
+  }
 
-  void __set_index_page_header(const IndexPageHeader& val);
+  void __set_index_page_header(const IndexPageHeader& val) {
+    index_page_header = val;
+    __isset.index_page_header = true;
+  }
 
-  void __set_dictionary_page_header(const DictionaryPageHeader& val);
+  void __set_dictionary_page_header(const DictionaryPageHeader& val) {
+    dictionary_page_header = val;
+    __isset.dictionary_page_header = true;
+  }
 
-  void __set_data_page_header_v2(const DataPageHeaderV2& val);
+  void __set_data_page_header_v2(const DataPageHeaderV2& val) {
+    data_page_header_v2 = val;
+    __isset.data_page_header_v2 = true;
+  }
 
   bool operator == (const PageHeader & rhs) const
   {
@@ -648,39 +684,39 @@ class PageHeader {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(PageHeader &a, PageHeader &b);
 
-inline std::ostream& operator<<(std::ostream& out, const PageHeader& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _KeyValue__isset {
   _KeyValue__isset() : value(false) {}
-  bool value :1;
+  bool value;
 } _KeyValue__isset;
 
 class KeyValue {
  public:
 
-  KeyValue(const KeyValue&);
-  KeyValue& operator=(const KeyValue&);
+  static const char* ascii_fingerprint; // = "5B708A954C550ECA9C1A49D3C5CAFAB9";
+  static const uint8_t binary_fingerprint[16]; // = {0x5B,0x70,0x8A,0x95,0x4C,0x55,0x0E,0xCA,0x9C,0x1A,0x49,0xD3,0xC5,0xCA,0xFA,0xB9};
+
   KeyValue() : key(), value() {
   }
 
-  virtual ~KeyValue() throw();
+  virtual ~KeyValue() throw() {}
+
   std::string key;
   std::string value;
 
   _KeyValue__isset __isset;
 
-  void __set_key(const std::string& val);
+  void __set_key(const std::string& val) {
+    key = val;
+  }
 
-  void __set_value(const std::string& val);
+  void __set_value(const std::string& val) {
+    value = val;
+    __isset.value = true;
+  }
 
   bool operator == (const KeyValue & rhs) const
   {
@@ -701,36 +737,37 @@ class KeyValue {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(KeyValue &a, KeyValue &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 
 class SortingColumn {
  public:
 
-  SortingColumn(const SortingColumn&);
-  SortingColumn& operator=(const SortingColumn&);
+  static const char* ascii_fingerprint; // = "F079C2D58A783AD90F9BE05D10DBBC6F";
+  static const uint8_t binary_fingerprint[16]; // = {0xF0,0x79,0xC2,0xD5,0x8A,0x78,0x3A,0xD9,0x0F,0x9B,0xE0,0x5D,0x10,0xDB,0xBC,0x6F};
+
   SortingColumn() : column_idx(0), descending(0), nulls_first(0) {
   }
 
-  virtual ~SortingColumn() throw();
+  virtual ~SortingColumn() throw() {}
+
   int32_t column_idx;
   bool descending;
   bool nulls_first;
 
-  void __set_column_idx(const int32_t val);
+  void __set_column_idx(const int32_t val) {
+    column_idx = val;
+  }
 
-  void __set_descending(const bool val);
+  void __set_descending(const bool val) {
+    descending = val;
+  }
 
-  void __set_nulls_first(const bool val);
+  void __set_nulls_first(const bool val) {
+    nulls_first = val;
+  }
 
   bool operator == (const SortingColumn & rhs) const
   {
@@ -751,36 +788,37 @@ class SortingColumn {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(SortingColumn &a, SortingColumn &b);
 
-inline std::ostream& operator<<(std::ostream& out, const SortingColumn&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 
 class PageEncodingStats {
  public:
 
-  PageEncodingStats(const PageEncodingStats&);
-  PageEncodingStats& operator=(const PageEncodingStats&);
+  static const char* ascii_fingerprint; // = "5F1BEE04836FAA3055D3EE2492AE44FB";
+  static const uint8_t binary_fingerprint[16]; // = {0x5F,0x1B,0xEE,0x04,0x83,0x6F,0xAA,0x30,0x55,0xD3,0xEE,0x24,0x92,0xAE,0x44,0xFB};
+
   PageEncodingStats() : page_type((PageType::type)0), encoding((Encoding::type)0), count(0)
{
   }
 
-  virtual ~PageEncodingStats() throw();
+  virtual ~PageEncodingStats() throw() {}
+
   PageType::type page_type;
   Encoding::type encoding;
   int32_t count;
 
-  void __set_page_type(const PageType::type val);
+  void __set_page_type(const PageType::type val) {
+    page_type = val;
+  }
 
-  void __set_encoding(const Encoding::type val);
+  void __set_encoding(const Encoding::type val) {
+    encoding = val;
+  }
 
-  void __set_count(const int32_t val);
+  void __set_count(const int32_t val) {
+    count = val;
+  }
 
   bool operator == (const PageEncodingStats & rhs) const
   {
@@ -801,35 +839,30 @@ class PageEncodingStats {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(PageEncodingStats &a, PageEncodingStats &b);
 
-inline std::ostream& operator<<(std::ostream& out, const PageEncodingStats&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _ColumnMetaData__isset {
   _ColumnMetaData__isset() : key_value_metadata(false), index_page_offset(false), dictionary_page_offset(false),
statistics(false), encoding_stats(false) {}
-  bool key_value_metadata :1;
-  bool index_page_offset :1;
-  bool dictionary_page_offset :1;
-  bool statistics :1;
-  bool encoding_stats :1;
+  bool key_value_metadata;
+  bool index_page_offset;
+  bool dictionary_page_offset;
+  bool statistics;
+  bool encoding_stats;
 } _ColumnMetaData__isset;
 
 class ColumnMetaData {
  public:
 
-  ColumnMetaData(const ColumnMetaData&);
-  ColumnMetaData& operator=(const ColumnMetaData&);
+  static const char* ascii_fingerprint; // = "AEE7317B6DB9719FE828388D537DBD71";
+  static const uint8_t binary_fingerprint[16]; // = {0xAE,0xE7,0x31,0x7B,0x6D,0xB9,0x71,0x9F,0xE8,0x28,0x38,0x8D,0x53,0x7D,0xBD,0x71};
+
   ColumnMetaData() : type((Type::type)0), codec((CompressionCodec::type)0), num_values(0),
total_uncompressed_size(0), total_compressed_size(0), data_page_offset(0), index_page_offset(0),
dictionary_page_offset(0) {
   }
 
-  virtual ~ColumnMetaData() throw();
+  virtual ~ColumnMetaData() throw() {}
+
   Type::type type;
   std::vector<Encoding::type>  encodings;
   std::vector<std::string>  path_in_schema;
@@ -846,31 +879,62 @@ class ColumnMetaData {
 
   _ColumnMetaData__isset __isset;
 
-  void __set_type(const Type::type val);
+  void __set_type(const Type::type val) {
+    type = val;
+  }
 
-  void __set_encodings(const std::vector<Encoding::type> & val);
+  void __set_encodings(const std::vector<Encoding::type> & val) {
+    encodings = val;
+  }
 
-  void __set_path_in_schema(const std::vector<std::string> & val);
+  void __set_path_in_schema(const std::vector<std::string> & val) {
+    path_in_schema = val;
+  }
 
-  void __set_codec(const CompressionCodec::type val);
+  void __set_codec(const CompressionCodec::type val) {
+    codec = val;
+  }
 
-  void __set_num_values(const int64_t val);
+  void __set_num_values(const int64_t val) {
+    num_values = val;
+  }
 
-  void __set_total_uncompressed_size(const int64_t val);
+  void __set_total_uncompressed_size(const int64_t val) {
+    total_uncompressed_size = val;
+  }
 
-  void __set_total_compressed_size(const int64_t val);
+  void __set_total_compressed_size(const int64_t val) {
+    total_compressed_size = val;
+  }
 
-  void __set_key_value_metadata(const std::vector<KeyValue> & val);
+  void __set_key_value_metadata(const std::vector<KeyValue> & val) {
+    key_value_metadata = val;
+    __isset.key_value_metadata = true;
+  }
 
-  void __set_data_page_offset(const int64_t val);
+  void __set_data_page_offset(const int64_t val) {
+    data_page_offset = val;
+  }
 
-  void __set_index_page_offset(const int64_t val);
+  void __set_index_page_offset(const int64_t val) {
+    index_page_offset = val;
+    __isset.index_page_offset = true;
+  }
 
-  void __set_dictionary_page_offset(const int64_t val);
+  void __set_dictionary_page_offset(const int64_t val) {
+    dictionary_page_offset = val;
+    __isset.dictionary_page_offset = true;
+  }
 
-  void __set_statistics(const Statistics& val);
+  void __set_statistics(const Statistics& val) {
+    statistics = val;
+    __isset.statistics = true;
+  }
 
-  void __set_encoding_stats(const std::vector<PageEncodingStats> & val);
+  void __set_encoding_stats(const std::vector<PageEncodingStats> & val) {
+    encoding_stats = val;
+    __isset.encoding_stats = true;
+  }
 
   bool operator == (const ColumnMetaData & rhs) const
   {
@@ -921,43 +985,46 @@ class ColumnMetaData {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(ColumnMetaData &a, ColumnMetaData &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ColumnMetaData&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _ColumnChunk__isset {
   _ColumnChunk__isset() : file_path(false), meta_data(false) {}
-  bool file_path :1;
-  bool meta_data :1;
+  bool file_path;
+  bool meta_data;
 } _ColumnChunk__isset;
 
 class ColumnChunk {
  public:
 
-  ColumnChunk(const ColumnChunk&);
-  ColumnChunk& operator=(const ColumnChunk&);
+  static const char* ascii_fingerprint; // = "F9F2DFFF1A7805AEF05AA10B23AF3108";
+  static const uint8_t binary_fingerprint[16]; // = {0xF9,0xF2,0xDF,0xFF,0x1A,0x78,0x05,0xAE,0xF0,0x5A,0xA1,0x0B,0x23,0xAF,0x31,0x08};
+
   ColumnChunk() : file_path(), file_offset(0) {
   }
 
-  virtual ~ColumnChunk() throw();
+  virtual ~ColumnChunk() throw() {}
+
   std::string file_path;
   int64_t file_offset;
   ColumnMetaData meta_data;
 
   _ColumnChunk__isset __isset;
 
-  void __set_file_path(const std::string& val);
+  void __set_file_path(const std::string& val) {
+    file_path = val;
+    __isset.file_path = true;
+  }
 
-  void __set_file_offset(const int64_t val);
+  void __set_file_offset(const int64_t val) {
+    file_offset = val;
+  }
 
-  void __set_meta_data(const ColumnMetaData& val);
+  void __set_meta_data(const ColumnMetaData& val) {
+    meta_data = val;
+    __isset.meta_data = true;
+  }
 
   bool operator == (const ColumnChunk & rhs) const
   {
@@ -982,31 +1049,26 @@ class ColumnChunk {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(ColumnChunk &a, ColumnChunk &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ColumnChunk& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _RowGroup__isset {
   _RowGroup__isset() : sorting_columns(false) {}
-  bool sorting_columns :1;
+  bool sorting_columns;
 } _RowGroup__isset;
 
 class RowGroup {
  public:
 
-  RowGroup(const RowGroup&);
-  RowGroup& operator=(const RowGroup&);
+  static const char* ascii_fingerprint; // = "9BCFCB6790B06809B46424957993EDA6";
+  static const uint8_t binary_fingerprint[16]; // = {0x9B,0xCF,0xCB,0x67,0x90,0xB0,0x68,0x09,0xB4,0x64,0x24,0x95,0x79,0x93,0xED,0xA6};
+
   RowGroup() : total_byte_size(0), num_rows(0) {
   }
 
-  virtual ~RowGroup() throw();
+  virtual ~RowGroup() throw() {}
+
   std::vector<ColumnChunk>  columns;
   int64_t total_byte_size;
   int64_t num_rows;
@@ -1014,13 +1076,22 @@ class RowGroup {
 
   _RowGroup__isset __isset;
 
-  void __set_columns(const std::vector<ColumnChunk> & val);
+  void __set_columns(const std::vector<ColumnChunk> & val) {
+    columns = val;
+  }
 
-  void __set_total_byte_size(const int64_t val);
+  void __set_total_byte_size(const int64_t val) {
+    total_byte_size = val;
+  }
 
-  void __set_num_rows(const int64_t val);
+  void __set_num_rows(const int64_t val) {
+    num_rows = val;
+  }
 
-  void __set_sorting_columns(const std::vector<SortingColumn> & val);
+  void __set_sorting_columns(const std::vector<SortingColumn> & val) {
+    sorting_columns = val;
+    __isset.sorting_columns = true;
+  }
 
   bool operator == (const RowGroup & rhs) const
   {
@@ -1045,32 +1116,27 @@ class RowGroup {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(RowGroup &a, RowGroup &b);
 
-inline std::ostream& operator<<(std::ostream& out, const RowGroup& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 typedef struct _FileMetaData__isset {
   _FileMetaData__isset() : key_value_metadata(false), created_by(false) {}
-  bool key_value_metadata :1;
-  bool created_by :1;
+  bool key_value_metadata;
+  bool created_by;
 } _FileMetaData__isset;
 
 class FileMetaData {
  public:
 
-  FileMetaData(const FileMetaData&);
-  FileMetaData& operator=(const FileMetaData&);
+  static const char* ascii_fingerprint; // = "D76119B1A4F2B4F404F095255FBDBD9A";
+  static const uint8_t binary_fingerprint[16]; // = {0xD7,0x61,0x19,0xB1,0xA4,0xF2,0xB4,0xF4,0x04,0xF0,0x95,0x25,0x5F,0xBD,0xBD,0x9A};
+
   FileMetaData() : version(0), num_rows(0), created_by() {
   }
 
-  virtual ~FileMetaData() throw();
+  virtual ~FileMetaData() throw() {}
+
   int32_t version;
   std::vector<SchemaElement>  schema;
   int64_t num_rows;
@@ -1080,17 +1146,31 @@ class FileMetaData {
 
   _FileMetaData__isset __isset;
 
-  void __set_version(const int32_t val);
+  void __set_version(const int32_t val) {
+    version = val;
+  }
 
-  void __set_schema(const std::vector<SchemaElement> & val);
+  void __set_schema(const std::vector<SchemaElement> & val) {
+    schema = val;
+  }
 
-  void __set_num_rows(const int64_t val);
+  void __set_num_rows(const int64_t val) {
+    num_rows = val;
+  }
 
-  void __set_row_groups(const std::vector<RowGroup> & val);
+  void __set_row_groups(const std::vector<RowGroup> & val) {
+    row_groups = val;
+  }
 
-  void __set_key_value_metadata(const std::vector<KeyValue> & val);
+  void __set_key_value_metadata(const std::vector<KeyValue> & val) {
+    key_value_metadata = val;
+    __isset.key_value_metadata = true;
+  }
 
-  void __set_created_by(const std::string& val);
+  void __set_created_by(const std::string& val) {
+    created_by = val;
+    __isset.created_by = true;
+  }
 
   bool operator == (const FileMetaData & rhs) const
   {
@@ -1121,17 +1201,10 @@ class FileMetaData {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
-  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(FileMetaData &a, FileMetaData &b);
 
-inline std::ostream& operator<<(std::ostream& out, const FileMetaData&
obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
 } // namespace
 
 #endif

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7555cff7/thirdparty/build_thirdparty.sh
----------------------------------------------------------------------
diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh
index 5205fe8..5e5cf6a 100755
--- a/thirdparty/build_thirdparty.sh
+++ b/thirdparty/build_thirdparty.sh
@@ -90,6 +90,7 @@ if [ -n "$F_ALL" -o -n "$F_THRIFT" ]; then
     # such a way that ./configure can find them
     cd $TP_DIR/$THRIFT_BASEDIR
     ./configure CXXFLAGS='-fPIC' --without-qt4 --without-c_glib --without-csharp --without-java
--without-erlang --without-nodejs --without-lua --without-python --without-perl --without-php
--without-php_extension --without-ruby --without-haskell --without-go --without-d --with-cpp
--prefix=$PREFIX
+	make clean
     make install
   fi
 fi

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/7555cff7/thirdparty/versions.sh
----------------------------------------------------------------------
diff --git a/thirdparty/versions.sh b/thirdparty/versions.sh
index 112352d..9fa2d31 100755
--- a/thirdparty/versions.sh
+++ b/thirdparty/versions.sh
@@ -6,7 +6,7 @@ SNAPPY_VERSION=1.1.3
 SNAPPY_URL="https://github.com/google/snappy/releases/download/${SNAPPY_VERSION}/snappy-${SNAPPY_VERSION}.tar.gz"
 SNAPPY_BASEDIR=snappy-$SNAPPY_VERSION
 
-THRIFT_VERSION=0.9.3
+THRIFT_VERSION=0.9.1
 THRIFT_URL="http://archive.apache.org/dist/thrift/${THRIFT_VERSION}/thrift-${THRIFT_VERSION}.tar.gz"
 THRIFT_BASEDIR=thrift-$THRIFT_VERSION
 


Mime
View raw message