From e10dcc75428c831321077fd32fe019ceaf784b76 Mon Sep 17 00:00:00 2001 From: tnextday Date: Wed, 30 Mar 2016 16:35:36 +0800 Subject: [PATCH] Refactor project dir --- .gitignore | 3 ++- Dockerfile.go_build | 2 +- Makefile | 20 ++++++++++-------- README.md | 6 +++--- unmaintained/fix_dat/fix_dat.go | 6 +++--- unmaintained/see_idx/see_idx.go | 4 ++-- {go => weed}/compress/compression_test.go | 0 {go => weed}/compress/delta_binary_pack32.go | 0 .../filer/cassandra_store/cassandra_store.go | 2 +- {go => weed}/filer/cassandra_store/schema.cql | 0 {go => weed}/filer/client_operations.go | 2 +- {go => weed}/filer/embedded_filer/design.txt | 0 .../filer/embedded_filer/directory.go | 2 +- .../filer/embedded_filer/directory_in_map.go | 4 ++-- .../filer/embedded_filer/directory_test.go | 0 .../filer/embedded_filer/filer_embedded.go | 4 ++-- .../filer/embedded_filer/files_in_leveldb.go | 4 ++-- {go => weed}/filer/filer.go | 0 .../flat_namespace/flat_namespace_filer.go | 2 +- .../flat_namespace/flat_namespace_store.go | 0 {go => weed}/filer/redis_store/redis_store.go | 0 {go => weed}/glog/LICENSE | 0 {go => weed}/glog/README | 0 {go => weed}/glog/convenient_api.go | 0 {go => weed}/glog/glog.go | 0 {go => weed}/glog/glog_file.go | 0 {go => weed}/glog/glog_test.go | 0 {go => weed}/images/orientation.go | 0 {go => weed}/images/orientation_test.go | 0 {go => weed}/images/preprocess.go | 0 {go => weed}/images/resizing.go | 2 +- {go => weed}/images/resizing_test.go | 0 {go => weed}/images/sample1.jpg | Bin weed/main.go | 7 ++++++ {go => weed}/operation/assign_file_id.go | 4 ++-- {go => weed}/operation/chunked_manifest.go | 2 +- {go => weed}/operation/compress.go | 2 +- {go => weed}/operation/delete_content.go | 4 ++-- {go => weed}/operation/list_masters.go | 4 ++-- {go => weed}/operation/lookup.go | 2 +- {go => weed}/operation/lookup_vid_cache.go | 2 +- .../operation/lookup_vid_cache_test.go | 0 {go => weed}/operation/submit.go | 4 ++-- {go => weed}/operation/sync_volume.go | 4 ++-- {go => weed}/operation/upload_content.go | 4 ++-- {go => weed}/security/guard.go | 2 +- {go => weed}/security/jwt.go | 2 +- {go => weed}/sequence/memory_sequencer.go | 0 {go => weed}/sequence/sequence.go | 0 {go => weed}/stats/disk.go | 0 {go => weed}/stats/disk_notsupported.go | 0 {go => weed}/stats/disk_supported.go | 0 {go => weed}/stats/duration_counter.go | 0 {go => weed}/stats/duration_counter_test.go | 0 {go => weed}/stats/memory.go | 0 {go => weed}/stats/memory_notsupported.go | 0 {go => weed}/stats/memory_supported.go | 0 {go => weed}/stats/stats.go | 0 {go => weed}/storage/chunked_file_reader.go | 4 ++-- {go => weed}/storage/collection_settings.go | 2 +- .../storage/collection_settings_test.go | 0 {go => weed}/storage/compact_map.go | 0 {go => weed}/storage/compact_map_perf_test.go | 4 ++-- {go => weed}/storage/compact_map_test.go | 0 {go => weed}/storage/crc.go | 2 +- {go => weed}/storage/disk_location.go | 2 +- {go => weed}/storage/file_id.go | 2 +- {go => weed}/storage/needle.go | 8 +++---- {go => weed}/storage/needle_map.go | 2 +- {go => weed}/storage/needle_map_boltdb.go | 4 ++-- {go => weed}/storage/needle_map_leveldb.go | 4 ++-- {go => weed}/storage/needle_map_memory.go | 2 +- {go => weed}/storage/needle_read_write.go | 4 ++-- {go => weed}/storage/replica_placement.go | 0 .../storage/replica_placement_test.go | 0 {go => weed}/storage/store.go | 8 +++---- {go => weed}/storage/store_task.go | 2 +- {go => weed}/storage/store_task_cli.go | 4 ++-- .../storage/store_task_replication.go | 2 +- {go => weed}/storage/store_task_vacuum.go | 0 {go => weed}/storage/store_vacuum.go | 2 +- {go => weed}/storage/volume.go | 2 +- {go => weed}/storage/volume_id.go | 0 {go => weed}/storage/volume_info.go | 2 +- {go => weed}/storage/volume_info_test.go | 0 {go => weed}/storage/volume_pure_reader.go | 2 +- {go => weed}/storage/volume_replicate_test.go | 0 {go => weed}/storage/volume_super_block.go | 4 ++-- .../storage/volume_super_block_test.go | 0 {go => weed}/storage/volume_sync.go | 6 +++--- {go => weed}/storage/volume_ttl.go | 0 {go => weed}/storage/volume_ttl_test.go | 0 {go => weed}/storage/volume_vacuum.go | 2 +- {go => weed}/storage/volume_version.go | 0 {go => weed}/tools/read_index.go | 2 +- {go => weed}/topology/allocate_volume.go | 4 ++-- {go => weed}/topology/batch_operation.go | 4 ++-- {go => weed}/topology/cluster_commands.go | 4 ++-- {go => weed}/topology/collection.go | 4 ++-- {go => weed}/topology/configuration.go | 0 {go => weed}/topology/configuration_test.go | 0 {go => weed}/topology/data_center.go | 0 {go => weed}/topology/data_node.go | 4 ++-- {go => weed}/topology/node.go | 4 ++-- {go => weed}/topology/rack.go | 0 {go => weed}/topology/store_replicate.go | 10 ++++----- {go => weed}/topology/topo_test.go | 0 {go => weed}/topology/topology.go | 10 ++++----- .../topology/topology_event_handling.go | 4 ++-- {go => weed}/topology/topology_map.go | 0 {go => weed}/topology/topology_replicate.go | 4 ++-- {go => weed}/topology/topology_vacuum.go | 6 +++--- {go => weed}/topology/volume_growth.go | 4 ++-- {go => weed}/topology/volume_growth_test.go | 4 ++-- {go => weed}/topology/volume_layout.go | 4 ++-- {go => weed}/topology/volume_location_list.go | 2 +- {go => weed}/util/bytes.go | 0 {go => weed}/util/concurrent_map.go | 0 {go => weed}/util/config.go | 2 +- {go => weed}/util/constants.go | 0 {go => weed}/util/file_util.go | 2 +- {go => weed}/util/http_util.go | 4 ++-- {go => weed}/util/net_timeout.go | 2 +- {go => weed}/util/parse.go | 0 {go/weed => weed/weedcmd}/backup.go | 6 +++--- {go/weed => weed/weedcmd}/benchmark.go | 10 ++++----- {go/weed => weed/weedcmd}/command.go | 2 +- {go/weed => weed/weedcmd}/compact.go | 6 +++--- {go/weed => weed/weedcmd}/download.go | 6 +++--- {go/weed => weed/weedcmd}/export.go | 6 +++--- {go/weed => weed/weedcmd}/filer.go | 10 ++++----- {go/weed => weed/weedcmd}/fix.go | 6 +++--- {go/weed => weed/weedcmd}/master.go | 12 +++++------ {go/weed => weed/weedcmd}/mount.go | 2 +- .../weedcmd}/mount_notsupported.go | 2 +- {go/weed => weed/weedcmd}/mount_std.go | 10 ++++----- {go/weed => weed/weedcmd}/server.go | 18 ++++++++-------- {go/weed => weed/weedcmd}/shell.go | 4 ++-- {go/weed => weed/weedcmd}/signal_handling.go | 2 +- .../weedcmd}/signal_handling_notsupported.go | 2 +- {go/weed => weed/weedcmd}/upload.go | 6 +++--- {go/weed => weed/weedcmd}/version.go | 4 ++-- {go/weed => weed/weedcmd}/volume.go | 12 +++++------ {go/weed => weed/weedcmd}/volume_test.go | 4 ++-- {go/weed => weed/weedcmd}/weed.go | 6 +++--- {go => weed}/weedpb/Makefile | 0 {go => weed}/weedpb/system_message.pb.go | 0 {go => weed}/weedpb/system_message.proto | 0 {go => weed}/weedpb/system_message_test.go | 0 .../weed_server => weed/weedserver}/common.go | 14 ++++++------ .../weedserver}/filer_server.go | 16 +++++++------- .../weedserver}/filer_server_handlers.go | 10 ++++----- .../filer_server_handlers_admin.go | 4 ++-- .../weedserver}/master_server.go | 14 ++++++------ .../weedserver}/master_server_handlers.go | 8 +++---- .../master_server_handlers_admin.go | 12 +++++------ .../weedserver}/master_server_handlers_ui.go | 8 +++---- .../weedserver}/master_ui/templates.go | 0 .../weedserver}/raft_server.go | 6 +++--- .../weedserver}/raft_server_handlers.go | 6 +++--- .../weedserver}/volume_server.go | 10 ++++----- .../weedserver}/volume_server_handlers.go | 4 ++-- .../volume_server_handlers_admin.go | 10 ++++----- .../volume_server_handlers_helper.go | 2 +- .../volume_server_handlers_read.go | 12 +++++------ .../volume_server_handlers_sync.go | 8 +++---- .../volume_server_handlers_task.go | 6 +++--- .../weedserver}/volume_server_handlers_ui.go | 8 +++---- .../volume_server_handlers_vacuum.go | 4 ++-- .../volume_server_handlers_write.go | 10 ++++----- .../weedserver}/volume_server_ui/templates.go | 0 171 files changed, 292 insertions(+), 282 deletions(-) rename {go => weed}/compress/compression_test.go (100%) rename {go => weed}/compress/delta_binary_pack32.go (100%) rename {go => weed}/filer/cassandra_store/cassandra_store.go (98%) rename {go => weed}/filer/cassandra_store/schema.cql (100%) rename {go => weed}/filer/client_operations.go (97%) rename {go => weed}/filer/embedded_filer/design.txt (100%) rename {go => weed}/filer/embedded_filer/directory.go (91%) rename {go => weed}/filer/embedded_filer/directory_in_map.go (98%) rename {go => weed}/filer/embedded_filer/directory_test.go (100%) rename {go => weed}/filer/embedded_filer/filer_embedded.go (97%) rename {go => weed}/filer/embedded_filer/files_in_leveldb.go (96%) rename {go => weed}/filer/filer.go (100%) rename {go => weed}/filer/flat_namespace/flat_namespace_filer.go (96%) rename {go => weed}/filer/flat_namespace/flat_namespace_store.go (100%) rename {go => weed}/filer/redis_store/redis_store.go (100%) rename {go => weed}/glog/LICENSE (100%) rename {go => weed}/glog/README (100%) rename {go => weed}/glog/convenient_api.go (100%) rename {go => weed}/glog/glog.go (100%) rename {go => weed}/glog/glog_file.go (100%) rename {go => weed}/glog/glog_test.go (100%) rename {go => weed}/images/orientation.go (100%) rename {go => weed}/images/orientation_test.go (100%) rename {go => weed}/images/preprocess.go (100%) rename {go => weed}/images/resizing.go (96%) rename {go => weed}/images/resizing_test.go (100%) rename {go => weed}/images/sample1.jpg (100%) create mode 100644 weed/main.go rename {go => weed}/operation/assign_file_id.go (92%) rename {go => weed}/operation/chunked_manifest.go (96%) rename {go => weed}/operation/compress.go (96%) rename {go => weed}/operation/delete_content.go (96%) rename {go => weed}/operation/list_masters.go (87%) rename {go => weed}/operation/lookup.go (98%) rename {go => weed}/operation/lookup_vid_cache.go (96%) rename {go => weed}/operation/lookup_vid_cache_test.go (100%) rename {go => weed}/operation/submit.go (98%) rename {go => weed}/operation/sync_volume.go (94%) rename {go => weed}/operation/upload_content.go (96%) rename {go => weed}/security/guard.go (98%) rename {go => weed}/security/jwt.go (97%) rename {go => weed}/sequence/memory_sequencer.go (100%) rename {go => weed}/sequence/sequence.go (100%) rename {go => weed}/stats/disk.go (100%) rename {go => weed}/stats/disk_notsupported.go (100%) rename {go => weed}/stats/disk_supported.go (100%) rename {go => weed}/stats/duration_counter.go (100%) rename {go => weed}/stats/duration_counter_test.go (100%) rename {go => weed}/stats/memory.go (100%) rename {go => weed}/stats/memory_notsupported.go (100%) rename {go => weed}/stats/memory_supported.go (100%) rename {go => weed}/stats/stats.go (100%) rename {go => weed}/storage/chunked_file_reader.go (97%) rename {go => weed}/storage/collection_settings.go (98%) rename {go => weed}/storage/collection_settings_test.go (100%) rename {go => weed}/storage/compact_map.go (100%) rename {go => weed}/storage/compact_map_perf_test.go (90%) rename {go => weed}/storage/compact_map_test.go (100%) rename {go => weed}/storage/crc.go (91%) rename {go => weed}/storage/disk_location.go (98%) rename {go => weed}/storage/file_id.go (96%) rename {go => weed}/storage/needle.go (97%) rename {go => weed}/storage/needle_map.go (98%) rename {go => weed}/storage/needle_map_boltdb.go (97%) rename {go => weed}/storage/needle_map_leveldb.go (97%) rename {go => weed}/storage/needle_map_memory.go (98%) rename {go => weed}/storage/needle_read_write.go (99%) rename {go => weed}/storage/replica_placement.go (100%) rename {go => weed}/storage/replica_placement_test.go (100%) rename {go => weed}/storage/store.go (98%) rename {go => weed}/storage/store_task.go (98%) rename {go => weed}/storage/store_task_cli.go (95%) rename {go => weed}/storage/store_task_replication.go (98%) rename {go => weed}/storage/store_task_vacuum.go (100%) rename {go => weed}/storage/store_vacuum.go (97%) rename {go => weed}/storage/volume.go (99%) rename {go => weed}/storage/volume_id.go (100%) rename {go => weed}/storage/volume_info.go (96%) rename {go => weed}/storage/volume_info_test.go (100%) rename {go => weed}/storage/volume_pure_reader.go (99%) rename {go => weed}/storage/volume_replicate_test.go (100%) rename {go => weed}/storage/volume_super_block.go (96%) rename {go => weed}/storage/volume_super_block_test.go (100%) rename {go => weed}/storage/volume_sync.go (98%) rename {go => weed}/storage/volume_ttl.go (100%) rename {go => weed}/storage/volume_ttl_test.go (100%) rename {go => weed}/storage/volume_vacuum.go (98%) rename {go => weed}/storage/volume_version.go (100%) rename {go => weed}/tools/read_index.go (91%) rename {go => weed}/topology/allocate_volume.go (88%) rename {go => weed}/topology/batch_operation.go (92%) rename {go => weed}/topology/cluster_commands.go (87%) rename {go => weed}/topology/collection.go (94%) rename {go => weed}/topology/configuration.go (100%) rename {go => weed}/topology/configuration_test.go (100%) rename {go => weed}/topology/data_center.go (100%) rename {go => weed}/topology/data_node.go (97%) rename {go => weed}/topology/node.go (99%) rename {go => weed}/topology/rack.go (100%) rename {go => weed}/topology/store_replicate.go (93%) rename {go => weed}/topology/topo_test.go (100%) rename {go => weed}/topology/topology.go (96%) rename {go => weed}/topology/topology_event_handling.go (95%) rename {go => weed}/topology/topology_map.go (100%) rename {go => weed}/topology/topology_replicate.go (97%) rename {go => weed}/topology/topology_vacuum.go (97%) rename {go => weed}/topology/volume_growth.go (98%) rename {go => weed}/topology/volume_growth_test.go (98%) rename {go => weed}/topology/volume_layout.go (98%) rename {go => weed}/topology/volume_location_list.go (98%) rename {go => weed}/util/bytes.go (100%) rename {go => weed}/util/concurrent_map.go (100%) rename {go => weed}/util/config.go (98%) rename {go => weed}/util/constants.go (100%) rename {go => weed}/util/file_util.go (93%) rename {go => weed}/util/http_util.go (98%) rename {go => weed}/util/net_timeout.go (97%) rename {go => weed}/util/parse.go (100%) rename {go/weed => weed/weedcmd}/backup.go (95%) rename {go/weed => weed/weedcmd}/benchmark.go (98%) rename {go/weed => weed/weedcmd}/command.go (98%) rename {go/weed => weed/weedcmd}/compact.go (91%) rename {go/weed => weed/weedcmd}/download.go (96%) rename {go/weed => weed/weedcmd}/export.go (98%) rename {go/weed => weed/weedcmd}/filer.go (93%) rename {go/weed => weed/weedcmd}/fix.go (94%) rename {go/weed => weed/weedcmd}/master.go (91%) rename {go/weed => weed/weedcmd}/mount.go (98%) rename {go/weed => weed/weedcmd}/mount_notsupported.go (92%) rename {go/weed => weed/weedcmd}/mount_std.go (92%) rename {go/weed => weed/weedcmd}/server.go (95%) rename {go/weed => weed/weedcmd}/shell.go (94%) rename {go/weed => weed/weedcmd}/signal_handling.go (96%) rename {go/weed => weed/weedcmd}/signal_handling_notsupported.go (75%) rename {go/weed => weed/weedcmd}/upload.go (97%) rename {go/weed => weed/weedcmd}/version.go (86%) rename {go/weed => weed/weedcmd}/volume.go (95%) rename {go/weed => weed/weedcmd}/volume_test.go (74%) rename {go/weed => weed/weedcmd}/weed.go (97%) rename {go => weed}/weedpb/Makefile (100%) rename {go => weed}/weedpb/system_message.pb.go (100%) rename {go => weed}/weedpb/system_message.proto (100%) rename {go => weed}/weedpb/system_message_test.go (100%) rename {go/weed/weed_server => weed/weedserver}/common.go (94%) rename {go/weed/weed_server => weed/weedserver}/filer_server.go (81%) rename {go/weed/weed_server => weed/weedserver}/filer_server_handlers.go (97%) rename {go/weed/weed_server => weed/weedserver}/filer_server_handlers_admin.go (89%) rename {go/weed/weed_server => weed/weedserver}/master_server.go (94%) rename {go/weed/weed_server => weed/weedserver}/master_server_handlers.go (95%) rename {go/weed/weed_server => weed/weedserver}/master_server_handlers_admin.go (97%) rename {go/weed/weed_server => weed/weedserver}/master_server_handlers_ui.go (76%) rename {go/weed/weed_server => weed/weedserver}/master_ui/templates.go (100%) rename {go/weed/weed_server => weed/weedserver}/raft_server.go (97%) rename {go/weed/weed_server => weed/weedserver}/raft_server_handlers.go (94%) rename {go/weed/weed_server => weed/weedserver}/volume_server.go (95%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers.go (94%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_admin.go (94%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_helper.go (99%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_read.go (97%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_sync.go (97%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_task.go (94%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_ui.go (79%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_vacuum.go (95%) rename {go/weed/weed_server => weed/weedserver}/volume_server_handlers_write.go (95%) rename {go/weed/weed_server => weed/weedserver}/volume_server_ui/templates.go (100%) diff --git a/.gitignore b/.gitignore index 57fd53063..aefd44b2c 100644 --- a/.gitignore +++ b/.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 diff --git a/Dockerfile.go_build b/Dockerfile.go_build index 7e0f57a95..d0bc21c91 100644 --- a/Dockerfile.go_build +++ b/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 diff --git a/Makefile b/Makefile index bbca92151..5e40c7b31 100644 --- a/Makefile +++ b/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) diff --git a/README.md b/README.md index 0ff94e51f..838305bc3 100644 --- a/README.md +++ b/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 ## diff --git a/unmaintained/fix_dat/fix_dat.go b/unmaintained/fix_dat/fix_dat.go index 5d35686f4..bcb985fe9 100644 --- a/unmaintained/fix_dat/fix_dat.go +++ b/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 ( diff --git a/unmaintained/see_idx/see_idx.go b/unmaintained/see_idx/see_idx.go index c1e80184a..e7735b9a1 100644 --- a/unmaintained/see_idx/see_idx.go +++ b/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 ( diff --git a/go/compress/compression_test.go b/weed/compress/compression_test.go similarity index 100% rename from go/compress/compression_test.go rename to weed/compress/compression_test.go diff --git a/go/compress/delta_binary_pack32.go b/weed/compress/delta_binary_pack32.go similarity index 100% rename from go/compress/delta_binary_pack32.go rename to weed/compress/delta_binary_pack32.go diff --git a/go/filer/cassandra_store/cassandra_store.go b/weed/filer/cassandra_store/cassandra_store.go similarity index 98% rename from go/filer/cassandra_store/cassandra_store.go rename to weed/filer/cassandra_store/cassandra_store.go index 1c2be8a8e..4ee2f65be 100644 --- a/go/filer/cassandra_store/cassandra_store.go +++ b/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" ) diff --git a/go/filer/cassandra_store/schema.cql b/weed/filer/cassandra_store/schema.cql similarity index 100% rename from go/filer/cassandra_store/schema.cql rename to weed/filer/cassandra_store/schema.cql diff --git a/go/filer/client_operations.go b/weed/filer/client_operations.go similarity index 97% rename from go/filer/client_operations.go rename to weed/filer/client_operations.go index b3ccc633a..3e486c97e 100644 --- a/go/filer/client_operations.go +++ b/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" ) diff --git a/go/filer/embedded_filer/design.txt b/weed/filer/embedded_filer/design.txt similarity index 100% rename from go/filer/embedded_filer/design.txt rename to weed/filer/embedded_filer/design.txt diff --git a/go/filer/embedded_filer/directory.go b/weed/filer/embedded_filer/directory.go similarity index 91% rename from go/filer/embedded_filer/directory.go rename to weed/filer/embedded_filer/directory.go index 7c50e7185..4d4bd1c59 100644 --- a/go/filer/embedded_filer/directory.go +++ b/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 { diff --git a/go/filer/embedded_filer/directory_in_map.go b/weed/filer/embedded_filer/directory_in_map.go similarity index 98% rename from go/filer/embedded_filer/directory_in_map.go rename to weed/filer/embedded_filer/directory_in_map.go index a1679f93e..3ebb4a3e3 100644 --- a/go/filer/embedded_filer/directory_in_map.go +++ b/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 diff --git a/go/filer/embedded_filer/directory_test.go b/weed/filer/embedded_filer/directory_test.go similarity index 100% rename from go/filer/embedded_filer/directory_test.go rename to weed/filer/embedded_filer/directory_test.go diff --git a/go/filer/embedded_filer/filer_embedded.go b/weed/filer/embedded_filer/filer_embedded.go similarity index 97% rename from go/filer/embedded_filer/filer_embedded.go rename to weed/filer/embedded_filer/filer_embedded.go index f467334de..27299eb40 100644 --- a/go/filer/embedded_filer/filer_embedded.go +++ b/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 { diff --git a/go/filer/embedded_filer/files_in_leveldb.go b/weed/filer/embedded_filer/files_in_leveldb.go similarity index 96% rename from go/filer/embedded_filer/files_in_leveldb.go rename to weed/filer/embedded_filer/files_in_leveldb.go index b0b410a26..19f6dd7e8 100644 --- a/go/filer/embedded_filer/files_in_leveldb.go +++ b/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" ) diff --git a/go/filer/filer.go b/weed/filer/filer.go similarity index 100% rename from go/filer/filer.go rename to weed/filer/filer.go diff --git a/go/filer/flat_namespace/flat_namespace_filer.go b/weed/filer/flat_namespace/flat_namespace_filer.go similarity index 96% rename from go/filer/flat_namespace/flat_namespace_filer.go rename to weed/filer/flat_namespace/flat_namespace_filer.go index 9959b2924..c20fd2521 100644 --- a/go/filer/flat_namespace/flat_namespace_filer.go +++ b/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 { diff --git a/go/filer/flat_namespace/flat_namespace_store.go b/weed/filer/flat_namespace/flat_namespace_store.go similarity index 100% rename from go/filer/flat_namespace/flat_namespace_store.go rename to weed/filer/flat_namespace/flat_namespace_store.go diff --git a/go/filer/redis_store/redis_store.go b/weed/filer/redis_store/redis_store.go similarity index 100% rename from go/filer/redis_store/redis_store.go rename to weed/filer/redis_store/redis_store.go diff --git a/go/glog/LICENSE b/weed/glog/LICENSE similarity index 100% rename from go/glog/LICENSE rename to weed/glog/LICENSE diff --git a/go/glog/README b/weed/glog/README similarity index 100% rename from go/glog/README rename to weed/glog/README diff --git a/go/glog/convenient_api.go b/weed/glog/convenient_api.go similarity index 100% rename from go/glog/convenient_api.go rename to weed/glog/convenient_api.go diff --git a/go/glog/glog.go b/weed/glog/glog.go similarity index 100% rename from go/glog/glog.go rename to weed/glog/glog.go diff --git a/go/glog/glog_file.go b/weed/glog/glog_file.go similarity index 100% rename from go/glog/glog_file.go rename to weed/glog/glog_file.go diff --git a/go/glog/glog_test.go b/weed/glog/glog_test.go similarity index 100% rename from go/glog/glog_test.go rename to weed/glog/glog_test.go diff --git a/go/images/orientation.go b/weed/images/orientation.go similarity index 100% rename from go/images/orientation.go rename to weed/images/orientation.go diff --git a/go/images/orientation_test.go b/weed/images/orientation_test.go similarity index 100% rename from go/images/orientation_test.go rename to weed/images/orientation_test.go diff --git a/go/images/preprocess.go b/weed/images/preprocess.go similarity index 100% rename from go/images/preprocess.go rename to weed/images/preprocess.go diff --git a/go/images/resizing.go b/weed/images/resizing.go similarity index 96% rename from go/images/resizing.go rename to weed/images/resizing.go index 2da3f9b6f..0f099229e 100644 --- a/go/images/resizing.go +++ b/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" ) diff --git a/go/images/resizing_test.go b/weed/images/resizing_test.go similarity index 100% rename from go/images/resizing_test.go rename to weed/images/resizing_test.go diff --git a/go/images/sample1.jpg b/weed/images/sample1.jpg similarity index 100% rename from go/images/sample1.jpg rename to weed/images/sample1.jpg diff --git a/weed/main.go b/weed/main.go new file mode 100644 index 000000000..fc989bda8 --- /dev/null +++ b/weed/main.go @@ -0,0 +1,7 @@ +package main + +import "github.com/chrislusf/seaweedfs/weed/weedcmd" + +func main() { + weedcmd.Main() +} diff --git a/go/operation/assign_file_id.go b/weed/operation/assign_file_id.go similarity index 92% rename from go/operation/assign_file_id.go rename to weed/operation/assign_file_id.go index 45ac5c362..39882e2ec 100644 --- a/go/operation/assign_file_id.go +++ b/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 { diff --git a/go/operation/chunked_manifest.go b/weed/operation/chunked_manifest.go similarity index 96% rename from go/operation/chunked_manifest.go rename to weed/operation/chunked_manifest.go index 2fdcb6039..1d3a76918 100644 --- a/go/operation/chunked_manifest.go +++ b/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 { diff --git a/go/operation/compress.go b/weed/operation/compress.go similarity index 96% rename from go/operation/compress.go rename to weed/operation/compress.go index b1105ba4b..de62e5bf7 100644 --- a/go/operation/compress.go +++ b/weed/operation/compress.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "strings" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) /* diff --git a/go/operation/delete_content.go b/weed/operation/delete_content.go similarity index 96% rename from go/operation/delete_content.go rename to weed/operation/delete_content.go index 28ab4f498..878d266ab 100644 --- a/go/operation/delete_content.go +++ b/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 { diff --git a/go/operation/list_masters.go b/weed/operation/list_masters.go similarity index 87% rename from go/operation/list_masters.go rename to weed/operation/list_masters.go index 8aa1eae58..a30781a7f 100644 --- a/go/operation/list_masters.go +++ b/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 { diff --git a/go/operation/lookup.go b/weed/operation/lookup.go similarity index 98% rename from go/operation/lookup.go rename to weed/operation/lookup.go index 3b91fa5f1..1eb7a4422 100644 --- a/go/operation/lookup.go +++ b/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 { diff --git a/go/operation/lookup_vid_cache.go b/weed/operation/lookup_vid_cache.go similarity index 96% rename from go/operation/lookup_vid_cache.go rename to weed/operation/lookup_vid_cache.go index 25c079db1..738be3224 100644 --- a/go/operation/lookup_vid_cache.go +++ b/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" ) diff --git a/go/operation/lookup_vid_cache_test.go b/weed/operation/lookup_vid_cache_test.go similarity index 100% rename from go/operation/lookup_vid_cache_test.go rename to weed/operation/lookup_vid_cache_test.go diff --git a/go/operation/submit.go b/weed/operation/submit.go similarity index 98% rename from go/operation/submit.go rename to weed/operation/submit.go index ce4cda535..f1ecc4a6d 100644 --- a/go/operation/submit.go +++ b/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 { diff --git a/go/operation/sync_volume.go b/weed/operation/sync_volume.go similarity index 94% rename from go/operation/sync_volume.go rename to weed/operation/sync_volume.go index f63d6f96a..ed6adcd20 100644 --- a/go/operation/sync_volume.go +++ b/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 { diff --git a/go/operation/upload_content.go b/weed/operation/upload_content.go similarity index 96% rename from go/operation/upload_content.go rename to weed/operation/upload_content.go index c3fd5f4b1..a87784cad 100644 --- a/go/operation/upload_content.go +++ b/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 { diff --git a/go/security/guard.go b/weed/security/guard.go similarity index 98% rename from go/security/guard.go rename to weed/security/guard.go index 57b1f22d9..721ead8b8 100644 --- a/go/security/guard.go +++ b/weed/security/guard.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) var ( diff --git a/go/security/jwt.go b/weed/security/jwt.go similarity index 97% rename from go/security/jwt.go rename to weed/security/jwt.go index a29a94b3c..a2472ca6e 100644 --- a/go/security/jwt.go +++ b/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" ) diff --git a/go/sequence/memory_sequencer.go b/weed/sequence/memory_sequencer.go similarity index 100% rename from go/sequence/memory_sequencer.go rename to weed/sequence/memory_sequencer.go diff --git a/go/sequence/sequence.go b/weed/sequence/sequence.go similarity index 100% rename from go/sequence/sequence.go rename to weed/sequence/sequence.go diff --git a/go/stats/disk.go b/weed/stats/disk.go similarity index 100% rename from go/stats/disk.go rename to weed/stats/disk.go diff --git a/go/stats/disk_notsupported.go b/weed/stats/disk_notsupported.go similarity index 100% rename from go/stats/disk_notsupported.go rename to weed/stats/disk_notsupported.go diff --git a/go/stats/disk_supported.go b/weed/stats/disk_supported.go similarity index 100% rename from go/stats/disk_supported.go rename to weed/stats/disk_supported.go diff --git a/go/stats/duration_counter.go b/weed/stats/duration_counter.go similarity index 100% rename from go/stats/duration_counter.go rename to weed/stats/duration_counter.go diff --git a/go/stats/duration_counter_test.go b/weed/stats/duration_counter_test.go similarity index 100% rename from go/stats/duration_counter_test.go rename to weed/stats/duration_counter_test.go diff --git a/go/stats/memory.go b/weed/stats/memory.go similarity index 100% rename from go/stats/memory.go rename to weed/stats/memory.go diff --git a/go/stats/memory_notsupported.go b/weed/stats/memory_notsupported.go similarity index 100% rename from go/stats/memory_notsupported.go rename to weed/stats/memory_notsupported.go diff --git a/go/stats/memory_supported.go b/weed/stats/memory_supported.go similarity index 100% rename from go/stats/memory_supported.go rename to weed/stats/memory_supported.go diff --git a/go/stats/stats.go b/weed/stats/stats.go similarity index 100% rename from go/stats/stats.go rename to weed/stats/stats.go diff --git a/go/storage/chunked_file_reader.go b/weed/storage/chunked_file_reader.go similarity index 97% rename from go/storage/chunked_file_reader.go rename to weed/storage/chunked_file_reader.go index d7ba964a7..2f2ec22eb 100644 --- a/go/storage/chunked_file_reader.go +++ b/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 ( diff --git a/go/storage/collection_settings.go b/weed/storage/collection_settings.go similarity index 98% rename from go/storage/collection_settings.go rename to weed/storage/collection_settings.go index 84653f054..e36832cf3 100644 --- a/go/storage/collection_settings.go +++ b/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 diff --git a/go/storage/collection_settings_test.go b/weed/storage/collection_settings_test.go similarity index 100% rename from go/storage/collection_settings_test.go rename to weed/storage/collection_settings_test.go diff --git a/go/storage/compact_map.go b/weed/storage/compact_map.go similarity index 100% rename from go/storage/compact_map.go rename to weed/storage/compact_map.go diff --git a/go/storage/compact_map_perf_test.go b/weed/storage/compact_map_perf_test.go similarity index 90% rename from go/storage/compact_map_perf_test.go rename to weed/storage/compact_map_perf_test.go index 79e122227..7a45194c4 100644 --- a/go/storage/compact_map_perf_test.go +++ b/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) { diff --git a/go/storage/compact_map_test.go b/weed/storage/compact_map_test.go similarity index 100% rename from go/storage/compact_map_test.go rename to weed/storage/compact_map_test.go diff --git a/go/storage/crc.go b/weed/storage/crc.go similarity index 91% rename from go/storage/crc.go rename to weed/storage/crc.go index b10354d64..ad0774d06 100644 --- a/go/storage/crc.go +++ b/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) diff --git a/go/storage/disk_location.go b/weed/storage/disk_location.go similarity index 98% rename from go/storage/disk_location.go rename to weed/storage/disk_location.go index df977ae0a..e056e9b00 100644 --- a/go/storage/disk_location.go +++ b/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 diff --git a/go/storage/file_id.go b/weed/storage/file_id.go similarity index 96% rename from go/storage/file_id.go rename to weed/storage/file_id.go index 0cd0abc11..16e0f7844 100644 --- a/go/storage/file_id.go +++ b/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 { diff --git a/go/storage/needle.go b/weed/storage/needle.go similarity index 97% rename from go/storage/needle.go rename to weed/storage/needle.go index 0e2b639f2..47bb60d40 100644 --- a/go/storage/needle.go +++ b/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 ( diff --git a/go/storage/needle_map.go b/weed/storage/needle_map.go similarity index 98% rename from go/storage/needle_map.go rename to weed/storage/needle_map.go index 9e997e9ba..86cfefeab 100644 --- a/go/storage/needle_map.go +++ b/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 diff --git a/go/storage/needle_map_boltdb.go b/weed/storage/needle_map_boltdb.go similarity index 97% rename from go/storage/needle_map_boltdb.go rename to weed/storage/needle_map_boltdb.go index a08e809aa..80ce85041 100644 --- a/go/storage/needle_map_boltdb.go +++ b/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 { diff --git a/go/storage/needle_map_leveldb.go b/weed/storage/needle_map_leveldb.go similarity index 97% rename from go/storage/needle_map_leveldb.go rename to weed/storage/needle_map_leveldb.go index 2fd17d850..60e1b2125 100644 --- a/go/storage/needle_map_leveldb.go +++ b/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" ) diff --git a/go/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go similarity index 98% rename from go/storage/needle_map_memory.go rename to weed/storage/needle_map_memory.go index 8e244169b..65e812b29 100644 --- a/go/storage/needle_map_memory.go +++ b/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 { diff --git a/go/storage/needle_read_write.go b/weed/storage/needle_read_write.go similarity index 99% rename from go/storage/needle_read_write.go rename to weed/storage/needle_read_write.go index 073b2899a..5ede78ece 100644 --- a/go/storage/needle_read_write.go +++ b/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 ( diff --git a/go/storage/replica_placement.go b/weed/storage/replica_placement.go similarity index 100% rename from go/storage/replica_placement.go rename to weed/storage/replica_placement.go diff --git a/go/storage/replica_placement_test.go b/weed/storage/replica_placement_test.go similarity index 100% rename from go/storage/replica_placement_test.go rename to weed/storage/replica_placement_test.go diff --git a/go/storage/store.go b/weed/storage/store.go similarity index 98% rename from go/storage/store.go rename to weed/storage/store.go index de49df4e6..aa6b7e564 100644 --- a/go/storage/store.go +++ b/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 ( diff --git a/go/storage/store_task.go b/weed/storage/store_task.go similarity index 98% rename from go/storage/store_task.go rename to weed/storage/store_task.go index 5d9efbadf..bf86549a7 100644 --- a/go/storage/store_task.go +++ b/weed/storage/store_task.go @@ -7,7 +7,7 @@ import ( "sync" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) const ( diff --git a/go/storage/store_task_cli.go b/weed/storage/store_task_cli.go similarity index 95% rename from go/storage/store_task_cli.go rename to weed/storage/store_task_cli.go index 90d22ce83..8ef4e8e1c 100644 --- a/go/storage/store_task_cli.go +++ b/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 diff --git a/go/storage/store_task_replication.go b/weed/storage/store_task_replication.go similarity index 98% rename from go/storage/store_task_replication.go rename to weed/storage/store_task_replication.go index 4461b2911..315316984 100644 --- a/go/storage/store_task_replication.go +++ b/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 { diff --git a/go/storage/store_task_vacuum.go b/weed/storage/store_task_vacuum.go similarity index 100% rename from go/storage/store_task_vacuum.go rename to weed/storage/store_task_vacuum.go diff --git a/go/storage/store_vacuum.go b/weed/storage/store_vacuum.go similarity index 97% rename from go/storage/store_vacuum.go rename to weed/storage/store_vacuum.go index 52343c898..03825c159 100644 --- a/go/storage/store_vacuum.go +++ b/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) { diff --git a/go/storage/volume.go b/weed/storage/volume.go similarity index 99% rename from go/storage/volume.go rename to weed/storage/volume.go index 31531d4d7..466dbbc17 100644 --- a/go/storage/volume.go +++ b/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 { diff --git a/go/storage/volume_id.go b/weed/storage/volume_id.go similarity index 100% rename from go/storage/volume_id.go rename to weed/storage/volume_id.go diff --git a/go/storage/volume_info.go b/weed/storage/volume_info.go similarity index 96% rename from go/storage/volume_info.go rename to weed/storage/volume_info.go index f2973cb8f..75691e750 100644 --- a/go/storage/volume_info.go +++ b/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 { diff --git a/go/storage/volume_info_test.go b/weed/storage/volume_info_test.go similarity index 100% rename from go/storage/volume_info_test.go rename to weed/storage/volume_info_test.go diff --git a/go/storage/volume_pure_reader.go b/weed/storage/volume_pure_reader.go similarity index 99% rename from go/storage/volume_pure_reader.go rename to weed/storage/volume_pure_reader.go index 2b35397f5..25e5e191a 100644 --- a/go/storage/volume_pure_reader.go +++ b/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 { diff --git a/go/storage/volume_replicate_test.go b/weed/storage/volume_replicate_test.go similarity index 100% rename from go/storage/volume_replicate_test.go rename to weed/storage/volume_replicate_test.go diff --git a/go/storage/volume_super_block.go b/weed/storage/volume_super_block.go similarity index 96% rename from go/storage/volume_super_block.go rename to weed/storage/volume_super_block.go index d6e9e8395..1372552bf 100644 --- a/go/storage/volume_super_block.go +++ b/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 ( diff --git a/go/storage/volume_super_block_test.go b/weed/storage/volume_super_block_test.go similarity index 100% rename from go/storage/volume_super_block_test.go rename to weed/storage/volume_super_block_test.go diff --git a/go/storage/volume_sync.go b/weed/storage/volume_sync.go similarity index 98% rename from go/storage/volume_sync.go rename to weed/storage/volume_sync.go index b1211acd5..11e22b903 100644 --- a/go/storage/volume_sync.go +++ b/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: diff --git a/go/storage/volume_ttl.go b/weed/storage/volume_ttl.go similarity index 100% rename from go/storage/volume_ttl.go rename to weed/storage/volume_ttl.go diff --git a/go/storage/volume_ttl_test.go b/weed/storage/volume_ttl_test.go similarity index 100% rename from go/storage/volume_ttl_test.go rename to weed/storage/volume_ttl_test.go diff --git a/go/storage/volume_vacuum.go b/weed/storage/volume_vacuum.go similarity index 98% rename from go/storage/volume_vacuum.go rename to weed/storage/volume_vacuum.go index 646266a4c..9ba6a48fc 100644 --- a/go/storage/volume_vacuum.go +++ b/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 { diff --git a/go/storage/volume_version.go b/weed/storage/volume_version.go similarity index 100% rename from go/storage/volume_version.go rename to weed/storage/volume_version.go diff --git a/go/tools/read_index.go b/weed/tools/read_index.go similarity index 91% rename from go/tools/read_index.go rename to weed/tools/read_index.go index 1543f4482..642ff786b 100644 --- a/go/tools/read_index.go +++ b/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 ( diff --git a/go/topology/allocate_volume.go b/weed/topology/allocate_volume.go similarity index 88% rename from go/topology/allocate_volume.go rename to weed/topology/allocate_volume.go index e48f01495..05bb20ce9 100644 --- a/go/topology/allocate_volume.go +++ b/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 { diff --git a/go/topology/batch_operation.go b/weed/topology/batch_operation.go similarity index 92% rename from go/topology/batch_operation.go rename to weed/topology/batch_operation.go index 2ecf1c4bd..dfc1db0f2 100644 --- a/go/topology/batch_operation.go +++ b/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) { diff --git a/go/topology/cluster_commands.go b/weed/topology/cluster_commands.go similarity index 87% rename from go/topology/cluster_commands.go rename to weed/topology/cluster_commands.go index eac93c13c..53f45ec4d 100644 --- a/go/topology/cluster_commands.go +++ b/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 { diff --git a/go/topology/collection.go b/weed/topology/collection.go similarity index 94% rename from go/topology/collection.go rename to weed/topology/collection.go index 1c81ba2b6..b0f8bcbe1 100644 --- a/go/topology/collection.go +++ b/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 { diff --git a/go/topology/configuration.go b/weed/topology/configuration.go similarity index 100% rename from go/topology/configuration.go rename to weed/topology/configuration.go diff --git a/go/topology/configuration_test.go b/weed/topology/configuration_test.go similarity index 100% rename from go/topology/configuration_test.go rename to weed/topology/configuration_test.go diff --git a/go/topology/data_center.go b/weed/topology/data_center.go similarity index 100% rename from go/topology/data_center.go rename to weed/topology/data_center.go diff --git a/go/topology/data_node.go b/weed/topology/data_node.go similarity index 97% rename from go/topology/data_node.go rename to weed/topology/data_node.go index f0f261ea1..331332e30 100644 --- a/go/topology/data_node.go +++ b/weed/topology/data_node.go @@ -4,8 +4,8 @@ import ( "fmt" "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" "net" "time" ) diff --git a/go/topology/node.go b/weed/topology/node.go similarity index 99% rename from go/topology/node.go rename to weed/topology/node.go index 6d018fe39..c3e21d3dc 100644 --- a/go/topology/node.go +++ b/weed/topology/node.go @@ -8,8 +8,8 @@ import ( "sync" - "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 NodeId string diff --git a/go/topology/rack.go b/weed/topology/rack.go similarity index 100% rename from go/topology/rack.go rename to weed/topology/rack.go diff --git a/go/topology/store_replicate.go b/weed/topology/store_replicate.go similarity index 93% rename from go/topology/store_replicate.go rename to weed/topology/store_replicate.go index 8d02acd34..dd4a96c30 100644 --- a/go/topology/store_replicate.go +++ b/weed/topology/store_replicate.go @@ -8,11 +8,11 @@ import ( "net" "net/url" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/security" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" ) func ReplicatedWrite(masterNode string, s *storage.Store, diff --git a/go/topology/topo_test.go b/weed/topology/topo_test.go similarity index 100% rename from go/topology/topo_test.go rename to weed/topology/topo_test.go diff --git a/go/topology/topology.go b/weed/topology/topology.go similarity index 96% rename from go/topology/topology.go rename to weed/topology/topology.go index f6d015f88..eca2a51c5 100644 --- a/go/topology/topology.go +++ b/weed/topology/topology.go @@ -9,11 +9,11 @@ import ( "time" "github.com/chrislusf/raft" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/sequence" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weedpb" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/sequence" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedpb" ) type Topology struct { diff --git a/go/topology/topology_event_handling.go b/weed/topology/topology_event_handling.go similarity index 95% rename from go/topology/topology_event_handling.go rename to weed/topology/topology_event_handling.go index ad5aaabbc..a81dfd197 100644 --- a/go/topology/topology_event_handling.go +++ b/weed/topology/topology_event_handling.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) func (t *Topology) StartRefreshWritableVolumes() { diff --git a/go/topology/topology_map.go b/weed/topology/topology_map.go similarity index 100% rename from go/topology/topology_map.go rename to weed/topology/topology_map.go diff --git a/go/topology/topology_replicate.go b/weed/topology/topology_replicate.go similarity index 97% rename from go/topology/topology_replicate.go rename to weed/topology/topology_replicate.go index a491e5d91..528b6e06e 100644 --- a/go/topology/topology_replicate.go +++ b/weed/topology/topology_replicate.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "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 ( diff --git a/go/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go similarity index 97% rename from go/topology/topology_vacuum.go rename to weed/topology/topology_vacuum.go index a1ae78bef..92d9fd352 100644 --- a/go/topology/topology_vacuum.go +++ b/weed/topology/topology_vacuum.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - "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" ) func batchVacuumVolumeCheck(vl *VolumeLayout, vid storage.VolumeId, locationlist *VolumeLocationList, garbageThreshold string) bool { diff --git a/go/topology/volume_growth.go b/weed/topology/volume_growth.go similarity index 98% rename from go/topology/volume_growth.go rename to weed/topology/volume_growth.go index d475b3aad..f9d068813 100644 --- a/go/topology/volume_growth.go +++ b/weed/topology/volume_growth.go @@ -5,8 +5,8 @@ import ( "math/rand" "sync" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) /* diff --git a/go/topology/volume_growth_test.go b/weed/topology/volume_growth_test.go similarity index 98% rename from go/topology/volume_growth_test.go rename to weed/topology/volume_growth_test.go index 04125e7f2..f79f0e256 100644 --- a/go/topology/volume_growth_test.go +++ b/weed/topology/volume_growth_test.go @@ -7,8 +7,8 @@ import ( "strings" - "github.com/chrislusf/seaweedfs/go/sequence" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/sequence" + "github.com/chrislusf/seaweedfs/weed/storage" "github.com/syndtr/goleveldb/leveldb/errors" ) diff --git a/go/topology/volume_layout.go b/weed/topology/volume_layout.go similarity index 98% rename from go/topology/volume_layout.go rename to weed/topology/volume_layout.go index a5e5418dc..c8ee3b3c9 100644 --- a/go/topology/volume_layout.go +++ b/weed/topology/volume_layout.go @@ -6,8 +6,8 @@ import ( "math/rand" "sync" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) // mapping from volume to its locations, inverted from server to volume diff --git a/go/topology/volume_location_list.go b/weed/topology/volume_location_list.go similarity index 98% rename from go/topology/volume_location_list.go rename to weed/topology/volume_location_list.go index ec71d6115..b78e6f76d 100644 --- a/go/topology/volume_location_list.go +++ b/weed/topology/volume_location_list.go @@ -3,7 +3,7 @@ package topology import ( "fmt" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/storage" "math/rand" ) diff --git a/go/util/bytes.go b/weed/util/bytes.go similarity index 100% rename from go/util/bytes.go rename to weed/util/bytes.go diff --git a/go/util/concurrent_map.go b/weed/util/concurrent_map.go similarity index 100% rename from go/util/concurrent_map.go rename to weed/util/concurrent_map.go diff --git a/go/util/config.go b/weed/util/config.go similarity index 98% rename from go/util/config.go rename to weed/util/config.go index 7e9471b8a..e4549c322 100644 --- a/go/util/config.go +++ b/weed/util/config.go @@ -14,7 +14,7 @@ import ( "encoding/json" "os" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) type Config struct { diff --git a/go/util/constants.go b/weed/util/constants.go similarity index 100% rename from go/util/constants.go rename to weed/util/constants.go diff --git a/go/util/file_util.go b/weed/util/file_util.go similarity index 93% rename from go/util/file_util.go rename to weed/util/file_util.go index 37133b5b2..a39fb0860 100644 --- a/go/util/file_util.go +++ b/weed/util/file_util.go @@ -5,7 +5,7 @@ import ( "errors" "os" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) func TestFolderWritable(folder string) (err error) { diff --git a/go/util/http_util.go b/weed/util/http_util.go similarity index 98% rename from go/util/http_util.go rename to weed/util/http_util.go index 13cc1d8ed..0e5ec9c42 100644 --- a/go/util/http_util.go +++ b/weed/util/http_util.go @@ -13,8 +13,8 @@ import ( "os" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/security" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/security" "github.com/golang/protobuf/proto" "github.com/pierrec/lz4" "strconv" diff --git a/go/util/net_timeout.go b/weed/util/net_timeout.go similarity index 97% rename from go/util/net_timeout.go rename to weed/util/net_timeout.go index ad8396e18..f46776992 100644 --- a/go/util/net_timeout.go +++ b/weed/util/net_timeout.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/chrislusf/seaweedfs/go/stats" + "github.com/chrislusf/seaweedfs/weed/stats" ) // Listener wraps a net.Listener, and gives a place to store the timeout diff --git a/go/util/parse.go b/weed/util/parse.go similarity index 100% rename from go/util/parse.go rename to weed/util/parse.go diff --git a/go/weed/backup.go b/weed/weedcmd/backup.go similarity index 95% rename from go/weed/backup.go rename to weed/weedcmd/backup.go index 3d852de60..5c11be927 100644 --- a/go/weed/backup.go +++ b/weed/weedcmd/backup.go @@ -1,10 +1,10 @@ -package main +package weedcmd import ( "fmt" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/storage" ) var ( diff --git a/go/weed/benchmark.go b/weed/weedcmd/benchmark.go similarity index 98% rename from go/weed/benchmark.go rename to weed/weedcmd/benchmark.go index e9f882008..af63f460c 100644 --- a/go/weed/benchmark.go +++ b/weed/weedcmd/benchmark.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "bufio" @@ -14,10 +14,10 @@ import ( "sync" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/security" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/util" ) type BenchmarkOptions struct { diff --git a/go/weed/command.go b/weed/weedcmd/command.go similarity index 98% rename from go/weed/command.go rename to weed/weedcmd/command.go index c8d86ca66..7a659aefc 100644 --- a/go/weed/command.go +++ b/weed/weedcmd/command.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "flag" diff --git a/go/weed/compact.go b/weed/weedcmd/compact.go similarity index 91% rename from go/weed/compact.go rename to weed/weedcmd/compact.go index b51879f97..592ab2721 100644 --- a/go/weed/compact.go +++ b/weed/weedcmd/compact.go @@ -1,8 +1,8 @@ -package main +package weedcmd import ( - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) func init() { diff --git a/go/weed/download.go b/weed/weedcmd/download.go similarity index 96% rename from go/weed/download.go rename to weed/weedcmd/download.go index a2f3118fd..2cb60353c 100644 --- a/go/weed/download.go +++ b/weed/weedcmd/download.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "fmt" @@ -8,8 +8,8 @@ import ( "path" "strings" - "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 ( diff --git a/go/weed/export.go b/weed/weedcmd/export.go similarity index 98% rename from go/weed/export.go rename to weed/weedcmd/export.go index 4417c65f4..25f8e1a6d 100644 --- a/go/weed/export.go +++ b/weed/weedcmd/export.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "archive/tar" @@ -12,8 +12,8 @@ import ( "text/template" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) const ( diff --git a/go/weed/filer.go b/weed/weedcmd/filer.go similarity index 93% rename from go/weed/filer.go rename to weed/weedcmd/filer.go index ae9dac2ca..a4fffb4e4 100644 --- a/go/weed/filer.go +++ b/weed/weedcmd/filer.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "net/http" @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weed/weed_server" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedserver" ) var ( @@ -78,7 +78,7 @@ func runFiler(cmd *Command, args []string) bool { } r := http.NewServeMux() - _, nfs_err := weed_server.NewFilerServer(r, *f.port, *f.master, *f.dir, *f.collection, + _, nfs_err := weedserver.NewFilerServer(r, *f.port, *f.master, *f.dir, *f.collection, *f.defaultReplicaPlacement, *f.redirectOnRead, *f.disableDirListing, *f.secretKey, *f.cassandra_server, *f.cassandra_keyspace, diff --git a/go/weed/fix.go b/weed/weedcmd/fix.go similarity index 94% rename from go/weed/fix.go rename to weed/weedcmd/fix.go index 3abcbc31c..a60fcea71 100644 --- a/go/weed/fix.go +++ b/weed/weedcmd/fix.go @@ -1,12 +1,12 @@ -package main +package weedcmd import ( "os" "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" ) func init() { diff --git a/go/weed/master.go b/weed/weedcmd/master.go similarity index 91% rename from go/weed/master.go rename to weed/weedcmd/master.go index c4889ce57..bdbf030bc 100644 --- a/go/weed/master.go +++ b/weed/weedcmd/master.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "net/http" @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weed/weed_server" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedserver" "github.com/gorilla/mux" "net" ) @@ -60,7 +60,7 @@ func runMaster(cmd *Command, args []string) bool { } r := mux.NewRouter() - ms := weed_server.NewMasterServer(r, *mport, *metaFolder, + ms := weedserver.NewMasterServer(r, *mport, *metaFolder, *volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList, *masterSecureKey, ) @@ -81,7 +81,7 @@ func runMaster(cmd *Command, args []string) bool { if *masterPeers != "" { peers = strings.Split(*masterPeers, ",") } - raftServer := weed_server.NewRaftServer(r, peers, myMasterAddress, *metaFolder, ms.Topo, *mpulse) + raftServer := weedserver.NewRaftServer(r, peers, myMasterAddress, *metaFolder, ms.Topo, *mpulse) ms.SetRaftServer(raftServer) }() diff --git a/go/weed/mount.go b/weed/weedcmd/mount.go similarity index 98% rename from go/weed/mount.go rename to weed/weedcmd/mount.go index e6f46c392..840d4a06d 100644 --- a/go/weed/mount.go +++ b/weed/weedcmd/mount.go @@ -1,4 +1,4 @@ -package main +package weedcmd type MountOptions struct { filer *string diff --git a/go/weed/mount_notsupported.go b/weed/weedcmd/mount_notsupported.go similarity index 92% rename from go/weed/mount_notsupported.go rename to weed/weedcmd/mount_notsupported.go index bc77ffa16..05302263e 100644 --- a/go/weed/mount_notsupported.go +++ b/weed/weedcmd/mount_notsupported.go @@ -1,7 +1,7 @@ // +build !linux // +build !darwin -package main +package weedcmd import ( "fmt" diff --git a/go/weed/mount_std.go b/weed/weedcmd/mount_std.go similarity index 92% rename from go/weed/mount_std.go rename to weed/weedcmd/mount_std.go index db097fb1d..139195914 100644 --- a/go/weed/mount_std.go +++ b/weed/weedcmd/mount_std.go @@ -1,6 +1,6 @@ // +build linux darwin -package main +package weedcmd import ( "fmt" @@ -8,10 +8,10 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/chrislusf/seaweedfs/go/filer" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/filer" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" "golang.org/x/net/context" ) diff --git a/go/weed/server.go b/weed/weedcmd/server.go similarity index 95% rename from go/weed/server.go rename to weed/weedcmd/server.go index 74362228a..10b0bf8d4 100644 --- a/go/weed/server.go +++ b/weed/weedcmd/server.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "net/http" @@ -12,10 +12,10 @@ import ( "net" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weed/weed_server" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedserver" "github.com/gorilla/mux" ) @@ -168,7 +168,7 @@ func runServer(cmd *Command, args []string) bool { if *isStartingFiler { go func() { r := http.NewServeMux() - _, nfs_err := weed_server.NewFilerServer(r, *filerOptions.port, *filerOptions.master, *filerOptions.dir, *filerOptions.collection, + _, nfs_err := weedserver.NewFilerServer(r, *filerOptions.port, *filerOptions.master, *filerOptions.dir, *filerOptions.collection, *filerOptions.defaultReplicaPlacement, *filerOptions.redirectOnRead, *filerOptions.disableDirListing, *filerOptions.secretKey, @@ -200,7 +200,7 @@ func runServer(cmd *Command, args []string) bool { go func() { r := mux.NewRouter() - ms := weed_server.NewMasterServer(r, *masterPort, *masterMetaFolder, + ms := weedserver.NewMasterServer(r, *masterPort, *masterMetaFolder, *masterVolumeSizeLimitMB, *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, serverWhiteList, *serverSecureKey, ) @@ -219,7 +219,7 @@ func runServer(cmd *Command, args []string) bool { if *serverPeers != "" { peers = strings.Split(*serverPeers, ",") } - raftServer := weed_server.NewRaftServer(r, peers, myAddress, *masterMetaFolder, ms.Topo, *volumePulse) + raftServer := weedserver.NewRaftServer(r, peers, myAddress, *masterMetaFolder, ms.Topo, *volumePulse) ms.SetRaftServer(raftServer) volumeWait.Done() }() @@ -251,7 +251,7 @@ func runServer(cmd *Command, args []string) bool { case "boltdb": volumeNeedleMapKind = storage.NeedleMapBoltDb } - volumeServer := weed_server.NewVolumeServer(volumeMux, publicVolumeMux, + volumeServer := weedserver.NewVolumeServer(volumeMux, publicVolumeMux, *serverIp, *volumePort, *volumeServerPublicUrl, folders, maxCounts, volumeNeedleMapKind, diff --git a/go/weed/shell.go b/weed/weedcmd/shell.go similarity index 94% rename from go/weed/shell.go rename to weed/weedcmd/shell.go index feac5ddd4..1c6967a96 100644 --- a/go/weed/shell.go +++ b/weed/weedcmd/shell.go @@ -1,11 +1,11 @@ -package main +package weedcmd import ( "bufio" "fmt" "os" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) func init() { diff --git a/go/weed/signal_handling.go b/weed/weedcmd/signal_handling.go similarity index 96% rename from go/weed/signal_handling.go rename to weed/weedcmd/signal_handling.go index 9c3908ce3..f2a6d2bdc 100644 --- a/go/weed/signal_handling.go +++ b/weed/weedcmd/signal_handling.go @@ -1,6 +1,6 @@ // +build !plan9 -package main +package weedcmd import ( "os" diff --git a/go/weed/signal_handling_notsupported.go b/weed/weedcmd/signal_handling_notsupported.go similarity index 75% rename from go/weed/signal_handling_notsupported.go rename to weed/weedcmd/signal_handling_notsupported.go index 343cf7de2..f87747067 100644 --- a/go/weed/signal_handling_notsupported.go +++ b/weed/weedcmd/signal_handling_notsupported.go @@ -1,6 +1,6 @@ // +build plan9 -package main +package weedcmd func OnInterrupt(fn func()) { } diff --git a/go/weed/upload.go b/weed/weedcmd/upload.go similarity index 97% rename from go/weed/upload.go rename to weed/weedcmd/upload.go index df0e359b9..15f7b295c 100644 --- a/go/weed/upload.go +++ b/weed/weedcmd/upload.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "encoding/json" @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/security" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/security" ) var ( diff --git a/go/weed/version.go b/weed/weedcmd/version.go similarity index 86% rename from go/weed/version.go rename to weed/weedcmd/version.go index 8fef546f4..6a7d959ae 100644 --- a/go/weed/version.go +++ b/weed/weedcmd/version.go @@ -1,10 +1,10 @@ -package main +package weedcmd import ( "fmt" "runtime" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/util" ) var cmdVersion = &Command{ diff --git a/go/weed/volume.go b/weed/weedcmd/volume.go similarity index 95% rename from go/weed/volume.go rename to weed/weedcmd/volume.go index b22728445..b559b4867 100644 --- a/go/weed/volume.go +++ b/weed/weedcmd/volume.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "net/http" @@ -10,10 +10,10 @@ import ( "net" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weed/weed_server" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedserver" ) var ( @@ -130,7 +130,7 @@ func runVolume(cmd *Command, args []string) bool { case "boltdb": volumeNeedleMapKind = storage.NeedleMapBoltDb } - volumeServer := weed_server.NewVolumeServer(volumeMux, publicVolumeMux, + volumeServer := weedserver.NewVolumeServer(volumeMux, publicVolumeMux, *v.ip, *v.port, *v.publicUrl, v.folders, v.folderMaxLimits, volumeNeedleMapKind, diff --git a/go/weed/volume_test.go b/weed/weedcmd/volume_test.go similarity index 74% rename from go/weed/volume_test.go rename to weed/weedcmd/volume_test.go index ba06cb985..03a0b860e 100644 --- a/go/weed/volume_test.go +++ b/weed/weedcmd/volume_test.go @@ -1,11 +1,11 @@ -package main +package weedcmd import ( "net/http" "testing" "time" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) func TestXYZ(t *testing.T) { diff --git a/go/weed/weed.go b/weed/weedcmd/weed.go similarity index 97% rename from go/weed/weed.go rename to weed/weedcmd/weed.go index 49fe17eaa..407113663 100644 --- a/go/weed/weed.go +++ b/weed/weedcmd/weed.go @@ -1,4 +1,4 @@ -package main +package weedcmd import ( "flag" @@ -13,7 +13,7 @@ import ( "unicode" "unicode/utf8" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) var IsDebug *bool @@ -47,7 +47,7 @@ func setExitStatus(n int) { exitMu.Unlock() } -func main() { +func Main() { glog.MaxSize = 1024 * 1024 * 32 rand.Seed(time.Now().UnixNano()) flag.Usage = usage diff --git a/go/weedpb/Makefile b/weed/weedpb/Makefile similarity index 100% rename from go/weedpb/Makefile rename to weed/weedpb/Makefile diff --git a/go/weedpb/system_message.pb.go b/weed/weedpb/system_message.pb.go similarity index 100% rename from go/weedpb/system_message.pb.go rename to weed/weedpb/system_message.pb.go diff --git a/go/weedpb/system_message.proto b/weed/weedpb/system_message.proto similarity index 100% rename from go/weedpb/system_message.proto rename to weed/weedpb/system_message.proto diff --git a/go/weedpb/system_message_test.go b/weed/weedpb/system_message_test.go similarity index 100% rename from go/weedpb/system_message_test.go rename to weed/weedpb/system_message_test.go diff --git a/go/weed/weed_server/common.go b/weed/weedserver/common.go similarity index 94% rename from go/weed/weed_server/common.go rename to weed/weedserver/common.go index ada571f49..ee523238d 100644 --- a/go/weed/weed_server/common.go +++ b/weed/weedserver/common.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "bytes" @@ -12,12 +12,12 @@ import ( "io/ioutil" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/security" - "github.com/chrislusf/seaweedfs/go/stats" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/golang/protobuf/proto" ) diff --git a/go/weed/weed_server/filer_server.go b/weed/weedserver/filer_server.go similarity index 81% rename from go/weed/weed_server/filer_server.go rename to weed/weedserver/filer_server.go index ae3088454..309305a8a 100644 --- a/go/weed/weed_server/filer_server.go +++ b/weed/weedserver/filer_server.go @@ -1,16 +1,16 @@ -package weed_server +package weedserver import ( "net/http" "strconv" - "github.com/chrislusf/seaweedfs/go/filer" - "github.com/chrislusf/seaweedfs/go/filer/cassandra_store" - "github.com/chrislusf/seaweedfs/go/filer/embedded_filer" - "github.com/chrislusf/seaweedfs/go/filer/flat_namespace" - "github.com/chrislusf/seaweedfs/go/filer/redis_store" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/security" + "github.com/chrislusf/seaweedfs/weed/filer" + "github.com/chrislusf/seaweedfs/weed/filer/cassandra_store" + "github.com/chrislusf/seaweedfs/weed/filer/embedded_filer" + "github.com/chrislusf/seaweedfs/weed/filer/flat_namespace" + "github.com/chrislusf/seaweedfs/weed/filer/redis_store" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/security" ) type FilerServer struct { diff --git a/go/weed/weed_server/filer_server_handlers.go b/weed/weedserver/filer_server_handlers.go similarity index 97% rename from go/weed/weed_server/filer_server_handlers.go rename to weed/weedserver/filer_server_handlers.go index d3772ebbd..b037ad4e0 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/weed/weedserver/filer_server_handlers.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "bytes" @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/go/weed/weed_server/filer_server_handlers_admin.go b/weed/weedserver/filer_server_handlers_admin.go similarity index 89% rename from go/weed/weed_server/filer_server_handlers_admin.go rename to weed/weedserver/filer_server_handlers_admin.go index 2f317ff79..f62fdaaa5 100644 --- a/go/weed/weed_server/filer_server_handlers_admin.go +++ b/weed/weedserver/filer_server_handlers_admin.go @@ -1,9 +1,9 @@ -package weed_server +package weedserver import ( "net/http" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) /* diff --git a/go/weed/weed_server/master_server.go b/weed/weedserver/master_server.go similarity index 94% rename from go/weed/weed_server/master_server.go rename to weed/weedserver/master_server.go index e5b34a2cd..fc320430e 100644 --- a/go/weed/weed_server/master_server.go +++ b/weed/weedserver/master_server.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "fmt" @@ -8,12 +8,12 @@ import ( "sync" "github.com/chrislusf/raft" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/security" - "github.com/chrislusf/seaweedfs/go/sequence" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/topology" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/sequence" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/topology" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/gorilla/mux" ) diff --git a/go/weed/weed_server/master_server_handlers.go b/weed/weedserver/master_server_handlers.go similarity index 95% rename from go/weed/weed_server/master_server_handlers.go rename to weed/weedserver/master_server_handlers.go index 9e37c0834..71c241345 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/weed/weedserver/master_server_handlers.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "fmt" @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/stats" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/storage" ) func (ms *MasterServer) lookupVolumeId(vids []string, collection string) (volumeLocations map[string]operation.LookupResult) { diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/weed/weedserver/master_server_handlers_admin.go similarity index 97% rename from go/weed/weed_server/master_server_handlers_admin.go rename to weed/weedserver/master_server_handlers_admin.go index f34ad0662..0030f131d 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/weed/weedserver/master_server_handlers_admin.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "encoding/json" @@ -13,11 +13,11 @@ import ( "net" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/topology" - "github.com/chrislusf/seaweedfs/go/util" - "github.com/chrislusf/seaweedfs/go/weedpb" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/topology" + "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/weedpb" "github.com/golang/protobuf/proto" ) diff --git a/go/weed/weed_server/master_server_handlers_ui.go b/weed/weedserver/master_server_handlers_ui.go similarity index 76% rename from go/weed/weed_server/master_server_handlers_ui.go rename to weed/weedserver/master_server_handlers_ui.go index 35231d61b..e1eaaa51e 100644 --- a/go/weed/weed_server/master_server_handlers_ui.go +++ b/weed/weedserver/master_server_handlers_ui.go @@ -1,11 +1,11 @@ -package weed_server +package weedserver import ( "net/http" - "github.com/chrislusf/seaweedfs/go/stats" - "github.com/chrislusf/seaweedfs/go/util" - ui "github.com/chrislusf/seaweedfs/go/weed/weed_server/master_ui" + "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/util" + ui "github.com/chrislusf/seaweedfs/weed/weedserver/master_ui" ) func (ms *MasterServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/master_ui/templates.go b/weed/weedserver/master_ui/templates.go similarity index 100% rename from go/weed/weed_server/master_ui/templates.go rename to weed/weedserver/master_ui/templates.go diff --git a/go/weed/weed_server/raft_server.go b/weed/weedserver/raft_server.go similarity index 97% rename from go/weed/weed_server/raft_server.go rename to weed/weedserver/raft_server.go index 9c8947862..a98f67a04 100644 --- a/go/weed/weed_server/raft_server.go +++ b/weed/weedserver/raft_server.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "bytes" @@ -15,8 +15,8 @@ import ( "time" "github.com/chrislusf/raft" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/topology" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/topology" "github.com/gorilla/mux" ) diff --git a/go/weed/weed_server/raft_server_handlers.go b/weed/weedserver/raft_server_handlers.go similarity index 94% rename from go/weed/weed_server/raft_server_handlers.go rename to weed/weedserver/raft_server_handlers.go index b1d964a32..ca654fba0 100644 --- a/go/weed/weed_server/raft_server_handlers.go +++ b/weed/weedserver/raft_server_handlers.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "encoding/json" @@ -7,8 +7,8 @@ import ( "strings" "github.com/chrislusf/raft" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" ) // Handles incoming RAFT joins. diff --git a/go/weed/weed_server/volume_server.go b/weed/weedserver/volume_server.go similarity index 95% rename from go/weed/weed_server/volume_server.go rename to weed/weedserver/volume_server.go index 5d0fa35c8..312bb2e93 100644 --- a/go/weed/weed_server/volume_server.go +++ b/weed/weedserver/volume_server.go @@ -1,14 +1,14 @@ -package weed_server +package weedserver import ( "math/rand" "net/http" "time" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/security" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/weedpb" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/weedpb" ) type VolumeServer struct { diff --git a/go/weed/weed_server/volume_server_handlers.go b/weed/weedserver/volume_server_handlers.go similarity index 94% rename from go/weed/weed_server/volume_server_handlers.go rename to weed/weedserver/volume_server_handlers.go index 885156ed2..2218af2fe 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/weed/weedserver/volume_server_handlers.go @@ -1,9 +1,9 @@ -package weed_server +package weedserver import ( "net/http" - "github.com/chrislusf/seaweedfs/go/stats" + "github.com/chrislusf/seaweedfs/weed/stats" ) /* diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/weed/weedserver/volume_server_handlers_admin.go similarity index 94% rename from go/weed/weed_server/volume_server_handlers_admin.go rename to weed/weedserver/volume_server_handlers_admin.go index 40a4642e5..e541520c7 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/weed/weedserver/volume_server_handlers_admin.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "errors" @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/stats" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/util" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" ) type VolumeOptError struct { diff --git a/go/weed/weed_server/volume_server_handlers_helper.go b/weed/weedserver/volume_server_handlers_helper.go similarity index 99% rename from go/weed/weed_server/volume_server_handlers_helper.go rename to weed/weedserver/volume_server_handlers_helper.go index 2bab35e45..f3d884893 100644 --- a/go/weed/weed_server/volume_server_handlers_helper.go +++ b/weed/weedserver/volume_server_handlers_helper.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "errors" diff --git a/go/weed/weed_server/volume_server_handlers_read.go b/weed/weedserver/volume_server_handlers_read.go similarity index 97% rename from go/weed/weed_server/volume_server_handlers_read.go rename to weed/weedserver/volume_server_handlers_read.go index 3e987edf0..cc4de9c92 100644 --- a/go/weed/weed_server/volume_server_handlers_read.go +++ b/weed/weedserver/volume_server_handlers_read.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "bytes" @@ -18,11 +18,11 @@ import ( "encoding/json" "errors" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/images" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/storage" - "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/storage" + "github.com/chrislusf/seaweedfs/weed/util" ) var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"") diff --git a/go/weed/weed_server/volume_server_handlers_sync.go b/weed/weedserver/volume_server_handlers_sync.go similarity index 97% rename from go/weed/weed_server/volume_server_handlers_sync.go rename to weed/weedserver/volume_server_handlers_sync.go index 471cdbf5c..2195bfa81 100644 --- a/go/weed/weed_server/volume_server_handlers_sync.go +++ b/weed/weedserver/volume_server_handlers_sync.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "fmt" @@ -6,9 +6,9 @@ import ( "net/http" "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" "github.com/pierrec/lz4" ) diff --git a/go/weed/weed_server/volume_server_handlers_task.go b/weed/weedserver/volume_server_handlers_task.go similarity index 94% rename from go/weed/weed_server/volume_server_handlers_task.go rename to weed/weedserver/volume_server_handlers_task.go index 9677e7d95..e91d3cbd8 100644 --- a/go/weed/weed_server/volume_server_handlers_task.go +++ b/weed/weedserver/volume_server_handlers_task.go @@ -1,4 +1,4 @@ -package weed_server +package weedserver import ( "net/http" @@ -7,8 +7,8 @@ import ( "strings" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/storage" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/storage" ) func (vs *VolumeServer) newTaskHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_handlers_ui.go b/weed/weedserver/volume_server_handlers_ui.go similarity index 79% rename from go/weed/weed_server/volume_server_handlers_ui.go rename to weed/weedserver/volume_server_handlers_ui.go index 5e1bd6478..931e76454 100644 --- a/go/weed/weed_server/volume_server_handlers_ui.go +++ b/weed/weedserver/volume_server_handlers_ui.go @@ -1,13 +1,13 @@ -package weed_server +package weedserver import ( "net/http" "path/filepath" "time" - "github.com/chrislusf/seaweedfs/go/stats" - "github.com/chrislusf/seaweedfs/go/util" - ui "github.com/chrislusf/seaweedfs/go/weed/weed_server/volume_server_ui" + "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/util" + ui "github.com/chrislusf/seaweedfs/weed/weedserver/volume_server_ui" ) func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/weed/weedserver/volume_server_handlers_vacuum.go similarity index 95% rename from go/weed/weed_server/volume_server_handlers_vacuum.go rename to weed/weedserver/volume_server_handlers_vacuum.go index e174835ca..e8b30a515 100644 --- a/go/weed/weed_server/volume_server_handlers_vacuum.go +++ b/weed/weedserver/volume_server_handlers_vacuum.go @@ -1,9 +1,9 @@ -package weed_server +package weedserver import ( "net/http" - "github.com/chrislusf/seaweedfs/go/glog" + "github.com/chrislusf/seaweedfs/weed/glog" ) func (vs *VolumeServer) vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_handlers_write.go b/weed/weedserver/volume_server_handlers_write.go similarity index 95% rename from go/weed/weed_server/volume_server_handlers_write.go rename to weed/weedserver/volume_server_handlers_write.go index db2431046..0d03995dc 100644 --- a/go/weed/weed_server/volume_server_handlers_write.go +++ b/weed/weedserver/volume_server_handlers_write.go @@ -1,14 +1,14 @@ -package weed_server +package weedserver import ( "errors" "fmt" "net/http" - "github.com/chrislusf/seaweedfs/go/glog" - "github.com/chrislusf/seaweedfs/go/operation" - "github.com/chrislusf/seaweedfs/go/storage" - "github.com/chrislusf/seaweedfs/go/topology" + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/topology" ) func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_ui/templates.go b/weed/weedserver/volume_server_ui/templates.go similarity index 100% rename from go/weed/weed_server/volume_server_ui/templates.go rename to weed/weedserver/volume_server_ui/templates.go