add vendor & update README.md

vendor/github.com/qiniu/x/bytes.v7/README.md

@@ -0,0 +1,4 @@
+qiniupkg.com/x/bytes.v7
+=====
+
+Extension module of golang bytes processing

vendor/github.com/qiniu/x/bytes.v7/bytes.go

@@ -0,0 +1,177 @@
+package bytes
+
+import (
+	"io"
+	"syscall"
+)
+
+// ---------------------------------------------------
+
+type Reader struct {
+	b   []byte
+	off int
+}
+
+func NewReader(val []byte) *Reader {
+	return &Reader{val, 0}
+}
+
+func (r *Reader) Len() int {
+	if r.off >= len(r.b) {
+		return 0
+	}
+	return len(r.b) - r.off
+}
+
+func (r *Reader) Bytes() []byte {
+	return r.b[r.off:]
+}
+
+func (r *Reader) SeekToBegin() (err error) {
+	r.off = 0
+	return
+}
+
+func (r *Reader) Seek(offset int64, whence int) (ret int64, err error) {
+	switch whence {
+	case 0:
+	case 1:
+		offset += int64(r.off)
+	case 2:
+		offset += int64(len(r.b))
+	default:
+		err = syscall.EINVAL
+		return
+	}
+	if offset < 0 {
+		err = syscall.EINVAL
+		return
+	}
+	if offset >= int64(len(r.b)) {
+		r.off = len(r.b)
+	} else {
+		r.off = int(offset)
+	}
+	ret = int64(r.off)
+	return
+}
+
+func (r *Reader) Read(val []byte) (n int, err error) {
+	n = copy(val, r.b[r.off:])
+	if n == 0 && len(val) != 0 {
+		err = io.EOF
+		return
+	}
+	r.off += n
+	return
+}
+
+func (r *Reader) Close() (err error) {
+	return
+}
+
+// ---------------------------------------------------
+
+type Writer struct {
+	b []byte
+	n int
+}
+
+func NewWriter(buff []byte) *Writer {
+	return &Writer{buff, 0}
+}
+
+func (p *Writer) Write(val []byte) (n int, err error) {
+	n = copy(p.b[p.n:], val)
+	if n == 0 && len(val) > 0 {
+		err = io.EOF
+		return
+	}
+	p.n += n
+	return
+}
+
+func (p *Writer) Len() int {
+	return p.n
+}
+
+func (p *Writer) Bytes() []byte {
+	return p.b[:p.n]
+}
+
+func (p *Writer) Reset() {
+	p.n = 0
+}
+
+// ---------------------------------------------------
+
+type Buffer struct {
+	b []byte
+}
+
+func NewBuffer() *Buffer {
+	return new(Buffer)
+}
+
+func (p *Buffer) ReadAt(buf []byte, off int64) (n int, err error) {
+	ioff := int(off)
+	if len(p.b) <= ioff {
+		return 0, io.EOF
+	}
+	n = copy(buf, p.b[ioff:])
+	if n != len(buf) {
+		err = io.EOF
+	}
+	return
+}
+
+func (p *Buffer) WriteAt(buf []byte, off int64) (n int, err error) {
+	ioff := int(off)
+	iend := ioff + len(buf)
+	if len(p.b) < iend {
+		if len(p.b) == ioff {
+			p.b = append(p.b, buf...)
+			return len(buf), nil
+		}
+		zero := make([]byte, iend-len(p.b))
+		p.b = append(p.b, zero...)
+	}
+	copy(p.b[ioff:], buf)
+	return len(buf), nil
+}
+
+func (p *Buffer) WriteStringAt(buf string, off int64) (n int, err error) {
+	ioff := int(off)
+	iend := ioff + len(buf)
+	if len(p.b) < iend {
+		if len(p.b) == ioff {
+			p.b = append(p.b, buf...)
+			return len(buf), nil
+		}
+		zero := make([]byte, iend-len(p.b))
+		p.b = append(p.b, zero...)
+	}
+	copy(p.b[ioff:], buf)
+	return len(buf), nil
+}
+
+func (p *Buffer) Truncate(fsize int64) (err error) {
+	size := int(fsize)
+	if len(p.b) < size {
+		zero := make([]byte, size-len(p.b))
+		p.b = append(p.b, zero...)
+	} else {
+		p.b = p.b[:size]
+	}
+	return nil
+}
+
+func (p *Buffer) Buffer() []byte {
+	return p.b
+}
+
+func (p *Buffer) Len() int {
+	return len(p.b)
+}
+
+// ---------------------------------------------------

