Change targets to target

6 files changed, 28 insertions, 28 deletions

diff --git a/src/mem3/src/mem3_reshard.erl b/src/mem3/src/mem3_reshard.erl
index 46c013d58..2b968d106 100644
--- a/src/mem3/src/mem3_reshard.erl
+++ b/src/mem3/src/mem3_reshard.erl
@@ -67,8 +67,8 @@ start_split_job(ShardName) when is_binary(ShardName) ->
 start_split_job(#shard{} = Source, Split) ->
     case mem3_reshard_validate:start_args(Source, Split) of
         ok ->
-            Targets = target_shards(Source, Split),
-            case mem3_reshard_validate:targets(Source, Targets) of
+            Target = target_shards(Source, Split),
+            case mem3_reshard_validate:targets(Source, Target) of
                 ok ->
                     TStamp = now_sec(),
                     Job = #job{
@@ -79,7 +79,7 @@ start_split_job(#shard{} = Source, Split) ->
                         update_time = TStamp,
                         node = node(),
                         source = Source,
-                        targets = Targets
+                        target = Target
                    },
                    Job1 = Job#job{id = job_id(Job)},
                    Job2 = update_job_history(Job1),
diff --git a/src/mem3/src/mem3_reshard.hrl b/src/mem3/src/mem3_reshard.hrl
index 652f681dd..175377f9b 100644
--- a/src/mem3/src/mem3_reshard.hrl
+++ b/src/mem3/src/mem3_reshard.hrl
@@ -51,7 +51,7 @@
     split_state :: split_state(),
     state_info = [] :: [{atom(), any()}],
     source :: #shard{},
-    targets :: [#shard{}],
+    target :: [#shard{}],
     history = [] :: [{atom(), time_sec()}],
     start_time = 0 :: non_neg_integer(),
     update_time = 0 :: non_neg_integer(),
diff --git a/src/mem3/src/mem3_reshard_dbdoc.erl b/src/mem3/src/mem3_reshard_dbdoc.erl
index 2e93866f0..d6914040f 100644
--- a/src/mem3/src/mem3_reshard_dbdoc.erl
+++ b/src/mem3/src/mem3_reshard_dbdoc.erl
@@ -23,7 +23,7 @@
 -include("mem3_reshard.hrl").
 
 
-update_shard_map(#job{source = Source, targets = Targets} = Job) ->
+update_shard_map(#job{source = Source, target = Target} = Job) ->
     couch_log:info("~p : replicating dbs to local node", [?MODULE]),
     case mem3_util:replicate_dbs_from_all_nodes(600000) of
         ok ->
@@ -42,7 +42,7 @@ update_shard_map(#job{source = Source, targets = Targets} = Job) ->
             exit({shard_doc_open_error, OpenErr})
     end,
     Node = hd(mem3_util:live_nodes()),
-    Body = update_shard_props(OldBody, Source, Targets),
+    Body = update_shard_props(OldBody, Source, Target),
     JobStr = mem3_reshard_job:jobfmt(Job),
     LogArgs1 = [?MODULE, JobStr, Node, OldBody, Body],
     couch_log:notice("~p : ~s node:~p doc ~p -> ~p", LogArgs1),
diff --git a/src/mem3/src/mem3_reshard_job.erl b/src/mem3/src/mem3_reshard_job.erl
index a37d68739..40be94e1e 100644
--- a/src/mem3/src/mem3_reshard_job.erl
+++ b/src/mem3/src/mem3_reshard_job.erl
@@ -60,12 +60,12 @@ jobfmt(#job{} = Job) ->
     #job{
         id = Id,
         source = #shard{name = Source},
-        targets = Targets,
+        target = Target,
         split_state = State,
         job_state = JobState,
         pid = Pid
     } = Job,
-    TargetCount = length(Targets),
+    TargetCount = length(Target),
     Msg = "#job{~s ~s /~B job_state:~s split_state:~s pid:~p}",
     Fmt = io_lib:format(Msg, [Id, Source, TargetCount, JobState, State, Pid]),
     lists:flatten(Fmt).
@@ -113,9 +113,9 @@ handle_cast(Cast, Job) ->
 
 
 handle_info(retry, #job{split_state = initial_copy} = Job) ->
-    % For initial copy before retrying make sure to reset the targets
+    % For initial copy before retrying make sure to reset the target
     % as initial copy works from newly created copy every time
-    handle_cast(do_state, reset_targets(Job));
+    handle_cast(do_state, reset_target(Job));
 
 handle_info(retry, #job{} = Job) ->
     handle_cast(do_state, Job);
@@ -155,11 +155,11 @@ next_state(State, [_ | Rest]) ->
 
 -spec maybe_recover(#job{}) -> #job{} | no_return().
 maybe_recover(#job{split_state = new} = Job) ->
-    Job1 = reset_targets(Job),
+    Job1 = reset_target(Job),
     switch_state(Job1, initial_copy);
 
 maybe_recover(#job{split_state = initial_copy} = Job) ->
-    Job1 = reset_targets(Job),
+    Job1 = reset_target(Job),
     switch_state(Job1, initial_copy);
 
 maybe_recover(#job{split_state = topoff1} = Job) ->
@@ -237,7 +237,7 @@ do_state(#job{split_state = topoff1} = Job) ->
     do_state_topoff(Job);
 
 do_state(#job{split_state = build_indices} = Job) ->
-    case build_indices(Job#job.source, Job#job.targets) of
+    case build_indices(Job#job.source, Job#job.target) of
         {ok, []} ->
             {ok, switch_state(Job, next_state(build_indices))};
         {ok, Pids} when is_list(Pids) ->
@@ -317,9 +317,9 @@ worker_exited({error, missing_source}, #job{} = Job) ->
         copy_local_docs
     ]) of
         true ->
-            Msg2 = "~p cleaning targets after db was deleted ~p",
+            Msg2 = "~p cleaning target after db was deleted ~p",
             couch_log:error(Msg2, [?MODULE, jobfmt(Job)]),
-            {stop, {error, missing_source}, reset_targets(Job)};
+            {stop, {error, missing_source}, reset_target(Job)};
         false ->
             {stop, {error, missing_source}, Job}
     end;
@@ -354,7 +354,7 @@ check_state(#job{split_state = State} = Job) ->
     end.
 
 
-initial_copy(#job{source = Source, targets = Targets0} = Job) ->
+initial_copy(#job{source = Source, target = Targets0} = Job) ->
     #shard{name = SourceName} = Source,
     Targets = [{Range, Name} || #shard{range = Range, name = Name} <- Targets0],
     TMap = maps:from_list(Targets),
@@ -376,7 +376,7 @@ initial_copy(#job{source = Source, targets = Targets0} = Job) ->
 
 
 create_artificial_mem3_rep_checkpoints(#job{} = Job, Seq) ->
-    #job{source = Source = #shard{name = SourceName}, targets = Targets} = Job,
+    #job{source = Source = #shard{name = SourceName}, target = Targets} = Job,
     check_source_exists(Source, initial_copy),
     TNames = [TN || #shard{name = TN} <- Targets],
     Timestamp = list_to_binary(mem3_util:iso8601_timestamp()),
@@ -414,7 +414,7 @@ mem3_rep_checkpoint_doc(SourceDb, TargetDb, Timestamp, Seq) ->
 
 
 do_state_topoff(#job{} = Job) ->
-    #job{source = Source, targets = Targets} = Job,
+    #job{source = Source, target = Targets} = Job,
     Pid = spawn_link(?MODULE, topoff, [Source, Targets]),
     {ok, report(Job#job{workers = [Pid]})}.
 
@@ -479,7 +479,7 @@ build_indices(#shard{name = SourceName} = Source, Targets) ->
     mem3_reshard_index:spawn_builders(Indices).
 
 
-copy_local_docs(#job{source = Source, targets = Targets0}) ->
+copy_local_docs(#job{source = Source, target = Targets0}) ->
     #shard{name = SourceName} = Source,
     Targets = [{Range, Name} || #shard{range = Range, name = Name} <- Targets0],
     TMap = maps:from_list(Targets),
@@ -496,7 +496,7 @@ copy_local_docs(#job{source = Source, targets = Targets0}) ->
     end.
 
 
-wait_source_close(#job{source = #shard{name = Name}, targets = Targets}) ->
+wait_source_close(#job{source = #shard{name = Name}, target = Targets}) ->
     Timeout = config:get_integer("mem3_reshard",
         "source_close_timeout_sec", 600),
     check_targets_exist(Targets, wait_source_close),
@@ -533,7 +533,7 @@ wait_source_close(Db, SleepSec, UntilSec) ->
     end.
 
 
-source_delete(#job{source = #shard{name = Name}, targets = Targets}) ->
+source_delete(#job{source = #shard{name = Name}, target = Targets}) ->
     check_targets_exist(Targets, source_delete),
     case config:get_boolean("mem3_reshard", "delete_source", true) of
         true ->
@@ -581,8 +581,8 @@ shardsstr(#shard{name = SourceName}, Targets) ->
     lists:flatten(io_lib:format("~s -> ~s", [SourceName, TargetsStr])).
 
 
--spec reset_targets(#job{}) -> #job{}.
-reset_targets(#job{source = Source, targets = Targets} = Job) ->
+-spec reset_target(#job{}) -> #job{}.
+reset_target(#job{source = Source, target = Targets} = Job) ->
     ShardNames = try
         [N || #shard{name = N} <- mem3:shards(mem3:dbname(Source))]
     catch
diff --git a/src/mem3/src/mem3_reshard_store.erl b/src/mem3/src/mem3_reshard_store.erl
index 1d0c75461..4d0b4ccc2 100644
--- a/src/mem3/src/mem3_reshard_store.erl
+++ b/src/mem3/src/mem3_reshard_store.erl
@@ -177,7 +177,7 @@ job_to_ejson_props(#job{} = Job) ->
     job_to_ejson_props(Job, []).
 
 
-job_to_ejson_props(#job{source = Source, targets = Targets} = Job, Opts) ->
+job_to_ejson_props(#job{source = Source, target = Targets} = Job, Opts) ->
     Iso8601 = proplists:get_value(iso8601, Opts),
     History = history_to_ejson(Job#job.history, Iso8601),
     StartTime = case Iso8601 of
@@ -192,7 +192,7 @@ job_to_ejson_props(#job{source = Source, targets = Targets} = Job, Opts) ->
         {id, Job#job.id},
         {type, Job#job.type},
         {source, Source#shard.name},
-        {targets, [T#shard.name || T <- Targets]},
+        {target, [T#shard.name || T <- Targets]},
         {job_state, Job#job.job_state},
         {split_state, Job#job.split_state},
         {state_info, state_info_to_ejson(Job#job.state_info)},
@@ -207,7 +207,7 @@ job_from_ejson({Props}) ->
     Id = couch_util:get_value(<<"id">>, Props),
     Type = couch_util:get_value(<<"type">>, Props),
     Source = couch_util:get_value(<<"source">>, Props),
-    Targets = couch_util:get_value(<<"targets">>, Props),
+    Target = couch_util:get_value(<<"target">>, Props),
     JobState = couch_util:get_value(<<"job_state">>, Props),
     SplitState = couch_util:get_value(<<"split_state">>, Props),
     StateInfo = couch_util:get_value(<<"state_info">>, Props),
@@ -224,7 +224,7 @@ job_from_ejson({Props}) ->
         start_time = TStarted,
         update_time = TUpdated,
         source = mem3_reshard:shard_from_name(Source),
-        targets = [mem3_reshard:shard_from_name(T) || T <- Targets],
+        target = [mem3_reshard:shard_from_name(T) || T <- Target],
         history = history_from_ejson(History)
     }.
 
diff --git a/src/mem3/test/mem3_reshard_api_test.erl b/src/mem3/test/mem3_reshard_api_test.erl
index e4ba5edf3..270c3e2cf 100644
--- a/src/mem3/test/mem3_reshard_api_test.erl
+++ b/src/mem3/test/mem3_reshard_api_test.erl
@@ -167,7 +167,7 @@ create_job_basic(Top) ->
         ?assertMatch(#{<<"split_state">> := SSt} when is_binary(SSt), R2),
         ?assertMatch(#{<<"job_state">> := JSt} when is_binary(JSt), R2),
         ?assertMatch(#{<<"state_info">> := #{}}, R2),
-        ?assertMatch(#{<<"targets">> := Targets} when length(Targets) == 2, R2),
+        ?assertMatch(#{<<"target">> := Target} when length(Target) == 2, R2),
 
         % GET  /_reshard/job/$jobid/state
         ?assertMatch({200, #{<<"state">> := S, <<"reason">> := R}}