diff options
| author | Magnus Ahltorp <map@kth.se> | 2016-02-11 02:02:50 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-04-25 13:14:10 +0200 |
| commit | 76a135b93d47b9cb5be5b80b831b9c59c805edb7 (patch) | |
| tree | d748067213bbbb46ae87a0c1ace5171d8789f7ce | |
| parent | 361fc2ce1a0c7274b6f30c3e6e63f68c8752cfc8 (diff) | |
Fix warnings. More printouts. Change timeouts.
| -rw-r--r-- | c_src/permdb.c | 2 | ||||
| -rw-r--r-- | src/permdb.erl | 2 | ||||
| -rwxr-xr-x | test/permdbbench.erl | 12 |
3 files changed, 13 insertions, 3 deletions
diff --git a/c_src/permdb.c b/c_src/permdb.c index f629e85..57a09d3 100644 --- a/c_src/permdb.c +++ b/c_src/permdb.c @@ -486,7 +486,7 @@ rebuild_index_file(permdb_object *state) //fprintf(stderr, "verifying commit: %llu %p\n", offset, data_commit); if (data_commit == NULL || validate_checksum(data_commit, &state->datafile) < 0) { - fprintf(stderr, "commit broken: %llu\n", offset); + fprintf(stderr, "commit broken: %llu\n", (unsigned long long) offset); free(cookie); return -1; } diff --git a/src/permdb.erl b/src/permdb.erl index 90b0fdf..2698b0c 100644 --- a/src/permdb.erl +++ b/src/permdb.erl @@ -99,7 +99,7 @@ getvalue_file(State, Key) -> getvalue(Name, Key) -> - gen_server:call(Name, {getvalue, Key}). + gen_server:call(Name, {getvalue, Key}, 600000). addvalue(Name, Key, Value) -> gen_server:call(Name, {addvalue, Key, Value}). diff --git a/test/permdbbench.erl b/test/permdbbench.erl index ade9c34..e825146 100755 --- a/test/permdbbench.erl +++ b/test/permdbbench.erl @@ -4,6 +4,8 @@ -mode(compile). +-include_lib("kernel/include/file.hrl"). + gentestdata(Size) -> [{crypto:hash(sha256, <<E:32, 0:32>>), crypto:hash(sha256, <<E:32, 1:32>>)} || E <- lists:seq(0, Size-1)]. @@ -56,7 +58,7 @@ testget(_Filename, TestData, Datasize) -> testadd(_Filename, TestData, Datasize) -> addvalue_loop(TestData, none, Datasize), - case permdb:commit(testdb) of + case permdb:commit(testdb, 600000) of <<0>> -> ok; Other -> @@ -89,6 +91,7 @@ main([]) -> Size = 20000, Datasize = 1000, ChunkSize = 1000, + io:format("Size ~p entries, chunks of ~p entries, entry size ~p bytes~n", [Size, ChunkSize, Datasize]), Filename = "testpermdb", file:delete(Filename), file:delete(Filename ++ ".idx"), @@ -108,6 +111,10 @@ main([]) -> runbench(fun () -> testget(Filename, TestData, Datasize) end, Size, "Get"), stop(), + {ok, FileInfo} = file:read_file_info(Filename), + {ok, FileInfoIdx} = file:read_file_info(Filename ++ ".idx"), + io:format("data file size ~p, index file size ~p~n", [FileInfo#file_info.size, FileInfoIdx#file_info.size]), + file:delete(Filename ++ ".idx"), testinit(Filename), @@ -115,5 +122,8 @@ main([]) -> runbench(fun () -> testget(Filename, TestData, Datasize) end, Size, "Get"), stop(), + {ok, FileInfoIdx2} = file:read_file_info(Filename ++ ".idx"), + io:format("rebuilt index file size ~p~n", [FileInfoIdx2#file_info.size]), + ok. |