vendor/github.com/qiniu/x/bytes.v7/doc.go

@@ -0,0 +1,34 @@
+/*
+包 qiniupkg.com/x/bytes.v7 提供了 byte slice 相关的功能扩展
+
+NewReader 创建一个 byte slice 的只读流：
+
+	var slice []byte
+	...
+	r := bytes.NewReader(slice)
+	...
+	r.Seek(0, 0) // r.SeekToBegin()
+	...
+
+和标准库的 bytes.NewReader 不同的是，这里的 Reader 支持 Seek。
+
+NewWriter 创建一个有上限容量的写流：
+
+	slice := make([]byte, 1024)
+	w := bytes.NewWriter(slice)
+	...
+	writtenData := w.Bytes()
+
+如果我们向 w 里面写入超过 1024 字节的数据，那么多余的数据会被丢弃。
+
+NewBuffer 创建一个可随机读写的内存文件，支持 ReadAt/WriteAt 方法，而不是 Read/Write:
+
+	b := bytes.NewBuffer()
+	b.Truncate(100)
+	b.WriteAt([]byte("hello"), 100)
+	slice := make([]byte, 105)
+	n, err := b.ReadAt(slice, 0)
+	...
+*/
+package bytes
+

vendor/github.com/qiniu/x/bytes.v7/replace.go

@@ -0,0 +1,54 @@
+package bytes
+
+import (
+	"bytes"
+)
+
+// ---------------------------------------------------
+
+func ReplaceAt(b []byte, off, nsrc int, dest []byte) []byte {
+
+	ndelta := len(dest) - nsrc
+	if ndelta < 0 {
+		left := b[off+nsrc:]
+		off += copy(b[off:], dest)
+		off += copy(b[off:], left)
+		return b[:off]
+	}
+
+	if ndelta > 0 {
+		b = append(b, dest[:ndelta]...)
+		copy(b[off+len(dest):], b[off+nsrc:])
+		copy(b[off:], dest)
+	} else {
+		copy(b[off:], dest)
+	}
+	return b
+}
+
+func ReplaceOne(b []byte, from int, src, dest []byte) ([]byte, int) {
+
+	pos := bytes.Index(b[from:], src)
+	if pos < 0 {
+		return b, -1
+	}
+
+	from += pos
+	return ReplaceAt(b, from, len(src), dest), from + len(dest)
+}
+
+func Replace(b []byte, src, dest []byte, n int) []byte {
+
+	from := 0
+	for n != 0 {
+		b, from = ReplaceOne(b, from, src, dest)
+		if from < 0 {
+			break
+		}
+		n--
+	}
+	return b
+}
+
+// ---------------------------------------------------
+

vendor/github.com/qiniu/x/bytes.v7/seekable/seekable.go

@@ -0,0 +1,63 @@
+// This package provide a method to read and replace http.Request's body.
+package seekable
+
+import (
+	"errors"
+	"io"
+	"io/ioutil"
+	"net/http"
+
+	"qiniupkg.com/x/bytes.v7"
+)
+
+// ---------------------------------------------------
+
+type Seekabler interface {
+	Bytes() []byte
+	Read(val []byte) (n int, err error)
+	SeekToBegin() error
+}
+
+type SeekableCloser interface {
+	Seekabler
+	io.Closer
+}
+
+// ---------------------------------------------------
+
+type readCloser struct {
+	Seekabler
+	io.Closer
+}
+
+var ErrNoBody = errors.New("no body")
+
+func New(req *http.Request) (r SeekableCloser, err error) {
+	if req.Body == nil {
+		return nil, ErrNoBody
+	}
+	var ok bool
+	if r, ok = req.Body.(SeekableCloser); ok {
+		return
+	}
+	b, err2 := ReadAll(req)
+	if err2 != nil {
+		return nil, err2
+	}
+	r = bytes.NewReader(b)
+	req.Body = readCloser{r, req.Body}
+	return
+}
+
+func ReadAll(req *http.Request) (b []byte, err error) {
+	if req.ContentLength > 0 {
+		b = make([]byte, int(req.ContentLength))
+		_, err = io.ReadFull(req.Body, b)
+		return
+	} else if req.ContentLength == 0 {
+		return nil, ErrNoBody
+	}
+	return ioutil.ReadAll(req.Body)
+}
+
+// ---------------------------------------------------

