DRILL-6642: Update protocol-buffers version

1. Updated protobuf to version 3.6.1
2. Added protobuf to the root pom dependency management
3. Added classes BoundedByteString and LiteralByteString for compatibility with HBase
4. Added ProtobufPatcher to provide compatibility with MapR-DB and HBase
closes #1639

1 files changed, 171 insertions, 93 deletions

diff --git a/contrib/native/client/src/include/drill/protobuf/Types.pb.h b/contrib/native/client/src/include/drill/protobuf/Types.pb.h
index b1dec7bd6..ed99a61d0 100644
--- a/contrib/native/client/src/include/drill/protobuf/Types.pb.h
+++ b/contrib/native/client/src/include/drill/protobuf/Types.pb.h
@@ -1,40 +1,62 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Types.proto
 
-#ifndef PROTOBUF_Types_2eproto__INCLUDED
-#define PROTOBUF_Types_2eproto__INCLUDED
+#ifndef PROTOBUF_INCLUDED_Types_2eproto
+#define PROTOBUF_INCLUDED_Types_2eproto
 
 #include <string>
 
 #include <google/protobuf/stubs/common.h>
 
-#if GOOGLE_PROTOBUF_VERSION < 2005000
+#if GOOGLE_PROTOBUF_VERSION < 3006001
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please update
 #error your headers.
 #endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3006001 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers.  Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/arena.h>
+#include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/inlined_string_field.h>
+#include <google/protobuf/metadata.h>
 #include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
+#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
+#include <google/protobuf/extension_set.h>  // IWYU pragma: export
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
-
+#define PROTOBUF_INTERNAL_EXPORT_protobuf_Types_2eproto 
+
+namespace protobuf_Types_2eproto {
+// Internal implementation detail -- do not use these members.
+struct TableStruct {
+  static const ::google::protobuf::internal::ParseTableField entries[];
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
+  static const ::google::protobuf::internal::ParseTable schema[1];
+  static const ::google::protobuf::internal::FieldMetadata field_metadata[];
+  static const ::google::protobuf::internal::SerializationTable serialization_table[];
+  static const ::google::protobuf::uint32 offsets[];
+};
+void AddDescriptors();
+}  // namespace protobuf_Types_2eproto
 namespace common {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_Types_2eproto();
-void protobuf_AssignDesc_Types_2eproto();
-void protobuf_ShutdownFile_Types_2eproto();
-
 class MajorType;
+class MajorTypeDefaultTypeInternal;
+extern MajorTypeDefaultTypeInternal _MajorType_default_instance_;
+}  // namespace common
+namespace google {
+namespace protobuf {
+template<> ::common::MajorType* Arena::CreateMaybeMessage<::common::MajorType>(Arena*);
+}  // namespace protobuf
+}  // namespace google
+namespace common {
 
 enum MinorType {
   LATE = 0,
@@ -114,7 +136,7 @@ inline bool DataMode_Parse(
 }
 // ===================================================================
 
-class MajorType : public ::google::protobuf::Message {
+class MajorType : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:common.MajorType) */ {
  public:
   MajorType();
   virtual ~MajorType();
@@ -125,141 +147,177 @@ class MajorType : public ::google::protobuf::Message {
     CopyFrom(from);
     return *this;
   }
+  #if LANG_CXX11
+  MajorType(MajorType&& from) noexcept
+    : MajorType() {
+    *this = ::std::move(from);
+  }
 
+  inline MajorType& operator=(MajorType&& from) noexcept {
+    if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
+      if (this != &from) InternalSwap(&from);
+    } else {
+      CopyFrom(from);
+    }
+    return *this;
+  }
+  #endif
   inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
+    return _internal_metadata_.unknown_fields();
   }
-
   inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
+    return _internal_metadata_.mutable_unknown_fields();
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
   static const MajorType& default_instance();
 
+  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
+  static inline const MajorType* internal_default_instance() {
+    return reinterpret_cast<const MajorType*>(
+               &_MajorType_default_instance_);
+  }
+  static constexpr int kIndexInFileMessages =
+    0;
+
   void Swap(MajorType* other);
+  friend void swap(MajorType& a, MajorType& b) {
+    a.Swap(&b);
+  }
 
   // implements Message ----------------------------------------------
 
-  MajorType* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
+  inline MajorType* New() const final {
+    return CreateMaybeMessage<MajorType>(NULL);
+  }
+
+  MajorType* New(::google::protobuf::Arena* arena) const final {
+    return CreateMaybeMessage<MajorType>(arena);
+  }
+  void CopyFrom(const ::google::protobuf::Message& from) final;
+  void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const MajorType& from);
   void MergeFrom(const MajorType& from);
