Browse Source

Swap imports to use joeslay

pull/1087/head
j.laycock 5 years ago
parent
commit
595a1beff0
  1. 6
      unmaintained/change_superblock/change_superblock.go
  2. 10
      unmaintained/fix_dat/fix_dat.go
  3. 6
      unmaintained/repeated_vacuum/repeated_vacuum.go
  4. 6
      unmaintained/see_dat/see_dat.go
  5. 6
      unmaintained/see_idx/see_idx.go
  6. 6
      unmaintained/see_meta/see_meta.go
  7. 8
      unmaintained/volume_tailer/volume_tailer.go
  8. 10
      weed/command/backup.go
  9. 10
      weed/command/benchmark.go
  10. 6
      weed/command/compact.go
  11. 4
      weed/command/download.go
  12. 8
      weed/command/export.go
  13. 10
      weed/command/filer.go
  14. 10
      weed/command/filer_copy.go
  15. 20
      weed/command/filer_replication.go
  16. 8
      weed/command/fix.go
  17. 10
      weed/command/master.go
  18. 8
      weed/command/mount_std.go
  19. 8
      weed/command/s3.go
  20. 4
      weed/command/server.go
  21. 6
      weed/command/shell.go
  22. 6
      weed/command/upload.go
  23. 2
      weed/command/version.go
  24. 12
      weed/command/volume.go
  25. 2
      weed/command/volume_test.go
  26. 8
      weed/command/webdav.go
  27. 4
      weed/filer2/abstract_sql/abstract_sql_store.go
  28. 6
      weed/filer2/cassandra/cassandra_store.go
  29. 2
      weed/filer2/configuration.go
  30. 2
      weed/filer2/entry.go
  31. 2
      weed/filer2/entry_codec.go
  32. 6
      weed/filer2/etcd/etcd_store.go
  33. 2
      weed/filer2/filechunks.go
  34. 2
      weed/filer2/filechunks_test.go
  35. 4
      weed/filer2/filer.go
  36. 6
      weed/filer2/filer_client_util.go
  37. 6
      weed/filer2/filer_deletion.go
  38. 6
      weed/filer2/filer_notify.go
  39. 2
      weed/filer2/filer_notify_test.go
  40. 6
      weed/filer2/filerstore.go
  41. 6
      weed/filer2/leveldb/leveldb_store.go
  42. 2
      weed/filer2/leveldb/leveldb_store_test.go
  43. 6
      weed/filer2/leveldb2/leveldb2_store.go
  44. 2
      weed/filer2/leveldb2/leveldb2_store_test.go
  45. 4
      weed/filer2/memdb/memdb_store.go
  46. 2
      weed/filer2/memdb/memdb_store_test.go
  47. 6
      weed/filer2/mysql/mysql_store.go
  48. 6
      weed/filer2/postgres/postgres_store.go
  49. 4
      weed/filer2/redis/redis_cluster_store.go
  50. 4
      weed/filer2/redis/redis_store.go
  51. 4
      weed/filer2/redis/universal_redis_store.go
  52. 8
      weed/filer2/stream.go
  53. 6
      weed/filesys/dir.go
  54. 4
      weed/filesys/dir_link.go
  55. 2
      weed/filesys/dir_rename.go
  56. 8
      weed/filesys/dirty_page.go
  57. 6
      weed/filesys/file.go
  58. 6
      weed/filesys/filehandle.go
  59. 6
      weed/filesys/wfs.go
  60. 8
      weed/filesys/wfs_deletion.go
  61. 2
      weed/images/resizing.go
  62. 6
      weed/notification/aws_sqs/aws_sqs_pub.go
  63. 4
      weed/notification/configuration.go
  64. 6
      weed/notification/gocdk_pub_sub/gocdk_pub_sub.go
  65. 6
      weed/notification/google_pub_sub/google_pub_sub.go
  66. 6
      weed/notification/kafka/kafka_queue.go
  67. 6
      weed/notification/log/log_queue.go
  68. 6
      weed/operation/assign_file_id.go
  69. 4
      weed/operation/chunked_file.go
  70. 4
      weed/operation/delete_content.go
  71. 8
      weed/operation/grpc_client.go
  72. 4
      weed/operation/lookup.go
  73. 2
      weed/operation/lookup_vid_cache.go
  74. 2
      weed/operation/stats.go
  75. 4
      weed/operation/submit.go
  76. 2
      weed/operation/sync_volume.go
  77. 4
      weed/operation/tail_volume.go
  78. 6
      weed/operation/upload_content.go
  79. 2
      weed/pb/filer_pb/filer_pb_helper.go
  80. 10
      weed/replication/replicator.go
  81. 12
      weed/replication/sink/azuresink/azure_sink.go
  82. 10
      weed/replication/sink/b2sink/b2_sink.go
  83. 10
      weed/replication/sink/filersink/fetch_write.go
  84. 14
      weed/replication/sink/filersink/filer_sink.go
  85. 12
      weed/replication/sink/gcssink/gcs_sink.go
  86. 6
      weed/replication/sink/replication_sink.go
  87. 12
      weed/replication/sink/s3sink/s3_sink.go
  88. 8
      weed/replication/sink/s3sink/s3_write.go
  89. 8
      weed/replication/source/filer_source.go
  90. 6
      weed/replication/sub/notification_aws_sqs.go
  91. 6
      weed/replication/sub/notification_gocdk_pub_sub.go
  92. 6
      weed/replication/sub/notification_google_pub_sub.go
  93. 6
      weed/replication/sub/notification_kafka.go
  94. 4
      weed/replication/sub/notifications.go
  95. 6
      weed/s3api/filer_multipart.go
  96. 4
      weed/s3api/filer_util.go
  97. 4
      weed/s3api/s3api_bucket_handlers.go
  98. 6
      weed/s3api/s3api_handlers.go
  99. 4
      weed/s3api/s3api_object_handlers.go
  100. 6
      weed/s3api/s3api_objects_list_handlers.go

