Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Gitlab Pages
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to JiHu GitLab
Provide feedback
Keyboard shortcuts
?
What's new
5
Snippets
Groups
Projects
gitlab-org
Gitlab Pages
Commits
5f2c138e
Commit
5f2c138e
authored
4 years ago
by
Arran Walker
Browse files
Options
Downloads
Patches
Plain Diff
Add vfs deflate reader pool
parent
ad8f7ff5
Branches
ajwalker/deflate-pool
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
internal/vfs/zip/archive_test.go
+53
-0
53 additions, 0 deletions
internal/vfs/zip/archive_test.go
internal/vfs/zip/deflate_reader.go
+39
-4
39 additions, 4 deletions
internal/vfs/zip/deflate_reader.go
with
92 additions
and
4 deletions
internal/vfs/zip/archive_test.go
+
53
−
0
View file @
5f2c138e
package
zip
import
(
"archive/zip"
"bytes"
"context"
"crypto/rand"
"io"
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
"strconv"
"sync/atomic"
"testing"
"time"
...
...
@@ -419,3 +424,51 @@ func newZipFileServerURL(t *testing.T, zipFilePath string, requests *int64) (str
testServer
.
Close
()
}
}
func
benchmarkArchiveRead
(
b
*
testing
.
B
,
size
int64
)
{
zbuf
:=
new
(
bytes
.
Buffer
)
// create zip file of specified size
zw
:=
zip
.
NewWriter
(
zbuf
)
w
,
err
:=
zw
.
Create
(
"public/file.txt"
)
require
.
NoError
(
b
,
err
)
_
,
err
=
io
.
CopyN
(
w
,
rand
.
Reader
,
size
)
require
.
NoError
(
b
,
err
)
require
.
NoError
(
b
,
zw
.
Close
())
modtime
:=
time
.
Now
()
.
Add
(
-
time
.
Hour
)
m
:=
http
.
NewServeMux
()
m
.
HandleFunc
(
"/public.zip"
,
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
http
.
ServeContent
(
w
,
r
,
"public.zip"
,
modtime
,
bytes
.
NewReader
(
zbuf
.
Bytes
()))
}))
ts
:=
httptest
.
NewServer
(
m
)
defer
ts
.
Close
()
fs
:=
New
(
zipCfg
)
.
(
*
zipVFS
)
b
.
ReportAllocs
()
b
.
ResetTimer
()
for
n
:=
0
;
n
<
b
.
N
;
n
++
{
z
:=
newArchive
(
fs
,
time
.
Second
)
err
:=
z
.
openArchive
(
context
.
Background
(),
ts
.
URL
+
"/public.zip"
)
require
.
NoError
(
b
,
err
)
f
,
err
:=
z
.
Open
(
context
.
Background
(),
"file.txt"
)
require
.
NoError
(
b
,
err
)
_
,
err
=
io
.
Copy
(
ioutil
.
Discard
,
f
)
require
.
NoError
(
b
,
err
)
require
.
NoError
(
b
,
f
.
Close
())
}
}
func
BenchmarkArchiveRead
(
b
*
testing
.
B
)
{
for
_
,
size
:=
range
[]
int
{
32
*
1024
,
64
*
1024
,
1024
*
1024
}
{
b
.
Run
(
strconv
.
Itoa
(
size
),
func
(
b
*
testing
.
B
)
{
benchmarkArchiveRead
(
b
,
int64
(
size
))
})
}
}
This diff is collapsed.
Click to expand it.
internal/vfs/zip/deflate_reader.go
+
39
−
4
View file @
5f2c138e
package
zip
import
(
"bufio"
"compress/flate"
"errors"
"io"
"sync"
)
var
ErrClosedReader
=
errors
.
New
(
"deflatereader: reader is closed"
)
var
deflateReaderPool
sync
.
Pool
// deflateReader wrapper to support reading compressed files.
// Implements the io.ReadCloser interface.
type
deflateReader
struct
{
reader
io
.
ReadCloser
reader
*
bufio
.
Reader
closer
io
.
Closer
flateReader
io
.
ReadCloser
}
// Read from flateReader
func
(
r
*
deflateReader
)
Read
(
p
[]
byte
)
(
n
int
,
err
error
)
{
if
r
.
closer
==
nil
{
return
0
,
ErrClosedReader
}
return
r
.
flateReader
.
Read
(
p
)
}
// Close all readers
func
(
r
*
deflateReader
)
Close
()
error
{
r
.
reader
.
Close
()
if
r
.
closer
==
nil
{
return
ErrClosedReader
}
defer
func
()
{
r
.
closer
.
Close
()
r
.
closer
=
nil
deflateReaderPool
.
Put
(
r
)
}()
return
r
.
flateReader
.
Close
()
}
func
(
r
*
deflateReader
)
reset
(
rc
io
.
ReadCloser
)
{
r
.
reader
.
Reset
(
rc
)
r
.
closer
=
rc
r
.
flateReader
.
(
flate
.
Resetter
)
.
Reset
(
r
.
reader
,
nil
)
}
func
newDeflateReader
(
r
io
.
ReadCloser
)
*
deflateReader
{
if
dr
,
ok
:=
deflateReaderPool
.
Get
()
.
(
*
deflateReader
);
ok
{
dr
.
reset
(
r
)
return
dr
}
br
:=
bufio
.
NewReader
(
r
)
return
&
deflateReader
{
reader
:
r
,
flateReader
:
flate
.
NewReader
(
r
),
reader
:
br
,
closer
:
r
,
flateReader
:
flate
.
NewReader
(
br
),
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment