update to 0.15 (#20)

* update to 0.15

* update CI

* update bindings to 0.15

---------

Co-authored-by: Drew Nutter <dnut@users.noreply.github.com>

Author: Rexicon226

.github/workflows/check.yml

@@ -1,7 +1,8 @@
-name: check
-
-on: push
-
+on:
+    pull_request:
+    push:
+      branches:
+        - master 
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -12,7 +13,7 @@ jobs:
       - name: setup-zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.1
+          version: 0.15.2
 
       - name: lint
         run: |
@@ -27,13 +28,11 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v2
-        with:
-          submodules: recursive
 
       - name: setup-zig
         uses: mlugg/setup-zig@v2
         with:
-          version: 0.14.1
+          version: 0.15.2
 
       - name: test
         run: |

README.md

@@ -2,7 +2,7 @@ Build and use RocksDB in zig.
 
 # Build Dependencies
 
-`rocksdb-zig` is pinned to [Zig `0.14.1`](https://ziglang.org/download/), so you will need to have it installed.
+`rocksdb-zig` is pinned to [Zig `0.15`](https://ziglang.org/download/), so you will need to have it installed.
 
 # Usage
 

build.zig

@@ -22,11 +22,7 @@ pub fn build(b: *Build) !void {
     });
     bindings_mod.addImport("rocksdb", rocksdb_mod);
 
-    const tests = b.addTest(.{
-        .target = target,
-        .optimize = optimize,
-        .root_source_file = b.path("src/lib.zig"),
-    });
+    const tests = b.addTest(.{ .root_module = bindings_mod });
     const test_step = b.step("test", "Run bindings tests");
     tests.root_module.addImport("rocksdb", rocksdb_mod);
     test_step.dependOn(&b.addRunArtifact(tests).step);

build.zig.zon

@@ -2,7 +2,6 @@
     .name = .rocksdb,
     .fingerprint = 0xd916a6b24e94f0cf,
     .version = "9.7.4",
-    .minimum_zig_version = "0.14.1",
     .dependencies = .{
         .rocksdb = .{
             .url = "git+https://github.com/Syndica/rocksdb#3793e721c7795b338d9d7808544b75db6bde3548",
@@ -14,6 +13,7 @@
             .lazy = true,
         },
     },
+    .minimum_zig_version = "0.15.0",
     .paths = .{
         "build.zig",
         "build.zig.zon",

src/data.zig

@@ -6,19 +6,14 @@ const Allocator = std.mem.Allocator;
 /// data that was allocated by rocksdb and must be freed by rocksdb
 pub const Data = struct {
     data: []const u8,
-    free: *const fn (?*anyopaque) callconv(.C) void,
+    free: *const fn (?*anyopaque) callconv(.c) void,
 
-    pub fn deinit(self: @This()) void {
+    pub fn deinit(self: Data) void {
         self.free(@ptrCast(@constCast(self.data.ptr)));
     }
 
-    pub fn format(
-        self: @This(),
-        comptime _: []const u8,
-        options: std.fmt.FormatOptions,
-        writer: anytype,
-    ) !void {
-        try std.fmt.formatBuf(self.data, options, writer);
+    pub fn format(self: Data, writer: *std.io.Writer) !void {
+        try writer.print("{any}", .{self});
     }
 };
 

src/database.zig

@@ -263,14 +263,18 @@ pub const DB = struct {
         return ri;
     }
 
-    pub fn liveFiles(self: *const Self, allocator: Allocator) Allocator.Error!std.ArrayList(LiveFile) {
+    pub fn liveFiles(self: *const Self, allocator: Allocator) Allocator.Error![]const LiveFile {
         const files = rdb.rocksdb_livefiles(self.db).?;
+        defer rdb.rocksdb_livefiles_destroy(files);
         const num_files: usize = @intCast(rdb.rocksdb_livefiles_count(files));
-        var livefiles = std.ArrayList(LiveFile).init(allocator);
+
+        var livefiles: std.ArrayList(LiveFile) = .empty;
+        defer livefiles.deinit(allocator);
+
         var key_size: usize = 0;
         for (0..num_files) |i| {
             const file_num: c_int = @intCast(i);
-            try livefiles.append(.{
+            try livefiles.append(allocator, .{
                 .allocator = allocator,
                 .column_family_name = try copy(allocator, rdb.rocksdb_livefiles_column_family_name(files, file_num)),
                 .name = try copy(allocator, rdb.rocksdb_livefiles_name(files, file_num)),
@@ -282,8 +286,8 @@ pub const DB = struct {
                 .num_deletions = rdb.rocksdb_livefiles_deletions(files, file_num),
             });
         }
-        rdb.rocksdb_livefiles_destroy(files);
-        return livefiles;
+
+        return try livefiles.toOwnedSlice(allocator);
     }
 
     pub fn propertyValueCf(
@@ -553,15 +557,17 @@ test DB {
     var err_str: ?Data = null;
     defer if (err_str) |e| e.deinit();
     runTest(&err_str) catch |e| {
-        std.debug.print("{}: {?}\n", .{ e, err_str });
+        std.debug.print("{}: {?f}\n", .{ e, err_str });
         return e;
     };
 }
 
 fn runTest(err_str: *?Data) !void {
+    const allocator = std.testing.allocator;
+
     {
         var db, const families = try DB.open(
-            std.testing.allocator,
+            allocator,
             "test-state",
             .{
                 .create_if_missing = true,
@@ -575,7 +581,7 @@ fn runTest(err_str: *?Data) !void {
             err_str,
         );
         defer db.deinit();
-        defer std.testing.allocator.free(families);
+        defer allocator.free(families);
         const a_family = families[1].handle;
 
         _ = try db.put(a_family, "hello", "world", err_str);
@@ -601,7 +607,7 @@ fn runTest(err_str: *?Data) !void {
     }
 
     var db, const families = try DB.open(
-        std.testing.allocator,
+        allocator,
         "test-state",
         .{
             .create_if_missing = true,
@@ -615,9 +621,12 @@ fn runTest(err_str: *?Data) !void {
         err_str,
     );
     defer db.deinit();
-    defer std.testing.allocator.free(families);
-    const lfs = try db.liveFiles(std.testing.allocator);
-    defer lfs.deinit();
-    defer for (lfs.items) |lf| lf.deinit();
-    try std.testing.expect(std.mem.eql(u8, "another", lfs.items[0].column_family_name));
+    defer allocator.free(families);
+
+    const lfs = try db.liveFiles(allocator);
+    defer {
+        for (lfs) |lf| lf.deinit();
+        allocator.free(lfs);
+    }
+    try std.testing.expect(std.mem.eql(u8, "another", lfs[0].column_family_name));
 }