Commit e193d775 authored by Marco De Marco's avatar Marco De Marco
Browse files

Request Response classes modified

parent d1eb7bfc

proto/Request.proto

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ message Request 
		

			required string name = 1;

			required Type type = 2;

			required bool nullable = 3;

		}



		repeated Column columns = 3;

proto/Response.proto

+20 −9
Original line number Diff line number Diff line
@@ -49,7 +49,15 @@ message Response 


	message Metadata

	{

		//Metadata response status

		//Metadata response partial



		required uint64 partial = 1;

	

		//Metadata response total



		required uint64 total = 2;	



		//Metadata response state



		enum State

		{
@@ -57,8 +65,11 @@ message Response 
			REJECTED = 1;

		}



		required State state = 1;

		required string status = 2;

		required State state = 3;



		//Metadata response status



		required string status = 4;



		//Mysql: FLOAT, DOUBLE, DECIMAL

		//SOCI:  dt_double
@@ -70,7 +81,7 @@ message Response 
			required double value = 2;

		}



		repeated DtDouble double_list = 3;

		repeated DtDouble double_list = 5;



		//Mysql: TINYINT, SMALLINT, INT, BIGINT

		//SOCI:  dt_integer
@@ -82,7 +93,7 @@ message Response 
			required int32 value = 2;

		}



		repeated DtInteger integer_list = 4;

		repeated DtInteger integer_list = 6;



		//Mysql: not used with mysql, needed for postgres

		//SOCI:  dt_unsigned_long
@@ -94,7 +105,7 @@ message Response 
			required uint64 value = 2;

		}



		repeated DtUnsignedLong unsinged_long_list = 5;

		repeated DtUnsignedLong unsinged_long_list = 7;



		//Mysql: not used with mysql, needed for postgres

		//SOCI:  dt_long_long
@@ -106,7 +117,7 @@ message Response 
			required int64 value = 2;

		}



		repeated DtLongLong long_long_list = 6;

		repeated DtLongLong long_long_list = 8;



		//Mysql: STRING/BINARY, VARCHAR/VARBINARY

		//SOCI:  dt_string
@@ -118,7 +129,7 @@ message Response 
			required string value = 2;

		}



		repeated DtString strings_list = 7;

		repeated DtString strings_list = 9;



		//Mysql: TIMESTAMP DATE, TIME, DATETIME

		//SOCI:  dt_date
@@ -130,7 +141,7 @@ message Response 
			required sfixed64 value = 2;

		}



		repeated DtDate date_list = 8;

		repeated DtDate date_list = 10;

	}



	optional Metadata metadata = 4;

src/Request.pb.cc

