chore: restructure pkg

mr-karan · Dec 18, 2022 · e0d49b4 · e0d49b4
1 parent 129cf02
commit e0d49b4
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,24 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - "*"
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ config.toml
 bin/
 data/
 coverage.txt
+dist/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -0,0 +1,28 @@
+env:
+  - GO111MODULE=on
+  - CGO_ENABLED=0
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - binary: barreldb
+    id: barreldb
+    goos:
+      - linux
+    goarch:
+      - amd64
+    ldflags:
+      - -s -w -X "main.buildVersion={{ .Tag }} ({{ .ShortCommit }} {{ .Date }})"
+    dir: ./cmd/server/
+
+  - skip: true
+    id: barrel_lib
+
+archives:
+  - format: tar.gz
+    files:
+      - README.md
+      - LICENSE
+      - cmd/server/config.sample.toml
diff --git a/Makefile b/Makefile
@@ -27,4 +27,4 @@ test:
 
 .PHONY: bench
 bench:
-	go test -bench=. -benchmem ./pkg/barrel/...
+	go test -bench=. -benchmem ./...
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ You can refer to [Writing a disk-based key-value store in Golang](https://mrkara
 
 ```go
 import (
-	"github.com/mr-karan/barreldb/pkg/barrel"
+	"github.com/mr-karan/barreldb"
 )
 
 barrel, _ := barrel.Init(barrel.WithDir("data/"))
@@ -82,17 +82,17 @@ ERR: invalid key: key is already expired
 Using `make bench`:
 
 ```
-go test -bench=. -benchmem ./pkg/barrel/...
+go test -bench=. -benchmem ./...
 HELLO
 goos: linux
 goarch: amd64
-pkg: github.com/mr-karan/barreldb/pkg/barrel
+pkg: github.com/mr-karan/barreldb
 cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz
 BenchmarkPut/DisableSync-8                385432              3712 ns/op        1103.48 MB/s          88 B/op          4 allocs/op
 BenchmarkPut/AlwaysSync-8                    222           5510563 ns/op           0.74 MB/s         115 B/op          4 allocs/op
 BenchmarkGet-8                            840627              1304 ns/op        3142.20 MB/s        4976 B/op          5 allocs/op
 PASS
-ok      github.com/mr-karan/barreldb/pkg/barrel 10.751s
+ok      github.com/mr-karan/barreldb 10.751s
 ```
 
 Using `redis-benchmark`:

diff --git a/pkg/barrel/barrel.go → barrel.go b/pkg/barrel/barrel.go → barrel.go
diff --git a/pkg/barrel/barrel_test.go → barrel_test.go b/pkg/barrel/barrel_test.go → barrel_test.go
diff --git a/pkg/barrel/benchmark_test.go → benchmark_test.go b/pkg/barrel/benchmark_test.go → benchmark_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mr-karan/barreldb/pkg/barrel"
+	barrel "github.com/mr-karan/barreldb"
 )
 
 func BenchmarkPut(b *testing.B) {

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/mr-karan/barreldb/pkg/barrel"
+	barrel "github.com/mr-karan/barreldb"
 	"github.com/tidwall/redcon"
 	"github.com/zerodha/logf"
 )

diff --git a/pkg/barrel/compact.go → compact.go b/pkg/barrel/compact.go → compact.go
diff --git a/pkg/barrel/config.go → config.go b/pkg/barrel/config.go → config.go
diff --git a/pkg/barrel/errors.go → errors.go b/pkg/barrel/errors.go → errors.go
diff --git a/examples/main.go b/examples/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/mr-karan/barreldb/pkg/barrel"
+	barrel "github.com/mr-karan/barreldb"
 )
 
 var (

diff --git a/pkg/barrel/flock.go → flock.go b/pkg/barrel/flock.go → flock.go
diff --git a/pkg/barrel/header.go → header.go b/pkg/barrel/header.go → header.go
diff --git a/pkg/barrel/keydir.go → keydir.go b/pkg/barrel/keydir.go → keydir.go
diff --git a/pkg/barrel/ops.go → ops.go b/pkg/barrel/ops.go → ops.go
diff --git a/pkg/barrel/utils.go → utils.go b/pkg/barrel/utils.go → utils.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,3 +21,4 @@ config.toml @@
     bin/
     data/
     coverage.txt
+    dist/