From 4c786878af6b4688dbaff20998e5d6e7ddf738c5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 24 Apr 2020 14:10:03 +0800 Subject: [PATCH] Fix gomod (#379) --- cmd/ledis-load/main.go | 4 ++-- cmd/ledis-repair/main.go | 4 ++-- cmd/ledis-server/main.go | 4 ++-- go.mod | 2 +- ledis/batch.go | 4 ++-- ledis/dump.go | 2 +- ledis/dump_test.go | 4 ++-- ledis/ledis.go | 6 +++--- ledis/ledis_db.go | 2 +- ledis/ledis_test.go | 2 +- ledis/migrate_test.go | 2 +- ledis/replication.go | 4 ++-- ledis/replication_test.go | 4 ++-- ledis/scan.go | 2 +- ledis/sort.go | 2 +- ledis/t_hash.go | 2 +- ledis/t_kv.go | 2 +- ledis/t_list.go | 2 +- ledis/t_set.go | 2 +- ledis/t_ttl.go | 2 +- ledis/t_zset.go | 2 +- ledis/t_zset_test.go | 2 +- rpl/file_store.go | 4 ++-- rpl/goleveldb_store.go | 4 ++-- rpl/rpl.go | 2 +- rpl/rpl_test.go | 2 +- rpl/store_test.go | 2 +- server/app.go | 5 +++-- server/app_test.go | 2 +- server/client.go | 2 +- server/client_http.go | 2 +- server/client_resp.go | 2 +- server/cmd_hash.go | 2 +- server/cmd_kv.go | 2 +- server/cmd_list.go | 3 ++- server/cmd_migrate.go | 2 +- server/cmd_migrate_test.go | 2 +- server/cmd_replication.go | 2 +- server/cmd_replication_test.go | 2 +- server/cmd_scan.go | 2 +- server/cmd_scan_test.go | 2 +- server/cmd_server.go | 3 ++- server/cmd_set.go | 2 +- server/cmd_zset.go | 4 ++-- server/const.go | 2 +- server/info.go | 2 +- server/replication.go | 4 ++-- server/script.go | 4 ++-- server/script_test.go | 4 ++-- server/snapshot.go | 2 +- server/snapshot_test.go | 2 +- store/db.go | 4 ++-- store/driver/store.go | 2 +- store/goleveldb/db.go | 4 ++-- store/goleveldb/snapshot.go | 2 +- store/iterator.go | 2 +- store/leveldb/db.go | 4 ++-- store/leveldb/snapshot.go | 2 +- store/rocksdb/db.go | 4 ++-- store/rocksdb/snapshot.go | 2 +- store/slice.go | 2 +- store/snapshot.go | 2 +- store/store.go | 10 +++++----- store/store_test.go | 4 ++-- store/writebatch.go | 2 +- upgrade/ledis-upgrade-ttl/main.go | 6 +++--- 66 files changed, 96 insertions(+), 93 deletions(-) diff --git a/cmd/ledis-load/main.go b/cmd/ledis-load/main.go index 1daeaea..b55a362 100644 --- a/cmd/ledis-load/main.go +++ b/cmd/ledis-load/main.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/ledis" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/ledis" ) var configPath = flag.String("config", "", "ledisdb config file") diff --git a/cmd/ledis-repair/main.go b/cmd/ledis-repair/main.go index e939201..f8c16ab 100644 --- a/cmd/ledis-repair/main.go +++ b/cmd/ledis-repair/main.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store" ) var fileName = flag.String("config", "", "ledisdb config file") diff --git a/cmd/ledis-server/main.go b/cmd/ledis-server/main.go index 285fea5..4fbd90b 100644 --- a/cmd/ledis-server/main.go +++ b/cmd/ledis-server/main.go @@ -12,8 +12,8 @@ import ( "strings" "syscall" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/server" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/server" ) var configFile = flag.String("config", "", "ledisdb config file") diff --git a/go.mod b/go.mod index 024b6cd..c2a9f3c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/siddontang/ledisdb +module github.com/ledisdb/ledisdb go 1.12 diff --git a/ledis/batch.go b/ledis/batch.go index 6800dfe..b23bc40 100644 --- a/ledis/batch.go +++ b/ledis/batch.go @@ -3,9 +3,9 @@ package ledis import ( "sync" + "github.com/ledisdb/ledisdb/rpl" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/log" - "github.com/siddontang/ledisdb/rpl" - "github.com/siddontang/ledisdb/store" ) type batch struct { diff --git a/ledis/dump.go b/ledis/dump.go index 9784575..7f31c57 100644 --- a/ledis/dump.go +++ b/ledis/dump.go @@ -7,8 +7,8 @@ import ( "io" "os" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/snappy" - "github.com/siddontang/ledisdb/store" ) // DumpHead is the head of a dump. diff --git a/ledis/dump_test.go b/ledis/dump_test.go index 2c0d97f..2621690 100644 --- a/ledis/dump_test.go +++ b/ledis/dump_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store" ) func TestDump(t *testing.T) { diff --git a/ledis/ledis.go b/ledis/ledis.go index ab8543c..915c1cb 100644 --- a/ledis/ledis.go +++ b/ledis/ledis.go @@ -8,11 +8,11 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/rpl" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/filelock" "github.com/siddontang/go/log" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/rpl" - "github.com/siddontang/ledisdb/store" ) // Ledis is the core structure to handle the database. diff --git a/ledis/ledis_db.go b/ledis/ledis_db.go index 4d250b5..f68cb31 100644 --- a/ledis/ledis_db.go +++ b/ledis/ledis_db.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/store" ) type ibucket interface { diff --git a/ledis/ledis_test.go b/ledis/ledis_test.go index b9c38bd..7a8c9af 100644 --- a/ledis/ledis_test.go +++ b/ledis/ledis_test.go @@ -5,7 +5,7 @@ import ( "sync" "testing" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) var testLedis *Ledis diff --git a/ledis/migrate_test.go b/ledis/migrate_test.go index 50a9619..7d3e141 100644 --- a/ledis/migrate_test.go +++ b/ledis/migrate_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) func TestMigrate(t *testing.T) { diff --git a/ledis/replication.go b/ledis/replication.go index 2d0c976..1912e33 100644 --- a/ledis/replication.go +++ b/ledis/replication.go @@ -6,10 +6,10 @@ import ( "io" "time" + "github.com/ledisdb/ledisdb/rpl" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/log" "github.com/siddontang/go/snappy" - "github.com/siddontang/ledisdb/rpl" - "github.com/siddontang/ledisdb/store" ) const ( diff --git a/ledis/replication_test.go b/ledis/replication_test.go index 1a95fba..591b345 100644 --- a/ledis/replication_test.go +++ b/ledis/replication_test.go @@ -6,8 +6,8 @@ import ( "os" "testing" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store" ) func checkLedisEqual(master *Ledis, slave *Ledis) error { diff --git a/ledis/scan.go b/ledis/scan.go index b91640f..f4014e5 100644 --- a/ledis/scan.go +++ b/ledis/scan.go @@ -4,7 +4,7 @@ import ( "errors" "regexp" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/store" ) var errDataType = errors.New("error data type") diff --git a/ledis/sort.go b/ledis/sort.go index 413db10..71f58a6 100644 --- a/ledis/sort.go +++ b/ledis/sort.go @@ -6,7 +6,7 @@ import ( "sort" "strconv" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/store" ) // Limit is for sort. diff --git a/ledis/t_hash.go b/ledis/t_hash.go index b9a8595..7396f33 100644 --- a/ledis/t_hash.go +++ b/ledis/t_hash.go @@ -5,8 +5,8 @@ import ( "errors" "time" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/store" ) // FVPair is the pair of field and value. diff --git a/ledis/t_kv.go b/ledis/t_kv.go index 9abec2a..f67d19b 100644 --- a/ledis/t_kv.go +++ b/ledis/t_kv.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/store" ) // KVPair is the pair of key-value. diff --git a/ledis/t_list.go b/ledis/t_list.go index c177cd9..8eb26b0 100644 --- a/ledis/t_list.go +++ b/ledis/t_list.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/hack" "github.com/siddontang/go/log" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/store" "golang.org/x/net/context" ) diff --git a/ledis/t_set.go b/ledis/t_set.go index 926d4ea..4ea93a5 100644 --- a/ledis/t_set.go +++ b/ledis/t_set.go @@ -5,8 +5,8 @@ import ( "errors" "time" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/hack" - "github.com/siddontang/ledisdb/store" ) var errSetKey = errors.New("invalid set key") diff --git a/ledis/t_ttl.go b/ledis/t_ttl.go index 126c8f6..76ae8dc 100644 --- a/ledis/t_ttl.go +++ b/ledis/t_ttl.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/store" ) var ( diff --git a/ledis/t_zset.go b/ledis/t_zset.go index 030b297..adae6b1 100644 --- a/ledis/t_zset.go +++ b/ledis/t_zset.go @@ -6,8 +6,8 @@ import ( "errors" "time" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/hack" - "github.com/siddontang/ledisdb/store" ) // For zset const. diff --git a/ledis/t_zset_test.go b/ledis/t_zset_test.go index b7513a5..693b575 100644 --- a/ledis/t_zset_test.go +++ b/ledis/t_zset_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/store" ) const ( diff --git a/rpl/file_store.go b/rpl/file_store.go index f6f708b..3231720 100644 --- a/rpl/file_store.go +++ b/rpl/file_store.go @@ -8,9 +8,9 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/go/log" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/config" ) const ( @@ -38,7 +38,7 @@ const ( meta: log1 offset | log2 offset log offset: bigendian uint32 | bigendian uint32 - //sha1 of github.com/siddontang/ledisdb 20 bytes + //sha1 of github.com/ledisdb/ledisdb 20 bytes magic data = "\x1c\x1d\xb8\x88\xff\x9e\x45\x55\x40\xf0\x4c\xda\xe0\xce\x47\xde\x65\x48\x71\x17" we must guarantee that the log id is monotonic increment strictly. diff --git a/rpl/goleveldb_store.go b/rpl/goleveldb_store.go index 445c17c..4f52093 100644 --- a/rpl/goleveldb_store.go +++ b/rpl/goleveldb_store.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store" ) type GoLevelDBStore struct { diff --git a/rpl/rpl.go b/rpl/rpl.go index 0ebf66d..ce44711 100644 --- a/rpl/rpl.go +++ b/rpl/rpl.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/go/log" "github.com/siddontang/go/snappy" - "github.com/siddontang/ledisdb/config" ) type Stat struct { diff --git a/rpl/rpl_test.go b/rpl/rpl_test.go index cd059f3..bec0077 100644 --- a/rpl/rpl_test.go +++ b/rpl/rpl_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) func TestReplication(t *testing.T) { diff --git a/rpl/store_test.go b/rpl/store_test.go index 99bd2a5..2659a3d 100644 --- a/rpl/store_test.go +++ b/rpl/store_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) func TestGoLevelDBStore(t *testing.T) { diff --git a/server/app.go b/server/app.go index 0b7d517..32507f5 100644 --- a/server/app.go +++ b/server/app.go @@ -11,9 +11,10 @@ import ( "sync" "crypto/tls" + + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/ledis" ) type App struct { diff --git a/server/app_test.go b/server/app_test.go index 1ea0752..31cef3c 100644 --- a/server/app_test.go +++ b/server/app_test.go @@ -5,8 +5,8 @@ import ( "sync" "testing" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/config" ) var testAppOnce sync.Once diff --git a/server/client.go b/server/client.go index b926241..149d700 100644 --- a/server/client.go +++ b/server/client.go @@ -7,8 +7,8 @@ import ( "strings" "time" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/sync2" - "github.com/siddontang/ledisdb/ledis" ) type responseWriter interface { diff --git a/server/client_http.go b/server/client_http.go index 2b429a3..f60b54b 100644 --- a/server/client_http.go +++ b/server/client_http.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/bson" "github.com/siddontang/go/hack" "github.com/siddontang/go/log" - "github.com/siddontang/ledisdb/ledis" "github.com/ugorji/go/codec" ) diff --git a/server/client_resp.go b/server/client_resp.go index d656f1e..ec54644 100644 --- a/server/client_resp.go +++ b/server/client_resp.go @@ -12,11 +12,11 @@ import ( "syscall" "time" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" "github.com/siddontang/go/log" "github.com/siddontang/go/num" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/ledis" ) var errReadRequest = errors.New("invalid request protocol") diff --git a/server/cmd_hash.go b/server/cmd_hash.go index 77b1f40..45491e5 100644 --- a/server/cmd_hash.go +++ b/server/cmd_hash.go @@ -1,7 +1,7 @@ package server import ( - "github.com/siddontang/ledisdb/ledis" + "github.com/ledisdb/ledisdb/ledis" ) func hsetCommand(c *client) error { diff --git a/server/cmd_kv.go b/server/cmd_kv.go index 051cead..3b5dcb3 100644 --- a/server/cmd_kv.go +++ b/server/cmd_kv.go @@ -3,7 +3,7 @@ package server import ( "strconv" - "github.com/siddontang/ledisdb/ledis" + "github.com/ledisdb/ledisdb/ledis" ) // func getCommand(c *client) error { diff --git a/server/cmd_list.go b/server/cmd_list.go index 0acf52f..61b4957 100644 --- a/server/cmd_list.go +++ b/server/cmd_list.go @@ -5,8 +5,9 @@ import ( "time" "bytes" + + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" - "github.com/siddontang/ledisdb/ledis" ) func lpushCommand(c *client) error { diff --git a/server/cmd_migrate.go b/server/cmd_migrate.go index edc52e3..6f29459 100644 --- a/server/cmd_migrate.go +++ b/server/cmd_migrate.go @@ -7,10 +7,10 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" "github.com/siddontang/go/log" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/ledis" ) func dumpCommand(c *client) error { diff --git a/server/cmd_migrate_test.go b/server/cmd_migrate_test.go index 18f4fdc..09ccf67 100644 --- a/server/cmd_migrate_test.go +++ b/server/cmd_migrate_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/config" ) func TestDumpRestore(t *testing.T) { diff --git a/server/cmd_replication.go b/server/cmd_replication.go index 62c1f1b..ed5ff50 100644 --- a/server/cmd_replication.go +++ b/server/cmd_replication.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/ledis" ) func slaveofCommand(c *client) error { diff --git a/server/cmd_replication_test.go b/server/cmd_replication_test.go index 23e4b76..0f74c0c 100644 --- a/server/cmd_replication_test.go +++ b/server/cmd_replication_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/config" ) func checkDataEqual(master *App, slave *App) error { diff --git a/server/cmd_scan.go b/server/cmd_scan.go index 5668e4d..a942d5f 100644 --- a/server/cmd_scan.go +++ b/server/cmd_scan.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/ledis" ) func parseXScanArgs(args [][]byte) (cursor []byte, match string, count int, desc bool, err error) { diff --git a/server/cmd_scan_test.go b/server/cmd_scan_test.go index 03250fe..8ad369e 100644 --- a/server/cmd_scan_test.go +++ b/server/cmd_scan_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/config" ) func TestScan(t *testing.T) { diff --git a/server/cmd_server.go b/server/cmd_server.go index 96c9e90..5282452 100644 --- a/server/cmd_server.go +++ b/server/cmd_server.go @@ -4,10 +4,11 @@ import ( "github.com/siddontang/go/hack" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/config" "strconv" "strings" "time" + + "github.com/ledisdb/ledisdb/config" ) func pingCommand(c *client) error { diff --git a/server/cmd_set.go b/server/cmd_set.go index 4b780b7..cbe8879 100644 --- a/server/cmd_set.go +++ b/server/cmd_set.go @@ -1,7 +1,7 @@ package server import ( - "github.com/siddontang/ledisdb/ledis" + "github.com/ledisdb/ledisdb/ledis" ) func saddCommand(c *client) error { diff --git a/server/cmd_zset.go b/server/cmd_zset.go index 057a293..6bffb1a 100644 --- a/server/cmd_zset.go +++ b/server/cmd_zset.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" + "github.com/ledisdb/ledisdb/ledis" + "github.com/ledisdb/ledisdb/store" "github.com/siddontang/go/hack" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/ledis" - "github.com/siddontang/ledisdb/store" ) //for simple implementation, we only support int64 score diff --git a/server/const.go b/server/const.go index df56e12..d482393 100644 --- a/server/const.go +++ b/server/const.go @@ -3,7 +3,7 @@ package server import ( "errors" - "github.com/siddontang/ledisdb/ledis" + "github.com/ledisdb/ledisdb/ledis" ) var ( diff --git a/server/info.go b/server/info.go index fd7e78f..07cd552 100644 --- a/server/info.go +++ b/server/info.go @@ -10,8 +10,8 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/sync2" - "github.com/siddontang/ledisdb/ledis" ) type info struct { diff --git a/server/replication.go b/server/replication.go index 6d3064e..eca6c1c 100644 --- a/server/replication.go +++ b/server/replication.go @@ -11,12 +11,12 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/ledis" + "github.com/ledisdb/ledisdb/rpl" "github.com/siddontang/go/log" "github.com/siddontang/go/num" "github.com/siddontang/go/sync2" "github.com/siddontang/goredis" - "github.com/siddontang/ledisdb/ledis" - "github.com/siddontang/ledisdb/rpl" ) var ( diff --git a/server/script.go b/server/script.go index 5d003a8..7897788 100644 --- a/server/script.go +++ b/server/script.go @@ -8,10 +8,10 @@ import ( "strings" "sync" + "github.com/ledisdb/ledisdb/ledis" "github.com/siddontang/go/hack" "github.com/siddontang/go/num" - "github.com/siddontang/ledisdb/ledis" - "github.com/yuin/gopher-lua" + lua "github.com/yuin/gopher-lua" luajson "github.com/glendc/gopher-json" ) diff --git a/server/script_test.go b/server/script_test.go index 124b164..6fc239c 100644 --- a/server/script_test.go +++ b/server/script_test.go @@ -3,8 +3,8 @@ package server import ( "fmt" - "github.com/siddontang/ledisdb/config" - "github.com/yuin/gopher-lua" + "github.com/ledisdb/ledisdb/config" + lua "github.com/yuin/gopher-lua" "testing" ) diff --git a/server/snapshot.go b/server/snapshot.go index b02b3f4..0b08c12 100644 --- a/server/snapshot.go +++ b/server/snapshot.go @@ -10,8 +10,8 @@ import ( "sync" "time" + "github.com/ledisdb/ledisdb/config" "github.com/siddontang/go/log" - "github.com/siddontang/ledisdb/config" ) const ( diff --git a/server/snapshot_test.go b/server/snapshot_test.go index 7c8f19c..af728fa 100644 --- a/server/snapshot_test.go +++ b/server/snapshot_test.go @@ -7,7 +7,7 @@ import ( "path" "testing" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) type testSnapshotDumper struct { diff --git a/store/db.go b/store/db.go index bfc0418..41e4353 100644 --- a/store/db.go +++ b/store/db.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" ) type DB struct { diff --git a/store/driver/store.go b/store/driver/store.go index fbaebfc..5d6a9a4 100644 --- a/store/driver/store.go +++ b/store/driver/store.go @@ -3,7 +3,7 @@ package driver import ( "fmt" - "github.com/siddontang/ledisdb/config" + "github.com/ledisdb/ledisdb/config" ) type Store interface { diff --git a/store/goleveldb/db.go b/store/goleveldb/db.go index c1c8517..487dbac 100644 --- a/store/goleveldb/db.go +++ b/store/goleveldb/db.go @@ -8,8 +8,8 @@ import ( "github.com/syndtr/goleveldb/leveldb/storage" "github.com/syndtr/goleveldb/leveldb/util" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" "os" ) diff --git a/store/goleveldb/snapshot.go b/store/goleveldb/snapshot.go index c615579..736d5b9 100644 --- a/store/goleveldb/snapshot.go +++ b/store/goleveldb/snapshot.go @@ -1,7 +1,7 @@ package goleveldb import ( - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/store/iterator.go b/store/iterator.go index 12a03b6..944b2b0 100644 --- a/store/iterator.go +++ b/store/iterator.go @@ -3,7 +3,7 @@ package store import ( "bytes" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" ) const ( diff --git a/store/leveldb/db.go b/store/leveldb/db.go index 7f1ee67..d261a09 100644 --- a/store/leveldb/db.go +++ b/store/leveldb/db.go @@ -15,8 +15,8 @@ import ( "runtime" "unsafe" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" ) const defaultFilterBits int = 10 diff --git a/store/leveldb/snapshot.go b/store/leveldb/snapshot.go index bdc8d51..ad2997c 100644 --- a/store/leveldb/snapshot.go +++ b/store/leveldb/snapshot.go @@ -7,7 +7,7 @@ package leveldb import "C" import ( - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" ) type Snapshot struct { diff --git a/store/rocksdb/db.go b/store/rocksdb/db.go index d5b7080..6e05942 100644 --- a/store/rocksdb/db.go +++ b/store/rocksdb/db.go @@ -16,8 +16,8 @@ import ( "runtime" "unsafe" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" ) const defaultFilterBits int = 10 diff --git a/store/rocksdb/snapshot.go b/store/rocksdb/snapshot.go index 1ced600..0584e79 100644 --- a/store/rocksdb/snapshot.go +++ b/store/rocksdb/snapshot.go @@ -7,7 +7,7 @@ package rocksdb import "C" import ( - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" ) type Snapshot struct { diff --git a/store/slice.go b/store/slice.go index b027f4f..a54682f 100644 --- a/store/slice.go +++ b/store/slice.go @@ -1,7 +1,7 @@ package store import ( - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" ) type Slice interface { diff --git a/store/snapshot.go b/store/snapshot.go index a1c9de9..6b75180 100644 --- a/store/snapshot.go +++ b/store/snapshot.go @@ -1,7 +1,7 @@ package store import ( - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" ) type Snapshot struct { diff --git a/store/store.go b/store/store.go index 1352491..b767963 100644 --- a/store/store.go +++ b/store/store.go @@ -5,12 +5,12 @@ import ( "os" "path" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" - _ "github.com/siddontang/ledisdb/store/goleveldb" - _ "github.com/siddontang/ledisdb/store/leveldb" - _ "github.com/siddontang/ledisdb/store/rocksdb" + _ "github.com/ledisdb/ledisdb/store/goleveldb" + _ "github.com/ledisdb/ledisdb/store/leveldb" + _ "github.com/ledisdb/ledisdb/store/rocksdb" ) func getStorePath(cfg *config.Config) string { diff --git a/store/store_test.go b/store/store_test.go index f5b9177..697a48b 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/store/driver" ) func TestStore(t *testing.T) { diff --git a/store/writebatch.go b/store/writebatch.go index 73760d7..446df3f 100644 --- a/store/writebatch.go +++ b/store/writebatch.go @@ -3,7 +3,7 @@ package store import ( "time" - "github.com/siddontang/ledisdb/store/driver" + "github.com/ledisdb/ledisdb/store/driver" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/upgrade/ledis-upgrade-ttl/main.go b/upgrade/ledis-upgrade-ttl/main.go index 70a4ec2..a5fc997 100644 --- a/upgrade/ledis-upgrade-ttl/main.go +++ b/upgrade/ledis-upgrade-ttl/main.go @@ -5,9 +5,9 @@ import ( "flag" "fmt" - "github.com/siddontang/ledisdb/config" - "github.com/siddontang/ledisdb/ledis" - "github.com/siddontang/ledisdb/store" + "github.com/ledisdb/ledisdb/config" + "github.com/ledisdb/ledisdb/ledis" + "github.com/ledisdb/ledisdb/store" ) var configPath = flag.String("config", "", "ledisdb config file")