Skip to content

Commit 9ea4322

Browse files
cole-millercole-miller
authored
Merge pull request #347 from cole-miller/v3
V3
2 parents f44cfcf + addcb6d commit 9ea4322

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+80
-80
lines changed

‎.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: |
3030
sudo add-apt-repository ppa:dqlite/dev -y
3131
sudo apt update
32-
sudo apt install -y libsqlite3-dev libuv1-dev liblz4-dev libdqlite1.17-dev
32+
sudo apt install -y libsqlite3-dev libuv1-dev liblz4-dev libdqlite-dev
3333
3434
- name: Download deps
3535
run: |
@@ -55,7 +55,7 @@ jobs:
5555
env:
5656
GO_DQLITE_MULTITHREAD: 1
5757
run: |
58-
go install -tags libsqlite3 github.com/canonical/go-dqlite/v2/cmd/dqlite-benchmark
58+
go install -tags libsqlite3 github.com/canonical/go-dqlite/v3/cmd/dqlite-benchmark
5959
dqlite-benchmark --db 127.0.0.1:9001 --driver --cluster 127.0.0.1:9001,127.0.0.1:9002,127.0.0.1:9003 --workload kvreadwrite &
6060
masterpid=$!
6161
dqlite-benchmark --db 127.0.0.1:9002 --join 127.0.0.1:9001 &

‎.github/workflows/daily-benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
GO_DQLITE_MULTITHREAD: 1
2727
run: |
2828
go get -t -tags libsqlite3 ./...
29-
go install -tags libsqlite3 github.com/canonical/go-dqlite/v2/cmd/dqlite-benchmark
29+
go install -tags libsqlite3 github.com/canonical/go-dqlite/v3/cmd/dqlite-benchmark
3030
dqlite-benchmark --db 127.0.0.1:9001 --duration 3600 --driver --cluster 127.0.0.1:9001,127.0.0.1:9002,127.0.0.1:9003 --workload kvreadwrite &
3131
masterpid=$!
3232
dqlite-benchmark --db 127.0.0.1:9002 --join 127.0.0.1:9001 &

‎.github/workflows/packages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build PPA source packages
22
on:
33
push:
44
branches:
5-
- v2
5+
- v3
66
jobs:
77
build:
88
if: github.repository == 'canonical/go-dqlite'
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@v4
2727
with:
2828
repository: canonical/dqlite-ppa
29-
ref: go-dqlite-v2
29+
ref: go-dqlite-v3
3030
path: dqlite-ppa
3131

3232
- name: Setup dependencies
@@ -57,7 +57,7 @@ jobs:
5757
VERSION="$(git describe --tags | sed -e "s/^v//" -e "s/-/+git/")"
5858
dch --create \
5959
--distribution ${TARGET} \
60-
--package go-dqlite-v2 \
60+
--package go-dqlite-v3 \
6161
--newversion ${VERSION}~${TARGET}1 \
6262
"Automatic build from Github"
6363
debuild -S -sa -d -k${{ vars.PPA_PUBLIC_KEY }}

‎app/app.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
"github.com/canonical/go-dqlite/v2"
17-
"github.com/canonical/go-dqlite/v2/client"
18-
"github.com/canonical/go-dqlite/v2/driver"
19-
"github.com/canonical/go-dqlite/v2/internal/protocol"
16+
"github.com/canonical/go-dqlite/v3"
17+
"github.com/canonical/go-dqlite/v3/client"
18+
"github.com/canonical/go-dqlite/v3/driver"
19+
"github.com/canonical/go-dqlite/v3/internal/protocol"
2020
"github.com/pkg/errors"
2121
"golang.org/x/sync/semaphore"
2222
)

‎app/app_go1.18_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ package app_test
99
// "net"
1010
// "testing"
1111

