Change joeslay paths to chrislusf paths

This commit is contained in:
j.laycock committed 2019-09-12 14:18:21 +01:00
1 parent d8c34b032f
commit 6fc6322c90
244 files changed
+745 -815

No files matched your search

+3 -3
View File
@@ -8,9 +8,9 @@ import (
"fmt"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
type DiskLocation struct {
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"sort"
"strconv"
"github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
var (
+5 -5
View File
@@ -5,11 +5,11 @@ import (
"io"
"os"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/klauspost/reedsolomon"
)
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"path"
"strconv"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
type ShardId uint8
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"os"
"testing"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/klauspost/reedsolomon"
)
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"sync"
"time"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
)
var (
@@ -5,8 +5,8 @@ import (
"io"
"os"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
var (
@@ -1,8 +1,8 @@
package erasure_coding
import (
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
// data structure used in master
+3 -3
View File
@@ -4,9 +4,9 @@ import (
"io"
"os"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
// walks through the index file, calls fn function with each key, offset, size
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"crypto/md5"
"fmt"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/klauspost/crc32"
)
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt"
"strings"
. "github.com/joeslay/seaweedfs/weed/storage/types"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
type FileId struct {
+1 -1
View File
@@ -1,7 +1,7 @@
package needle
import (
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"testing"
)
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"io/ioutil"
"github.com/joeslay/seaweedfs/weed/images"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/images"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
const (
@@ -1,8 +1,8 @@
package needle
import (
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util"
"io"
"io/ioutil"
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"math"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/memory_map"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/memory_map"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
const (
@@ -5,7 +5,7 @@ import (
"os"
"testing"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/types"
)
func TestAppend(t *testing.T) {
+1 -1
View File
@@ -3,7 +3,7 @@ package needle
import (
"testing"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/types"
)
func TestParseKeyHash(t *testing.T) {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"os"
"sync"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
type NeedleMapType int
+1 -1
View File
@@ -1,7 +1,7 @@
package needle_map
import (
. "github.com/joeslay/seaweedfs/weed/storage/types"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/google/btree"
)
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"sort"
"sync"
. "github.com/joeslay/seaweedfs/weed/storage/types"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
const (
@@ -8,8 +8,8 @@ import (
"testing"
"time"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
/*
+1 -1
View File
@@ -2,7 +2,7 @@ package needle_map
import (
"fmt"
. "github.com/joeslay/seaweedfs/weed/storage/types"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"testing"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package needle_map
import (
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/google/btree"
)
+1 -1
View File
@@ -1,7 +1,7 @@
package needle_map
import (
. "github.com/joeslay/seaweedfs/weed/storage/types"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
type NeedleValueMap interface {
+5 -5
View File
@@ -5,13 +5,13 @@ import (
"os"
"path/filepath"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/syndtr/goleveldb/leveldb/opt"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/syndtr/goleveldb/leveldb"
)
+4 -4
View File
@@ -3,10 +3,10 @@ package storage
import (
"os"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
type NeedleMap struct {
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"os"
"sync/atomic"
"github.com/joeslay/seaweedfs/weed/storage/idx"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/willf/bloom"
)
+2 -2
View File
@@ -1,8 +1,8 @@
package storage
import (
"github.com/joeslay/seaweedfs/weed/glog"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"io/ioutil"
"math/rand"
"testing"
+5 -5
View File
@@ -4,11 +4,11 @@ import (
"fmt"
"sync/atomic"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/storage/needle"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"google.golang.org/grpc"
)
+8 -8
View File
@@ -8,14 +8,14 @@ import (
"sync"
"time"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/klauspost/reedsolomon"
)
+6 -6
View File
@@ -4,12 +4,12 @@ import (
"context"
"fmt"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/storage/erasure_coding"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
)
func (s *Store) DeleteEcShardNeedle(ctx context.Context, ecVolume *erasure_coding.EcVolume, n *needle.Needle, cookie types.Cookie) (int64, error) {
+2 -2
View File
@@ -3,8 +3,8 @@ package storage
import (
"fmt"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
func (s *Store) CheckCompactVolume(volumeId needle.VolumeId) (float64, error) {
+1 -1
View File
@@ -2,7 +2,7 @@ package types
import (
"fmt"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/util"
"strconv"
)
+1 -1
View File
@@ -2,7 +2,7 @@ package types
import (
"fmt"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/util"
"math"
"strconv"
)
+5 -5
View File
@@ -3,10 +3,10 @@ package storage
import (
"fmt"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
"os"
"path"
@@ -14,7 +14,7 @@ import (
"sync"
"time"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/glog"
)
type Volume struct {
+5 -5
View File
@@ -6,11 +6,11 @@ import (
"io"
"os"
"github.com/joeslay/seaweedfs/weed/operation"
"github.com/joeslay/seaweedfs/weed/pb/volume_server_pb"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"google.golang.org/grpc"
)
+4 -4
View File
@@ -4,10 +4,10 @@ import (
"fmt"
"os"
"github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uint64, e error) {
+1 -1
View File
@@ -5,7 +5,7 @@ package storage
import (
"os"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/glog"
)
func createVolumeFile(fileName string, preallocate int64, useMemoryMap uint32) (*os.File, error) {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os"
"syscall"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/glog"
)
func createVolumeFile(fileName string, preallocate int64, useMemoryMap uint32) (file *os.File, e error) {
+3 -3
View File
@@ -5,11 +5,11 @@ package storage
import (
"os"
"github.com/joeslay/seaweedfs/weed/storage/memory_map"
"github.com/chrislusf/seaweedfs/weed/storage/memory_map"
"golang.org/x/sys/windows"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/os_overloads"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/os_overloads"
)
func createVolumeFile(fileName string, preallocate int64, memoryMapSizeMB uint32) (*os.File, error) {
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"sort"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
type VolumeInfo struct {
+1 -1
View File
@@ -3,7 +3,7 @@ package storage
import (
"testing"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
func TestSortVolumeInfos(t *testing.T) {
+3 -3
View File
@@ -5,11 +5,11 @@ import (
"os"
"time"
"github.com/joeslay/seaweedfs/weed/stats"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/syndtr/goleveldb/leveldb/opt"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/glog"
)
func loadVolumeWithoutIndex(dirname string, collection string, id needle.VolumeId, needleMapKind NeedleMapType) (v *Volume, e error) {
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"os"
"time"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/storage/memory_map"
"github.com/joeslay/seaweedfs/weed/storage/needle"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/storage/memory_map"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
)
var ErrorNotFound = errors.New("not found")
+5 -5
View File
@@ -4,13 +4,13 @@ import (
"fmt"
"os"
"github.com/joeslay/seaweedfs/weed/storage/memory_map"
"github.com/chrislusf/seaweedfs/weed/storage/memory_map"
"github.com/golang/protobuf/proto"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/pb/master_pb"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/util"
)
const (
+1 -1
View File
@@ -3,7 +3,7 @@ package storage
import (
"testing"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
func TestSuperBlockReadWrite(t *testing.T) {
+7 -7
View File
@@ -5,13 +5,13 @@ import (
"os"
"time"
"github.com/joeslay/seaweedfs/weed/glog"
"github.com/joeslay/seaweedfs/weed/stats"
idx2 "github.com/joeslay/seaweedfs/weed/storage/idx"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/needle_map"
. "github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/joeslay/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/stats"
idx2 "github.com/chrislusf/seaweedfs/weed/storage/idx"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/needle_map"
. "github.com/chrislusf/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/util"
)
func (v *Volume) garbageLevel() float64 {
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"testing"
"time"
"github.com/joeslay/seaweedfs/weed/storage/needle"
"github.com/joeslay/seaweedfs/weed/storage/types"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"github.com/chrislusf/seaweedfs/weed/storage/types"
)
/*