Merge branch 'develop'

Makefile

@@ -42,4 +42,5 @@ clean:
 	$(GO) clean -i ./...
 
 fmt:
-	go fmt ./...
+	gofmt -w=true cmd config ledis rpl server store vendor
+	goimports -w=true cmd config ledis rpl server store vendor

cmd/ledis-benchmark/main.go

@@ -3,13 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/goredis"
 	"math/rand"
 	"runtime"
 	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/siddontang/goredis"
 )
 
 var ip = flag.String("ip", "127.0.0.1", "redis/ledis/ssdb server ip")

cmd/ledis-cli/const.go

@@ -1,4 +1,4 @@
-//This file was generated by .tools/generate_commands.py on Sat Mar 14 2015 08:58:32 +0800 
+//This file was generated by .tools/generate_commands.py on Sat Mar 14 2015 08:58:32 +0800
 package main
 
 var helpCommands = [][]string{

cmd/ledis-cli/main.go

@@ -5,10 +5,11 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/goredis"
 	"regexp"
 	"strconv"
 	"strings"
+
+	"github.com/siddontang/goredis"
 )
 
 var ip = flag.String("h", "127.0.0.1", "ledisdb server ip (default 127.0.0.1)")

cmd/ledis-dump/main.go

@@ -3,8 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/goredis"
 	"os"
+
+	"github.com/siddontang/goredis"
 )
 
 var host = flag.String("host", "127.0.0.1", "ledis server host")

cmd/ledis-load/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/ledis"
 )

cmd/ledis-repair/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/store"
 )

cmd/ledis-server/main.go

@@ -3,8 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/server"
 	"log"
 	"net/http"
 	_ "net/http/pprof"
@@ -13,6 +11,9 @@ import (
 	"runtime"
 	"strings"
 	"syscall"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/server"
 )
 
 var configFile = flag.String("config", "", "ledisdb config file")

config/config.go

