adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Purge model package, not really used anyways.

Browse Source
This commit is contained in:
Christian Schwarz
2017-05-03 17:26:45 +02:00
parent 514f9aa123
commit f005ce318d
3 changed files with 7 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpc/rpc.go
+5 -6
View File
@@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
. "github.com/zrepl/zrepl/model"
. "github.com/zrepl/zrepl/util"
"github.com/zrepl/zrepl/zfs"
"io"
@@ -12,14 +11,14 @@ import (
)
type RPCRequester interface {
FilesystemRequest(r FilesystemRequest) (roots []Filesystem, err error)
FilesystemRequest(r FilesystemRequest) (roots []zfs.DatasetPath, err error)
FilesystemVersionsRequest(r FilesystemVersionsRequest) (versions []zfs.FilesystemVersion, err error)
InitialTransferRequest(r InitialTransferRequest) (io.Reader, error)
IncrementalTransferRequest(r IncrementalTransferRequest) (io.Reader, error)
}
type RPCHandler interface {
HandleFilesystemRequest(r FilesystemRequest) (roots []Filesystem, err error)
HandleFilesystemRequest(r FilesystemRequest) (roots []zfs.DatasetPath, err error)
// returned versions ordered by birthtime, oldest first
HandleFilesystemVersionsRequest(r FilesystemVersionsRequest) (versions []zfs.FilesystemVersion, err error)
@@ -284,13 +283,13 @@ func (c ByteStreamRPC) ProtocolVersionRequest() (err error) {
return c.sendRequestReceiveHeader(b, ROK)
}
func (c ByteStreamRPC) FilesystemRequest(r FilesystemRequest) (roots []Filesystem, err error) {
func (c ByteStreamRPC) FilesystemRequest(r FilesystemRequest) (roots []zfs.DatasetPath, err error) {
if err = c.sendRequestReceiveHeader(r, RFilesystems); err != nil {
return
}
roots = make([]Filesystem, 0)
roots = make([]zfs.DatasetPath, 0)
if err = c.decoder.Decode(&roots); err != nil {
return
@@ -334,7 +333,7 @@ func ConnectLocalRPC(handler RPCHandler) RPCRequester {
return LocalRPC{handler}
}
func (c LocalRPC) FilesystemRequest(r FilesystemRequest) (roots []Filesystem, err error) {
func (c LocalRPC) FilesystemRequest(r FilesystemRequest) (roots []zfs.DatasetPath, err error) {
return c.handler.HandleFilesystemRequest(r)
}