Further restructure

master
Harshavardhana 10 years ago
parent 3178879b03
commit 68de9ac19e
  1. 35
      Makefile
  2. 11
      pkg/fileutils/split/Makefile
  3. 2
      pkg/server/server.go
  4. 2
      pkg/server/server_test.go
  5. 2
      pkg/storage/appendstorage/append_storage.go
  6. 2
      pkg/storage/encodedstorage/encoded_storage.go
  7. 0
      pkg/utils/checksum/crc32c/Makefile
  8. 0
      pkg/utils/checksum/crc32c/asm.S
  9. 0
      pkg/utils/checksum/crc32c/crc32c.go
  10. 0
      pkg/utils/checksum/crc32c/crc32c_amd64.S
  11. 0
      pkg/utils/checksum/crc32c/crc32c_test.go
  12. 0
      pkg/utils/checksum/crc32c/doc.go
  13. 0
      pkg/utils/crypto/md5/md5.go
  14. 0
      pkg/utils/crypto/md5/md5_test.go
  15. 0
      pkg/utils/crypto/sha1/TODO
  16. 0
      pkg/utils/crypto/sha1/asm.S
  17. 0
      pkg/utils/crypto/sha1/sha1.go
  18. 0
      pkg/utils/crypto/sha1/sha1_amd64.S
  19. 0
      pkg/utils/crypto/sha1/sha1_test.go
  20. 0
      pkg/utils/crypto/sha256/TODO
  21. 0
      pkg/utils/crypto/sha256/asm.S
  22. 0
      pkg/utils/crypto/sha256/sha256-avx-asm.S
  23. 0
      pkg/utils/crypto/sha256/sha256-avx2-asm.S
  24. 0
      pkg/utils/crypto/sha256/sha256-ssse3-asm.S
  25. 0
      pkg/utils/crypto/sha256/sha256.go
  26. 0
      pkg/utils/crypto/sha256/sha256_test.go
  27. 0
      pkg/utils/crypto/sha512/TODO
  28. 0
      pkg/utils/crypto/sha512/asm.S
  29. 0
      pkg/utils/crypto/sha512/sha512-avx-asm.S
  30. 0
      pkg/utils/crypto/sha512/sha512-avx2-asm.S
  31. 0
      pkg/utils/crypto/sha512/sha512-ssse3-asm.S
  32. 0
      pkg/utils/crypto/sha512/sha512.go
  33. 0
      pkg/utils/crypto/sha512/sha512_test.go
  34. 0
      pkg/utils/split/.gitignore
  35. 0
      pkg/utils/split/split.go
  36. 4
      pkg/utils/split/split_test.go
  37. 0
      pkg/utils/split/test-data/TESTFILE

@ -13,36 +13,27 @@ getdeps: checkdeps
build-utils: build-utils:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/cpu @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/cpu
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/unitconv @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/unitconv
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/split
build-crypto: @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/md5/
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/md5/ @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha1/
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha1/ @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha256/
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha256/ @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/crypto/sha512/
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/crypto/sha512/ @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/utils/checksum/crc32c
build-checksum:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/checksum/crc32c
build-os: build-os:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/scsi @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/scsi
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/sysctl @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/os/sysctl
build-fileutils: build-utils build-storage:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/fileutils/split
build-storage: build-erasure build-storage-append build-storage-encoded
build-erasure:
@$(MAKE) $(MAKE_OPTIONS) -C pkg/storage/erasure/isal lib @$(MAKE) $(MAKE_OPTIONS) -C pkg/storage/erasure/isal lib
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/erasure @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/erasure
build-storage-append:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/appendstorage @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/appendstorage
build-storage-encoded:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/encodedstorage @godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/storage/encodedstorage
cover: build-fileutils build-checksum build-os build-storage build-crypto build-server:
@godep go test -race -coverprofile=cover.out github.com/minio-io/minio/pkg/server
cover: build-storage build-os build-server build-utils
install: cover install: cover
@ -56,5 +47,7 @@ env:
@godep go env @godep go env
clean: clean:
@echo "Cleaning up all the generated files"
@$(MAKE) $(MAKE_OPTIONS) -C pkg/storage/erasure/isal clean @$(MAKE) $(MAKE_OPTIONS) -C pkg/storage/erasure/isal clean
@rm -v cover.out @rm -fv pkg/utils/split/TESTPREFIX.*
@rm -fv cover.out

@ -1,11 +0,0 @@
all: build test
.PHONY: all
build:
@godep go build
test: build
@godep go test -race -coverprofile=cover.out
clean:
@rm -fv NEWFILE TESTPREFIX.* cover.out

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package gateway package server
import ( import (
"bytes" "bytes"

@ -1,4 +1,4 @@
package gateway package server
import ( import (
"io/ioutil" "io/ioutil"

@ -27,8 +27,8 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/minio-io/minio/pkg/checksum/crc32c"
"github.com/minio-io/minio/pkg/storage" "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/utils/checksum/crc32c"
) )
type appendStorage struct { type appendStorage struct {

@ -29,10 +29,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/minio-io/minio/pkg/fileutils/split"
"github.com/minio-io/minio/pkg/storage" "github.com/minio-io/minio/pkg/storage"
"github.com/minio-io/minio/pkg/storage/appendstorage" "github.com/minio-io/minio/pkg/storage/appendstorage"
"github.com/minio-io/minio/pkg/storage/erasure" "github.com/minio-io/minio/pkg/storage/erasure"
"github.com/minio-io/minio/pkg/utils/split"
"github.com/spaolacci/murmur3" "github.com/spaolacci/murmur3"
) )

@ -52,9 +52,9 @@ func (s *MySuite) TestSplitStream(c *C) {
} }
func (s *MySuite) TestFileSplitJoin(c *C) { func (s *MySuite) TestFileSplitJoin(c *C) {
err := SplitFileWithPrefix("TESTFILE", 1024, "TESTPREFIX") err := SplitFileWithPrefix("test-data/TESTFILE", 1024, "TESTPREFIX")
c.Assert(err, IsNil) c.Assert(err, IsNil)
err = SplitFileWithPrefix("TESTFILE", 1024, "") err = SplitFileWithPrefix("test-data/TESTFILE", 1024, "")
c.Assert(err, Not(IsNil)) c.Assert(err, Not(IsNil))
devnull, err := os.OpenFile(os.DevNull, 2, os.ModeAppend) devnull, err := os.OpenFile(os.DevNull, 2, os.ModeAppend)
Loading…
Cancel
Save