mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2025-12-30 08:50:01 -06:00
Code Issues Packages Projects Releases 114 Wiki Activity

Merge pull request #10094 from dolthub/aaron/fix-aws-conjoin

Browse Source 
go/store/nbs: Fix NomsBlockStore Conjoin against AWS S3 when the AWS S3 endpoint requires a Content-Length header.
This commit is contained in:
Aaron Son
2025-11-18 14:38:06 -08:00
committed by GitHub
parent b7258bde75 c22a767c81
commit 71152788fe
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
go/store/nbs/aws_table_persister.go
View File

@@ -373,10 +373,14 @@ func (s3p awsTablePersister) assembleTable(ctx context.Context, plan compactionP
} else if end < lbuf {
rdr = bytes.NewReader(buff[start:end])
} else {
rdr = io.MultiReader(
bytes.NewReader(buff[start:]),
bytes.NewReader(tail[:end-lbuf]),
)
// UploadPart needs a ReadSeeker, so we can't use a simple
// io.MultiReader here. We can revisit this later, but for
// now we make an unquota'd copy of these two buffers which
// must live until the upload is done.
data := make([]byte, 0, len(buff[start:])+len(tail[:end-lbuf]))
data = append(data, buff[start:]...)
data = append(data, tail[:end-lbuf]...)
rdr = bytes.NewReader(data)
}
uploadWg.Add(1)
go func(data io.Reader, partNum int32) {