forked from p30928647/excelize
Pre-allocate some memory when reading files (#510)
This commit is contained in:
parent
e7581ebf3e
commit
9fe267ffcf
|
@ -1278,3 +1278,9 @@ func fillCells(f *File, sheet string, colCount, rowCount int) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func BenchmarkOpenFile(b *testing.B) {
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
|
OpenFile(filepath.Join("test", "Book1.xlsx"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
9
lib.go
9
lib.go
|
@ -22,16 +22,14 @@ import (
|
||||||
// ReadZipReader can be used to read an XLSX in memory without touching the
|
// ReadZipReader can be used to read an XLSX in memory without touching the
|
||||||
// filesystem.
|
// filesystem.
|
||||||
func ReadZipReader(r *zip.Reader) (map[string][]byte, int, error) {
|
func ReadZipReader(r *zip.Reader) (map[string][]byte, int, error) {
|
||||||
fileList := make(map[string][]byte)
|
fileList := make(map[string][]byte, len(r.File))
|
||||||
worksheets := 0
|
worksheets := 0
|
||||||
for _, v := range r.File {
|
for _, v := range r.File {
|
||||||
fileList[v.Name] = readFile(v)
|
fileList[v.Name] = readFile(v)
|
||||||
if len(v.Name) > 18 {
|
if strings.HasPrefix(v.Name, "xl/worksheets/sheet") {
|
||||||
if v.Name[0:19] == "xl/worksheets/sheet" {
|
|
||||||
worksheets++
|
worksheets++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return fileList, worksheets, nil
|
return fileList, worksheets, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +56,8 @@ func readFile(file *zip.File) []byte {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
}
|
}
|
||||||
buff := bytes.NewBuffer(nil)
|
dat := make([]byte, 0, file.FileInfo().Size())
|
||||||
|
buff := bytes.NewBuffer(dat)
|
||||||
_, _ = io.Copy(buff, rc)
|
_, _ = io.Copy(buff, rc)
|
||||||
rc.Close()
|
rc.Close()
|
||||||
return buff.Bytes()
|
return buff.Bytes()
|
||||||
|
|
|
@ -695,8 +695,8 @@ func TestErrSheetNotExistError(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func BenchmarkRows(b *testing.B) {
|
func BenchmarkRows(b *testing.B) {
|
||||||
for i := 0; i < b.N; i++ {
|
|
||||||
f, _ := OpenFile(filepath.Join("test", "Book1.xlsx"))
|
f, _ := OpenFile(filepath.Join("test", "Book1.xlsx"))
|
||||||
|
for i := 0; i < b.N; i++ {
|
||||||
rows, _ := f.Rows("Sheet2")
|
rows, _ := f.Rows("Sheet2")
|
||||||
for rows.Next() {
|
for rows.Next() {
|
||||||
row, _ := rows.Columns()
|
row, _ := rows.Columns()
|
||||||
|
|
Loading…
Reference in New Issue