aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2013-02-10 03:49:51 -0800
committerChris Lu <chris.lu@gmail.com>2013-02-10 03:49:51 -0800
commit5071f528f649f3f99336c7d491ceef4859e34744 (patch)
tree0c4bc8a286597cd79e22b1ce02cd9cd3b1c44602
parent55f2627fcf965c3765ad9b63878e9a22a59f4b55 (diff)
downloadseaweedfs-5071f528f649f3f99336c7d491ceef4859e34744.tar.xz
seaweedfs-5071f528f649f3f99336c7d491ceef4859e34744.zip
testing compilation with remove package
-rw-r--r--go/cmd/command.go (renamed from weed/command.go)0
-rw-r--r--go/cmd/export.go (renamed from weed/export.go)4
-rw-r--r--go/cmd/fix.go (renamed from weed/fix.go)2
-rw-r--r--go/cmd/master.go (renamed from weed/master.go)6
-rw-r--r--go/cmd/shell.go (renamed from weed/shell.go)0
-rw-r--r--go/cmd/upload.go (renamed from weed/upload.go)4
-rw-r--r--go/cmd/version.go (renamed from weed/version.go)0
-rw-r--r--go/cmd/volume.go (renamed from weed/volume.go)4
-rw-r--r--go/cmd/weed.go (renamed from weed/weed.go)0
-rw-r--r--go/directory/file_id.go (renamed from weed/directory/file_id.go)4
-rw-r--r--go/operation/allocate_volume.go (renamed from weed/operation/allocate_volume.go)6
-rw-r--r--go/operation/delete_content.go (renamed from weed/operation/delete_content.go)0
-rw-r--r--go/operation/lookup_volume_id.go (renamed from weed/operation/lookup_volume_id.go)4
-rw-r--r--go/operation/upload_content.go (renamed from weed/operation/upload_content.go)0
-rw-r--r--go/replication/volume_growth.go (renamed from weed/replication/volume_growth.go)6
-rw-r--r--go/replication/volume_growth_test.go (renamed from weed/replication/volume_growth_test.go)4
-rw-r--r--go/sequence/sequence.go (renamed from weed/sequence/sequence.go)0
-rw-r--r--go/storage/compact_map.go (renamed from weed/storage/compact_map.go)0
-rw-r--r--go/storage/compact_map_perf_test.go (renamed from weed/storage/compact_map_perf_test.go)4
-rw-r--r--go/storage/compact_map_test.go (renamed from weed/storage/compact_map_test.go)0
-rw-r--r--go/storage/compress.go (renamed from weed/storage/compress.go)0
-rw-r--r--go/storage/crc.go (renamed from weed/storage/crc.go)0
-rw-r--r--go/storage/needle.go (renamed from weed/storage/needle.go)2
-rw-r--r--go/storage/needle_map.go (renamed from weed/storage/needle_map.go)2
-rw-r--r--go/storage/needle_read_write.go (renamed from weed/storage/needle_read_write.go)2
-rw-r--r--go/storage/replication_type.go (renamed from weed/storage/replication_type.go)0
-rw-r--r--go/storage/store.go (renamed from weed/storage/store.go)2
-rw-r--r--go/storage/volume.go (renamed from weed/storage/volume.go)0
-rw-r--r--go/storage/volume_id.go (renamed from weed/storage/volume_id.go)0
-rw-r--r--go/storage/volume_info.go (renamed from weed/storage/volume_info.go)0
-rw-r--r--go/storage/volume_version.go (renamed from weed/storage/volume_version.go)0
-rw-r--r--go/topology/configuration.go (renamed from weed/topology/configuration.go)0
-rw-r--r--go/topology/configuration_test.go (renamed from weed/topology/configuration_test.go)0
-rw-r--r--go/topology/data_center.go (renamed from weed/topology/data_center.go)0
-rw-r--r--go/topology/data_node.go (renamed from weed/topology/data_node.go)2
-rw-r--r--go/topology/node.go (renamed from weed/topology/node.go)2
-rw-r--r--go/topology/node_list.go (renamed from weed/topology/node_list.go)2
-rw-r--r--go/topology/node_list_test.go (renamed from weed/topology/node_list_test.go)0
-rw-r--r--go/topology/rack.go (renamed from weed/topology/rack.go)0
-rw-r--r--go/topology/topo_test.go (renamed from weed/topology/topo_test.go)2
-rw-r--r--go/topology/topology.go (renamed from weed/topology/topology.go)6
-rw-r--r--go/topology/topology_compact.go (renamed from weed/topology/topology_compact.go)4
-rw-r--r--go/topology/topology_event_handling.go (renamed from weed/topology/topology_event_handling.go)2
-rw-r--r--go/topology/topology_map.go (renamed from weed/topology/topology_map.go)0
-rw-r--r--go/topology/volume_layout.go (renamed from weed/topology/volume_layout.go)2
-rw-r--r--go/topology/volume_location.go (renamed from weed/topology/volume_location.go)0
-rw-r--r--go/util/bytes.go (renamed from weed/util/bytes.go)0
-rw-r--r--go/util/config.go (renamed from weed/util/config.go)0
-rw-r--r--go/util/parse.go (renamed from weed/util/parse.go)0
-rw-r--r--go/util/post.go (renamed from weed/util/post.go)0
-rw-r--r--test/sample.idx (renamed from weed/storage/sample.idx)bin27140560 -> 27140560 bytes
51 files changed, 39 insertions, 39 deletions
diff --git a/weed/command.go b/go/cmd/command.go
index c8d86ca66..c8d86ca66 100644
--- a/weed/command.go
+++ b/go/cmd/command.go
diff --git a/weed/export.go b/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
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
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
index daf0b7e1f..daf0b7e1f 100644
--- a/weed/shell.go
+++ b/go/cmd/shell.go
diff --git a/weed/upload.go b/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
index b418126a4..b418126a4 100644
--- a/weed/version.go
+++ b/go/cmd/version.go
diff --git a/weed/volume.go b/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
index c03cb68ac..c03cb68ac 100644
--- a/weed/weed.go
+++ b/go/cmd/weed.go
diff --git a/weed/directory/file_id.go b/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
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
index 2bdb49651..2bdb49651 100644
--- a/weed/operation/delete_content.go
+++ b/go/operation/delete_content.go
diff --git a/weed/operation/lookup_volume_id.go b/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
index 0bdb697da..0bdb697da 100644
--- a/weed/operation/upload_content.go
+++ b/go/operation/upload_content.go
diff --git a/weed/replication/volume_growth.go b/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
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
index c85289468..c85289468 100644
--- a/weed/sequence/sequence.go
+++ b/go/sequence/sequence.go
diff --git a/weed/storage/compact_map.go b/go/storage/compact_map.go
index 0b33961c4..0b33961c4 100644
--- a/weed/storage/compact_map.go
+++ b/go/storage/compact_map.go
diff --git a/weed/storage/compact_map_perf_test.go b/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
index e76e9578d..e76e9578d 100644
--- a/weed/storage/compact_map_test.go
+++ b/go/storage/compact_map_test.go
diff --git a/weed/storage/compress.go b/go/storage/compress.go
index 256789c9c..256789c9c 100644
--- a/weed/storage/compress.go
+++ b/go/storage/compress.go
diff --git a/weed/storage/crc.go b/go/storage/crc.go
index 198352e68..198352e68 100644
--- a/weed/storage/crc.go
+++ b/go/storage/crc.go
diff --git a/weed/storage/needle.go b/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
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
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
index 0902d1016..0902d1016 100644
--- a/weed/storage/replication_type.go
+++ b/go/storage/replication_type.go
diff --git a/weed/storage/store.go b/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
index 707c6e6f8..707c6e6f8 100644
--- a/weed/storage/volume.go
+++ b/go/storage/volume.go
diff --git a/weed/storage/volume_id.go b/go/storage/volume_id.go
index 0333c6cf0..0333c6cf0 100644
--- a/weed/storage/volume_id.go
+++ b/go/storage/volume_id.go
diff --git a/weed/storage/volume_info.go b/go/storage/volume_info.go
index e4c5f6ec4..e4c5f6ec4 100644
--- a/weed/storage/volume_info.go
+++ b/go/storage/volume_info.go
diff --git a/weed/storage/volume_version.go b/go/storage/volume_version.go
index 9702ae904..9702ae904 100644
--- a/weed/storage/volume_version.go
+++ b/go/storage/volume_version.go
diff --git a/weed/topology/configuration.go b/go/topology/configuration.go
index 4c8424214..4c8424214 100644
--- a/weed/topology/configuration.go
+++ b/go/topology/configuration.go
diff --git a/weed/topology/configuration_test.go b/go/topology/configuration_test.go
index 35d82c058..35d82c058 100644
--- a/weed/topology/configuration_test.go
+++ b/go/topology/configuration_test.go
diff --git a/weed/topology/data_center.go b/go/topology/data_center.go
index a3b2b7d13..a3b2b7d13 100644
--- a/weed/topology/data_center.go
+++ b/go/topology/data_center.go
diff --git a/weed/topology/data_node.go b/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
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
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
index 2fb4fa970..2fb4fa970 100644
--- a/weed/topology/node_list_test.go
+++ b/go/topology/node_list_test.go
diff --git a/weed/topology/rack.go b/go/topology/rack.go
index acc34417a..acc34417a 100644
--- a/weed/topology/rack.go
+++ b/go/topology/rack.go
diff --git a/weed/topology/topo_test.go b/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
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
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
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
index b416ee943..b416ee943 100644
--- a/weed/topology/topology_map.go
+++ b/go/topology/topology_map.go
diff --git a/weed/topology/volume_layout.go b/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
index 507a240b5..507a240b5 100644
--- a/weed/topology/volume_location.go
+++ b/go/topology/volume_location.go
diff --git a/weed/util/bytes.go b/go/util/bytes.go
index 6cc3d7018..6cc3d7018 100644
--- a/weed/util/bytes.go
+++ b/go/util/bytes.go
diff --git a/weed/util/config.go b/go/util/config.go
index 6ac8a3a65..6ac8a3a65 100644
--- a/weed/util/config.go
+++ b/go/util/config.go
diff --git a/weed/util/parse.go b/go/util/parse.go
index 930da9522..930da9522 100644
--- a/weed/util/parse.go
+++ b/go/util/parse.go
diff --git a/weed/util/post.go b/go/util/post.go
index 6e6ab0003..6e6ab0003 100644
--- a/weed/util/post.go
+++ b/go/util/post.go
diff --git a/weed/storage/sample.idx b/test/sample.idx
index 44918b41d..44918b41d 100644
--- a/weed/storage/sample.idx
+++ b/test/sample.idx
Binary files differ