Skip to content

Commit f6c7ba1

Browse files
committed
remove _sync from public interface
1 parent 7c41a60 commit f6c7ba1

2 files changed

Lines changed: 38 additions & 38 deletions

File tree

lib/b4.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ defmodule B4 do
88
end
99
end
1010

11-
def insert_sync(directory, key, value) do
11+
def insert(directory, key, value) do
1212
Writer.insert_sync(directory, key, value)
1313
end
1414

15-
def fetch_sync(directory, key) do
15+
def fetch(directory, key) do
1616
tid = KeydirOwner.get_keydir_tid(directory)
1717

1818
case Keydir.fetch(tid, key) do
@@ -46,7 +46,7 @@ defmodule B4 do
4646
end
4747
end
4848

49-
def delete_sync(directory, key) do
49+
def delete(directory, key) do
5050
Writer.delete_sync(directory, key)
5151
end
5252

test/b4_test.exs

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,58 @@ defmodule B4Test do
1414

1515
test "trivial roundtrip", %{dir: dir} do
1616
assert :ok = B4.new(dir)
17-
assert :ok = B4.insert_sync(dir, "a", "b")
18-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
17+
assert :ok = B4.insert(dir, "a", "b")
18+
assert {:ok, "b"} = B4.fetch(dir, "a")
1919
end
2020

2121
test "loads existing data from one file", %{dir: dir} do
2222
assert :ok = B4.new(dir)
23-
assert :ok = B4.insert_sync(dir, "a", "b")
24-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
23+
assert :ok = B4.insert(dir, "a", "b")
24+
assert {:ok, "b"} = B4.fetch(dir, "a")
2525

2626
assert :ok = B4.close(dir)
2727
assert :ok = B4.new(dir)
28-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
28+
assert {:ok, "b"} = B4.fetch(dir, "a")
2929
end
3030

3131
test "loads from multiple files", %{dir: dir} do
3232
Enum.each([{"a", "b"}, {"c", "d"}, {"e", "f"}], fn {k, v} ->
3333
assert :ok = B4.new(dir)
34-
assert :ok = B4.insert_sync(dir, k, v)
35-
assert {:ok, ^v} = B4.fetch_sync(dir, k)
34+
assert :ok = B4.insert(dir, k, v)
35+
assert {:ok, ^v} = B4.fetch(dir, k)
3636
assert :ok = B4.close(dir)
3737
end)
3838

3939
assert :ok = B4.new(dir)
40-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
41-
assert {:ok, "d"} = B4.fetch_sync(dir, "c")
42-
assert {:ok, "f"} = B4.fetch_sync(dir, "e")
40+
assert {:ok, "b"} = B4.fetch(dir, "a")
41+
assert {:ok, "d"} = B4.fetch(dir, "c")
42+
assert {:ok, "f"} = B4.fetch(dir, "e")
4343
end
4444

4545
test "loads from multiple files with deletes", %{dir: dir} do
4646
assert :ok = B4.new(dir)
47-
assert :ok = B4.insert_sync(dir, "a", "b")
48-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
47+
assert :ok = B4.insert(dir, "a", "b")
48+
assert {:ok, "b"} = B4.fetch(dir, "a")
4949
assert :ok = B4.close(dir)
5050

5151
# DELETE HERE, for "c" key
5252
assert :ok = B4.new(dir)
53-
assert :ok = B4.insert_sync(dir, "c", "d")
54-
assert {:ok, "d"} = B4.fetch_sync(dir, "c")
55-
assert :ok = B4.delete_sync(dir, "c")
56-
assert :error = B4.fetch_sync(dir, "c")
53+
assert :ok = B4.insert(dir, "c", "d")
54+
assert {:ok, "d"} = B4.fetch(dir, "c")
55+
assert :ok = B4.delete(dir, "c")
56+
assert :error = B4.fetch(dir, "c")
5757
assert :ok = B4.close(dir)
5858

