Push log update through to cdb/sst

Using the cdb_options and sst_options records

test/end_to_end/basic_SUITE.erl

@@ -197,8 +197,8 @@ journal_compaction_tester(Restart, WRP) ->
     ObjListD = testutil:generate_objects(10000, 2),
     lists:foreach(fun({_R, O, _S}) ->
                         testutil:book_riakdelete(Bookie0,
-                                                    O#r_object.bucket,
-                                                    O#r_object.key,
+                                                    testutil:get_bucket(O),
+                                                    testutil:get_key(O),
                                                     [])
                         end,
                     ObjListD),
@@ -577,8 +577,8 @@ load_and_count_withdelete(_Config) ->
                         0,
                         lists:seq(1, 20)),
     testutil:check_forobject(Bookie1, TestObject),
-    {BucketD, KeyD} = {TestObject#r_object.bucket,
-                            TestObject#r_object.key},
+    {BucketD, KeyD} =
+        {testutil:get_bucket(TestObject), testutil:get_key(TestObject)},
     {_, 1} = testutil:check_bucket_stats(Bookie1, BucketD),
     ok = testutil:book_riakdelete(Bookie1, BucketD, KeyD, []),
     not_found = testutil:book_riakget(Bookie1, BucketD, KeyD),

test/end_to_end/iterator_SUITE.erl

@@ -445,10 +445,12 @@ small_load_with2i(_Config) ->
     
     %% Delete the objects from the ChkList removing the indexes
     lists:foreach(fun({_RN, Obj, Spc}) ->
-                        DSpc = lists:map(fun({add, F, T}) -> {remove, F, T}
-                                                                end,
+                        DSpc = lists:map(fun({add, F, T}) -> 
+                                                {remove, F, T}
+                                            end,
                                             Spc),
-                        {B, K} = {Obj#r_object.bucket, Obj#r_object.key},
+                        {B, K} =
+                            {testutil:get_bucket(Obj), testutil:get_key(Obj)},
                         testutil:book_riakdelete(Bookie1, B, K, DSpc)
                         end,
                     ChkList1),

test/end_to_end/recovery_SUITE.erl

@@ -256,8 +256,8 @@ recovr_strategy(_Config) ->
     {TestObject, TestSpec} = testutil:generate_testobject(),
     ok = testutil:book_riakput(Book1, TestObject, TestSpec),
     ok = testutil:book_riakdelete(Book1,
-                                    TestObject#r_object.bucket,
-                                    TestObject#r_object.key,
+                                    testutil:get_bucket(TestObject),
+                                    testutil:get_key(TestObject),
                                     []),
     
     lists:foreach(fun({K, _SpcL}) -> 

test/end_to_end/riak_SUITE.erl

@@ -639,14 +639,14 @@ test_segfilter_query(Bookie, CLs) ->
 
     SegMapFun = 
         fun({_RN, RiakObject, _Spc}) ->
-            B = RiakObject#r_object.bucket,
-            K = RiakObject#r_object.key,
+            B = testutil:get_bucket(RiakObject),
+            K = testutil:get_key(RiakObject),
             leveled_tictac:keyto_segment32(<<B/binary, K/binary>>)
         end,
     BKMapFun = 
         fun({_RN, RiakObject, _Spc}) ->
-            B = RiakObject#r_object.bucket,
-            K = RiakObject#r_object.key,
+            B = testutil:get_bucket(RiakObject),
+            K = testutil:get_key(RiakObject),
             {B, K}
         end,
 

test/end_to_end/testutil.erl

@@ -71,6 +71,18 @@
 -define(EMPTY_VTAG_BIN, <<"e">>).
 -define(ROOT_PATH, "test").
 
+-record(r_content, {
+          metadata,
+          value :: term()
+         }).
+
+-record(r_object, {
+          bucket,
+          key,
+          contents :: [#r_content{}],
+          vclock,
+          updatemetadata=dict:store(clean, true, dict:new()),
+          updatevalue :: term()}).
 
 riak_object(Bucket, Key, Value, MetaData) ->
     Content = #r_content{metadata=dict:from_list(MetaData), value=Value},