Merge pull request #76 from PowerDNS/fix-import-path

Rename module to github.com/PowerDNS/lightningstream/lmdbenv
PowerDNS · Jun 20, 2024 · d1fec5a · d1fec5a
2 parents a241744 + 4ab17be
commit d1fec5a
Show file tree

Hide file tree

Showing 46 changed files with 117 additions and 119 deletions.
diff --git a/cmd/lightningstream/commands/dropshadow.go b/cmd/lightningstream/commands/dropshadow.go
@@ -4,13 +4,13 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/syncer"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/syncer"
 )
 
 func init() {

diff --git a/cmd/lightningstream/commands/dump.go b/cmd/lightningstream/commands/dump.go
@@ -5,14 +5,14 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/syncer"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/syncer"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 var (

diff --git a/cmd/lightningstream/commands/experimental-pdns.go b/cmd/lightningstream/commands/experimental-pdns.go
@@ -7,13 +7,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv/header"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/PowerDNS/lmdb-go/lmdbscan"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/lmdbenv/header"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 func init() {

diff --git a/cmd/lightningstream/commands/experimental.go b/cmd/lightningstream/commands/experimental.go
@@ -4,13 +4,13 @@ import (
 	"encoding/binary"
 	"fmt"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv/header"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/PowerDNS/lmdb-go/lmdbscan"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/lmdbenv/header"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 func init() {

diff --git a/cmd/lightningstream/commands/root.go b/cmd/lightningstream/commands/root.go
@@ -7,11 +7,11 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/config/logger"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/config/logger"
 )
 
 const (

diff --git a/cmd/lightningstream/commands/snapshots.go b/cmd/lightningstream/commands/snapshots.go
@@ -10,15 +10,15 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv/dbiflags"
+	"github.com/PowerDNS/lightningstream/lmdbenv/header"
+	"github.com/PowerDNS/lightningstream/snapshot"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/simpleblob"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/slices"
-	"powerdns.com/platform/lightningstream/lmdbenv/dbiflags"
-	"powerdns.com/platform/lightningstream/lmdbenv/header"
-	"powerdns.com/platform/lightningstream/snapshot"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 func init() {

diff --git a/cmd/lightningstream/commands/stats.go b/cmd/lightningstream/commands/stats.go
@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv/stats"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/c2h5oh/datasize"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/lmdbenv/stats"
 )
 
 func init() {

diff --git a/cmd/lightningstream/commands/sync.go b/cmd/lightningstream/commands/sync.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"os"
 
+	"github.com/PowerDNS/lightningstream/status"
+	"github.com/PowerDNS/lightningstream/syncer"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/simpleblob"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/wojas/go-healthz"
 	"golang.org/x/sync/errgroup"
-	"powerdns.com/platform/lightningstream/status"
-	"powerdns.com/platform/lightningstream/syncer"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 var (

diff --git a/cmd/lightningstream/main.go b/cmd/lightningstream/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"powerdns.com/platform/lightningstream/cmd/lightningstream/commands"
+	"github.com/PowerDNS/lightningstream/cmd/lightningstream/commands"
 
 	// Register storage backends
 	_ "github.com/PowerDNS/simpleblob/backends/fs"

diff --git a/config/config.go b/config/config.go
@@ -7,15 +7,15 @@ import (
 	"os"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv/dbiflags"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
-	"powerdns.com/platform/lightningstream/lmdbenv/dbiflags"
 
-	"powerdns.com/platform/lightningstream/config/logger"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/status/healthtracker"
-	"powerdns.com/platform/lightningstream/status/starttracker"
+	"github.com/PowerDNS/lightningstream/config/logger"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/status/healthtracker"
+	"github.com/PowerDNS/lightningstream/status/starttracker"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module powerdns.com/platform/lightningstream
+module github.com/PowerDNS/lightningstream
 
 go 1.19
 

diff --git a/lmdbenv/stats/collector.go b/lmdbenv/stats/collector.go
@@ -11,7 +11,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 // Collector implements an LMDB stats collector for Prometheus.

diff --git a/lmdbenv/stats/collector_test.go b/lmdbenv/stats/collector_test.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/prometheus/client_golang/prometheus"
-	"powerdns.com/platform/lightningstream/lmdbenv"
 )
 
 func TestCollector(t *testing.T) {

diff --git a/lmdbenv/stats/log.go b/lmdbenv/stats/log.go
@@ -4,10 +4,10 @@ package stats
 import (
 	"os"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"powerdns.com/platform/lightningstream/lmdbenv"
 )
 
 // Log logs all LMDB statistics once using logrus

diff --git a/lmdbenv/strategy/append_test.go b/lmdbenv/strategy/append_test.go
@@ -3,8 +3,8 @@ package strategy
 import (
 	"testing"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 	"github.com/PowerDNS/lmdb-go/lmdb"
-	"powerdns.com/platform/lightningstream/lmdbenv"
 )
 
 func TestAppend(t *testing.T) {

diff --git a/lmdbenv/strategy/iterput_test.go b/lmdbenv/strategy/iterput_test.go
@@ -3,7 +3,7 @@ package strategy
 import (
 	"testing"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 func TestIterPut_empty(t *testing.T) {

diff --git a/lmdbenv/strategy/iterupdate_test.go b/lmdbenv/strategy/iterupdate_test.go
@@ -3,7 +3,7 @@ package strategy
 import (
 	"testing"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 func TestIterUpdate_empty(t *testing.T) {

diff --git a/lmdbenv/strategy/put_test.go b/lmdbenv/strategy/put_test.go
@@ -3,7 +3,7 @@ package strategy
 import (
 	"testing"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 func TestPut(t *testing.T) {

diff --git a/lmdbenv/strategy/testutil_test.go b/lmdbenv/strategy/testutil_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/pkg/errors"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 type TestIterator struct {

diff --git a/lmdbenv/strategy/update_test.go b/lmdbenv/strategy/update_test.go
@@ -3,7 +3,7 @@ package strategy
 import (
 	"testing"
 
-	"powerdns.com/platform/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv"
 )
 
 // Test iterator does not do dedup!

diff --git a/snapshot/doc.go b/snapshot/doc.go
@@ -22,13 +22,13 @@ In total that is 440 MB data uncompressed. It turns out that half of the
 allocation was used by the code copying all key and value bytes.
 
 	     flat  flat%   sum%        cum   cum%
-	2047.55MB 56.26% 56.26%  2722.09MB 74.80%  powerdns.com/platform/lightningstream/snapshot.(*DBI).Unmarshal
-	 674.54MB 18.54% 98.45%   674.54MB 18.54%  powerdns.com/platform/lightningstream/snapshot.(*KV).Unmarshal
+	2047.55MB 56.26% 56.26%  2722.09MB 74.80%  github.com/PowerDNS/lightningstream/snapshot.(*DBI).Unmarshal
+	 674.54MB 18.54% 98.45%   674.54MB 18.54%  github.com/PowerDNS/lightningstream/snapshot.(*KV).Unmarshal
 
 Patching the generated code to not copy the data reduced the total memory use to
 1.4 GB:
 
-	1378.77MB 52.20% 52.20%  1378.77MB 52.20%  powerdns.com/platform/lightningstream/snapshot.(*DBI).Unmarshal
+	1378.77MB 52.20% 52.20%  1378.77MB 52.20%  github.com/PowerDNS/lightningstream/snapshot.(*DBI).Unmarshal
 
 That is still significantly more than the 440 MB we would expect. Part of it
 is likely because the allocated slices are up to 2x larger than needed with

diff --git a/snapshot/flags.go b/snapshot/flags.go
@@ -1,6 +1,6 @@
 package snapshot
 
-import "powerdns.com/platform/lightningstream/lmdbenv/header"
+import "github.com/PowerDNS/lightningstream/lmdbenv/header"
 
 func (kv *KV) MaskedFlags() header.Flags {
 	return header.Flags(kv.Flags).Masked()

diff --git a/snapshot/gogosnapshot/compat_test.go b/snapshot/gogosnapshot/compat_test.go
@@ -6,8 +6,8 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/PowerDNS/lightningstream/snapshot"
 	"github.com/stretchr/testify/assert"
-	"powerdns.com/platform/lightningstream/snapshot"
 )
 
 func Test_roundtrip_compat_generated(t *testing.T) {
@@ -31,15 +31,15 @@ func Test_roundtrip_compat_manual(t *testing.T) {
 		},
 		Databases: []*DBI{
 			{
-				Name: "test-dbi-1",
+				Name:    "test-dbi-1",
 				Entries: []KV{
 					// Filled below
 				},
 				Flags:     0,
 				Transform: "",
 			},
 			{
-				Name: "test-dbi-2",
+				Name:    "test-dbi-2",
 				Entries: []KV{
 					// Filled below
 				},

diff --git a/snapshot/gogosnapshot/snapshot.proto b/snapshot/gogosnapshot/snapshot.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package gogosnapshot;
 
-//option go_package = "powerdns.com/platform/lightningstream/snapshot";
-
 import "gogo.proto";
 option (gogoproto.goproto_unrecognized_all) = false;
 option (gogoproto.goproto_sizecache_all) = false;

diff --git a/snapshot/name.go b/snapshot/name.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"powerdns.com/platform/lightningstream/lmdbenv/header"
-	"powerdns.com/platform/lightningstream/utils"
+	"github.com/PowerDNS/lightningstream/lmdbenv/header"
+	"github.com/PowerDNS/lightningstream/utils"
 )
 
 const (

diff --git a/status/httpd.go b/status/httpd.go
@@ -13,7 +13,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/wojas/go-healthz"
 
-	"powerdns.com/platform/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/config"
 )
 
 func StartHTTPServer(c config.Config) {

diff --git a/status/status.go b/status/status.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"sync"
 
+	"github.com/PowerDNS/lightningstream/lmdbenv"
+	"github.com/PowerDNS/lightningstream/lmdbenv/dbiflags"
+	"github.com/PowerDNS/lightningstream/lmdbenv/stats"
 	"github.com/PowerDNS/lmdb-go/lmdb"
 	"github.com/PowerDNS/simpleblob"
 	"github.com/c2h5oh/datasize"
 	"github.com/pkg/errors"
-	"powerdns.com/platform/lightningstream/lmdbenv"
-	"powerdns.com/platform/lightningstream/lmdbenv/dbiflags"
-	"powerdns.com/platform/lightningstream/lmdbenv/stats"
 )
 
 type info struct {

diff --git a/syncer/cleaner/cleaner.go b/syncer/cleaner/cleaner.go
@@ -5,13 +5,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/snapshot"
+	"github.com/PowerDNS/lightningstream/utils"
 	"github.com/PowerDNS/simpleblob"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/exp/slices"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/snapshot"
-	"powerdns.com/platform/lightningstream/utils"
 )
 
 func New(name string, st simpleblob.Interface, cc config.Cleanup, logger logrus.FieldLogger) *Worker {

diff --git a/syncer/cleaner/cleaner_test.go b/syncer/cleaner/cleaner_test.go
@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/PowerDNS/lightningstream/config"
+	"github.com/PowerDNS/lightningstream/snapshot"
 	"github.com/PowerDNS/simpleblob/backends/memory"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
-	"powerdns.com/platform/lightningstream/config"
-	"powerdns.com/platform/lightningstream/snapshot"
 )
 
 func mt(timeString string) time.Time {