5959
assert :ok = B4.new(dir)
60-
assert :ok = B4.insert_sync(dir, "e", "f")
61-
assert {:ok, "f"} = B4.fetch_sync(dir, "e")
62-
assert :error = B4.fetch_sync(dir, "c")
60+
assert :ok = B4.insert(dir, "e", "f")
61+
assert {:ok, "f"} = B4.fetch(dir, "e")
62+
assert :error = B4.fetch(dir, "c")
6363
assert :ok = B4.close(dir)
6464

6565
assert :ok = B4.new(dir)
66-
assert {:ok, "b"} = B4.fetch_sync(dir, "a")
67-
assert :error = B4.fetch_sync(dir, "c")
68-
assert {:ok, "f"} = B4.fetch_sync(dir, "e")
66+
assert {:ok, "b"} = B4.fetch(dir, "a")
67+
assert :error = B4.fetch(dir, "c")
68+
assert {:ok, "f"} = B4.fetch(dir, "e")
6969
end
7070

7171
test "loads large values", %{dir: dir} do
@@ -74,29 +74,29 @@ defmodule B4Test do
7474
large_2 = :rand.bytes(20000)
7575
large_3 = :rand.bytes(20000)
7676

77-
assert :ok = B4.insert_sync(dir, "a", large_1)
78-
assert :ok = B4.insert_sync(dir, "b", large_2)
77+
assert :ok = B4.insert(dir, "a", large_1)
78+
assert :ok = B4.insert(dir, "b", large_2)
7979

80-
assert {:ok, ^large_1} = B4.fetch_sync(dir, "a")
81-
assert {:ok, ^large_2} = B4.fetch_sync(dir, "b")
80+
assert {:ok, ^large_1} = B4.fetch(dir, "a")
81+
assert {:ok, ^large_2} = B4.fetch(dir, "b")
8282

83-
assert :ok = B4.insert_sync(dir, "b", large_3)
84-
assert {:ok, ^large_3} = B4.fetch_sync(dir, "b")
83+
assert :ok = B4.insert(dir, "b", large_3)
84+
assert {:ok, ^large_3} = B4.fetch(dir, "b")
8585
end
8686

8787
test "creates new write file when target_file_size", %{dir: dir} do
8888
target_file_size = 50
8989
assert :ok = B4.new(dir, target_file_size: target_file_size)
9090
assert Enum.count(File.ls!(dir)) == 1
9191

92-
assert :ok = B4.insert_sync(dir, "a", :rand.bytes(50))
92+
assert :ok = B4.insert(dir, "a", :rand.bytes(50))
9393
assert Enum.count(File.ls!(dir)) == 1
9494

9595
# file creation happens on the subsequent write above the limit
96-
assert :ok = B4.insert_sync(dir, "a", :rand.bytes(50))
96+
assert :ok = B4.insert(dir, "a", :rand.bytes(50))
9797
assert Enum.count(File.ls!(dir)) == 2
9898

99-
assert :ok = B4.insert_sync(dir, "a", :rand.bytes(50))
99+
assert :ok = B4.insert(dir, "a", :rand.bytes(50))
100100
assert Enum.count(File.ls!(dir)) == 3
101101

102102
assert Enum.all?(File.ls!(dir), fn path ->
@@ -109,16 +109,16 @@ defmodule B4Test do
109109
assert :ok = B4.new(dir)
110110
assert [] = B4.keys(dir)
111111

112-
assert :ok = B4.insert_sync(dir, "a", "b")
112+
assert :ok = B4.insert(dir, "a", "b")
113113
assert ["a"] = B4.keys(dir)
114114

115-
assert :ok = B4.insert_sync(dir, "c", "d")
115+
assert :ok = B4.insert(dir, "c", "d")
116116
assert ["a", "c"] = Enum.sort(B4.keys(dir))
117117

118-
assert :ok = B4.delete_sync(dir, "a")
118+
assert :ok = B4.delete(dir, "a")
119119
assert ["c"] = Enum.sort(B4.keys(dir))
120120

121-
assert :ok = B4.delete_sync(dir, "c")
121+
assert :ok = B4.delete(dir, "c")
122122
assert [] = Enum.sort(B4.keys(dir))
123123
end
124124
end

0 commit comments

Comments
 (0)