12-
// "github.com/canonical/go-dqlite/v2/app"
13-
// "github.com/canonical/go-dqlite/v2/client"
12+
// "github.com/canonical/go-dqlite/v3/app"
13+
// "github.com/canonical/go-dqlite/v3/client"
1414
// "github.com/quic-go/quic-go"
1515
// "github.com/stretchr/testify/assert"
1616
// "github.com/stretchr/testify/require"

‎app/app_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"testing"
1919
"time"
2020

21-
"github.com/canonical/go-dqlite/v2"
22-
"github.com/canonical/go-dqlite/v2/app"
23-
"github.com/canonical/go-dqlite/v2/client"
21+
"github.com/canonical/go-dqlite/v3"
22+
"github.com/canonical/go-dqlite/v3/app"
23+
"github.com/canonical/go-dqlite/v3/client"
2424
"github.com/stretchr/testify/assert"
2525
"github.com/stretchr/testify/require"
2626
)

‎app/dial.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"net"
88

9-
"github.com/canonical/go-dqlite/v2/client"
9+
"github.com/canonical/go-dqlite/v3/client"
1010
)
1111

1212
// Like client.DialFuncWithTLS but also starts the proxy, since the raft

‎app/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"io/ioutil"
66
"os"
77

8-
"github.com/canonical/go-dqlite/v2/app"
8+
"github.com/canonical/go-dqlite/v3/app"
99
)
1010

1111
// To start the first node of a dqlite cluster for the first time, its network

‎app/options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"strings"
99
"time"
1010

11-
"github.com/canonical/go-dqlite/v2"
12-
"github.com/canonical/go-dqlite/v2/client"
13-
"github.com/canonical/go-dqlite/v2/internal/protocol"
11+
"github.com/canonical/go-dqlite/v3"
12+
"github.com/canonical/go-dqlite/v3/client"
13+
"github.com/canonical/go-dqlite/v3/internal/protocol"
1414
)
1515

1616
// Option can be used to tweak app parameters.

‎app/roles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package app
33
import (
44
"sort"
55

6-
"github.com/canonical/go-dqlite/v2/client"
6+
"github.com/canonical/go-dqlite/v3/client"
77
)
88

99
const minVoters = 3

‎benchmark/benchmark.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"path"
1010
"time"
1111

12-
"github.com/canonical/go-dqlite/v2/app"
13-
"github.com/canonical/go-dqlite/v2/client"
12+
"github.com/canonical/go-dqlite/v3/app"
13+
"github.com/canonical/go-dqlite/v3/client"
1414
)
1515

1616
const (

‎benchmark/benchmark_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/canonical/go-dqlite/v2/app"
12-
"github.com/canonical/go-dqlite/v2/benchmark"
11+
"github.com/canonical/go-dqlite/v3/app"
12+
"github.com/canonical/go-dqlite/v3/benchmark"
1313
"github.com/stretchr/testify/require"
1414
)
1515

‎client/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package client
33
import (
44
"context"
55

6-
"github.com/canonical/go-dqlite/v2/internal/protocol"
6+
"github.com/canonical/go-dqlite/v3/internal/protocol"
77
"github.com/pkg/errors"
88
)
99

‎client/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"testing"
99
"time"
1010

11-
dqlite "github.com/canonical/go-dqlite/v2"
12-
"github.com/canonical/go-dqlite/v2/client"
11+
dqlite "github.com/canonical/go-dqlite/v3"
12+
"github.com/canonical/go-dqlite/v3/client"
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"
1515
)

‎client/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package client
22

33
import (
4-
"github.com/canonical/go-dqlite/v2/internal/protocol"
4+
"github.com/canonical/go-dqlite/v3/internal/protocol"
55
)
66

77
// Node roles

‎client/dial.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/tls"
66
"net"
77

8-
"github.com/canonical/go-dqlite/v2/internal/protocol"
8+
"github.com/canonical/go-dqlite/v3/internal/protocol"
99
)
1010

