From 87d52c6855fc3508f2c0e1fb8de77a2da450625b Mon Sep 17 00:00:00 2001
From: g41797 <g41797@gmail.com>
Date: Sun, 29 Dec 2024 17:44:09 +0200
Subject: [PATCH] Add reserve

---
 src/client.zig       | 13 ++++++++-----
 src/client_tests.zig | 26 ++++++++++++++++++++------
 src/job.zig          | 23 +++++++++++++++--------
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/client.zig b/src/client.zig
index 79b7c00..f1322f5 100644
--- a/src/client.zig
+++ b/src/client.zig
@@ -307,13 +307,13 @@ pub const Client = struct {
             return err.findError(cl.readLine[0..linelen]);
         }
 
-        const ret = try parse.parseSize(cl.readLine[0..linelen]);
+        var ret = try parse.parseSize(cl.readLine[0..linelen]);
 
         const jsize: usize = ret[1];
 
         try job.alloc(jsize);
 
-        try cl.read_buffer(job.buffer[0..job.len], jsize);
+        try cl.read_buffer(job.buffer.?[0..job.len], jsize);
 
         job.actual_len = jsize;
 
@@ -321,7 +321,7 @@ pub const Client = struct {
 
         const jid: usize = ret[1];
 
-        job.jid = jid;
+        job.jid = @intCast(jid);
 
         return;
     }
@@ -473,15 +473,18 @@ pub const Client = struct {
         if (cl.connection == null) {
             return ReturnedError.CommunicationFailure;
         }
+        if (len > buffer.len) {
+            return ReturnedError.Internal;
+        }
         if (len > 0) {
-            const rlen = try cl.connection.?.reader().readAtLeast(buffer, len);
+            const rlen = try cl.connection.?.reader().readAll(buffer[0..len]);
 
             if (rlen < len) {
                 return ReturnedError.NoCRLF;
             }
         }
         var rn: [2]u8 = undefined;
-        _ = try cl.readLine(&rn[0..2], 2);
+        _ = try cl.read_line(rn[0..2]);
 
         return;
     }
diff --git a/src/client_tests.zig b/src/client_tests.zig
index 33550f5..3d25163 100644
--- a/src/client_tests.zig
+++ b/src/client_tests.zig
@@ -9,6 +9,7 @@ const ReturnedError = err.ReturnedError;
 const client = @import("client.zig");
 const Client = client.Client;
 const Allocator = std.mem.Allocator;
+const Job = @import("job.zig").Job;
 
 test "connect-disconnect" {
     var cl: Client = .{};
@@ -16,20 +17,33 @@ test "connect-disconnect" {
     cl.disconnect();
 }
 
-test "put-state-delete" {
+test "put-state-reserve-delete" {
     var cl: Client = .{};
     try cl.connect(std.testing.allocator, null, null);
     defer cl.disconnect();
 
-    try testing.expectError(ReturnedError.NotFound, cl.state(1));
+    const firstJob = 1;
+    if (cl.delete(firstJob)) {} else |_| {}
+    try testing.expectError(ReturnedError.NotFound, cl.state(firstJob));
 
-    const jid = try cl.put(1, 2, 120, "job body");
+    const job_body = "job body";
+    const jid = try cl.put(1, 0, 120, job_body);
 
-    const job_state = cl.state(jid);
-    try testing.expectEqual(job_state, client.JobState.delayed);
+    var job_state = cl.state(jid);
+    try testing.expectEqual(job_state, client.JobState.ready);
 
-    try cl.delete(jid);
+    var job: Job = .{};
+    try job.init(std.testing.allocator);
+    defer job.free();
+
+    try cl.reserve(0, &job);
+    const rid = job.id().?;
+    job_state = cl.state(rid);
+    try testing.expectEqual(job_state, client.JobState.reserved);
+    try testing.expectEqual(jid, rid);
+    try testing.expectEqual(std.mem.eql(u8, job_body, job.body().?), true);
 
+    try cl.delete(jid);
     try testing.expectError(ReturnedError.NotFound, cl.state(jid));
 }
 
diff --git a/src/job.zig b/src/job.zig
index 3e60cc4..a617f31 100644
--- a/src/job.zig
+++ b/src/job.zig
@@ -5,12 +5,21 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 
 pub const Job = struct {
+    ready: bool = false,
     jid: ?u32 = null,
     buffer: ?[]u8 = null,
     len: usize = undefined,
     actual_len: usize = 0,
     allocator: Allocator = undefined,
 
+    pub fn init(job: *Job, allocator: Allocator) !void {
+        if (job.ready) {
+            return error.AlreadyInitialized;
+        }
+        job.allocator = allocator;
+        job.ready = true;
+    }
+
     pub fn alloc(job: *Job, len: usize) !void {
         if (job.buffer == null) {
             job.len = roundlen(len);
@@ -18,17 +27,15 @@ pub const Job = struct {
             return;
         }
 
-        len = roundlen(len);
+        const rlen = roundlen(len);
 
-        if (job.len >= len) {
+        if (job.len >= rlen) {
             return;
         }
 
         job.free();
 
-        job.len = len;
-
-        return job.alloc();
+        return job.alloc(rlen);
     }
 
     pub fn free(job: *Job) void {
@@ -43,17 +50,17 @@ pub const Job = struct {
         if (job.buffer == null) {
             return null;
         }
-        if (job.id == null) {
+        if (job.jid == null) {
             return null;
         }
-        return job.id.?;
+        return job.jid.?;
     }
 
     pub fn body(job: *Job) ?[]u8 {
         if (job.buffer == null) {
             return null;
         }
-        return job.buffer[0..job.actual_len];
+        return job.buffer.?[0..job.actual_len];
     }
 };