server: Remove deadcode/deprecated code. (#2088)

master
Harshavardhana 9 years ago committed by Anand Babu (AB) Periasamy
parent 1ec86dac2c
commit 4cfbdb1bf0
  1. 17
      api-resources.go
  2. 12
      appveyor.yml
  3. 5
      fs-v1-multipart.go
  4. 6
      main.go
  5. 18
      object-errors.go
  6. 3
      xl-v1-errors.go

@ -50,23 +50,6 @@ func getListObjectsV2Args(values url.Values) (prefix, token, startAfter, delimit
return return
} }
// Parse bucket url queries
func getBucketResources(values url.Values) (listType int, prefix, marker, delimiter string, maxkeys int, encodingType string) {
if values.Get("list-type") != "" {
listType, _ = strconv.Atoi(values.Get("list-type"))
}
prefix = values.Get("prefix")
marker = values.Get("marker")
delimiter = values.Get("delimiter")
if values.Get("max-keys") != "" {
maxkeys, _ = strconv.Atoi(values.Get("max-keys"))
} else {
maxkeys = maxObjectList
}
encodingType = values.Get("encoding-type")
return
}
// Parse bucket url queries for ?uploads // Parse bucket url queries for ?uploads
func getBucketMultipartResources(values url.Values) (prefix, keyMarker, uploadIDMarker, delimiter string, maxUploads int, encodingType string) { func getBucketMultipartResources(values url.Values) (prefix, keyMarker, uploadIDMarker, delimiter string, maxUploads int, encodingType string) {
prefix = values.Get("prefix") prefix = values.Get("prefix")

@ -1,6 +1,10 @@
# version format
version: "{build}"
# Operating system (build VM template) # Operating system (build VM template)
os: Visual Studio 2015 os: Windows Server 2012 R2
# Platform.
platform: x64 platform: x64
clone_folder: c:\gopath\src\github.com\minio\minio clone_folder: c:\gopath\src\github.com\minio\minio
@ -8,19 +12,13 @@ clone_folder: c:\gopath\src\github.com\minio\minio
# environment variables # environment variables
environment: environment:
GOPATH: c:\gopath GOPATH: c:\gopath
GO_EXTLINK_ENABLED: 0
GO15VENDOREXPERIMENT: 1 GO15VENDOREXPERIMENT: 1
# scripts that run after cloning repository # scripts that run after cloning repository
install: install:
- '"C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64'
- set PATH=%GOPATH%\bin;c:\go\bin;%PATH% - set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
- rd C:\Go /s /q
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.6.windows-amd64.zip
- 7z x go1.6.windows-amd64.zip -oC:\ >nul
- go version - go version
- go env - go env
- cd %GOPATH%\src\github.com\minio\minio
# to run your custom scripts instead of automatic MSBuild # to run your custom scripts instead of automatic MSBuild
build_script: build_script:

@ -206,11 +206,6 @@ func (fs fsObjects) ListMultipartUploads(bucket, prefix, keyMarker, uploadIDMark
// all the disks. `uploads.json` carries metadata regarding on going // all the disks. `uploads.json` carries metadata regarding on going
// multipart operation on the object. // multipart operation on the object.
func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[string]string) (uploadID string, err error) { func (fs fsObjects) newMultipartUpload(bucket string, object string, meta map[string]string) (uploadID string, err error) {
// No metadata is set, allocate a new one.
if meta == nil {
meta = make(map[string]string)
}
// Initialize `fs.json` values. // Initialize `fs.json` values.
fsMeta := newFSMetaV1() fsMeta := newFSMetaV1()

@ -19,7 +19,6 @@ package main
import ( import (
"fmt" "fmt"
"os" "os"
"path/filepath"
"sort" "sort"
"github.com/minio/cli" "github.com/minio/cli"
@ -141,11 +140,6 @@ func checkMainSyntax(c *cli.Context) {
} }
} }
// mustGetProfilePath must get location that the profile will be written to.
func mustGetProfilePath() string {
return filepath.Join(mustGetConfigPath(), globalMinioProfilePath)
}
func main() { func main() {
app := registerApp() app := registerApp()
app.Before = func(c *cli.Context) error { app.Before = func(c *cli.Context) error {

@ -197,15 +197,6 @@ func (e ObjectNameInvalid) Error() string {
return "Object name invalid: " + e.Bucket + "#" + e.Object return "Object name invalid: " + e.Bucket + "#" + e.Object
} }
// UnExpectedDataSize - Reader contains more/less data than specified.
type UnExpectedDataSize struct {
Size int
}
func (e UnExpectedDataSize) Error() string {
return fmt.Sprintf("Contains more data than specified size of %d bytes.", e.Size)
}
// IncompleteBody You did not provide the number of bytes specified by the Content-Length HTTP header. // IncompleteBody You did not provide the number of bytes specified by the Content-Length HTTP header.
type IncompleteBody GenericError type IncompleteBody GenericError
@ -241,15 +232,6 @@ func (e InvalidPart) Error() string {
return "One or more of the specified parts could not be found" return "One or more of the specified parts could not be found"
} }
// InvalidPartOrder parts are not ordered as Requested
type InvalidPartOrder struct {
UploadID string
}
func (e InvalidPartOrder) Error() string {
return "Invalid part order sent for " + e.UploadID
}
// PartTooSmall - error if part size is less than 5MB. // PartTooSmall - error if part size is less than 5MB.
type PartTooSmall struct { type PartTooSmall struct {
PartSize int64 PartSize int64

@ -32,6 +32,3 @@ var errXLReadQuorum = errors.New("Read failed. Insufficient number of disks onli
// errXLWriteQuorum - did not meet write quorum. // errXLWriteQuorum - did not meet write quorum.
var errXLWriteQuorum = errors.New("Write failed. Insufficient number of disks online") var errXLWriteQuorum = errors.New("Write failed. Insufficient number of disks online")
// errXLDataCorrupt - err data corrupt.
var errXLDataCorrupt = errors.New("Data likely corrupted, read failed.")

Loading…
Cancel
Save