6
unmaintained/change_superblock/change_superblock.go

@ -7,9 +7,9 @@ import (
"path" "path"
"strconv" "strconv"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
) )
var ( var (

10
unmaintained/fix_dat/fix_dat.go

@ -8,11 +8,11 @@ import (
"path" "path"
"strconv" "strconv"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
) )
var ( var (

6
unmaintained/repeated_vacuum/repeated_vacuum.go

@ -7,11 +7,11 @@ import (
"log" "log"
"math/rand" "math/rand"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/util"
) )
var ( var (

6
unmaintained/see_dat/see_dat.go

@ -3,9 +3,9 @@ package main
import ( import (
"flag" "flag"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"time" "time"
) )

6
unmaintained/see_idx/see_idx.go

@ -7,9 +7,9 @@ import (
"path" "path"
"strconv" "strconv"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/types"
) )
var ( var (

6
unmaintained/see_meta/see_meta.go

@ -7,9 +7,9 @@ import (
"log" "log"
"os" "os"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

8
unmaintained/volume_tailer/volume_tailer.go

@ -5,10 +5,10 @@ import (
"log" "log"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
util2 "github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/storage/needle"
util2 "github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
"golang.org/x/tools/godoc/util" "golang.org/x/tools/godoc/util"
) )

10
weed/command/backup.go

@ -3,13 +3,13 @@ package command
import ( import (
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/storage"
) )
var ( var (

10
weed/command/benchmark.go

@ -18,11 +18,11 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/wdclient"
) )
type BenchmarkOptions struct { type BenchmarkOptions struct {

6
weed/command/compact.go

@ -1,9 +1,9 @@
package command package command
import ( import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
) )
func init() { func init() {

4
weed/command/download.go

@ -8,8 +8,8 @@ import (
"path" "path"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/util"
) )
var ( var (

8
weed/command/export.go

@ -14,10 +14,10 @@ import (
"io" "io"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
) )
const ( const (

10
weed/command/filer.go

@ -6,13 +6,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/server"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
) )

10
weed/command/filer_copy.go

@ -14,11 +14,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/wdclient"
"github.com/spf13/viper" "github.com/spf13/viper"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

20
weed/command/filer_replication.go

@ -4,16 +4,16 @@ import (
"context" "context"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/replication"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/azuresink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/b2sink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/filersink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/gcssink"
_ "github.com/chrislusf/seaweedfs/weed/replication/sink/s3sink"
"github.com/chrislusf/seaweedfs/weed/replication/sub"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/replication"
"github.com/joeslay/seaweedfs/weed/replication/sink"
_ "github.com/joeslay/seaweedfs/weed/replication/sink/azuresink"
_ "github.com/joeslay/seaweedfs/weed/replication/sink/b2sink"
_ "github.com/joeslay/seaweedfs/weed/replication/sink/filersink"
_ "github.com/joeslay/seaweedfs/weed/replication/sink/gcssink"
_ "github.com/joeslay/seaweedfs/weed/replication/sink/s3sink"
"github.com/joeslay/seaweedfs/weed/replication/sub"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

8
weed/command/fix.go

@ -5,10 +5,10 @@ import (
"path" "path"
"strconv" "strconv"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
) )
func init() { func init() {

10
weed/command/master.go

@ -8,11 +8,11 @@ import (
"strings" "strings"
"github.com/chrislusf/raft/protobuf" "github.com/chrislusf/raft/protobuf"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/server"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/spf13/viper" "github.com/spf13/viper"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"

8
weed/command/mount_std.go

@ -12,13 +12,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/jacobsa/daemonize" "github.com/jacobsa/daemonize"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/filesys"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filesys"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"
) )

8
weed/command/s3.go

@ -4,14 +4,14 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/s3api"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/s3api"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

4
weed/command/server.go

@ -8,8 +8,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
) )
type ServerOptions struct { type ServerOptions struct {

6
weed/command/shell.go

@ -1,9 +1,9 @@
package command package command
import ( import (
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/shell"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/shell"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

6
weed/command/upload.go

@ -6,11 +6,11 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/operation"
) )
var ( var (

2
weed/command/version.go

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"runtime" "runtime"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/util"
) )
var cmdVersion = &Command{ var cmdVersion = &Command{

12
weed/command/volume.go

@ -9,14 +9,14 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/server"
"github.com/joeslay/seaweedfs/weed/storage"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/grpc/reflection" "google.golang.org/grpc/reflection"
) )

2
weed/command/volume_test.go

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/glog"
) )
func TestXYZ(t *testing.T) { func TestXYZ(t *testing.T) {

8
weed/command/webdav.go

@ -7,10 +7,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/server"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

4
weed/filer2/abstract_sql/abstract_sql_store.go

@ -5,8 +5,8 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
) )
type AbstractSqlStore struct { type AbstractSqlStore struct {

6
weed/filer2/cassandra/cassandra_store.go

@ -3,9 +3,9 @@ package cassandra
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/gocql/gocql" "github.com/gocql/gocql"
) )

2
weed/filer2/configuration.go

@ -3,7 +3,7 @@ package filer2
import ( import (
"os" "os"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

2
weed/filer2/entry.go

@ -4,7 +4,7 @@ import (
"os" "os"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
type Attr struct { type Attr struct {

2
weed/filer2/entry_codec.go

@ -5,7 +5,7 @@ import (
"time" "time"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

6
weed/filer2/etcd/etcd_store.go

@ -6,9 +6,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
weed_util "github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
weed_util "github.com/joeslay/seaweedfs/weed/util"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
) )

2
weed/filer2/filechunks.go

@ -6,7 +6,7 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
func TotalSize(chunks []*filer_pb.FileChunk) (size uint64) { func TotalSize(chunks []*filer_pb.FileChunk) (size uint64) {

2
weed/filer2/filechunks_test.go

@ -5,7 +5,7 @@ import (
"testing" "testing"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
func TestCompactFileChunks(t *testing.T) { func TestCompactFileChunks(t *testing.T) {

4
weed/filer2/filer.go

@ -10,8 +10,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/wdclient"
"github.com/karlseguin/ccache" "github.com/karlseguin/ccache"
) )

6
weed/filer2/filer_client_util.go

@ -6,9 +6,9 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
) )
func VolumeId(fileId string) string { func VolumeId(fileId string) string {

6
weed/filer2/filer_deletion.go

@ -3,9 +3,9 @@ package filer2
import ( import (
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
func (f *Filer) loopProcessingDeletion() { func (f *Filer) loopProcessingDeletion() {

6
weed/filer2/filer_notify.go

@ -1,9 +1,9 @@
package filer2 package filer2
import ( import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool) { func (f *Filer) NotifyUpdateEvent(oldEntry, newEntry *Entry, deleteChunks bool) {

2
weed/filer2/filer_notify_test.go

@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

6
weed/filer2/filerstore.go

@ -5,9 +5,9 @@ import (
"errors" "errors"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/util"
) )
type FilerStore interface { type FilerStore interface {

6
weed/filer2/leveldb/leveldb_store.go

@ -5,9 +5,9 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
weed_util "github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
weed_util "github.com/joeslay/seaweedfs/weed/util"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/opt"
leveldb_util "github.com/syndtr/goleveldb/leveldb/util" leveldb_util "github.com/syndtr/goleveldb/leveldb/util"

2
weed/filer2/leveldb/leveldb_store_test.go

@ -2,7 +2,7 @@ package leveldb
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/filer2"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"

6
weed/filer2/leveldb2/leveldb2_store.go

@ -8,9 +8,9 @@ import (
"io" "io"
"os" "os"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
weed_util "github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
weed_util "github.com/joeslay/seaweedfs/weed/util"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
"github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/opt"
leveldb_util "github.com/syndtr/goleveldb/leveldb/util" leveldb_util "github.com/syndtr/goleveldb/leveldb/util"

2
weed/filer2/leveldb2/leveldb2_store_test.go

@ -2,7 +2,7 @@ package leveldb
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/filer2"
"io/ioutil" "io/ioutil"
"os" "os"
"testing" "testing"

4
weed/filer2/memdb/memdb_store.go

@ -3,8 +3,8 @@ package memdb
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/google/btree" "github.com/google/btree"
"strings" "strings"
"sync" "sync"

2
weed/filer2/memdb/memdb_store_test.go

@ -2,7 +2,7 @@ package memdb
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/filer2"
"testing" "testing"
) )

6
weed/filer2/mysql/mysql_store.go

@ -4,9 +4,9 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/filer2/abstract_sql"
"github.com/joeslay/seaweedfs/weed/util"
_ "github.com/go-sql-driver/mysql" _ "github.com/go-sql-driver/mysql"
) )

6
weed/filer2/postgres/postgres_store.go

@ -4,9 +4,9 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/filer2/abstract_sql"
"github.com/joeslay/seaweedfs/weed/util"
_ "github.com/lib/pq" _ "github.com/lib/pq"
) )

4
weed/filer2/redis/redis_cluster_store.go

@ -1,8 +1,8 @@
package redis package redis
import ( import (
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/go-redis/redis" "github.com/go-redis/redis"
) )

4
weed/filer2/redis/redis_store.go

@ -1,8 +1,8 @@
package redis package redis
import ( import (
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/go-redis/redis" "github.com/go-redis/redis"
) )

4
weed/filer2/redis/universal_redis_store.go

@ -3,8 +3,8 @@ package redis
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/go-redis/redis" "github.com/go-redis/redis"
"sort" "sort"
"strings" "strings"

8
weed/filer2/stream.go

@ -3,10 +3,10 @@ package filer2
import ( import (
"io" "io"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/wdclient"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/wdclient"
) )
func StreamContent(masterClient *wdclient.MasterClient, w io.Writer, chunks []*filer_pb.FileChunk, offset int64, size int) error { func StreamContent(masterClient *wdclient.MasterClient, w io.Writer, chunks []*filer_pb.FileChunk, offset int64, size int) error {

6
weed/filesys/dir.go

@ -6,9 +6,9 @@ import (
"path" "path"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"
) )

4
weed/filesys/dir_link.go

@ -6,8 +6,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"
) )

2
weed/filesys/dir_rename.go

@ -3,7 +3,7 @@ package filesys
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"
) )

8
weed/filesys/dirty_page.go

@ -8,10 +8,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/security"
) )
type ContinuousDirtyPages struct { type ContinuousDirtyPages struct {

6
weed/filesys/file.go

@ -7,9 +7,9 @@ import (
"sort" "sort"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"
) )

6
weed/filesys/filehandle.go

@ -7,9 +7,9 @@ import (
"path" "path"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/gabriel-vasile/mimetype" "github.com/gabriel-vasile/mimetype"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"

6
weed/filesys/wfs.go

@ -8,9 +8,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/karlseguin/ccache" "github.com/karlseguin/ccache"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
"github.com/seaweedfs/fuse/fs" "github.com/seaweedfs/fuse/fs"

8
weed/filesys/wfs_deletion.go

@ -3,10 +3,10 @@ package filesys
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
weed/images/resizing.go

@ -7,7 +7,7 @@ import (
"image/jpeg" "image/jpeg"
"image/png" "image/png"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
"io" "io"
) )

6
weed/notification/aws_sqs/aws_sqs_pub.go

@ -8,9 +8,9 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sqs"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

4
weed/notification/configuration.go

@ -1,8 +1,8 @@
package notification package notification
import ( import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

6
weed/notification/gocdk_pub_sub/gocdk_pub_sub.go

@ -18,9 +18,9 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"gocloud.dev/pubsub" "gocloud.dev/pubsub"
_ "gocloud.dev/pubsub/awssnssqs" _ "gocloud.dev/pubsub/awssnssqs"

6
weed/notification/google_pub_sub/google_pub_sub.go

@ -6,9 +6,9 @@ import (
"os" "os"
"cloud.google.com/go/pubsub" "cloud.google.com/go/pubsub"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"google.golang.org/api/option" "google.golang.org/api/option"
) )

6
weed/notification/kafka/kafka_queue.go

@ -2,9 +2,9 @@ package kafka
import ( import (
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

6
weed/notification/log/log_queue.go

@ -1,9 +1,9 @@
package kafka package kafka
import ( import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/notification"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

6
weed/operation/assign_file_id.go

@ -3,9 +3,9 @@ package operation
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/grpc" "google.golang.org/grpc"
"strings" "strings"
) )

4
weed/operation/chunked_file.go

@ -13,8 +13,8 @@ import (
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
) )
var ( var (

4
weed/operation/delete_content.go

@ -4,8 +4,8 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"google.golang.org/grpc" "google.golang.org/grpc"
"net/http" "net/http"
"strings" "strings"

8
weed/operation/grpc_client.go

@ -3,10 +3,10 @@ package operation
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/grpc" "google.golang.org/grpc"
"strconv" "strconv"
"strings" "strings"

4
weed/operation/lookup.go

@ -11,8 +11,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/util"
) )
type Location struct { type Location struct {

2
weed/operation/lookup_vid_cache.go

@ -6,7 +6,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/glog"
) )
var ErrorNotFound = errors.New("not found") var ErrorNotFound = errors.New("not found")

2
weed/operation/stats.go

@ -4,7 +4,7 @@ import (
"context" "context"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
) )
func Statistics(server string, grpcDialOption grpc.DialOption, req *master_pb.StatisticsRequest) (resp *master_pb.StatisticsResponse, err error) { func Statistics(server string, grpcDialOption grpc.DialOption, req *master_pb.StatisticsRequest) (resp *master_pb.StatisticsResponse, err error) {

4
weed/operation/submit.go

@ -11,8 +11,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/security"
) )
type FilePart struct { type FilePart struct {

2
weed/operation/sync_volume.go

@ -2,7 +2,7 @@ package operation
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

4
weed/operation/tail_volume.go

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"io" "io"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

6
weed/operation/upload_content.go

@ -16,9 +16,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
) )
type UploadResult struct { type UploadResult struct {

2
weed/pb/filer_pb/filer_pb_helper.go

@ -1,7 +1,7 @@
package filer_pb package filer_pb
import ( import (
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/needle"
) )
func toFileIdObject(fileIdStr string) (*FileId, error) { func toFileIdObject(fileIdStr string) (*FileId, error) {

10
weed/replication/replicator.go

@ -6,11 +6,11 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
) )
type Replicator struct { type Replicator struct {

12
weed/replication/sink/azuresink/azure_sink.go

@ -8,12 +8,12 @@ import (
"strings" "strings"
"github.com/Azure/azure-storage-blob-go/azblob" "github.com/Azure/azure-storage-blob-go/azblob"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
) )
type AzureSink struct { type AzureSink struct {

10
weed/replication/sink/b2sink/b2_sink.go

@ -4,11 +4,11 @@ import (
"context" "context"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/kurin/blazer/b2" "github.com/kurin/blazer/b2"
) )

10
weed/replication/sink/filersink/fetch_write.go

@ -7,11 +7,11 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/util"
) )
func (fs *FilerSink) replicateChunks(ctx context.Context, sourceChunks []*filer_pb.FileChunk) (replicatedChunks []*filer_pb.FileChunk, err error) { func (fs *FilerSink) replicateChunks(ctx context.Context, sourceChunks []*filer_pb.FileChunk) (replicatedChunks []*filer_pb.FileChunk, err error) {

14
weed/replication/sink/filersink/filer_sink.go

@ -3,16 +3,16 @@ package filersink
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
) )
type FilerSink struct { type FilerSink struct {

12
weed/replication/sink/gcssink/gcs_sink.go

@ -6,12 +6,12 @@ import (
"os" "os"
"cloud.google.com/go/storage" "cloud.google.com/go/storage"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/api/option" "google.golang.org/api/option"
) )

6
weed/replication/sink/replication_sink.go

@ -2,9 +2,9 @@ package sink
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
) )
type ReplicationSink interface { type ReplicationSink interface {

12
weed/replication/sink/s3sink/s3_sink.go

@ -11,12 +11,12 @@ import (
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3iface" "github.com/aws/aws-sdk-go/service/s3/s3iface"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/replication/sink"
"github.com/chrislusf/seaweedfs/weed/replication/source"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/replication/sink"
"github.com/joeslay/seaweedfs/weed/replication/source"
"github.com/joeslay/seaweedfs/weed/util"
) )
type S3Sink struct { type S3Sink struct {

8
weed/replication/sink/s3sink/s3_write.go

@ -9,10 +9,10 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
) )
func (s3sink *S3Sink) deleteObject(key string) error { func (s3sink *S3Sink) deleteObject(key string) error {

8
weed/replication/source/filer_source.go

@ -3,16 +3,16 @@ package source
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/joeslay/seaweedfs/weed/security"
"github.com/spf13/viper" "github.com/spf13/viper"
"google.golang.org/grpc" "google.golang.org/grpc"
"io" "io"
"net/http" "net/http"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
) )
type ReplicationSource interface { type ReplicationSource interface {

6
weed/replication/sub/notification_aws_sqs.go

@ -8,9 +8,9 @@ import (
"github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sqs"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

6
weed/replication/sub/notification_gocdk_pub_sub.go

@ -3,9 +3,9 @@ package sub
import ( import (
"context" "context"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"gocloud.dev/pubsub" "gocloud.dev/pubsub"
_ "gocloud.dev/pubsub/awssnssqs" _ "gocloud.dev/pubsub/awssnssqs"

6
weed/replication/sub/notification_google_pub_sub.go

@ -6,9 +6,9 @@ import (
"os" "os"
"cloud.google.com/go/pubsub" "cloud.google.com/go/pubsub"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"google.golang.org/api/option" "google.golang.org/api/option"
) )

6
weed/replication/sub/notification_kafka.go

@ -8,9 +8,9 @@ import (
"time" "time"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

4
weed/replication/sub/notifications.go

@ -1,8 +1,8 @@
package sub package sub
import ( import (
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
) )
type NotificationInput interface { type NotificationInput interface {

6
weed/s3api/filer_multipart.go

@ -11,9 +11,9 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/satori/go.uuid" "github.com/satori/go.uuid"
) )

4
weed/s3api/filer_util.go

@ -7,8 +7,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
) )
func (s3a *S3ApiServer) mkdir(ctx context.Context, parentDirectoryPath string, dirName string, fn func(entry *filer_pb.Entry)) error { func (s3a *S3ApiServer) mkdir(ctx context.Context, parentDirectoryPath string, dirName string, fn func(entry *filer_pb.Entry)) error {

4
weed/s3api/s3api_bucket_handlers.go

@ -11,8 +11,8 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

6
weed/s3api/s3api_handlers.go

@ -6,9 +6,9 @@ import (
"encoding/base64" "encoding/base64"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/util"
"google.golang.org/grpc" "google.golang.org/grpc"
"net/http" "net/http"
"net/url" "net/url"

4
weed/s3api/s3api_object_handlers.go

@ -9,8 +9,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/server"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

6
weed/s3api/s3api_objects_list_handlers.go

@ -10,9 +10,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/joeslay/seaweedfs/weed/filer2"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/filer_pb"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save