-  void Clear();
-  bool IsInitialized() const;
+  void Clear() final;
+  bool IsInitialized() const final;
 
-  int ByteSize() const;
+  size_t ByteSizeLong() const final;
   bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
+      ::google::protobuf::io::CodedInputStream* input) final;
   void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
+      ::google::protobuf::io::CodedOutputStream* output) const final;
+  ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
+      bool deterministic, ::google::protobuf::uint8* target) const final;
+  int GetCachedSize() const final { return _cached_size_.Get(); }
+
   private:
   void SharedCtor();
   void SharedDtor();
-  void SetCachedSize(int size) const;
+  void SetCachedSize(int size) const final;
+  void InternalSwap(MajorType* other);
+  private:
+  inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
+    return NULL;
+  }
+  inline void* MaybeArenaPtr() const {
+    return NULL;
+  }
   public:
 
-  ::google::protobuf::Metadata GetMetadata() const;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
   // accessors -------------------------------------------------------
 
+  // repeated .common.MinorType sub_type = 7;
+  int sub_type_size() const;
+  void clear_sub_type();
+  static const int kSubTypeFieldNumber = 7;
+  ::common::MinorType sub_type(int index) const;
+  void set_sub_type(int index, ::common::MinorType value);
+  void add_sub_type(::common::MinorType value);
+  const ::google::protobuf::RepeatedField<int>& sub_type() const;
+  ::google::protobuf::RepeatedField<int>* mutable_sub_type();
+
   // optional .common.MinorType minor_type = 1;
-  inline bool has_minor_type() const;
-  inline void clear_minor_type();
+  bool has_minor_type() const;
+  void clear_minor_type();
   static const int kMinorTypeFieldNumber = 1;
-  inline ::common::MinorType minor_type() const;
-  inline void set_minor_type(::common::MinorType value);
+  ::common::MinorType minor_type() const;
+  void set_minor_type(::common::MinorType value);
 
   // optional .common.DataMode mode = 2;
-  inline bool has_mode() const;
-  inline void clear_mode();
+  bool has_mode() const;
+  void clear_mode();
   static const int kModeFieldNumber = 2;
-  inline ::common::DataMode mode() const;
-  inline void set_mode(::common::DataMode value);
+  ::common::DataMode mode() const;
+  void set_mode(::common::DataMode value);
 
   // optional int32 width = 3;
-  inline bool has_width() const;
-  inline void clear_width();
+  bool has_width() const;
+  void clear_width();
   static const int kWidthFieldNumber = 3;
-  inline ::google::protobuf::int32 width() const;
-  inline void set_width(::google::protobuf::int32 value);
+  ::google::protobuf::int32 width() const;
+  void set_width(::google::protobuf::int32 value);
 
   // optional int32 precision = 4;
-  inline bool has_precision() const;
-  inline void clear_precision();
+  bool has_precision() const;
+  void clear_precision();
   static const int kPrecisionFieldNumber = 4;
-  inline ::google::protobuf::int32 precision() const;
-  inline void set_precision(::google::protobuf::int32 value);
+  ::google::protobuf::int32 precision() const;
+  void set_precision(::google::protobuf::int32 value);
 
   // optional int32 scale = 5;
