dxt 2 лет назад
Родитель
Сommit
0e3ea1fde5
7 измененных файлов с 11 добавлено и 11 удалено
  1. 2 1
      include/api.hrl
  2. 1 1
      include/backend.hrl
  3. 1 1
      mix.exs
  4. 4 5
      src/kvs.erl
  5. 1 1
      src/stores/kvs_fs.erl
  6. 1 1
      src/stores/kvs_mnesia.erl
  7. 1 1
      src/stores/kvs_rocks.erl

+ 2 - 1
include/api.hrl

@@ -1,7 +1,8 @@
 -ifndef(API_HRL).
 -ifndef(API_HRL).
 -define(API_HRL, true).
 -define(API_HRL, true).
 -define(API,[start/0,stop/0,leave/0,leave/1,destroy/0,destroy/1,
 -define(API,[start/0,stop/0,leave/0,leave/1,destroy/0,destroy/1,
-             join/0,join/1,modules/0,cursors/0,get/2,get/3,put/1,put/2,index/3,index/4,match/1,match/2,index_match/2,index_match/3,
+             join/0,join/1,modules/0,cursors/0,get/2,get/3,put/1,put/2,index/3,index/4,
+             match/1,match/2,index_match/2,index_match/3,key_match/2,key_match/3,
              delete/2,delete/3,delete_range/3,
              delete/2,delete/3,delete_range/3,
              table/1,tables/0,dir/0,initialize/2,seq/2,all/1,all/2,count/1,ver/0]).
              table/1,tables/0,dir/0,initialize/2,seq/2,all/1,all/2,count/1,ver/0]).
 -include("metainfo.hrl").
 -include("metainfo.hrl").

+ 1 - 1
include/backend.hrl

@@ -2,7 +2,7 @@
 -define(BACKEND_HRL, true).
 -define(BACKEND_HRL, true).
 -define(BACKEND, [db/0,get/3,put/1,put/2,delete/3,delete_range/3,index/3,dump/0,start/0,stop/0,destroy/0,destroy/1,keys/2,
 -define(BACKEND, [db/0,get/3,put/1,put/2,delete/3,delete_range/3,index/3,dump/0,start/0,stop/0,destroy/0,destroy/1,keys/2,
                   join/2,leave/0,leave/1,dir/0,create_table/2,add_table_index/2,seq/2,all/2,count/1,version/0,
                   join/2,leave/0,leave/1,dir/0,create_table/2,add_table_index/2,seq/2,all/2,count/1,version/0,
-                  match/1,match/3,index_match/2]).
+                  match/1,key_match/3,index_match/2]).
 -compile({no_auto_import,[get/1,put/2]}).
 -compile({no_auto_import,[get/1,put/2]}).
 -include("kvs.hrl").
 -include("kvs.hrl").
 -spec put(tuple() | list(tuple())) -> ok | {error,any()}.
 -spec put(tuple() | list(tuple())) -> ok | {error,any()}.

+ 1 - 1
mix.exs

@@ -4,7 +4,7 @@ defmodule KVS.Mixfile do
   def project do
   def project do
     [
     [
       app: :kvs,
       app: :kvs,
-      version: "9.9.1",
+      version: "9.9.2",
       description: "KVS Abstract Chain Database",
       description: "KVS Abstract Chain Database",
       package: package(),
       package: package(),
       deps: deps()
       deps: deps()

+ 4 - 5
src/kvs.erl

@@ -25,7 +25,6 @@
          ensure/2,
          ensure/2,
          seq_gen/0,
          seq_gen/0,
          keys/1,
          keys/1,
-         find/2,
          fields/1,
          fields/1,
          defined/2,
          defined/2,
          field/2,
          field/2,
@@ -78,8 +77,8 @@ index(Table, K, V) ->
 keys(Feed) ->
 keys(Feed) ->
     keys(Feed, #kvs{mod = dba(), db = db()}).
     keys(Feed, #kvs{mod = dba(), db = db()}).
 
 
-find(Feed, Id) ->
-  find(Feed,Id, #kvs{mod = dba(), db=db()}).
+key_match(Feed, Id) ->
+  key_match(Feed, Id, #kvs{mod = dba(), db=db()}).
 
 
 match(Record) ->
 match(Record) ->
     match(Record, #kvs{mod = dba()}).
     match(Record, #kvs{mod = dba()}).
@@ -139,8 +138,8 @@ index(Tab, Key, Value, #kvs{mod = DBA}) ->
 keys(Feed, #kvs{mod = DBA, db = Db}) ->
 keys(Feed, #kvs{mod = DBA, db = Db}) ->
     DBA:keys(Feed, Db).
     DBA:keys(Feed, Db).
 
 
-find(Feed, Id, #kvs{mod = DBA, db = Db}) ->
-    DBA:find(Feed, Id, Db).
+key_match(Feed, Id, #kvs{mod = DBA, db = Db}) ->
+    DBA:key_match(Feed, Id, Db).
 
 
 match(Record, #kvs{mod = DBA}) ->
 match(Record, #kvs{mod = DBA}) ->
     DBA:match(Record).
     DBA:match(Record).

+ 1 - 1
src/stores/kvs_fs.erl

@@ -77,7 +77,7 @@ delete(TableName, Key, _) ->
     end.
     end.
 delete_range(_,_,_) -> {error, not_found}.
 delete_range(_,_,_) -> {error, not_found}.
 keys(_,_) -> [].
 keys(_,_) -> [].
-match(_,_,_) -> [].
+key_match(_,_,_) -> [].
 
 
 count(RecordName) -> length(filelib:fold_files(filename:join([dir_name(), RecordName]), "",true, fun(A,Acc)-> [A|Acc] end, [])).
 count(RecordName) -> length(filelib:fold_files(filename:join([dir_name(), RecordName]), "",true, fun(A,Acc)-> [A|Acc] end, [])).
 
 

+ 1 - 1
src/stores/kvs_mnesia.erl

@@ -38,7 +38,7 @@ index(Tab,Key,Value) ->
 
 
 keys(Tab,_) -> mnesia:all_keys(Tab).
 keys(Tab,_) -> mnesia:all_keys(Tab).
 
 
-match(_Tab,_Id,_) -> [].
+key_match(_Tab,_Id,_) -> [].
 
 
 get(RecordName, Key, _) -> just_one(fun() -> mnesia:read(RecordName, Key) end).
 get(RecordName, Key, _) -> just_one(fun() -> mnesia:read(RecordName, Key) end).
 put(R)                  -> put(R,db()).
 put(R)                  -> put(R,db()).

+ 1 - 1
src/stores/kvs_rocks.erl

@@ -39,7 +39,7 @@ keys(Tab, Db) ->
     {ok, K, _} = rocksdb:iterator_move(H, {seek, Feed}),
     {ok, K, _} = rocksdb:iterator_move(H, {seek, Feed}),
     Keys(K,[]).
     Keys(K,[]).
 
 
- match(Tab, Id, Db) ->
+ key_match(Tab, Id, Db) ->
   Feed = key(Tab,[]),
   Feed = key(Tab,[]),
   {ok, H} = rocksdb:iterator(ref(Db), []),
   {ok, H} = rocksdb:iterator(ref(Db), []),
   Keys = fun KEY(K1) when 
   Keys = fun KEY(K1) when