feat: Add parallel bzip2 support

cmd/stbak/cmd/archive.go

@@ -328,6 +328,8 @@ func archive(
 
 				hdr.Name += compressionFormatBrotliSuffix
 			case compressionFormatBzip2Key:
+				fallthrough
+			case compressionFormatBzip2ParallelKey:
 				// Get the compressed size for the header
 				file, err := os.Open(path)
 				if err != nil {
@@ -530,6 +532,8 @@ func archive(
 				return err
 			}
 		case compressionFormatBzip2Key:
+			fallthrough
+		case compressionFormatBzip2ParallelKey:
 			// Compress and write the file
 			file, err := os.Open(path)
 			if err != nil {

cmd/stbak/cmd/recovery_fetch.go

@@ -4,11 +4,13 @@ import (
 	"archive/tar"
 	"bufio"
 	"compress/gzip"
+	"context"
 	"io"
 	"os"
 	"path/filepath"
 
 	"github.com/andybalholm/brotli"
+	"github.com/cosnicolaou/pbzip2"
 	"github.com/dsnet/compress/bzip2"
 	"github.com/klauspost/compress/zstd"
 	"github.com/klauspost/pgzip"
@@ -184,6 +186,12 @@ func restoreFromRecordAndBlock(
 				return err
 			}
 
+			if _, err := io.Copy(dstFile, bz); err != nil {
+				return err
+			}
+		case compressionFormatBzip2ParallelKey:
+			bz := pbzip2.NewReader(context.Background(), tr)
+
 			if _, err := io.Copy(dstFile, bz); err != nil {
 				return err
 			}

cmd/stbak/cmd/recovery_index.go

@@ -280,6 +280,8 @@ func indexHeader(
 		case compressionFormatBrotliKey:
 			hdr.Name = strings.TrimSuffix(hdr.Name, compressionFormatBrotliSuffix)
 		case compressionFormatBzip2Key:
+			fallthrough
+		case compressionFormatBzip2ParallelKey:
 			hdr.Name = strings.TrimSuffix(hdr.Name, compressionFormatBzip2Suffix)
 		case compressionFormatNoneKey:
 		default:

cmd/stbak/cmd/root.go

@@ -35,10 +35,12 @@ const (
 
 	compressionFormatBzip2Key    = "bzip2"
 	compressionFormatBzip2Suffix = ".bz2"
+
+	compressionFormatBzip2ParallelKey = "parallelbzip2"
 )
 
 var (
-	knownCompressionFormats = []string{compressionFormatNoneKey, compressionFormatGZipKey, compressionFormatParallelGZipKey, compressionFormatLZ4Key, compressionFormatZStandardKey, compressionFormatBrotliKey, compressionFormatBzip2Key}
+	knownCompressionFormats = []string{compressionFormatNoneKey, compressionFormatGZipKey, compressionFormatParallelGZipKey, compressionFormatLZ4Key, compressionFormatZStandardKey, compressionFormatBrotliKey, compressionFormatBzip2Key, compressionFormatBzip2ParallelKey}
 
 	errUnknownCompressionFormat     = errors.New("unknown compression format")
 	errUnsupportedCompressionFormat = errors.New("unsupported compression format")

go.mod

@@ -3,9 +3,14 @@ module github.com/pojntfx/stfs
 go 1.17
 
 require (
+	github.com/andybalholm/brotli v1.0.4
+	github.com/cosnicolaou/pbzip2 v1.0.1
+	github.com/dsnet/compress v0.0.1
 	github.com/friendsofgo/errors v0.9.2
+	github.com/klauspost/compress v1.13.6
 	github.com/klauspost/pgzip v1.2.5
 	github.com/mattn/go-sqlite3 v1.14.9
+	github.com/pierrec/lz4/v4 v4.1.11
 	github.com/pkg/errors v0.9.1
 	github.com/rubenv/sql-migrate v0.0.0-20211023115951-9f02b1e13857
 	github.com/spf13/cobra v1.2.1
@@ -18,17 +23,13 @@ require (
 )
 
 require (
-	github.com/andybalholm/brotli v1.0.4 // indirect
-	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/gofrs/uuid v3.2.0+incompatible // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/pierrec/lz4/v4 v4.1.11 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

go.sum

@@ -84,6 +84,8 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/cosnicolaou/pbzip2 v1.0.1 h1:f5Ix000Rtl9tr0Ne33wNLtljGl2nAyR4ZirJrz9qg+0=
+github.com/cosnicolaou/pbzip2 v1.0.1/go.mod h1:cE04zhBMvwMrCLhsx6aLYh9cGsU9GyFB0oo/GmO+SkY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=