Simpler index getting API for the server

Author: lalinsky

src/MultiIndex.zig

@@ -114,14 +114,18 @@ fn removeIndex(self: *Self, name: []const u8) void {
     }
 }
 
-pub fn releaseIndex(self: *Self, index_ref: *IndexRef) void {
+fn releaseIndexRef(self: *Self, index_ref: *IndexRef) void {
     self.lock.lock();
     defer self.lock.unlock();
 
     _ = index_ref.decRef();
 }
 
-pub fn acquireIndex(self: *Self, name: []const u8) !*IndexRef {
+pub fn releaseIndex(self: *Self, index: *Index) void {
+    self.releaseIndexRef(@fieldParentPtr("index", index));
+}
+
+fn acquireIndex(self: *Self, name: []const u8) !*IndexRef {
     if (!isValidName(name)) {
         return error.InvalidIndexName;
     }
@@ -149,20 +153,20 @@ pub fn acquireIndex(self: *Self, name: []const u8) !*IndexRef {
     return result.value_ptr;
 }
 
-pub fn getIndex(self: *Self, name: []const u8) !*IndexRef {
+pub fn getIndex(self: *Self, name: []const u8) !*Index {
     const index_ref = try self.acquireIndex(name);
-    errdefer self.releaseIndex(index_ref);
+    errdefer self.releaseIndexRef(index_ref);
 
     try index_ref.ensureOpen(false);
 
-    return index_ref;
+    return &index_ref.index;
 }
 
 pub fn createIndex(self: *Self, name: []const u8) !void {
     log.info("creating index {s}", .{name});
 
     const index_ref = try self.acquireIndex(name);
-    defer self.releaseIndex(index_ref);
+    defer self.releaseIndexRef(index_ref);
 
     try index_ref.ensureOpen(true);
 }

src/server.zig

@@ -6,7 +6,7 @@ const log = std.log.scoped(.server);
 const msgpack = @import("msgpack");
 
 const MultiIndex = @import("MultiIndex.zig");
-const IndexData = MultiIndex.IndexRef;
+const Index = @import("Index.zig");
 const common = @import("common.zig");
 const SearchResults = common.SearchResults;
 const Change = @import("change.zig").Change;
@@ -138,7 +138,7 @@ fn getId(req: *httpz.Request, res: *httpz.Response, send_body: bool) !?u32 {
     };
 }
 
-fn getIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response, send_body: bool) !?*IndexData {
+fn getIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response, send_body: bool) !?*Index {
     const index_name = req.param("index") orelse {
         if (send_body) {
             try writeErrorResponse(400, error.MissingIndexName, req, res);
@@ -161,7 +161,7 @@ fn getIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response, send_body:
     return index;
 }
 
-fn releaseIndex(ctx: *Context, index: *IndexData) void {
+fn releaseIndex(ctx: *Context, index: *Index) void {
     ctx.indexes.releaseIndex(index);
 }
 
@@ -262,9 +262,8 @@ fn getRequestBody(comptime T: type, req: *httpz.Request, res: *httpz.Response) !
 fn handleSearch(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
     const body = try getRequestBody(SearchRequestJSON, req, res) orelse return;
 
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     var timeout = body.timeout;
     if (timeout == 0) {
@@ -299,9 +298,8 @@ const UpdateRequestJSON = struct {
 fn handleUpdate(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
     const body = try getRequestBody(UpdateRequestJSON, req, res) orelse return;
 
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     metrics.update(body.changes.len);
 
@@ -311,9 +309,8 @@ fn handleUpdate(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void
 }
 
 fn handleHeadFingerprint(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, false) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, false) orelse return;
+    defer releaseIndex(ctx, index);
 
     var index_reader = index.acquireReader();
     defer index.releaseReader(&index_reader);
@@ -333,9 +330,8 @@ const GetFingerprintResponse = struct {
 };
 
 fn handleGetFingerprint(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     var index_reader = index.acquireReader();
     defer index.releaseReader(&index_reader);
@@ -359,9 +355,8 @@ const PutFingerprintRequest = struct {
 fn handlePutFingerprint(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
     const body = try getRequestBody(PutFingerprintRequest, req, res) orelse return;
 
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     const id = try getId(req, res, true) orelse return;
     const change: Change = .{ .insert = .{
@@ -377,9 +372,8 @@ fn handlePutFingerprint(ctx: *Context, req: *httpz.Request, res: *httpz.Response
 }
 
 fn handleDeleteFingerprint(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     const id = try getId(req, res, true) orelse return;
     const change: Change = .{ .delete = .{
@@ -426,9 +420,8 @@ const GetIndexResponse = struct {
 };
 
 fn handleGetIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, true) orelse return;
-    const index = &index_ref.index;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, true) orelse return;
+    defer releaseIndex(ctx, index);
 
     var index_reader = index.acquireReader();
     defer index.releaseReader(&index_reader);
@@ -461,13 +454,13 @@ fn handleDeleteIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !
 }
 
 fn handleHeadIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, false) orelse return;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, false) orelse return;
+    defer releaseIndex(ctx, index);
 }
 
 fn handlePingIndex(ctx: *Context, req: *httpz.Request, res: *httpz.Response) !void {
-    const index_ref = try getIndex(ctx, req, res, false) orelse return;
-    defer releaseIndex(ctx, index_ref);
+    const index = try getIndex(ctx, req, res, false) orelse return;
+    defer releaseIndex(ctx, index);
 
     try handlePing(ctx, req, res);
 }