Browse Source

remove mnesia, fix test

Namdak Tonpa 5 years ago
parent
commit
0dfec83035
5 changed files with 8 additions and 8 deletions
  1. 2 2
      config/config.exs
  2. 1 1
      include/cursors.hrl
  3. 2 2
      mix.exs
  4. 1 1
      src/kvs.app.src
  5. 2 2
      src/kvs.erl

+ 2 - 2
config/config.exs

@@ -1,6 +1,6 @@
 use Mix.Config
 use Mix.Config
 
 
 config :kvs,
 config :kvs,
-  dba: :kvs_rocks,
-  dba_st: :kvs_st,
+  dba: :kvs_mnesia,
+  dba_st: :kvs_stream,
   schema: [:kvs, :kvs_stream]
   schema: [:kvs, :kvs_stream]

+ 1 - 1
include/cursors.hrl

@@ -9,7 +9,7 @@
 -record(reader, { id    = [] :: [] | integer(),
 -record(reader, { id    = [] :: [] | integer(),
                   pos   =  0 :: integer(),
                   pos   =  0 :: integer(),
                   cache = [] :: [] | integer() | {term(),term()},
                   cache = [] :: [] | integer() | {term(),term()},
-                  args  = [] :: term(),
+                  args  = 0 :: term(),
                   feed  = [] :: term(),
                   feed  = [] :: term(),
                   dir   =  0 :: 0 | 1 } ).
                   dir   =  0 :: 0 | 1 } ).
 -endif.
 -endif.

+ 2 - 2
mix.exs

@@ -2,11 +2,11 @@ defmodule KVS.Mixfile do
   use Mix.Project
   use Mix.Project
 
 
   def project do
   def project do
-    [app: :kvs, version: "6.10.0", description: "KVS Abstract Chain Database", package: package(), deps: deps()]
+    [app: :kvs, version: "6.10.1", description: "KVS Abstract Chain Database", package: package(), deps: deps()]
   end
   end
 
 
   def application do
   def application do
-    [mod: {:kvs, []}, applications: [:rocksdb]]
+    [mod: {:kvs, []}]
   end
   end
 
 
   defp package do
   defp package do

+ 1 - 1
src/kvs.app.src

@@ -2,6 +2,6 @@
    [{description, "KVS Abstract Chain Database"},
    [{description, "KVS Abstract Chain Database"},
     {vsn, "6.10.0"},
     {vsn, "6.10.0"},
     {registered, []},
     {registered, []},
-    {applications, [kernel,stdlib,rocksdb]},
+    {applications, [kernel,stdlib]},
     {mod, { kvs, []}},
     {mod, { kvs, []}},
     {env, []} ]}.
     {env, []} ]}.

+ 2 - 2
src/kvs.erl

@@ -136,8 +136,8 @@ check() ->
     #reader{args=A} = (kvs:take(kvs:reader(Id1)))#reader{args=20},
     #reader{args=A} = (kvs:take(kvs:reader(Id1)))#reader{args=20},
     B = kvs:feed(Id1),
     B = kvs:feed(Id1),
     C = kvs:feed(Id2),
     C = kvs:feed(Id2),
-    ?assertMatch(A,B),
-    ?assertMatch(X,length(C)).
+    ?assertMatch(A,20),
+    ?assertMatch(X,length(B)).
 
 
 fetch(Table, Key) -> fetch(Table, Key, []).
 fetch(Table, Key) -> fetch(Table, Key, []).
 fetch(Table, Key, Default) -> case get(Table, Key) of
 fetch(Table, Key, Default) -> case get(Table, Key) of