-  inline bool has_scale() const;
-  inline void clear_scale();
+  bool has_scale() const;
+  void clear_scale();
   static const int kScaleFieldNumber = 5;
-  inline ::google::protobuf::int32 scale() const;
-  inline void set_scale(::google::protobuf::int32 value);
+  ::google::protobuf::int32 scale() const;
+  void set_scale(::google::protobuf::int32 value);
 
   // optional int32 timeZone = 6;
-  inline bool has_timezone() const;
-  inline void clear_timezone();
+  bool has_timezone() const;
+  void clear_timezone();
   static const int kTimeZoneFieldNumber = 6;
-  inline ::google::protobuf::int32 timezone() const;
-  inline void set_timezone(::google::protobuf::int32 value);
-
-  // repeated .common.MinorType sub_type = 7;
-  inline int sub_type_size() const;
-  inline void clear_sub_type();
-  static const int kSubTypeFieldNumber = 7;
-  inline ::common::MinorType sub_type(int index) const;
-  inline void set_sub_type(int index, ::common::MinorType value);
-  inline void add_sub_type(::common::MinorType value);
-  inline const ::google::protobuf::RepeatedField<int>& sub_type() const;
-  inline ::google::protobuf::RepeatedField<int>* mutable_sub_type();
+  ::google::protobuf::int32 timezone() const;
+  void set_timezone(::google::protobuf::int32 value);
 
   // @@protoc_insertion_point(class_scope:common.MajorType)
  private:
-  inline void set_has_minor_type();
-  inline void clear_has_minor_type();
-  inline void set_has_mode();
-  inline void clear_has_mode();
-  inline void set_has_width();
-  inline void clear_has_width();
-  inline void set_has_precision();
-  inline void clear_has_precision();
-  inline void set_has_scale();
-  inline void clear_has_scale();
-  inline void set_has_timezone();
-  inline void clear_has_timezone();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
+  void set_has_minor_type();
+  void clear_has_minor_type();
+  void set_has_mode();
+  void clear_has_mode();
+  void set_has_width();
+  void clear_has_width();
+  void set_has_precision();
+  void clear_has_precision();
+  void set_has_scale();
+  void clear_has_scale();
+  void set_has_timezone();
+  void clear_has_timezone();
+
+  ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
+  ::google::protobuf::internal::HasBits<1> _has_bits_;
+  mutable ::google::protobuf::internal::CachedSize _cached_size_;
+  ::google::protobuf::RepeatedField<int> sub_type_;
   int minor_type_;
   int mode_;
   ::google::protobuf::int32 width_;
   ::google::protobuf::int32 precision_;
   ::google::protobuf::int32 scale_;
   ::google::protobuf::int32 timezone_;
-  ::google::protobuf::RepeatedField<int> sub_type_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-
-  friend void  protobuf_AddDesc_Types_2eproto();
-  friend void protobuf_AssignDesc_Types_2eproto();
-  friend void protobuf_ShutdownFile_Types_2eproto();
-
-  void InitAsDefaultInstance();
-  static MajorType* default_instance_;
+  friend struct ::protobuf_Types_2eproto::TableStruct;
 };
 // ===================================================================
 
 
 // ===================================================================
 
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif  // __GNUC__
 // MajorType
 
 // optional .common.MinorType minor_type = 1;
@@ -277,12 +335,14 @@ inline void MajorType::clear_minor_type() {
   clear_has_minor_type();
 }
 inline ::common::MinorType MajorType::minor_type() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.minor_type)
   return static_cast< ::common::MinorType >(minor_type_);
 }
 inline void MajorType::set_minor_type(::common::MinorType value) {
   assert(::common::MinorType_IsValid(value));
   set_has_minor_type();
   minor_type_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.minor_type)
 }
 
 // optional .common.DataMode mode = 2;
