Merge pull request #50 from Kinetic/change-ints-to-uints-where-the-value-must-be-positive (e273fab4) · Commits · kinetic-archive / kinetic-protocol

README.md

+4 −4

Original line number	Diff line number	Diff line
		@@ -107,7 +107,7 @@ The Kinetic Protocol supports restricting the operations a requester (identity)
		// the permission will only apply to keys that match the value at
		// the given offset. This is analogous to a substring match in many
		// languages, where the key in question is the target.
		optional int64 offset = 1;
		optional uint64 offset = 1;
		optional bytes value = 2;

		// The Permission being granted.
		@@ -2041,18 +2041,18 @@ The following Batch message construct is included in the END_BATCH and END_BATCH
		message Batch {
		// set by the client library in END_BATCH request message.
		// the total number of operations in the batch
		optional int32 count = 1;
		optional uint32 count = 1;

		// set by the drive in END_BATCH_RESPONSE message.
		// If a batch is committed successfully, all sequence Ids of those
		// commands (PUT/DELETE) performed in the batch are
		// added in the END_BATCH_RESPONSE message.
		repeated int64 sequence = 2 [packed=true];
		repeated uint64 sequence = 2 [packed=true];

		// This field is set by the drive if a batch commit failed.
		// The sequence of the first operation to fail in the batch.
		// There is no guarantee that the previous sequences would have succeeded.
		optional int64 failedSequence = 3;
		optional uint64 failedSequence = 3;
		}

		```

kinetic.proto

+13 −13

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ option java_outer_classname = "Kinetic";
		// the protocol version number by building this message
		// and then reading the value.
		message Local {
		optional string protocolVersion = 1 [default = "3.1.1"];
		optional string protocolVersion = 1 [default = "3.1.2"];
		}

		// THe message is an authorization and command bytes.
		@@ -116,10 +116,10 @@ message Command {
		// the sequence of this request in this TCP connection. As long as this value is getting larger we have
		// strong ordering and replay prevention within a session. This combined with the time and connectionID
		// provides strong ordering between sessions.
		optional int64 sequence = 4;
		optional uint64 sequence = 4;

		//co-related sequence
		optional int64 ackSequence = 6;
		optional uint64 ackSequence = 6;

		//operation code - put/get/delete/GetLog, etc.
		optional MessageType messageType = 7;
		@@ -132,7 +132,7 @@ message Command {
		// - EXPIRED meaning that a long running operation was stopped because the time expired.
		// - DATA_ERROR meaning that the request was in process, but that the error recovery was not
		// complete at the time that the time expired
		optional int64 timeout = 9;
		optional uint64 timeout = 9;

		// If true, requests will not attempt multi revolution recoveries even if the timeout has not occurred.
		// In this case the result will be DATA_ERROR. To have the device exhaust all possible error recovery, leave
		@@ -154,7 +154,7 @@ message Command {
		// sub operation and then check to see if there are other sub higher
		// priority operations. An example of a sub-operation might be a single put
		// in a P2P operation, etc.
		optional int64 TimeQuanta = 13;
		optional uint64 TimeQuanta = 13;

		// batch id to be included in each command of a batch operation
		// this id is generated by client library and must be unique
		@@ -204,18 +204,18 @@ message Command {
		message Batch {
		// set by the client library in END_BATCH request message.
		// the total number of operations in the batch
		optional int32 count = 1;
		optional uint32 count = 1;

		// set by the drive in END_BATCH_RESPONSE message.
		// If a batch is committed successfully, all sequence Ids of those
		// commands (PUT/DELETE) performed in the batch are
		// added in the END_BATCH_RESPONSE message.
		repeated int64 sequence = 2 [packed=true];
		repeated uint64 sequence = 2 [packed=true];

		// This field is set by the drive if a batch commit failed.
		// The sequence of the first operation to fail in the batch.
		// There is no guarantee that the previous sequences would have succeeded.
		optional int64 failedSequence = 3;
		optional uint64 failedSequence = 3;
		}

		//operation status
		@@ -363,7 +363,7 @@ message Command {
		optional bool endKeyInclusive = 4;

		// The maximum number of keys returned
		optional int32 maxReturned = 5;
		optional uint32 maxReturned = 5;

		// The keys are searched for and returned in a reverse order. For instance
		// if the search is startKey="j", endKey="k", maxReturned=2,
		@@ -433,7 +433,7 @@ message Command {

		message Peer {
		optional string hostname = 1;
		optional int32 port = 2;
		optional uint32 port = 2;
		optional bool tls = 3;
		}

		@@ -526,8 +526,8 @@ message Command {
		repeated Interface interface = 9;

		// these are the port numbers for the software
		optional int32 port = 10;
		optional int32 tlsPort = 11;
		optional uint32 port = 10;
		optional uint32 tlsPort = 11;

		// The unsolicited message at the beginning of a connection will return
		// the drive status. The only two possible values are OPERATIONAL
		@@ -618,7 +618,7 @@ message Command {
		}

		message Scope {
		optional int64 offset = 1;
		optional uint64 offset = 1;
		optional bytes value = 2;
		repeated Permission permission = 3;
		optional bool TlsRequired = 4; // This is only allowed over the the TLS connection