@@ -3,11 +3,12 @@ package config
 import (
 	"bytes"
 	"errors"
-	"github.com/BurntSushi/toml"
-	"github.com/siddontang/go/ioutil2"
 	"io"
 	"io/ioutil"
 	"sync"
+
+	"github.com/BurntSushi/toml"
+	"github.com/siddontang/go/ioutil2"
 )
 
 var (

ledis/batch.go

@@ -1,10 +1,11 @@
 package ledis
 
 import (
+	"sync"
+
 	"github.com/siddontang/go/log"
 	"github.com/siddontang/ledisdb/rpl"
 	"github.com/siddontang/ledisdb/store"
-	"sync"
 )
 
 type batch struct {

ledis/dump.go

@@ -4,10 +4,11 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/binary"
-	"github.com/siddontang/go/snappy"
-	"github.com/siddontang/ledisdb/store"
 	"io"
 	"os"
+
+	"github.com/siddontang/go/snappy"
+	"github.com/siddontang/ledisdb/store"
 )
 
 type DumpHead struct {

ledis/dump_test.go

@@ -2,10 +2,11 @@ package ledis
 
 import (
 	"bytes"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store"
 	"os"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store"
 )
 
 func TestDump(t *testing.T) {

ledis/event.go

@@ -3,8 +3,9 @@ package ledis
 import (
 	"errors"
 	"fmt"
-	"github.com/siddontang/go/hack"
 	"strconv"
+
+	"github.com/siddontang/go/hack"
 )
 
 var errInvalidEvent = errors.New("invalid event")

ledis/ledis.go

@@ -2,16 +2,17 @@ package ledis
 
 import (
 	"fmt"
-	"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"
 	"io"
 	"os"
 	"path"
 	"sync"
 	"time"
+
+	"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"
 )
 
 type Ledis struct {

ledis/ledis_db.go

@@ -4,8 +4,9 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/siddontang/ledisdb/store"
 	"sync"
+
+	"github.com/siddontang/ledisdb/store"
 )
 
 type ibucket interface {

ledis/ledis_test.go

@@ -1,10 +1,11 @@
 package ledis
 
 import (
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"sync"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
 )
 
 var testLedis *Ledis

ledis/migrate.go

@@ -2,6 +2,7 @@ package ledis
 
 import (
 	"fmt"
+
 	"github.com/siddontang/rdb"
 )
 

ledis/migrate_test.go

@@ -1,9 +1,10 @@
 package ledis
 
 import (
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
 )
 
 func TestMigrate(t *testing.T) {

ledis/replication.go

@@ -3,12 +3,13 @@ package ledis
 import (
 	"bytes"
 	"errors"
+	"io"
+	"time"
+
 	"github.com/siddontang/go/log"
 	"github.com/siddontang/go/snappy"
 	"github.com/siddontang/ledisdb/rpl"
 	"github.com/siddontang/ledisdb/store"
-	"io"
-	"time"
 )
 
 const (

ledis/replication_test.go

@@ -3,10 +3,11 @@ package ledis
 import (
 	"bytes"
 	"fmt"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store"
 	"os"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store"
 )
 
 func checkLedisEqual(master *Ledis, slave *Ledis) error {

ledis/scan.go

@@ -2,8 +2,9 @@ package ledis
 
 import (
 	"errors"
-	"github.com/siddontang/ledisdb/store"
 	"regexp"
+
+	"github.com/siddontang/ledisdb/store"
 )
 
 var errDataType = errors.New("error data type")

ledis/sort.go

@@ -3,9 +3,10 @@ package ledis
 import (
 	"bytes"
 	"fmt"
-	"github.com/siddontang/ledisdb/store"
 	"sort"
 	"strconv"
+
+	"github.com/siddontang/ledisdb/store"
 )
 
 type Limit struct {

ledis/t_hash.go

@@ -3,9 +3,10 @@ package ledis
 import (
 	"encoding/binary"
 	"errors"
+	"time"
+
 	"github.com/siddontang/go/num"
 	"github.com/siddontang/ledisdb/store"
-	"time"
 )
 
 type FVPair struct {

ledis/t_kv.go

@@ -4,10 +4,11 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/siddontang/go/num"
-	"github.com/siddontang/ledisdb/store"
 	"strings"
 	"time"
+
+	"github.com/siddontang/go/num"
+	"github.com/siddontang/ledisdb/store"
 )
 
 type KVPair struct {

ledis/t_list.go

@@ -4,10 +4,11 @@ import (
 	"container/list"
 	"encoding/binary"
 	"errors"
-	"github.com/siddontang/go/hack"
-	"github.com/siddontang/ledisdb/store"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/hack"
+	"github.com/siddontang/ledisdb/store"
 )
 
 const (

ledis/t_set.go

@@ -3,9 +3,10 @@ package ledis
 import (
 	"encoding/binary"
 	"errors"
+	"time"
+
 	"github.com/siddontang/go/hack"
 	"github.com/siddontang/ledisdb/store"
-	"time"
 )
 
 var errSetKey = errors.New("invalid set key")

ledis/t_ttl.go

@@ -3,9 +3,10 @@ package ledis
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/siddontang/ledisdb/store"
 	"sync"
 	"time"
+
+	"github.com/siddontang/ledisdb/store"
 )
 
 var (

ledis/t_ttl_test.go

@@ -2,10 +2,11 @@ package ledis
 
 import (
 	"fmt"
-	"github.com/siddontang/go/hack"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/siddontang/go/hack"
 )
 
 var m sync.Mutex

ledis/t_zset.go

@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"time"
+
 	"github.com/siddontang/go/hack"
 	"github.com/siddontang/ledisdb/store"
-	"time"
 )
 
 const (
@@ -582,9 +583,10 @@ func (db *DB) zRange(key []byte, min int64, max int64, offset int, count int, re
 		return []ScorePair{}, nil
 	}
 
-	nv := 64
+	nv := count
-	if count > 0 {
+	// count may be very large, so we must limit it for below mem make.
-		nv = count
+	if nv <= 0 || nv > 1024 {
+		nv = 64
 	}
 
 	v := make([]ScorePair, 0, nv)

ledis/t_zset_test.go

@@ -2,9 +2,10 @@ package ledis
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/store"
 	"reflect"
 	"testing"
+
+	"github.com/siddontang/ledisdb/store"
 )
 
 const (

ledis/util.go

@@ -3,8 +3,9 @@ package ledis
 import (
 	"encoding/binary"
 	"errors"
-	"github.com/siddontang/go/hack"
 	"strconv"
+
+	"github.com/siddontang/go/hack"
 )
 
 var errIntNumber = errors.New("invalid integer")

rpl/file_io.go

@@ -2,10 +2,11 @@ package rpl
 
 import (
 	"fmt"
-	"github.com/edsrzf/mmap-go"
-	"github.com/siddontang/go/log"
 	"io"
 	"os"
+
+	"github.com/edsrzf/mmap-go"
+	"github.com/siddontang/go/log"
 )
 
 //like leveldb or rocksdb file interface, haha!

rpl/file_store.go

@@ -2,14 +2,15 @@ package rpl
 
 import (
 	"fmt"
-	"github.com/siddontang/go/log"
-	"github.com/siddontang/go/num"
-	"github.com/siddontang/ledisdb/config"
 	"io/ioutil"
 	"os"
 	"sort"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/log"
+	"github.com/siddontang/go/num"
+	"github.com/siddontang/ledisdb/config"
 )
 
 const (

rpl/file_table.go

@@ -5,12 +5,13 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/siddontang/go/log"
-	"github.com/siddontang/go/sync2"
 	"io"
 	"path"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/log"
+	"github.com/siddontang/go/sync2"
 )
 
 var (

rpl/file_table_test.go

@@ -1,12 +1,13 @@
 package rpl
 
 import (
-	"github.com/siddontang/go/log"
 	"io/ioutil"
 	"os"
 	"path"
 	"testing"
 	"time"
+
+	"github.com/siddontang/go/log"
 )
 
 func TestFileTable(t *testing.T) {

rpl/goleveldb_store.go

@@ -3,12 +3,13 @@ package rpl
 import (
 	"bytes"
 	"fmt"
-	"github.com/siddontang/go/num"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store"
 	"os"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/num"
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store"
 )
 
 type GoLevelDBStore struct {

rpl/rpl.go

@@ -2,13 +2,14 @@ package rpl
 
 import (
 	"encoding/binary"
-	"github.com/siddontang/go/log"
-	"github.com/siddontang/go/snappy"
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"path"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/log"
+	"github.com/siddontang/go/snappy"
+	"github.com/siddontang/ledisdb/config"
 )
 
 type Stat struct {

rpl/rpl_test.go

@@ -1,10 +1,11 @@
 package rpl
 
 import (
-	"github.com/siddontang/ledisdb/config"
 	"io/ioutil"
 	"os"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
 )
 
 func TestReplication(t *testing.T) {

rpl/store_test.go

@@ -1,10 +1,11 @@
 package rpl
 
 import (
-	"github.com/siddontang/ledisdb/config"
 	"io/ioutil"
 	"os"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
 )
 
 func TestGoLevelDBStore(t *testing.T) {

server/app.go

@@ -1,14 +1,15 @@
 package server
 
 import (
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/ledis"
 	"net"
 	"net/http"
 	"path"
 	"strings"
 	"sync"
+
+	"github.com/siddontang/goredis"
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/ledis"
 )
 
 type App struct {

server/app_test.go

@@ -1,11 +1,12 @@
 package server
 
 import (
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"sync"
 	"testing"
+
+	"github.com/siddontang/goredis"
+	"github.com/siddontang/ledisdb/config"
 )
 
 var testAppOnce sync.Once

server/client.go

@@ -3,10 +3,11 @@ package server
 import (
 	"bytes"
 	//	"fmt"
-	"github.com/siddontang/go/sync2"
-	"github.com/siddontang/ledisdb/ledis"
 	"io"
 	"time"
+
+	"github.com/siddontang/go/sync2"
+	"github.com/siddontang/ledisdb/ledis"
 )
 
 // var txUnsupportedCmds = map[string]struct{}{

server/client_http.go

@@ -3,15 +3,16 @@ package server
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"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"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 var allowedContentTypes = map[string]struct{}{

server/client_resp.go

@@ -4,17 +4,18 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"github.com/siddontang/go/hack"
-	"github.com/siddontang/go/log"
-	"github.com/siddontang/go/num"
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/ledis"
 	"io"
 	"net"
 	"runtime"
 	"strconv"
 	"syscall"
 	"time"
+
+	"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")

server/cmd_hash_test.go

@@ -2,9 +2,10 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"strconv"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestHash(t *testing.T) {

server/cmd_kv.go

@@ -1,8 +1,9 @@
 package server
 
 import (
-	"github.com/siddontang/ledisdb/ledis"
 	"strconv"
+
+	"github.com/siddontang/ledisdb/ledis"
 )
 
 // func getCommand(c *client) error {

server/cmd_kv_test.go

@@ -1,8 +1,9 @@
 package server
 
 import (
-	"github.com/siddontang/goredis"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestKV(t *testing.T) {

server/cmd_list.go

@@ -1,10 +1,11 @@
 package server
 
 import (
-	"github.com/siddontang/go/hack"
-	"github.com/siddontang/ledisdb/ledis"
 	"strconv"
 	"time"
+
+	"github.com/siddontang/go/hack"
+	"github.com/siddontang/ledisdb/ledis"
 )
 
 func lpushCommand(c *client) error {

server/cmd_list_test.go

@@ -2,9 +2,10 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"strconv"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func testListIndex(key []byte, index int64, v int) error {

server/cmd_migrate_test.go

@@ -2,11 +2,12 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"testing"
 	"time"
+
+	"github.com/siddontang/goredis"
+	"github.com/siddontang/ledisdb/config"
 )
 
 func TestDumpRestore(t *testing.T) {

server/cmd_replication.go

@@ -3,13 +3,14 @@ package server
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/siddontang/go/hack"
-	"github.com/siddontang/go/num"
-	"github.com/siddontang/ledisdb/ledis"
 	"net"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/siddontang/go/hack"
+	"github.com/siddontang/go/num"
+	"github.com/siddontang/ledisdb/ledis"
 )
 
 func slaveofCommand(c *client) error {

server/cmd_replication_test.go

@@ -2,12 +2,13 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"reflect"
 	"testing"
 	"time"
+
+	"github.com/siddontang/goredis"
+	"github.com/siddontang/ledisdb/config"
 )
 
 func checkDataEqual(master *App, slave *App) error {

server/cmd_scan.go

@@ -2,11 +2,12 @@ package server
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/siddontang/go/hack"
 	"github.com/siddontang/go/num"
 	"github.com/siddontang/ledisdb/ledis"
-	"strconv"
-	"strings"
 )
 
 func parseScanArgs(args [][]byte) (cursor []byte, match string, count int, desc bool, err error) {

server/cmd_scan_test.go

@@ -2,10 +2,11 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
-	"github.com/siddontang/ledisdb/config"
 	"os"
 	"testing"
+
+	"github.com/siddontang/goredis"
+	"github.com/siddontang/ledisdb/config"
 )
 
 func TestScan(t *testing.T) {

server/cmd_script.go

@@ -6,11 +6,13 @@ import (
 	"crypto/sha1"
 	"encoding/hex"
 	"fmt"
+
 	"github.com/siddontang/go/hack"
 
-	"github.com/siddontang/ledisdb/vendor/lua"
 	"strconv"
 	"strings"
+
+	"github.com/siddontang/ledisdb/vendor/lua"
 )
 
 func parseEvalArgs(l *lua.State, c *client) error {

server/cmd_script_test.go

@@ -4,9 +4,10 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"reflect"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestCmdEval(t *testing.T) {

server/cmd_server_test.go

@@ -1,8 +1,9 @@
 package server
 
 import (
-	"github.com/siddontang/goredis"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestXSelect(t *testing.T) {

server/cmd_set_test.go

@@ -1,8 +1,9 @@
 package server
 
 import (
-	"github.com/siddontang/goredis"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestSet(t *testing.T) {

server/cmd_sort_test.go

@@ -2,8 +2,9 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func checkTestSortRes(ay interface{}, checks []string) error {

server/cmd_ttl_test.go

@@ -2,9 +2,10 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"testing"
 	"time"
+
+	"github.com/siddontang/goredis"
 )
 
 func now() int64 {

server/cmd_zset.go

@@ -2,13 +2,14 @@ package server
 
 import (
 	"errors"
+	"math"
+	"strconv"
+	"strings"
+
 	"github.com/siddontang/go/hack"
 	"github.com/siddontang/go/num"
 	"github.com/siddontang/ledisdb/ledis"
 	"github.com/siddontang/ledisdb/store"
-	"math"
-	"strconv"
-	"strings"
 )
 
 //for simple implementation, we only support int64 score

server/cmd_zset_test.go

@@ -2,10 +2,11 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/goredis"
 	"reflect"
 	"strconv"
 	"testing"
+
+	"github.com/siddontang/goredis"
 )
 
 func TestZSet(t *testing.T) {

server/const.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"errors"
+
 	"github.com/siddontang/ledisdb/ledis"
 )
 

server/info.go

@@ -3,13 +3,14 @@ package server
 import (
 	"bytes"
 	"fmt"
-	"github.com/siddontang/go/sync2"
 	"os"
 	"runtime"
 	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/sync2"
 )
 
 type info struct {

server/replication.go

@@ -4,18 +4,19 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"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"
 	"net"
 	"os"
 	"path"
 	"strings"
 	"sync"
 	"time"
+
+	"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 (

server/script.go

@@ -5,12 +5,13 @@ package server
 import (
 	"encoding/hex"
 	"fmt"
+	"io"
+	"sync"
+
 	"github.com/siddontang/go/hack"
 	"github.com/siddontang/go/num"
 	"github.com/siddontang/ledisdb/ledis"
 	"github.com/siddontang/ledisdb/vendor/lua"
-	"io"
-	"sync"
 )
 
 //ledis <-> lua type conversion, same as http://redis.io/commands/eval

server/script_test.go

@@ -4,6 +4,7 @@ package server
 
 import (
 	"fmt"
+
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/vendor/lua"
 

server/snapshot.go

@@ -2,8 +2,6 @@ package server
 
 import (
 	"fmt"
-	"github.com/siddontang/go/log"
-	"github.com/siddontang/ledisdb/config"
 	"io"
 	"io/ioutil"
 	"os"
@@ -11,6 +9,9 @@ import (
 	"sort"
 	"sync"
 	"time"
+
+	"github.com/siddontang/go/log"
+	"github.com/siddontang/ledisdb/config"
 )
 
 const (

server/snapshot_test.go

@@ -1,12 +1,13 @@
 package server
 
 import (
-	"github.com/siddontang/ledisdb/config"
 	"io"
 	"io/ioutil"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
 )
 
 type testSnapshotDumper struct {

server/util.go

@@ -1,7 +1,5 @@
 package server
 
-import ()
-
 func lowerSlice(buf []byte) []byte {
 	for i, r := range buf {
 		if 'A' <= r && r <= 'Z' {

store/boltdb/db.go

@@ -1,11 +1,12 @@
 package boltdb
 
 import (
+	"os"
+	"path"
+
 	"github.com/boltdb/bolt"
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/store/driver"
-	"os"
-	"path"
 )
 
 var bucketName = []byte("ledisdb")

store/db.go

@@ -1,10 +1,11 @@
 package store
 
 import (
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store/driver"
 	"sync"
 	"time"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store/driver"
 )
 
 type DB struct {

store/driver/store.go

@@ -2,6 +2,7 @@ package driver
 
 import (
 	"fmt"
+
 	"github.com/siddontang/ledisdb/config"
 )
 

store/iterator.go

@@ -2,6 +2,7 @@ package store
 
 import (
 	"bytes"
+
 	"github.com/siddontang/ledisdb/store/driver"
 )
 

store/leveldb/batch.go

@@ -8,8 +8,9 @@ package leveldb
 import "C"
 
 import (
-	"github.com/syndtr/goleveldb/leveldb"
 	"unsafe"
+
+	"github.com/syndtr/goleveldb/leveldb"
 )
 
 type WriteBatch struct {

store/leveldb/db.go

@@ -11,11 +11,12 @@ package leveldb
 import "C"
 
 import (
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store/driver"
 	"os"
 	"runtime"
 	"unsafe"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store/driver"
 )
 
 const defaultFilterBits int = 10

store/mdb/mdb.go

@@ -3,10 +3,11 @@
 package mdb
 
 import (
+	"os"
+
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/store/driver"
 	mdb "github.com/siddontang/ledisdb/vendor/gomdb"
-	"os"
 )
 
 type Store struct {

store/rocksdb/db.go

@@ -12,11 +12,12 @@ package rocksdb
 import "C"
 
 import (
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store/driver"
 	"os"
 	"runtime"
 	"unsafe"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store/driver"
 )
 
 const defaultFilterBits int = 10

store/store.go

@@ -2,11 +2,12 @@ package store
 
 import (
 	"fmt"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store/driver"
 	"os"
 	"path"
 
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store/driver"
+
 	_ "github.com/siddontang/ledisdb/store/boltdb"
 	_ "github.com/siddontang/ledisdb/store/goleveldb"
 	_ "github.com/siddontang/ledisdb/store/leveldb"

store/store_test.go

@@ -3,11 +3,12 @@ package store
 import (
 	"bytes"
 	"fmt"
-	"github.com/siddontang/ledisdb/config"
-	"github.com/siddontang/ledisdb/store/driver"
 	"os"
 	"reflect"
 	"testing"
+
+	"github.com/siddontang/ledisdb/config"
+	"github.com/siddontang/ledisdb/store/driver"
 )
 
 func TestStore(t *testing.T) {

store/tx_test.go

@@ -1,8 +1,9 @@
 package store
 
 import (
-	"github.com/siddontang/ledisdb/store/driver"
 	"testing"
+
+	"github.com/siddontang/ledisdb/store/driver"
 )
 
 func TestTx(t *testing.T) {

store/writebatch.go

@@ -2,9 +2,10 @@ package store
 
 import (
 	"encoding/binary"
+	"time"
+
 	"github.com/siddontang/ledisdb/store/driver"
 	"github.com/syndtr/goleveldb/leveldb"
-	"time"
 )
 
 type WriteBatch struct {

upgrade/ledis-upgrade-ttl/main.go

@@ -4,6 +4,7 @@ import (
 	"encoding/binary"
 	"flag"
 	"fmt"
+
 	"github.com/siddontang/ledisdb/config"
 	"github.com/siddontang/ledisdb/ledis"
 	"github.com/siddontang/ledisdb/store"