Merge pull request #216 from basho/sweeper-develop-merge

Merge sweeper code to develop
basho · Jan 4, 2017 · 4541303 · 4541303
2 parents a3edea9 + 6156ab3
commit 4541303
Show file tree

Hide file tree

Showing 13 changed files with 1,476 additions and 1,107 deletions.
diff --git a/include/riak_kv_pb.hrl b/include/riak_kv_pb.hrl
@@ -37,7 +37,8 @@
          last_mod_usecs         :: non_neg_integer() | undefined, % = 8, 32 bits
          usermeta = []          :: [#rpbpair{}],    % = 9
          indexes = []           :: [#rpbpair{}],    % = 10
-         deleted                :: boolean() | 0 | 1 | undefined % = 11
+         deleted                :: boolean() | 0 | 1 | undefined, % = 11
+         ttl                    :: non_neg_integer() | undefined % = 12, 32 bits
         }).
 -endif.
 
@@ -105,7 +106,8 @@
          datatype               :: binary() | undefined, % = 26
          consistent             :: boolean() | 0 | 1 | undefined, % = 27
          write_once             :: boolean() | 0 | 1 | undefined, % = 28
-         hll_precision          :: non_neg_integer() | undefined % = 29, 32 bits
+         hll_precision          :: non_neg_integer() | undefined, % = 29, 32 bits
+         ttl                    :: non_neg_integer() | undefined % = 30, 32 bits
         }).
 -endif.
 

diff --git a/include/riak_pb.hrl b/include/riak_pb.hrl
@@ -54,7 +54,8 @@
          datatype               :: binary() | undefined, % = 26
          consistent             :: boolean() | 0 | 1 | undefined, % = 27
          write_once             :: boolean() | 0 | 1 | undefined, % = 28
-         hll_precision          :: non_neg_integer() | undefined % = 29, 32 bits
+         hll_precision          :: non_neg_integer() | undefined, % = 29, 32 bits
+         ttl                    :: non_neg_integer() | undefined % = 30, 32 bits
         }).
 -endif.
 

diff --git a/include/riak_pb_kv_codec.hrl b/include/riak_pb_kv_codec.hrl
@@ -30,6 +30,7 @@
 -define(MD_USERMETA, <<"X-Riak-Meta">>).
 -define(MD_INDEX,    <<"index">>).
 -define(MD_DELETED,  <<"X-Riak-Deleted">>).
+-define(MD_TTL,      <<"X-Riak-TTL">>).
 
 %% Content-Type for Erlang term_to_binary format
 -define(CTYPE_ERLANG_BINARY, "application/x-erlang-binary").

diff --git a/include/riak_search_pb.hrl b/include/riak_search_pb.hrl
@@ -54,7 +54,8 @@
          datatype               :: binary() | undefined, % = 26
          consistent             :: boolean() | 0 | 1 | undefined, % = 27
          write_once             :: boolean() | 0 | 1 | undefined, % = 28
-         hll_precision          :: non_neg_integer() | undefined % = 29, 32 bits
+         hll_precision          :: non_neg_integer() | undefined, % = 29, 32 bits
+         ttl                    :: non_neg_integer() | undefined % = 30, 32 bits
         }).
 -endif.
 

diff --git a/include/riak_ts_pb.hrl b/include/riak_ts_pb.hrl
@@ -76,7 +76,8 @@
          datatype               :: binary() | undefined, % = 26
          consistent             :: boolean() | 0 | 1 | undefined, % = 27
          write_once             :: boolean() | 0 | 1 | undefined, % = 28
-         hll_precision          :: non_neg_integer() | undefined % = 29, 32 bits
+         hll_precision          :: non_neg_integer() | undefined, % = 29, 32 bits
+         ttl                    :: non_neg_integer() | undefined % = 30, 32 bits
         }).
 -endif.
 
@@ -107,7 +108,7 @@
 -ifndef('TSCOVERAGEREQ_PB_H').
 -define('TSCOVERAGEREQ_PB_H', true).
 -record(tscoveragereq,
-        {'query'                  :: #tsinterpolation{} | undefined, % = 1
+        {query                  :: #tsinterpolation{} | undefined, % = 1
          table                  :: binary(),        % = 2
          replace_cover          :: binary() | undefined, % = 3
          unavailable_cover = [] :: [binary()]       % = 4
@@ -258,7 +259,7 @@
 -ifndef('TSQUERYREQ_PB_H').
 -define('TSQUERYREQ_PB_H', true).
 -record(tsqueryreq,
-        {'query'                  :: #tsinterpolation{} | undefined, % = 1
+        {query                  :: #tsinterpolation{} | undefined, % = 1
          stream = false         :: boolean() | 0 | 1 | undefined, % = 2
          cover_context          :: binary() | undefined % = 3
         }).

diff --git a/src/riak.proto b/src/riak.proto
@@ -147,6 +147,9 @@ message RpbBucketProps {
 
     // Hyperlolog DT Precision
     optional uint32 hll_precision = 29;
+
+    // KV sweeper object expiry time
+    optional uint32 ttl = 30;
 }
 
 // Authentication request

diff --git a/src/riak_kv.proto b/src/riak_kv.proto
@@ -234,6 +234,7 @@ message RpbContent {
     repeated RpbPair usermeta = 9;       // user metadata stored with the object
     repeated RpbPair indexes = 10;       // user metadata stored with the object
     optional bool deleted = 11;
+    optional uint32 ttl = 12;
 }
 
 // Link metadata