Namdak Tonpa 5 лет назад
Родитель
Сommit
4a791b6966
3 измененных файлов с 5 добавлено и 11 удалено
  1. 2 2
      include/cursors.hrl
  2. 3 1
      src/layers/kvs_stream.erl
  3. 0 8
      src/stores/kvs_st.erl

+ 2 - 2
include/cursors.hrl

@@ -1,14 +1,14 @@
 -ifndef(CURSORS_HRL).
 -define(CURSORS_HRL, true).
 
--record(writer, { id    = [] :: [] | term(),
+-record(writer, { id    = [] :: term(),
                   count =  0 :: integer(),
                   cache = [] :: [] | integer() | {term(),term()},
                   args  = [] :: term(),
                   first = [] :: [] | tuple() } ).
 -record(reader, { id    = [] :: [] | integer(),
                   pos   =  0 :: integer(),
-                  cache = [] :: [] | integer() | {term(),term()} | reference(),
+                  cache = [] :: [] | integer() | {term(),term()},
                   args  = 0 :: term(),
                   feed  = [] :: term(),
                   dir   =  0 :: 0 | 1 } ).

+ 3 - 1
src/layers/kvs_stream.erl

@@ -95,7 +95,9 @@ add(M,#writer{cache=V1,count=S}=C) ->
 
 remove(Rec,Feed) ->
    {ok,W=#writer{count=Count}} = kvs:get(writer,Feed),
-   kvs:save(W#writer{count=Count-1}).
+   NC = Count-1,
+   kvs:save(W#writer{count=NC}),
+   NC.
 
 append(Rec,Feed) ->
    kvs:ensure(#writer{id=Feed}),

+ 0 - 8
src/stores/kvs_st.erl

@@ -28,10 +28,6 @@ next (#reader{feed=Feed,cache=I}=C) when is_tuple(I) ->
    rocksdb:iterator_move(I, {seek,Key}),
    case rocksdb:iterator_move(I, next) of
         {ok,_,Bin} -> C#reader{cache=bt(Bin)};
-            {error,Reason} -> {error,Reason} end;
-next (#reader{cache=I}=C) when is_reference(I) ->
-   case rocksdb:iterator_move(I, next) of
-        {ok,_,Bin} -> C#reader{cache=bt(Bin)};
             {error,Reason} -> {error,Reason} end.
 
 prev (#reader{cache=[]}) -> {error,empty};
@@ -40,10 +36,6 @@ prev (#reader{cache=I,id=Feed}=C) when is_tuple(I) ->
    rocksdb:iterator_move(I, {seek,Key}),
    case rocksdb:iterator_move(I, prev) of
         {ok,_,Bin} -> C#reader{cache=bt(Bin)};
-            {error,Reason} -> {error,Reason} end;
-prev (#reader{cache=I}=C) when is_reference(I) ->
-   case rocksdb:iterator_move(I, prev) of
-        {ok,_,Bin} -> C#reader{cache=bt(Bin)};
             {error,Reason} -> {error,Reason} end.
 
 % section: take, drop