1111
// DefaultDialFunc is the default dial function, which can handle plain TCP and

‎client/leader_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
dqlite "github.com/canonical/go-dqlite/v2"
10-
"github.com/canonical/go-dqlite/v2/client"
9+
dqlite "github.com/canonical/go-dqlite/v3"
10+
"github.com/canonical/go-dqlite/v3/client"
1111
"github.com/stretchr/testify/require"
1212
)
1313

‎client/log.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package client
22

33
import (
4-
"github.com/canonical/go-dqlite/v2/logging"
4+
"github.com/canonical/go-dqlite/v3/logging"
55
)
66

77
// LogFunc is a function that can be used for logging.

‎client/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/google/renameio"
1010
"gopkg.in/yaml.v2"
1111

12-
"github.com/canonical/go-dqlite/v2/internal/protocol"
12+
"github.com/canonical/go-dqlite/v3/internal/protocol"
1313
)
1414

1515
// NodeStore is used by a dqlite client to get an initial list of candidate

‎client/store_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"database/sql"
88
"testing"
99

10-
dqlite "github.com/canonical/go-dqlite/v2"
11-
"github.com/canonical/go-dqlite/v2/client"
12-
"github.com/canonical/go-dqlite/v2/driver"
10+
dqlite "github.com/canonical/go-dqlite/v3"
11+
"github.com/canonical/go-dqlite/v3/client"
12+
"github.com/canonical/go-dqlite/v3/driver"
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"
1515
)

‎cmd/dqlite-benchmark/dqlite-benchmark.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"path/filepath"
99
"time"
1010

11-
"github.com/canonical/go-dqlite/v2/app"
12-
"github.com/canonical/go-dqlite/v2/benchmark"
11+
"github.com/canonical/go-dqlite/v3/app"
12+
"github.com/canonical/go-dqlite/v3/benchmark"
1313
"github.com/pkg/errors"
1414
"github.com/spf13/cobra"
1515
"golang.org/x/sys/unix"

‎cmd/dqlite-demo/dqlite-demo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"path/filepath"
1515
"strings"
1616

17-
"github.com/canonical/go-dqlite/v2/app"
18-
"github.com/canonical/go-dqlite/v2/client"
17+
"github.com/canonical/go-dqlite/v3/app"
18+
"github.com/canonical/go-dqlite/v3/client"
1919
"github.com/pkg/errors"
2020
"github.com/spf13/cobra"
2121
"golang.org/x/sys/unix"

‎cmd/dqlite/dqlite.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/peterh/liner"
1515
"github.com/spf13/cobra"
1616

17-
"github.com/canonical/go-dqlite/v2/app"
18-
"github.com/canonical/go-dqlite/v2/client"
19-
"github.com/canonical/go-dqlite/v2/internal/shell"
17+
"github.com/canonical/go-dqlite/v3/app"
18+
"github.com/canonical/go-dqlite/v3/client"
19+
"github.com/canonical/go-dqlite/v3/internal/shell"
2020
)
2121

2222
func main() {

‎config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"fmt"
77
"os"
88

9-
"github.com/canonical/go-dqlite/v2/internal/bindings"
10-
"github.com/canonical/go-dqlite/v2/internal/protocol"
9+
"github.com/canonical/go-dqlite/v3/internal/bindings"
10+
"github.com/canonical/go-dqlite/v3/internal/protocol"
1111
"github.com/pkg/errors"
1212
)
1313

‎driver/driver.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727

2828
"github.com/pkg/errors"
2929

30-
"github.com/canonical/go-dqlite/v2/client"
31-
"github.com/canonical/go-dqlite/v2/internal/protocol"
32-
"github.com/canonical/go-dqlite/v2/tracing"
30+
"github.com/canonical/go-dqlite/v3/client"
31+
"github.com/canonical/go-dqlite/v3/internal/protocol"
32+
"github.com/canonical/go-dqlite/v3/tracing"
3333
)
3434

