Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve download performance #1315

Merged
merged 5 commits into from Nov 9, 2023
Merged

Improve download performance #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
139ef7e
improve download file
Hitenjain14 Nov 2, 2023
a942526
write data
Hitenjain14 Nov 2, 2023
54b7433
rmv content length
Hitenjain14 Nov 8, 2023
c379bbe
Merge branch 'sprint-1.11' of https://github.com/0chain/blobber into …
Hitenjain14 Nov 8, 2023
7e91131
fix unit test
Hitenjain14 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions code/go/0chain.net/blobbercore/handler/handler_download_test.go
View file
Open in desktop
Expand Up @@ -301,6 +301,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set(common.ClientSignatureHeader, sign)
r.Header.Set(common.ClientHeader, alloc.OwnerID)
r.Header.Set(common.ClientKeyHeader, alloc.OwnerPublicKey)
Expand Down Expand Up @@ -478,7 +479,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Path-Hash", pathHash)
r.Header.Set("X-Block-Num", fmt.Sprintf("%d", 1))
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Verify-Download", fmt.Sprint(false))
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Auth-Token", authTicket)
Expand Down Expand Up @@ -559,7 +560,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Path-Hash", pathHash)
r.Header.Set("X-Block-Num", fmt.Sprintf("%d", 1))
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Verify-Download", fmt.Sprint(false))
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Auth-Token", authTicket)
Expand Down Expand Up @@ -673,7 +674,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Path-Hash", filePathHash)
r.Header.Set("X-Block-Num", fmt.Sprintf("%d", 1))
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Verify-Download", fmt.Sprint(false))
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Auth-Token", authTicket)
Expand Down Expand Up @@ -793,7 +794,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Path-Hash", filePathHash)
r.Header.Set("X-Block-Num", fmt.Sprintf("%d", 1))
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Verify-Download", fmt.Sprint(false))
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Auth-Token", authTicket)
Expand Down Expand Up @@ -912,7 +913,7 @@ func TestHandlers_Download(t *testing.T) {
r.Header.Set("X-Path-Hash", filePathHash)
r.Header.Set("X-Block-Num", fmt.Sprintf("%d", 1))
r.Header.Set("X-Num-Blocks", fmt.Sprintf("%d", 1))
r.Header.Set("X-Verify-Download", fmt.Sprint(false))
r.Header.Set("X-Verify-Download", fmt.Sprint(true))
r.Header.Set("X-Connection-ID", connectionID)
r.Header.Set("X-Mode", DownloadContentFull)
r.Header.Set("X-Auth-Token", authTicket)
Expand Down Expand Up @@ -1005,9 +1006,7 @@ func TestHandlers_Download(t *testing.T) {
m := make(map[string]interface{})
err = json.Unmarshal(data, &m)
require.NoError(t, err)

if test.wantCode != http.StatusOK || test.wantBody != "" {
fmt.Println("fprint", test.args.w.Body.String())
var body string
if m["Data"] != nil {
body = m["Data"].(string)
Expand Down
3 changes: 3 additions & 0 deletions code/go/0chain.net/blobbercore/handler/object_operation_handler.go
View file
Open in desktop
Expand Up @@ -433,6 +433,9 @@ func (fsh *StorageHandler) DownloadFile(ctx context.Context, r *http.Request) (i
addDailyBlocks(clientID, dr.NumBlocks)
AddDownloadedData(clientID, dr.NumBlocks)
}()
if !dr.VerifyDownload {
return fileDownloadResponse.Data, nil
}
return fileDownloadResponse, nil
}

Expand Down
7 changes: 6 additions & 1 deletion code/go/0chain.net/core/common/handler.go
View file
Open in desktop
Expand Up @@ -82,7 +82,12 @@ func ToByteStream(handler JSONResponderF) ReqRespHandlerf {
w.Write(rawdata) //nolint:errcheck
} else {
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(data) //nolint:errcheck
byteData, err := json.Marshal(data)
if err != nil {
http.Error(w, err.Error(), 400)
return
}
w.Write(byteData) //nolint:errcheck
}
}
}
Expand Down