+51 −12
Original line number Diff line number Diff line
@@ -99,9 +99,10 @@ void protobuf_AssignDesc_Request_2eproto() { 
      ::google::protobuf::MessageFactory::generated_factory(),

      sizeof(Request_Validation));

  Request_Validation_Column_descriptor_ = Request_Validation_descriptor_->nested_type(0);

  static const int Request_Validation_Column_offsets_[2] = {

  static const int Request_Validation_Column_offsets_[3] = {

    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Request_Validation_Column, name_),

    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Request_Validation_Column, type_),

    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Request_Validation_Column, nullable_),

  };

  Request_Validation_Column_reflection_ =

    new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -179,7 +180,7 @@ void protobuf_AddDesc_Request_2eproto() { 
  GOOGLE_PROTOBUF_VERIFY_VERSION;



  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(

    "\n\rRequest.proto\022\023MetadataImporter_ns\"\325\005\n"

    "\n\rRequest.proto\022\023MetadataImporter_ns\"\347\005\n"

    "\007Request\022/\n\004type\030\001 \002(\0162!.MetadataImporte"

    "r_ns.Request.Type\022A\n\rauthorization\030\002 \001(\013"

    "2*.MetadataImporter_ns.Request.Authoriza"
@@ -187,18 +188,18 @@ void protobuf_AddDesc_Request_2eproto() { 
    "ter_ns.Request.Validation\0227\n\010metadata\030\004 "

    "\001(\0132%.MetadataImporter_ns.Request.Metada"

    "ta\0323\n\rAuthorization\022\020\n\010username\030\001 \002(\t\022\020\n"

    "\010password\030\002 \002(\t\032\263\002\n\nValidation\022\016\n\006schema"

    "\010password\030\002 \002(\t\032\305\002\n\nValidation\022\016\n\006schema"

    "\030\001 \002(\t\022\r\n\005table\030\002 \002(\t\022\?\n\007columns\030\003 \003(\0132."

    ".MetadataImporter_ns.Request.Validation."

    "Column\032\304\001\n\006Column\022\014\n\004name\030\001 \002(\t\022A\n\004type\030"

    "Column\032\326\001\n\006Column\022\014\n\004name\030\001 \002(\t\022A\n\004type\030"

    "\002 \002(\01623.MetadataImporter_ns.Request.Vali"

    "dation.Column.Type\"i\n\004Type\022\r\n\tDT_DOUBLE\020"

    "\000\022\016\n\nDT_INTEGER\020\001\022\024\n\020DT_UNSIGNED_LONG\020\002\022"

    "\020\n\014DT_LONG_LONG\020\003\022\r\n\tDT_STRING\020\004\022\013\n\007DT_D"

    "ATE\020\005\032<\n\010Metadata\022\016\n\006schema\030\001 \002(\t\022\r\n\005tab"

    "le\030\002 \002(\t\022\021\n\ttimestamp\030\003 \002(\020\"7\n\004Type\022\021\n\rA"

    "UTHORIZATION\020\000\022\016\n\nVALIDATION\020\001\022\014\n\010METADA"

    "TA\020\002", 764);

    "dation.Column.Type\022\020\n\010nullable\030\003 \002(\010\"i\n\004"

    "Type\022\r\n\tDT_DOUBLE\020\000\022\016\n\nDT_INTEGER\020\001\022\024\n\020D"

    "T_UNSIGNED_LONG\020\002\022\020\n\014DT_LONG_LONG\020\003\022\r\n\tD"

    "T_STRING\020\004\022\013\n\007DT_DATE\020\005\032<\n\010Metadata\022\016\n\006s"

    "chema\030\001 \002(\t\022\r\n\005table\030\002 \002(\t\022\021\n\ttimestamp\030"

    "\003 \002(\020\"7\n\004Type\022\021\n\rAUTHORIZATION\020\000\022\016\n\nVALI"

    "DATION\020\001\022\014\n\010METADATA\020\002", 782);

  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(

    "Request.proto", &protobuf_RegisterTypes);

  Request::default_instance_ = new Request();
@@ -561,6 +562,7 @@ const int Request_Validation_Column::Type_ARRAYSIZE; 
#ifndef _MSC_VER

const int Request_Validation_Column::kNameFieldNumber;

const int Request_Validation_Column::kTypeFieldNumber;

const int Request_Validation_Column::kNullableFieldNumber;

#endif  // !_MSC_VER



Request_Validation_Column::Request_Validation_Column()
@@ -581,6 +583,7 @@ void Request_Validation_Column::SharedCtor() { 
  _cached_size_ = 0;

  name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);

  type_ = 0;

  nullable_ = false;

  ::memset(_has_bits_, 0, sizeof(_has_bits_));

}
@@ -625,6 +628,7 @@ void Request_Validation_Column::Clear() { 
      }

    }

    type_ = 0;

    nullable_ = false;

  }

  ::memset(_has_bits_, 0, sizeof(_has_bits_));

  mutable_unknown_fields()->Clear();
@@ -669,6 +673,22 @@ bool Request_Validation_Column::MergePartialFromCodedStream( 
        } else {

          goto handle_uninterpreted;

        }

        if (input->ExpectTag(24)) goto parse_nullable;

        break;

      }



      // required bool nullable = 3;

      case 3: {

        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==

            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {

         parse_nullable:

          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<

                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(

                 input, &nullable_)));

          set_has_nullable();

        } else {

          goto handle_uninterpreted;

        }

        if (input->ExpectAtEnd()) return true;

        break;

      }
