qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 09:07:58 -07:00
Code Releases Activity

godoc: use a bufio.Buffer to read search index

Browse Source 
Also: Minor refactoring for cleanliness and symmetry.

Fixes #2286.

R=r
CC=golang-dev
https://golang.org/cl/5232041
This commit is contained in:
Robert Griesemer 2011-10-06 17:36:00 -07:00
parent 3e46699958
commit ec9ea9a5cb
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd/godoc/index.go
View File

@ -38,6 +38,7 @@
package main
import (
"bufio"
"bytes"
"go/ast"
"go/parser"
@ -840,6 +841,14 @@ type fileIndex struct {
Fulltext bool
}
func (x *fileIndex) Write(w io.Writer) os.Error {
return gob.NewEncoder(w).Encode(x)
}
func (x *fileIndex) Read(r io.Reader) os.Error {
return gob.NewDecoder(r).Decode(x)
}
// Write writes the index x to w.
func (x *Index) Write(w io.Writer) os.Error {
fulltext := false
@ -852,7 +861,7 @@ func (x *Index) Write(w io.Writer) os.Error {
x.snippets,
fulltext,
}
if err := gob.NewEncoder(w).Encode(fx); err != nil {
if err := fx.Write(w); err != nil {
return err
}
if fulltext {
@ -867,9 +876,14 @@ func (x *Index) Write(w io.Writer) os.Error {
}
// Read reads the index from r into x; x must not be nil.
// If r does not also implement io.ByteReader, it will be wrapped in a bufio.Reader.
func (x *Index) Read(r io.Reader) os.Error {
// We use the ability to read bytes as a plausible surrogate for buffering.
if _, ok := r.(io.ByteReader); !ok {
r = bufio.NewReader(r)
}
var fx fileIndex
if err := gob.NewDecoder(r).Decode(&fx); err != nil {
if err := fx.Read(r); err != nil {
return err
}
x.words = fx.Words