vendor/github.com/qiniu/x/reqid.v7/reqid.go

@@ -0,0 +1,52 @@
+package reqid
+
+import (
+	"encoding/binary"
+	"encoding/base64"
+	"net/http"
+	"time"
+
+	. "golang.org/x/net/context"
+)
+
+// --------------------------------------------------------------------
+
+var pid = uint32(time.Now().UnixNano() % 4294967291)
+
+func genReqId() string {
+	var b [12]byte
+	binary.LittleEndian.PutUint32(b[:], pid)
+	binary.LittleEndian.PutUint64(b[4:], uint64(time.Now().UnixNano()))
+	return base64.URLEncoding.EncodeToString(b[:])
+}
+
+// --------------------------------------------------------------------
+
+type key int // key is unexported and used for Context
+
+const (
+	reqidKey key = 0
+)
+
+func NewContext(ctx Context, reqid string) Context {
+	return WithValue(ctx, reqidKey, reqid)
+}
+
+func NewContextWith(ctx Context, w http.ResponseWriter, req *http.Request) Context {
+	reqid := req.Header.Get("X-Reqid")
+	if reqid == "" {
+		reqid = genReqId()
+		req.Header.Set("X-Reqid", reqid)
+	}
+	h := w.Header()
+	h.Set("X-Reqid", reqid)
+	return WithValue(ctx, reqidKey, reqid)
+}
+
+func FromContext(ctx Context) (reqid string, ok bool) {
+	reqid, ok = ctx.Value(reqidKey).(string)
+	return
+}
+
+// --------------------------------------------------------------------
+

vendor/github.com/qiniu/x/xlog.v7/xlog.go

