Refactor project dir

.gitignore

@@ -1,4 +1,4 @@
-go/weed/.goxc*
+weed/weedcmd/.goxc*
 tags
 *.swp
 ### OSX template
@@ -75,3 +75,4 @@ crashlytics.properties
 crashlytics-build.properties
 
 test_data
+bin

Dockerfile.go_build

@@ -1,5 +1,5 @@
 FROM cydev/go
-RUN go get github.com/chrislusf/seaweedfs/go/weed
+RUN go get github.com/chrislusf/seaweedfs/weed
 EXPOSE 8080
 EXPOSE 9333
 VOLUME /data

Makefile

@@ -1,7 +1,8 @@
 BINARY = weed
+OUT_DIR = bin
 
-GO_FLAGS = -race #-v
-SOURCE_DIR = ./go/weed/
+GO_FLAGS = -race -v
+SOURCE_DIR = ./weed
 
 all: build
 
@@ -15,14 +16,15 @@ deps:
 	go get $(GO_FLAGS) -d $(SOURCE_DIR)
 
 fmt:
-	gofmt -w -s ./go/
+	gofmt -w -s $(SOURCE_DIR)
 
 vet:
-	go vet ./go/...
+	go vet $(SOURCE_DIR)/...
 
-build: deps fmt
-	go build $(GO_FLAGS) -o $(BINARY) $(SOURCE_DIR)
+build: fmt
+	mkdir -p $(OUT_DIR)
+	go build $(GO_FLAGS) -o $(OUT_DIR)/$(BINARY) $(SOURCE_DIR)
 
-linux: deps
-	mkdir -p linux
-	GOOS=linux GOARCH=amd64 go build $(GO_FLAGS) -o linux/$(BINARY) $(SOURCE_DIR)
+linux:
+	mkdir -p $(OUT_DIR)
+	GOOS=linux GOARCH=amd64 go build $(GO_FLAGS) -o $(OUT_DIR)/$(BINARY)-linux-amd64 $(SOURCE_DIR)

README.md

