mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-03 10:37:35 +01:00
* compression: compress JSON uploads, and match file types by extension
IsCompressableFileType did not recognise JSON media types, so S3 uploads of application/json (which carry no file name) were never compressed. Its callers also passed filepath.Base of the file name where it expects the extension, so the .json/.js/.html/... extension rules never matched a real file name. Both callers now pass filepath.Ext; the function lower-cases the extension and media type, ignores media-type parameters ("application/json; charset=utf-8"), and treats */json and *+json types as compressible.
* compression: treat application/json-seq as JSON
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* volume(rust): compress JSON uploads and match media types without parameters
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
* operation: keep uploader gzip only when it saves at least 10%
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---------
Co-authored-by: Pat White <5015863+patwhite@users.noreply.github.com>
Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
164 lines
3.4 KiB
Go
164 lines
3.4 KiB
Go
package util
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
// "github.com/klauspost/compress/zstd"
|
|
)
|
|
|
|
var (
|
|
UnsupportedCompression = fmt.Errorf("unsupported compression")
|
|
)
|
|
|
|
func MaybeGzipData(input []byte) []byte {
|
|
if IsGzippedContent(input) {
|
|
return input
|
|
}
|
|
gzipped, err := GzipData(input)
|
|
if err != nil {
|
|
return input
|
|
}
|
|
if len(gzipped)*10 > len(input)*9 {
|
|
return input
|
|
}
|
|
return gzipped
|
|
}
|
|
|
|
func MaybeDecompressData(input []byte) []byte {
|
|
uncompressed, err := DecompressData(input)
|
|
if err != nil {
|
|
if err != UnsupportedCompression {
|
|
glog.Errorf("decompressed data: %v", err)
|
|
}
|
|
return input
|
|
}
|
|
return uncompressed
|
|
}
|
|
|
|
func GzipData(input []byte) ([]byte, error) {
|
|
w := new(bytes.Buffer)
|
|
_, err := GzipStream(w, bytes.NewReader(input))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return w.Bytes(), nil
|
|
}
|
|
|
|
func ungzipData(input []byte) ([]byte, error) {
|
|
w := new(bytes.Buffer)
|
|
_, err := GunzipStream(w, bytes.NewReader(input))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return w.Bytes(), nil
|
|
}
|
|
|
|
func DecompressData(input []byte) ([]byte, error) {
|
|
if IsGzippedContent(input) {
|
|
return ungzipData(input)
|
|
}
|
|
/*
|
|
if IsZstdContent(input) {
|
|
return unzstdData(input)
|
|
}
|
|
*/
|
|
return input, UnsupportedCompression
|
|
}
|
|
|
|
func IsGzippedContent(data []byte) bool {
|
|
if len(data) < 2 {
|
|
return false
|
|
}
|
|
return data[0] == 31 && data[1] == 139
|
|
}
|
|
|
|
/*
|
|
var zstdEncoder, _ = zstd.NewWriter(nil)
|
|
|
|
func ZstdData(input []byte) ([]byte, error) {
|
|
return zstdEncoder.EncodeAll(input, nil), nil
|
|
}
|
|
|
|
var decoder, _ = zstd.NewReader(nil)
|
|
|
|
func unzstdData(input []byte) ([]byte, error) {
|
|
return decoder.DecodeAll(input, nil)
|
|
}
|
|
|
|
func IsZstdContent(data []byte) bool {
|
|
if len(data) < 4 {
|
|
return false
|
|
}
|
|
return data[3] == 0xFD && data[2] == 0x2F && data[1] == 0xB5 && data[0] == 0x28
|
|
}
|
|
*/
|
|
|
|
/*
|
|
* Default not to compressed since compression can be done on client side.
|
|
*/func IsCompressableFileType(ext, mtype string) (shouldBeCompressed, iAmSure bool) {
|
|
ext = strings.ToLower(ext)
|
|
// Match on the media type alone: "application/json; charset=utf-8" is JSON.
|
|
if i := strings.IndexByte(mtype, ';'); i >= 0 {
|
|
mtype = strings.TrimSpace(mtype[:i])
|
|
}
|
|
mtype = strings.ToLower(mtype)
|
|
|
|
// text
|
|
if strings.HasPrefix(mtype, "text/") {
|
|
return true, true
|
|
}
|
|
|
|
// images
|
|
switch ext {
|
|
case ".svg", ".bmp", ".wav":
|
|
return true, true
|
|
}
|
|
if strings.HasPrefix(mtype, "image/") {
|
|
return false, true
|
|
}
|
|
|
|
// by file name extension
|
|
switch ext {
|
|
case ".zip", ".rar", ".gz", ".bz2", ".xz", ".zst", ".br":
|
|
return false, true
|
|
case ".pdf", ".txt", ".html", ".htm", ".css", ".js", ".json":
|
|
return true, true
|
|
case ".php", ".java", ".go", ".rb", ".c", ".cpp", ".h", ".hpp":
|
|
return true, true
|
|
case ".png", ".jpg", ".jpeg":
|
|
return false, true
|
|
}
|
|
|
|
// by mime type
|
|
if strings.HasPrefix(mtype, "application/") {
|
|
if strings.HasSuffix(mtype, "zstd") {
|
|
return false, true
|
|
}
|
|
if strings.HasSuffix(mtype, "xml") {
|
|
return true, true
|
|
}
|
|
if strings.HasSuffix(mtype, "script") {
|
|
return true, true
|
|
}
|
|
// application/json, application/ld+json, application/x-ndjson, application/json-seq, ...
|
|
if strings.HasSuffix(mtype, "json") || strings.HasSuffix(mtype, "json-seq") {
|
|
return true, true
|
|
}
|
|
if strings.HasSuffix(mtype, "vnd.rar") {
|
|
return false, true
|
|
}
|
|
}
|
|
|
|
if strings.HasPrefix(mtype, "audio/") {
|
|
switch strings.TrimPrefix(mtype, "audio/") {
|
|
case "wave", "wav", "x-wav", "x-pn-wav":
|
|
return true, true
|
|
}
|
|
}
|
|
|
|
return false, false
|
|
}
|