@@ -706,6 +726,11 @@ void Request_Validation_Column::SerializeWithCachedSizes( 
      2, this->type(), output);

  }



  // required bool nullable = 3;

  if (has_nullable()) {

    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->nullable(), output);

  }



  if (!unknown_fields().empty()) {

    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(

        unknown_fields(), output);
@@ -730,6 +755,11 @@ void Request_Validation_Column::SerializeWithCachedSizes( 
      2, this->type(), target);

  }



  // required bool nullable = 3;

  if (has_nullable()) {

    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->nullable(), target);

  }



  if (!unknown_fields().empty()) {

    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(

        unknown_fields(), target);
@@ -754,6 +784,11 @@ int Request_Validation_Column::ByteSize() const { 
        ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());

    }



    // required bool nullable = 3;

    if (has_nullable()) {

      total_size += 1 + 1;

    }



  }

  if (!unknown_fields().empty()) {

    total_size +=
@@ -787,6 +822,9 @@ void Request_Validation_Column::MergeFrom(const Request_Validation_Column& from) 
    if (from.has_type()) {

      set_type(from.type());

    }

    if (from.has_nullable()) {

      set_nullable(from.nullable());

    }

  }

  mutable_unknown_fields()->MergeFrom(from.unknown_fields());

}
@@ -804,7 +842,7 @@ void Request_Validation_Column::CopyFrom(const Request_Validation_Column& from) 
}



bool Request_Validation_Column::IsInitialized() const {

  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;

  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;



  return true;

}
@@ -813,6 +851,7 @@ void Request_Validation_Column::Swap(Request_Validation_Column* other) { 
  if (other != this) {

    std::swap(name_, other->name_);

    std::swap(type_, other->type_);

    std::swap(nullable_, other->nullable_);

    std::swap(_has_bits_[0], other->_has_bits_[0]);

    _unknown_fields_.Swap(&other->_unknown_fields_);

    std::swap(_cached_size_, other->_cached_size_);

src/Request.pb.h

+33 −1
Original line number Diff line number Diff line
@@ -288,20 +288,30 @@ class Request_Validation_Column : public ::google::protobuf::Message { 
  inline ::MetadataImporter_ns::Request_Validation_Column_Type type() const;

  inline void set_type(::MetadataImporter_ns::Request_Validation_Column_Type value);



  // required bool nullable = 3;

  inline bool has_nullable() const;

  inline void clear_nullable();

  static const int kNullableFieldNumber = 3;

  inline bool nullable() const;

  inline void set_nullable(bool value);



  // @@protoc_insertion_point(class_scope:MetadataImporter_ns.Request.Validation.Column)

 private:

  inline void set_has_name();

  inline void clear_has_name();

  inline void set_has_type();

  inline void clear_has_type();

  inline void set_has_nullable();

  inline void clear_has_nullable();



  ::google::protobuf::UnknownFieldSet _unknown_fields_;



  ::std::string* name_;

  int type_;

  bool nullable_;



  mutable int _cached_size_;

  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];

  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];



  friend void  protobuf_AddDesc_Request_2eproto();

  friend void protobuf_AssignDesc_Request_2eproto();
@@ -930,6 +940,28 @@ inline void Request_Validation_Column::set_type(::MetadataImporter_ns::Request_V 
  type_ = value;

}



// required bool nullable = 3;

inline bool Request_Validation_Column::has_nullable() const {

  return (_has_bits_[0] & 0x00000004u) != 0;

}

inline void Request_Validation_Column::set_has_nullable() {

  _has_bits_[0] |= 0x00000004u;

}

inline void Request_Validation_Column::clear_has_nullable() {

  _has_bits_[0] &= ~0x00000004u;

}

inline void Request_Validation_Column::clear_nullable() {

  nullable_ = false;

  clear_has_nullable();

}

inline bool Request_Validation_Column::nullable() const {

  return nullable_;

}

inline void Request_Validation_Column::set_nullable(bool value) {

  set_has_nullable();

  nullable_ = value;

}



// -------------------------------------------------------------------



// Request_Validation

src/Response.pb.cc

+178 −95

File changed.

Preview size limit exceeded, changes collapsed.