@@ -1,7 +1,7 @@
 # SeaweedFS
 
 [![Build Status](https://travis-ci.org/chrislusf/seaweedfs.svg?branch=master)](https://travis-ci.org/chrislusf/seaweedfs)
-[![GoDoc](https://godoc.org/github.com/chrislusf/seaweedfs/go?status.svg)](https://godoc.org/github.com/chrislusf/seaweedfs/go)
+[![GoDoc](https://godoc.org/github.com/chrislusf/seaweedfs?status.svg)](https://godoc.org/github.com/chrislusf/seaweedfs)
 [![Wiki](https://img.shields.io/badge/docs-wiki-blue.svg)](https://github.com/chrislusf/seaweedfs/wiki)
 
 ![SeaweedFS Logo](https://raw.githubusercontent.com/chrislusf/seaweedfs/master/note/seaweedfs.png)
@@ -287,11 +287,11 @@ http://mercurial.selenic.com/downloads
 
 step 3: download, compile, and install the project by executing the following command
 
-go get github.com/chrislusf/seaweedfs/go/weed
+go get github.com/chrislusf/seaweedfs/weed
 
 once this is done, you should see the executable "weed" under $GOPATH/bin
 
-step 4: after you modify your code locally, you could start a local build by calling "go install" under $GOPATH/src/github.com/chrislusf/seaweedfs/go/weed
+step 4: after you modify your code locally, you could start a local build by calling "go install" under $GOPATH/src/github.com/chrislusf/seaweedfs/weed
 
 ## Disk Related topics ##
 

unmaintained/fix_dat/fix_dat.go

@@ -8,9 +8,9 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/storage"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

unmaintained/see_idx/see_idx.go

@@ -6,8 +6,8 @@ import (
 	"path"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 var (

go/filer/cassandra_store/cassandra_store.go → weed/filer/cassandra_store/cassandra_store.go

@@ -3,7 +3,7 @@ package cassandra_store
 import (
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 
 	"github.com/gocql/gocql"
 )

go/filer/client_operations.go → weed/filer/client_operations.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 
 	"net/url"
 )

go/filer/embedded_filer/directory.go → weed/filer/embedded_filer/directory.go

@@ -1,7 +1,7 @@
 package embedded_filer
 
 import (
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
 )
 
 type DirectoryManager interface {

go/filer/embedded_filer/directory_in_map.go → weed/filer/embedded_filer/directory_in_map.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/filer"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var writeLock sync.Mutex //serialize changes to dir.log

go/filer/embedded_filer/filer_embedded.go → weed/filer/embedded_filer/filer_embedded.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
-	"github.com/chrislusf/seaweedfs/go/operation"
+	"github.com/chrislusf/seaweedfs/weed/filer"
+	"github.com/chrislusf/seaweedfs/weed/operation"
 )
 
 type FilerEmbedded struct {

go/filer/embedded_filer/files_in_leveldb.go → weed/filer/embedded_filer/files_in_leveldb.go

@@ -3,8 +3,8 @@ package embedded_filer
 import (
 	"bytes"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/filer"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/util"
 )

go/filer/flat_namespace/flat_namespace_filer.go → weed/filer/flat_namespace/flat_namespace_filer.go

@@ -3,7 +3,7 @@ package flat_namespace
 import (
 	"errors"
 
-	"github.com/chrislusf/seaweedfs/go/filer"
+	"github.com/chrislusf/seaweedfs/weed/filer"
 )
 
 type FlatNamespaceFiler struct {

go/images/resizing.go → weed/images/resizing.go

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

weed/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "github.com/chrislusf/seaweedfs/weed/weedcmd"
+
+func main() {
+	weedcmd.Main()
+}

go/operation/assign_file_id.go → weed/operation/assign_file_id.go

@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type AssignResult struct {

go/operation/chunked_manifest.go → weed/operation/chunked_manifest.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"sort"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 type ChunkInfo struct {

go/operation/compress.go → weed/operation/compress.go

@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 /*

go/operation/delete_content.go → weed/operation/delete_content.go

@@ -10,8 +10,8 @@ import (
 
 	"net/http"
 
-	"github.com/chrislusf/seaweedfs/go/security"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/security"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type DeleteResult struct {

go/operation/list_masters.go → weed/operation/list_masters.go

@@ -3,8 +3,8 @@ package operation
 import (
 	"encoding/json"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type ClusterStatusResult struct {

go/operation/lookup.go → weed/operation/lookup.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type Location struct {

go/operation/lookup_vid_cache.go → weed/operation/lookup_vid_cache.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"sync"
 )
 

go/operation/submit.go → weed/operation/submit.go

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

go/operation/sync_volume.go → weed/operation/sync_volume.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type SyncVolumeResponse struct {

go/operation/upload_content.go → weed/operation/upload_content.go

@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/security"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/security"
 )
 
 type UploadResult struct {

go/security/guard.go → weed/security/guard.go

@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 var (

go/security/jwt.go → weed/security/jwt.go

@@ -6,7 +6,7 @@ import (
 
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	jwt "github.com/dgrijalva/jwt-go"
 )
 

go/storage/chunked_file_reader.go → weed/storage/chunked_file_reader.go

@@ -7,8 +7,8 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/operation"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var (

go/storage/collection_settings.go → weed/storage/collection_settings.go

@@ -1,6 +1,6 @@
 package storage
 
-import "github.com/chrislusf/seaweedfs/go/weedpb"
+import "github.com/chrislusf/seaweedfs/weed/weedpb"
 
 type SettingKey int
 

go/storage/compact_map_perf_test.go → weed/storage/compact_map_perf_test.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func TestMemoryUsage(t *testing.T) {

go/storage/crc.go → weed/storage/crc.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"hash/crc32"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 var table = crc32.MakeTable(crc32.Castagnoli)

go/storage/disk_location.go → weed/storage/disk_location.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 // DiskLocation is concurrent safe

go/storage/file_id.go → weed/storage/file_id.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 type FileId struct {

go/storage/needle.go → weed/storage/needle.go

@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/images"
-	"github.com/chrislusf/seaweedfs/go/operation"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/images"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 const (

go/storage/needle_map.go → weed/storage/needle_map.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type NeedleMapType int

go/storage/needle_map_boltdb.go → weed/storage/needle_map_boltdb.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/boltdb/bolt"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type BoltDbNeedleMap struct {

go/storage/needle_map_leveldb.go → weed/storage/needle_map_leveldb.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/syndtr/goleveldb/leveldb"
 )
 

go/storage/needle_map_memory.go → weed/storage/needle_map_memory.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 type NeedleMap struct {

go/storage/needle_read_write.go → weed/storage/needle_read_write.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 const (

go/storage/store.go → weed/storage/store.go

@@ -11,10 +11,10 @@ import (
 
 	"encoding/json"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
-	"github.com/chrislusf/seaweedfs/go/util"
-	"github.com/chrislusf/seaweedfs/go/weedpb"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/util"
+	"github.com/chrislusf/seaweedfs/weed/weedpb"
 )
 
 const (

go/storage/store_task.go → weed/storage/store_task.go

@@ -7,7 +7,7 @@ import (
 
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 const (

go/storage/store_task_cli.go → weed/storage/store_task_cli.go

@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type TaskParams map[string]string

go/storage/store_task_replication.go → weed/storage/store_task_replication.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type ReplicaTask struct {

go/storage/store_vacuum.go → weed/storage/store_vacuum.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 func (s *Store) CheckCompactVolume(volumeIdString string, garbageThresholdString string) (error, bool) {

go/storage/volume.go → weed/storage/volume.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 type Volume struct {

go/storage/volume_info.go → weed/storage/volume_info.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/chrislusf/seaweedfs/go/weedpb"
+	"github.com/chrislusf/seaweedfs/weed/weedpb"
 )
 
 type VolumeInfo struct {

go/storage/volume_pure_reader.go → weed/storage/volume_pure_reader.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type DirtyData struct {

go/storage/volume_super_block.go → weed/storage/volume_super_block.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 const (

go/storage/volume_sync.go → weed/storage/volume_sync.go

@@ -9,9 +9,9 @@ import (
 	"sort"
 	"strconv"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/operation"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 // The volume sync with a master volume via 2 steps:

go/storage/volume_vacuum.go → weed/storage/volume_vacuum.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 )
 
 func (v *Volume) garbageLevel() float64 {

go/tools/read_index.go → weed/tools/read_index.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 var (

go/topology/allocate_volume.go → weed/topology/allocate_volume.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/chrislusf/seaweedfs/go/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/storage"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type AllocateVolumeResult struct {

go/topology/batch_operation.go → weed/topology/batch_operation.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func BatchOperation(locationList *VolumeLocationList, path string, values url.Values) (isSuccess bool) {

go/topology/cluster_commands.go → weed/topology/cluster_commands.go

@@ -2,8 +2,8 @@ package topology
 
 import (
 	"github.com/chrislusf/raft"
-	"github.com/chrislusf/seaweedfs/go/glog"
-	"github.com/chrislusf/seaweedfs/go/storage"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/storage"
 )
 
 type MaxVolumeIdCommand struct {

go/topology/collection.go → weed/topology/collection.go

@@ -3,8 +3,8 @@ package topology
 import (
 	"fmt"
 
-	"github.com/chrislusf/seaweedfs/go/storage"
-	"github.com/chrislusf/seaweedfs/go/util"
+	"github.com/chrislusf/seaweedfs/weed/storage"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type Collection struct {