@@ -0,0 +1,211 @@
+package xlog
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"runtime"
+
+	"qiniupkg.com/x/log.v7"
+	"qiniupkg.com/x/reqid.v7"
+
+	. "golang.org/x/net/context"
+)
+
+const (
+	Ldate         = log.Ldate
+	Ltime         = log.Ltime
+	Lmicroseconds = log.Lmicroseconds
+	Llongfile     = log.Llongfile
+	Lshortfile    = log.Lshortfile
+	Lmodule       = log.Lmodule
+	Llevel        = log.Llevel
+	LstdFlags     = log.LstdFlags
+	Ldefault      = log.Ldefault
+)
+
+const (
+	Ldebug = log.Ldebug
+	Linfo  = log.Linfo
+	Lwarn  = log.Lwarn
+	Lerror = log.Lerror
+	Lpanic = log.Lpanic
+	Lfatal = log.Lfatal
+)
+
+// ============================================================================
+// type *Logger
+
+type Logger struct {
+	ReqId string
+}
+
+func New(reqId string) *Logger {
+
+	return &Logger{reqId}
+}
+
+func NewWith(ctx Context) *Logger {
+
+	reqId, ok := reqid.FromContext(ctx)
+	if !ok {
+		log.Debug("xlog.New: reqid isn't find in context")
+	}
+	return &Logger{reqId}
+}
+
+func (xlog *Logger) Spawn(child string) *Logger {
+
+	return &Logger{xlog.ReqId + "." + child}
+}
+
+// ============================================================================
+
+// Print calls Output to print to the standard Logger.
+// Arguments are handled in the manner of fmt.Print.
+func (xlog *Logger) Print(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Linfo, 2, fmt.Sprint(v...))
+}
+
+// Printf calls Output to print to the standard Logger.
+// Arguments are handled in the manner of fmt.Printf.
+func (xlog *Logger) Printf(format string, v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Linfo, 2, fmt.Sprintf(format, v...))
+}
+
+// Println calls Output to print to the standard Logger.
+// Arguments are handled in the manner of fmt.Println.
+func (xlog *Logger) Println(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Linfo, 2, fmt.Sprintln(v...))
+}
+
+// -----------------------------------------
+
+func (xlog *Logger) Debugf(format string, v ...interface{}) {
+	if log.Ldebug < log.Std.Level {
+		return
+	}
+	log.Std.Output(xlog.ReqId, log.Ldebug, 2, fmt.Sprintf(format, v...))
+}
+
+func (xlog *Logger) Debug(v ...interface{}) {
+	if log.Ldebug < log.Std.Level {
+		return
+	}
+	log.Std.Output(xlog.ReqId, log.Ldebug, 2, fmt.Sprintln(v...))
+}
+
+// -----------------------------------------
+
+func (xlog *Logger) Infof(format string, v ...interface{}) {
+	if log.Linfo < log.Std.Level {
+		return
+	}
+	log.Std.Output(xlog.ReqId, log.Linfo, 2, fmt.Sprintf(format, v...))
+}
+
+func (xlog *Logger) Info(v ...interface{}) {
+	if log.Linfo < log.Std.Level {
+		return
+	}
+	log.Std.Output(xlog.ReqId, log.Linfo, 2, fmt.Sprintln(v...))
+}
+
+// -----------------------------------------
+
+func (xlog *Logger) Warnf(format string, v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lwarn, 2, fmt.Sprintf(format, v...))
+}
+
+func (xlog *Logger) Warn(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lwarn, 2, fmt.Sprintln(v...))
+}
+
+// -----------------------------------------
+
+func (xlog *Logger) Errorf(format string, v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lerror, 2, fmt.Sprintf(format, v...))
+}
+
+func (xlog *Logger) Error(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lerror, 2, fmt.Sprintln(v...))
+}
+
+// -----------------------------------------
+
+// Fatal is equivalent to Print() followed by a call to os.Exit(1).
+func (xlog *Logger) Fatal(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lfatal, 2, fmt.Sprint(v...))
+	os.Exit(1)
+}
+
+// Fatalf is equivalent to Printf() followed by a call to os.Exit(1).
+func (xlog *Logger) Fatalf(format string, v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lfatal, 2, fmt.Sprintf(format, v...))
+	os.Exit(1)
+}
+
+// Fatalln is equivalent to Println() followed by a call to os.Exit(1).
+func (xlog *Logger) Fatalln(v ...interface{}) {
+	log.Std.Output(xlog.ReqId, log.Lfatal, 2, fmt.Sprintln(v...))
+	os.Exit(1)
+}
+
+// -----------------------------------------
+
+// Panic is equivalent to Print() followed by a call to panic().
+func (xlog *Logger) Panic(v ...interface{}) {
+	s := fmt.Sprint(v...)
+	log.Std.Output(xlog.ReqId, log.Lpanic, 2, s)
+	panic(s)
+}
+
+// Panicf is equivalent to Printf() followed by a call to panic().
+func (xlog *Logger) Panicf(format string, v ...interface{}) {
+	s := fmt.Sprintf(format, v...)
+	log.Std.Output(xlog.ReqId, log.Lpanic, 2, s)
+	panic(s)
+}
+
+// Panicln is equivalent to Println() followed by a call to panic().
+func (xlog *Logger) Panicln(v ...interface{}) {
+	s := fmt.Sprintln(v...)
+	log.Std.Output(xlog.ReqId, log.Lpanic, 2, s)
+	panic(s)
+}
+
+func (xlog *Logger) Stack(v ...interface{}) {
+	s := fmt.Sprint(v...)
+	s += "\n"
+	buf := make([]byte, 1024*1024)
+	n := runtime.Stack(buf, true)
+	s += string(buf[:n])
+	s += "\n"
+	log.Std.Output(xlog.ReqId, log.Lerror, 2, s)
+}
+
+func (xlog *Logger) SingleStack(v ...interface{}) {
+	s := fmt.Sprint(v...)
+	s += "\n"
+	buf := make([]byte, 1024*1024)
+	n := runtime.Stack(buf, false)
+	s += string(buf[:n])
+	s += "\n"
+	log.Std.Output(xlog.ReqId, log.Lerror, 2, s)
+}
+
+// ============================================================================
+
+func SetOutput(w io.Writer) {
+	log.SetOutput(w)
+}
+
+func SetFlags(flag int) {
+	log.SetFlags(flag)
+}
+
+func SetOutputLevel(lvl int) {
+	log.SetOutputLevel(lvl)
+}
+
+// ============================================================================