From 5071f528f649f3f99336c7d491ceef4859e34744 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 10 Feb 2013 03:49:51 -0800 Subject: [PATCH] testing compilation with remove package --- {weed => go/cmd}/command.go | 0 {weed => go/cmd}/export.go | 4 ++-- {weed => go/cmd}/fix.go | 2 +- {weed => go/cmd}/master.go | 6 +++--- {weed => go/cmd}/shell.go | 0 {weed => go/cmd}/upload.go | 4 ++-- {weed => go/cmd}/version.go | 0 {weed => go/cmd}/volume.go | 4 ++-- {weed => go/cmd}/weed.go | 0 {weed => go}/directory/file_id.go | 4 ++-- {weed => go}/operation/allocate_volume.go | 6 +++--- {weed => go}/operation/delete_content.go | 0 {weed => go}/operation/lookup_volume_id.go | 4 ++-- {weed => go}/operation/upload_content.go | 0 {weed => go}/replication/volume_growth.go | 6 +++--- {weed => go}/replication/volume_growth_test.go | 4 ++-- {weed => go}/sequence/sequence.go | 0 {weed => go}/storage/compact_map.go | 0 {weed => go}/storage/compact_map_perf_test.go | 4 ++-- {weed => go}/storage/compact_map_test.go | 0 {weed => go}/storage/compress.go | 0 {weed => go}/storage/crc.go | 0 {weed => go}/storage/needle.go | 2 +- {weed => go}/storage/needle_map.go | 2 +- {weed => go}/storage/needle_read_write.go | 2 +- {weed => go}/storage/replication_type.go | 0 {weed => go}/storage/store.go | 2 +- {weed => go}/storage/volume.go | 0 {weed => go}/storage/volume_id.go | 0 {weed => go}/storage/volume_info.go | 0 {weed => go}/storage/volume_version.go | 0 {weed => go}/topology/configuration.go | 0 {weed => go}/topology/configuration_test.go | 0 {weed => go}/topology/data_center.go | 0 {weed => go}/topology/data_node.go | 2 +- {weed => go}/topology/node.go | 2 +- {weed => go}/topology/node_list.go | 2 +- {weed => go}/topology/node_list_test.go | 0 {weed => go}/topology/rack.go | 0 {weed => go}/topology/topo_test.go | 2 +- {weed => go}/topology/topology.go | 6 +++--- {weed => go}/topology/topology_compact.go | 4 ++-- {weed => go}/topology/topology_event_handling.go | 2 +- {weed => go}/topology/topology_map.go | 0 {weed => go}/topology/volume_layout.go | 2 +- {weed => go}/topology/volume_location.go | 0 {weed => go}/util/bytes.go | 0 {weed => go}/util/config.go | 0 {weed => go}/util/parse.go | 0 {weed => go}/util/post.go | 0 {weed/storage => test}/sample.idx | Bin 51 files changed, 39 insertions(+), 39 deletions(-) rename {weed => go/cmd}/command.go (100%) rename {weed => go/cmd}/export.go (97%) rename {weed => go/cmd}/fix.go (97%) rename {weed => go/cmd}/master.go (98%) rename {weed => go/cmd}/shell.go (100%) rename {weed => go/cmd}/upload.go (96%) rename {weed => go/cmd}/version.go (100%) rename {weed => go/cmd}/volume.go (99%) rename {weed => go/cmd}/weed.go (100%) rename {weed => go}/directory/file_id.go (92%) rename {weed => go}/operation/allocate_volume.go (83%) rename {weed => go}/operation/delete_content.go (100%) rename {weed => go}/operation/lookup_volume_id.go (89%) rename {weed => go}/operation/upload_content.go (100%) rename {weed => go}/replication/volume_growth.go (97%) rename {weed => go}/replication/volume_growth_test.go (97%) rename {weed => go}/sequence/sequence.go (100%) rename {weed => go}/storage/compact_map.go (100%) rename {weed => go}/storage/compact_map_perf_test.go (86%) rename {weed => go}/storage/compact_map_test.go (100%) rename {weed => go}/storage/compress.go (100%) rename {weed => go}/storage/crc.go (100%) rename {weed => go}/storage/needle.go (98%) rename {weed => go}/storage/needle_map.go (98%) rename {weed => go}/storage/needle_read_write.go (99%) rename {weed => go}/storage/replication_type.go (100%) rename {weed => go}/storage/store.go (99%) rename {weed => go}/storage/volume.go (100%) rename {weed => go}/storage/volume_id.go (100%) rename {weed => go}/storage/volume_info.go (100%) rename {weed => go}/storage/volume_version.go (100%) rename {weed => go}/topology/configuration.go (100%) rename {weed => go}/topology/configuration_test.go (100%) rename {weed => go}/topology/data_center.go (100%) rename {weed => go}/topology/data_node.go (96%) rename {weed => go}/topology/node.go (99%) rename {weed => go}/topology/node_list.go (97%) rename {weed => go}/topology/node_list_test.go (100%) rename {weed => go}/topology/rack.go (100%) rename {weed => go}/topology/topo_test.go (98%) rename {weed => go}/topology/topology.go (96%) rename {weed => go}/topology/topology_compact.go (98%) rename {weed => go}/topology/topology_event_handling.go (97%) rename {weed => go}/topology/topology_map.go (100%) rename {weed => go}/topology/volume_layout.go (98%) rename {weed => go}/topology/volume_location.go (100%) rename {weed => go}/util/bytes.go (100%) rename {weed => go}/util/config.go (100%) rename {weed => go}/util/parse.go (100%) rename {weed => go}/util/post.go (100%) rename {weed/storage => test}/sample.idx (100%) diff --git a/weed/command.go b/go/cmd/command.go similarity index 100% rename from weed/command.go rename to go/cmd/command.go diff --git a/weed/export.go b/go/cmd/export.go similarity index 97% rename from weed/export.go rename to go/cmd/export.go index 44cf85c24..fd9d51164 100644 --- a/weed/export.go +++ b/go/cmd/export.go @@ -7,8 +7,8 @@ import ( "log" "os" "path" - "code.google.com/p/weed-fs/weed/directory" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/directory" + "code.google.com/p/weed-fs/go/storage" "strconv" "strings" "text/template" diff --git a/weed/fix.go b/go/cmd/fix.go similarity index 97% rename from weed/fix.go rename to go/cmd/fix.go index 85693d9b1..249007252 100644 --- a/weed/fix.go +++ b/go/cmd/fix.go @@ -4,7 +4,7 @@ import ( "log" "os" "path" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" "strconv" ) diff --git a/weed/master.go b/go/cmd/master.go similarity index 98% rename from weed/master.go rename to go/cmd/master.go index 78db929f2..3d8757c16 100644 --- a/weed/master.go +++ b/go/cmd/master.go @@ -5,9 +5,9 @@ import ( "errors" "log" "net/http" - "code.google.com/p/weed-fs/weed/replication" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/topology" + "code.google.com/p/weed-fs/go/replication" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/topology" "runtime" "strconv" "strings" diff --git a/weed/shell.go b/go/cmd/shell.go similarity index 100% rename from weed/shell.go rename to go/cmd/shell.go diff --git a/weed/upload.go b/go/cmd/upload.go similarity index 96% rename from weed/upload.go rename to go/cmd/upload.go index e1e296bf2..0260c9c87 100644 --- a/weed/upload.go +++ b/go/cmd/upload.go @@ -7,8 +7,8 @@ import ( "net/url" "os" "path" - "code.google.com/p/weed-fs/weed/operation" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/operation" + "code.google.com/p/weed-fs/go/util" "strconv" ) diff --git a/weed/version.go b/go/cmd/version.go similarity index 100% rename from weed/version.go rename to go/cmd/version.go diff --git a/weed/volume.go b/go/cmd/volume.go similarity index 99% rename from weed/volume.go rename to go/cmd/volume.go index 8bfc7681a..bf906681e 100644 --- a/weed/volume.go +++ b/go/cmd/volume.go @@ -7,8 +7,8 @@ import ( "mime" "net/http" "os" - "code.google.com/p/weed-fs/weed/operation" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/operation" + "code.google.com/p/weed-fs/go/storage" "runtime" "strconv" "strings" diff --git a/weed/weed.go b/go/cmd/weed.go similarity index 100% rename from weed/weed.go rename to go/cmd/weed.go diff --git a/weed/directory/file_id.go b/go/directory/file_id.go similarity index 92% rename from weed/directory/file_id.go rename to go/directory/file_id.go index c9e20eaa9..f5f6d46d6 100644 --- a/weed/directory/file_id.go +++ b/go/directory/file_id.go @@ -2,8 +2,8 @@ package directory import ( "encoding/hex" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/util" "strings" ) diff --git a/weed/operation/allocate_volume.go b/go/operation/allocate_volume.go similarity index 83% rename from weed/operation/allocate_volume.go rename to go/operation/allocate_volume.go index c20d586cf..19166eaed 100644 --- a/weed/operation/allocate_volume.go +++ b/go/operation/allocate_volume.go @@ -4,9 +4,9 @@ import ( "encoding/json" "errors" "net/url" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/topology" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/topology" + "code.google.com/p/weed-fs/go/util" ) type AllocateVolumeResult struct { diff --git a/weed/operation/delete_content.go b/go/operation/delete_content.go similarity index 100% rename from weed/operation/delete_content.go rename to go/operation/delete_content.go diff --git a/weed/operation/lookup_volume_id.go b/go/operation/lookup_volume_id.go similarity index 89% rename from weed/operation/lookup_volume_id.go rename to go/operation/lookup_volume_id.go index 67d4ccb39..516ba9129 100644 --- a/weed/operation/lookup_volume_id.go +++ b/go/operation/lookup_volume_id.go @@ -5,8 +5,8 @@ import ( "errors" _ "fmt" "net/url" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/util" ) type Location struct { diff --git a/weed/operation/upload_content.go b/go/operation/upload_content.go similarity index 100% rename from weed/operation/upload_content.go rename to go/operation/upload_content.go diff --git a/weed/replication/volume_growth.go b/go/replication/volume_growth.go similarity index 97% rename from weed/replication/volume_growth.go rename to go/replication/volume_growth.go index bb59c9a8e..977d31044 100644 --- a/weed/replication/volume_growth.go +++ b/go/replication/volume_growth.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/operation" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/topology" + "code.google.com/p/weed-fs/go/operation" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/topology" "sync" ) diff --git a/weed/replication/volume_growth_test.go b/go/replication/volume_growth_test.go similarity index 97% rename from weed/replication/volume_growth_test.go rename to go/replication/volume_growth_test.go index 4ef0df46c..e35dbc707 100644 --- a/weed/replication/volume_growth_test.go +++ b/go/replication/volume_growth_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/topology" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/topology" "testing" "time" ) diff --git a/weed/sequence/sequence.go b/go/sequence/sequence.go similarity index 100% rename from weed/sequence/sequence.go rename to go/sequence/sequence.go diff --git a/weed/storage/compact_map.go b/go/storage/compact_map.go similarity index 100% rename from weed/storage/compact_map.go rename to go/storage/compact_map.go diff --git a/weed/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go similarity index 86% rename from weed/storage/compact_map_perf_test.go rename to go/storage/compact_map_perf_test.go index 8e114d305..cfc53ef65 100644 --- a/weed/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -3,13 +3,13 @@ package storage import ( "log" "os" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/util" "testing" ) func TestMemoryUsage(t *testing.T) { - indexFile, ie := os.OpenFile("sample.idx", os.O_RDWR|os.O_RDONLY, 0644) + indexFile, ie := os.OpenFile("../../test/sample.idx", os.O_RDWR|os.O_RDONLY, 0644) if ie != nil { log.Fatalln(ie) } diff --git a/weed/storage/compact_map_test.go b/go/storage/compact_map_test.go similarity index 100% rename from weed/storage/compact_map_test.go rename to go/storage/compact_map_test.go diff --git a/weed/storage/compress.go b/go/storage/compress.go similarity index 100% rename from weed/storage/compress.go rename to go/storage/compress.go diff --git a/weed/storage/crc.go b/go/storage/crc.go similarity index 100% rename from weed/storage/crc.go rename to go/storage/crc.go diff --git a/weed/storage/needle.go b/go/storage/needle.go similarity index 98% rename from weed/storage/needle.go rename to go/storage/needle.go index 6ba164735..2b66f5d69 100644 --- a/weed/storage/needle.go +++ b/go/storage/needle.go @@ -7,7 +7,7 @@ import ( "mime" "net/http" "path" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/util" "strconv" "strings" ) diff --git a/weed/storage/needle_map.go b/go/storage/needle_map.go similarity index 98% rename from weed/storage/needle_map.go rename to go/storage/needle_map.go index 47e1c43f0..774ac7627 100644 --- a/weed/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -3,7 +3,7 @@ package storage import ( //"log" "os" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/util" ) type NeedleMap struct { diff --git a/weed/storage/needle_read_write.go b/go/storage/needle_read_write.go similarity index 99% rename from weed/storage/needle_read_write.go rename to go/storage/needle_read_write.go index 74e866706..0777fd106 100644 --- a/weed/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -5,7 +5,7 @@ import ( "fmt" "io" "os" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/util" ) const ( diff --git a/weed/storage/replication_type.go b/go/storage/replication_type.go similarity index 100% rename from weed/storage/replication_type.go rename to go/storage/replication_type.go diff --git a/weed/storage/store.go b/go/storage/store.go similarity index 99% rename from weed/storage/store.go rename to go/storage/store.go index dc9304e7d..857a62506 100644 --- a/weed/storage/store.go +++ b/go/storage/store.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "log" "net/url" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/util" "strconv" "strings" ) diff --git a/weed/storage/volume.go b/go/storage/volume.go similarity index 100% rename from weed/storage/volume.go rename to go/storage/volume.go diff --git a/weed/storage/volume_id.go b/go/storage/volume_id.go similarity index 100% rename from weed/storage/volume_id.go rename to go/storage/volume_id.go diff --git a/weed/storage/volume_info.go b/go/storage/volume_info.go similarity index 100% rename from weed/storage/volume_info.go rename to go/storage/volume_info.go diff --git a/weed/storage/volume_version.go b/go/storage/volume_version.go similarity index 100% rename from weed/storage/volume_version.go rename to go/storage/volume_version.go diff --git a/weed/topology/configuration.go b/go/topology/configuration.go similarity index 100% rename from weed/topology/configuration.go rename to go/topology/configuration.go diff --git a/weed/topology/configuration_test.go b/go/topology/configuration_test.go similarity index 100% rename from weed/topology/configuration_test.go rename to go/topology/configuration_test.go diff --git a/weed/topology/data_center.go b/go/topology/data_center.go similarity index 100% rename from weed/topology/data_center.go rename to go/topology/data_center.go diff --git a/weed/topology/data_node.go b/go/topology/data_node.go similarity index 96% rename from weed/topology/data_node.go rename to go/topology/data_node.go index dbb634af2..ba37f0d5f 100644 --- a/weed/topology/data_node.go +++ b/go/topology/data_node.go @@ -2,7 +2,7 @@ package topology import ( _ "fmt" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" "strconv" ) diff --git a/weed/topology/node.go b/go/topology/node.go similarity index 99% rename from weed/topology/node.go rename to go/topology/node.go index fe69c57c0..90826dfae 100644 --- a/weed/topology/node.go +++ b/go/topology/node.go @@ -2,7 +2,7 @@ package topology import ( "fmt" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" ) type NodeId string diff --git a/weed/topology/node_list.go b/go/topology/node_list.go similarity index 97% rename from weed/topology/node_list.go rename to go/topology/node_list.go index 597d39b93..293f534ea 100644 --- a/weed/topology/node_list.go +++ b/go/topology/node_list.go @@ -3,7 +3,7 @@ package topology import ( "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" ) type NodeList struct { diff --git a/weed/topology/node_list_test.go b/go/topology/node_list_test.go similarity index 100% rename from weed/topology/node_list_test.go rename to go/topology/node_list_test.go diff --git a/weed/topology/rack.go b/go/topology/rack.go similarity index 100% rename from weed/topology/rack.go rename to go/topology/rack.go diff --git a/weed/topology/topo_test.go b/go/topology/topo_test.go similarity index 98% rename from weed/topology/topo_test.go rename to go/topology/topo_test.go index 99db15b5c..f8af79b21 100644 --- a/weed/topology/topo_test.go +++ b/go/topology/topo_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" "testing" "time" ) diff --git a/weed/topology/topology.go b/go/topology/topology.go similarity index 96% rename from weed/topology/topology.go rename to go/topology/topology.go index ac5505a66..70a1ad268 100644 --- a/weed/topology/topology.go +++ b/go/topology/topology.go @@ -4,9 +4,9 @@ import ( "errors" "io/ioutil" "math/rand" - "code.google.com/p/weed-fs/weed/directory" - "code.google.com/p/weed-fs/weed/sequence" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/directory" + "code.google.com/p/weed-fs/go/sequence" + "code.google.com/p/weed-fs/go/storage" ) type Topology struct { diff --git a/weed/topology/topology_compact.go b/go/topology/topology_compact.go similarity index 98% rename from weed/topology/topology_compact.go rename to go/topology/topology_compact.go index 980f72a6e..e25e394d4 100644 --- a/weed/topology/topology_compact.go +++ b/go/topology/topology_compact.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" "net/url" - "code.google.com/p/weed-fs/weed/storage" - "code.google.com/p/weed-fs/weed/util" + "code.google.com/p/weed-fs/go/storage" + "code.google.com/p/weed-fs/go/util" "time" ) diff --git a/weed/topology/topology_event_handling.go b/go/topology/topology_event_handling.go similarity index 97% rename from weed/topology/topology_event_handling.go rename to go/topology/topology_event_handling.go index 084dd5b57..9093bf884 100644 --- a/weed/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -3,7 +3,7 @@ package topology import ( "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" "time" ) diff --git a/weed/topology/topology_map.go b/go/topology/topology_map.go similarity index 100% rename from weed/topology/topology_map.go rename to go/topology/topology_map.go diff --git a/weed/topology/volume_layout.go b/go/topology/volume_layout.go similarity index 98% rename from weed/topology/volume_layout.go rename to go/topology/volume_layout.go index 494630d9f..b6e6e8bfe 100644 --- a/weed/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" "math/rand" - "code.google.com/p/weed-fs/weed/storage" + "code.google.com/p/weed-fs/go/storage" ) type VolumeLayout struct { diff --git a/weed/topology/volume_location.go b/go/topology/volume_location.go similarity index 100% rename from weed/topology/volume_location.go rename to go/topology/volume_location.go diff --git a/weed/util/bytes.go b/go/util/bytes.go similarity index 100% rename from weed/util/bytes.go rename to go/util/bytes.go diff --git a/weed/util/config.go b/go/util/config.go similarity index 100% rename from weed/util/config.go rename to go/util/config.go diff --git a/weed/util/parse.go b/go/util/parse.go similarity index 100% rename from weed/util/parse.go rename to go/util/parse.go diff --git a/weed/util/post.go b/go/util/post.go similarity index 100% rename from weed/util/post.go rename to go/util/post.go diff --git a/weed/storage/sample.idx b/test/sample.idx similarity index 100% rename from weed/storage/sample.idx rename to test/sample.idx