3535
// Driver perform queries against a dqlite server.

‎driver/driver_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import (
2424
"testing"
2525
"time"
2626

27-
dqlite "github.com/canonical/go-dqlite/v2"
28-
"github.com/canonical/go-dqlite/v2/client"
29-
dqlitedriver "github.com/canonical/go-dqlite/v2/driver"
30-
"github.com/canonical/go-dqlite/v2/logging"
27+
dqlite "github.com/canonical/go-dqlite/v3"
28+
"github.com/canonical/go-dqlite/v3/client"
29+
dqlitedriver "github.com/canonical/go-dqlite/v3/driver"
30+
"github.com/canonical/go-dqlite/v3/logging"
3131
"github.com/stretchr/testify/assert"
3232
"github.com/stretchr/testify/require"
3333
)

‎driver/integration_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"testing"
99
"time"
1010

11-
dqlite "github.com/canonical/go-dqlite/v2"
12-
"github.com/canonical/go-dqlite/v2/client"
13-
"github.com/canonical/go-dqlite/v2/driver"
14-
"github.com/canonical/go-dqlite/v2/logging"
11+
dqlite "github.com/canonical/go-dqlite/v3"
12+
"github.com/canonical/go-dqlite/v3/client"
13+
"github.com/canonical/go-dqlite/v3/driver"
14+
"github.com/canonical/go-dqlite/v3/logging"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717
)

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/canonical/go-dqlite/v2
1+
module github.com/canonical/go-dqlite/v3
22

33
// This is to maintain the ppa package on focal
44
go 1.13

‎internal/bindings/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ import "C"
77

88
// required dqlite version
99
var dqliteMajorVersion int = 1
10-
var dqliteMinorVersion int = 17
10+
var dqliteMinorVersion int = 18

‎internal/bindings/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ import (
8383
"time"
8484
"unsafe"
8585

86-
"github.com/canonical/go-dqlite/v2/internal/protocol"
86+
"github.com/canonical/go-dqlite/v3/internal/protocol"
8787
)
8888

8989
type Node struct {

‎internal/bindings/server_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/canonical/go-dqlite/v2/internal/bindings"
14-
"github.com/canonical/go-dqlite/v2/internal/protocol"
13+
"github.com/canonical/go-dqlite/v3/internal/bindings"
14+
"github.com/canonical/go-dqlite/v3/internal/protocol"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717
)

‎internal/bindings/sqlite3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
package bindings
44

55
import (
6-
"github.com/canonical/go-dqlite/v2/internal/protocol"
6+
"github.com/canonical/go-dqlite/v3/internal/protocol"
77
)
88

99
/*

‎internal/protocol/connector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/Rican7/retry"
14-
"github.com/canonical/go-dqlite/v2/logging"
14+
"github.com/canonical/go-dqlite/v3/logging"
1515
"github.com/pkg/errors"
1616
"golang.org/x/sync/semaphore"
1717
)

‎internal/protocol/connector_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/canonical/go-dqlite/v2/internal/bindings"
13-
"github.com/canonical/go-dqlite/v2/internal/protocol"
14-
"github.com/canonical/go-dqlite/v2/logging"
12+
"github.com/canonical/go-dqlite/v3/internal/bindings"
13+
"github.com/canonical/go-dqlite/v3/internal/protocol"
14+
"github.com/canonical/go-dqlite/v3/logging"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717
)

‎internal/protocol/protocol_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"testing"
66
"time"
77

8-
"github.com/canonical/go-dqlite/v2/internal/protocol"
9-
"github.com/canonical/go-dqlite/v2/logging"
8+
"github.com/canonical/go-dqlite/v3/internal/protocol"
9+
"github.com/canonical/go-dqlite/v3/logging"
1010
"github.com/stretchr/testify/assert"
1111
"github.com/stretchr/testify/require"
1212
)

0 commit comments

Comments
 (0)