Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge

Conflicts:
	src/db.erl
	src/frontend.erl
	src/index.erl
	src/plop.erl
	src/storage.erl
	src/ts.erl

1 files changed, 9 insertions, 9 deletions

diff --git a/src/ts.erl b/src/ts.erl
index 44d27cc..29d93aa 100644
--- a/src/ts.erl
+++ b/src/ts.erl
@@ -22,22 +22,22 @@ new() ->
 
 -spec add(tree_store(), non_neg_integer(), binary()) -> tree_store().
 add(S = #tree_store{layers = Layers}, Layer, Entry) ->
-    {NewLayers, Array} = layer_rw(Layers, Layer),
-    NewArray = array:set(array:size(Array), Entry, Array),
-    S#tree_store{layers = array:set(Layer, NewArray, NewLayers)}.
+    {NewLayers, List} = layer_rw(Layers, Layer),
+    NewList = array:set(array:size(List), Entry, List),
+    S#tree_store{layers = array:set(Layer, NewList, NewLayers)}.
 
 -spec delete(tree_store(), non_neg_integer()) -> tree_store().
 delete(S = #tree_store{layers = Layers}, Layer) ->
-    Array = layer_ro(Layers, Layer),
-    NewArray = array:resize(array:size(Array) - 1, Array),
-    S#tree_store{layers = array:set(Layer, NewArray, Layers)}.
+    List = layer_ro(Layers, Layer),
+    NewList = array:resize(array:size(List) - 1, List),
+    S#tree_store{layers = array:set(Layer, NewList, Layers)}.
 
 -spec retrieve(tree_store(), tuple()) -> binary() | undefined.
 retrieve(#tree_store{layers = Layers}, {Layer, Index}) ->
-    Array = layer_ro(Layers, Layer),
-    Len = array:size(Array),
+    List = layer_ro(Layers, Layer),
+    Len = array:size(List),
     case Index < Len of
-        true -> array:get(Index, Array);
+        true -> array:get(Index, List);
         false -> undefined
     end.