@@ -300,12 +360,14 @@ inline void MajorType::clear_mode() {
   clear_has_mode();
 }
 inline ::common::DataMode MajorType::mode() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.mode)
   return static_cast< ::common::DataMode >(mode_);
 }
 inline void MajorType::set_mode(::common::DataMode value) {
   assert(::common::DataMode_IsValid(value));
   set_has_mode();
   mode_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.mode)
 }
 
 // optional int32 width = 3;
@@ -323,11 +385,13 @@ inline void MajorType::clear_width() {
   clear_has_width();
 }
 inline ::google::protobuf::int32 MajorType::width() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.width)
   return width_;
 }
 inline void MajorType::set_width(::google::protobuf::int32 value) {
   set_has_width();
   width_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.width)
 }
 
 // optional int32 precision = 4;
@@ -345,11 +409,13 @@ inline void MajorType::clear_precision() {
   clear_has_precision();
 }
 inline ::google::protobuf::int32 MajorType::precision() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.precision)
   return precision_;
 }
 inline void MajorType::set_precision(::google::protobuf::int32 value) {
   set_has_precision();
   precision_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.precision)
 }
 
 // optional int32 scale = 5;
@@ -367,11 +433,13 @@ inline void MajorType::clear_scale() {
   clear_has_scale();
 }
 inline ::google::protobuf::int32 MajorType::scale() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.scale)
   return scale_;
 }
 inline void MajorType::set_scale(::google::protobuf::int32 value) {
   set_has_scale();
   scale_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.scale)
 }
 
 // optional int32 timeZone = 6;
@@ -389,11 +457,13 @@ inline void MajorType::clear_timezone() {
   clear_has_timezone();
 }
 inline ::google::protobuf::int32 MajorType::timezone() const {
+  // @@protoc_insertion_point(field_get:common.MajorType.timeZone)
   return timezone_;
 }
 inline void MajorType::set_timezone(::google::protobuf::int32 value) {
   set_has_timezone();
   timezone_ = value;
+  // @@protoc_insertion_point(field_set:common.MajorType.timeZone)
 }
 
 // repeated .common.MinorType sub_type = 7;
@@ -404,47 +474,55 @@ inline void MajorType::clear_sub_type() {
   sub_type_.Clear();
 }
 inline ::common::MinorType MajorType::sub_type(int index) const {
+  // @@protoc_insertion_point(field_get:common.MajorType.sub_type)
   return static_cast< ::common::MinorType >(sub_type_.Get(index));
 }
 inline void MajorType::set_sub_type(int index, ::common::MinorType value) {
   assert(::common::MinorType_IsValid(value));
   sub_type_.Set(index, value);
+  // @@protoc_insertion_point(field_set:common.MajorType.sub_type)
 }
 inline void MajorType::add_sub_type(::common::MinorType value) {
   assert(::common::MinorType_IsValid(value));
   sub_type_.Add(value);
+  // @@protoc_insertion_point(field_add:common.MajorType.sub_type)
 }
 inline const ::google::protobuf::RepeatedField<int>&
 MajorType::sub_type() const {
+  // @@protoc_insertion_point(field_list:common.MajorType.sub_type)
   return sub_type_;
 }
 inline ::google::protobuf::RepeatedField<int>*
 MajorType::mutable_sub_type() {
+  // @@protoc_insertion_point(field_mutable_list:common.MajorType.sub_type)
   return &sub_type_;
 }
 
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace common
 
-#ifndef SWIG
 namespace google {
 namespace protobuf {
 
+template <> struct is_proto_enum< ::common::MinorType> : ::std::true_type {};
 template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::common::MinorType>() {
   return ::common::MinorType_descriptor();
 }
+template <> struct is_proto_enum< ::common::DataMode> : ::std::true_type {};
 template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::common::DataMode>() {
   return ::common::DataMode_descriptor();
 }
 
-}  // namespace google
 }  // namespace protobuf
-#endif  // SWIG
+}  // namespace google
 
 // @@protoc_insertion_point(global_scope)
 
-#endif  // PROTOBUF_Types_2eproto__INCLUDED
+#endif  // PROTOBUF_INCLUDED_Types_2eproto