Don't force rsm when max_items is not defined (#2189)

diff --git a/src/node_flat.erl b/src/node_flat.erl
index 9de64d1a1e4da4cf8e04d207deeefb027bd35822..1899503683f92c60dfbe5f831ad77d2a72156af8 100644 (file)
--- a/src/node_flat.erl
+++ b/src/node_flat.erl
@@ -734,14 +734,7 @@ del_state(#pubsub_state{stateid = {Key, Nidx}, items = Items}) ->
 get_items(Nidx, _From, undefined) ->
     RItems = lists:keysort(#pubsub_item.creation,
                           mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx)),
-    Count = length(RItems),
-    if Count =< ?MAXITEMS ->
-        {result, {RItems, undefined}};
-       true ->
-        ItemsPage = lists:sublist(RItems, ?MAXITEMS),
-        Rsm = rsm_page(Count, 0, 0, ItemsPage),
-        {result, {ItemsPage, Rsm}}
-    end;
+    {result, {RItems, undefined}};
 
 get_items(Nidx, _From, #rsm_set{max = Max, index = IncIndex,
                                'after' = After, before = Before}) ->

diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
index 2773114a21babc6d6bd917d5c6d0e8887a793526..c48a1a63679fd4b5817909cc603b027f8c911f12 100644 (file)
--- a/src/node_flat_sql.erl
+++ b/src/node_flat_sql.erl
@@ -655,14 +655,7 @@ get_items(Nidx, _From, undefined) ->
              " from pubsub_item where nodeid='", SNidx/binary, "'",
              " order by creation asc">>]) of
        {selected, _, AllItems} ->
-           Count = length(AllItems),
-           if Count =< ?MAXITEMS ->
-               {result, {[raw_to_item(Nidx, RItem) || RItem <- AllItems], undefined}};
-              true ->
-               RItems = lists:sublist(AllItems, ?MAXITEMS),
-               Rsm = rsm_page(Count, 0, 0, RItems),
-               {result, {[raw_to_item(Nidx, RItem) || RItem <- RItems], Rsm}}
-           end;
+           {result, {[raw_to_item(Nidx, RItem) || RItem <- AllItems], undefined}};
        _ ->
            {result, {[], undefined}}
     end;