Fixes

Author: lalinsky

src/common.zig

@@ -49,11 +49,16 @@ pub const SearchResults = struct {
         return self.results.count();
     }
 
+    pub fn values(self: SearchResults) []SearchResult {
+        return self.results.values();
+    }
+
     pub fn get(self: SearchResults, id: u32) ?SearchResult {
         return self.results.get(id);
     }
 
     pub fn sort(self: *SearchResults) void {
+        // sort by score in descending order
         const Ctx = struct {
             values: []SearchResult,
             pub fn lessThan(ctx: @This(), a: usize, b: usize) bool {
@@ -63,16 +68,14 @@ pub const SearchResults = struct {
         self.results.sort(Ctx{ .values = self.results.values() });
     }
 
-    pub fn values(self: SearchResults) []SearchResult {
-        return self.results.values();
-    }
-
     pub fn removeOutdatedResults(self: *SearchResults, collection: anytype) void {
-        var iter = self.results.iterator();
-        while (iter.next()) |*entry| {
-            var result = entry.value_ptr;
+        var i: usize = 0;
+        while (i < self.results.count()) {
+            const result = self.results.values()[i];
             if (collection.hasNewerVersion(result.id, result.version)) {
-                result.score = 0;
+                self.results.swapRemoveAt(i);
+            } else {
+                i += 1;
             }
         }
     }

src/server.zig

@@ -117,7 +117,7 @@ fn getIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response, send_body:
     const index = ctx.indexes.getIndex(index_name) catch |err| {
         if (err == error.IndexNotFound) {
             if (send_body) {
-                try writeErrorResponse(400, err, req, res);
+                try writeErrorResponse(404, err, req, res);
             } else {
                 res.status = 404;
             }
@@ -246,11 +246,11 @@ fn handleSearch(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void
 
     const results = try index.search(body.query, req.arena, deadline);
 
-    var results_json = SearchResultsJSON{ .results = try req.arena.alloc(SearchResultJSON, results.count()) };
+    var results_json = SearchResultsJSON{
+        .results = try req.arena.alloc(SearchResultJSON, results.count()),
+    };
     for (results.values(), 0..) |r, i| {
-        if (r.score > 0) {
-            results_json.results[i] = SearchResultJSON{ .id = r.id, .score = r.score };
-        }
+        results_json.results[i] = SearchResultJSON{ .id = r.id, .score = r.score };
     }
     return writeResponse(results_json, req, res);
 }
@@ -274,7 +274,7 @@ fn handleUpdate(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void
 
     try index.update(body.changes);
 
-    return writeResponse(.{ .status = "ok" }, req, res);
+    return writeResponse(EmptyResponse{}, req, res);
 }
 
 fn handleHeadIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {

tests/conftest.py

@@ -0,0 +1,49 @@
+import requests
+import pytest
+from urllib.parse import urljoin
+
+
+@pytest.fixture
+def index_name():
+    return 'testidx'
+
+
+class Client:
+    def __init__(self, session, base_url):
+        self.session = session
+        self.base_url = base_url
+
+    def get(self, url, **kwargs):
+        return self.session.get(urljoin(self.base_url, url), **kwargs)
+
+    def put(self, url, **kwargs):
+        return self.session.put(urljoin(self.base_url, url), **kwargs)
+
+    def post(self, url, **kwargs):
+        return self.session.post(urljoin(self.base_url, url), **kwargs)
+
+    def delete(self, url, **kwargs):
+        return self.session.delete(urljoin(self.base_url, url), **kwargs)
+
+
+@pytest.fixture
+def session():
+    with requests.Session() as session:
+        yield session
+
+
+@pytest.fixture
+def client(session):
+    return Client(session, 'http://localhost:8080')
+
+
+@pytest.fixture(autouse=True)
+def delete_index(client, index_name):
+    req = client.delete(f'/{index_name}')
+    req.raise_for_status()
+
+
+@pytest.fixture()
+def create_index(client, index_name, delete_index):
+    req = client.put(f'/{index_name}')
+    req.raise_for_status()

tests/test_index_api.py

@@ -0,0 +1,45 @@
+import json
+
+
+def test_get_index_not_found(client, index_name):
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 404, req.content
+    assert json.loads(req.content) == {'error': 'IndexNotFound'}
+
+
+def test_get_index(client, index_name, create_index):
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 200, req.content
+    assert json.loads(req.content) == {'version': 0, 'attributes': []}
+
+
+def test_create_index(client, index_name):
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 404, req.content
+
+    req = client.put(f'/{index_name}')
+    assert req.status_code == 200, req.content
+    assert json.loads(req.content) == {}
+
+    req = client.put(f'/{index_name}')
+    assert req.status_code == 200, req.content
+    assert json.loads(req.content) == {}
+
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 200, req.content
+
+
+def test_delete_index(client, index_name, create_index):
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 200, req.content
+
+    req = client.delete(f'/{index_name}')
+    assert req.status_code == 200, req.content
+    assert json.loads(req.content) == {}
+
+    req = client.delete(f'/{index_name}')
+    assert req.status_code == 200, req.content
+    assert json.loads(req.content) == {}
+
+    req = client.get(f'/{index_name}')
+    assert req.status_code == 404, req.content