hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-01-29 14:23:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #57 from max-schaefer/trap.gz

Browse Source 
Gzip TRAP files
This commit is contained in:
Sauyon Lee
2020-03-12 06:24:32 -07:00
committed by GitHub
parent d7d5447689 6b0ba750e6
commit b64a43f578
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extractor/trap/labels.go
View File

@@ -55,7 +55,7 @@ func (l *Labeler) GlobalID(key string) Label {
label, exists := l.keyLabels[key]
if !exists {
id := l.nextID()
fmt.Fprintf(l.tw.w, "%s=@\"%s\"\n", id, escapeString(key))
fmt.Fprintf(l.tw.zip, "%s=@\"%s\"\n", id, escapeString(key))
label = Label{id}
l.keyLabels[key] = label
}
@@ -83,7 +83,7 @@ func (l *Labeler) LocalID(nd interface{}) Label {
// FreshID creates a fresh label and returns it
func (l *Labeler) FreshID() Label {
id := l.nextID()
fmt.Fprintf(l.tw.w, "%s=*\n", id)
fmt.Fprintf(l.tw.zip, "%s=*\n", id)
return Label{id}
}

29
extractor/trap/trapwriter.go
View File

@@ -2,6 +2,7 @@ package trap
import (
"bufio"
"compress/gzip"
"errors"
"fmt"
"go/types"
@@ -16,6 +17,7 @@ import (
// A Writer provides methods for writing data to a TRAP file
type Writer struct {
zip *gzip.Writer
w *bufio.Writer
file *os.File
Labeler *Labeler
@@ -31,7 +33,7 @@ func NewWriter(path string, pkg *packages.Package) (*Writer, error) {
if err != nil {
return nil, err
}
trapFilePath := filepath.Join(trapFolder, srcarchive.AppendablePath(path)+".trap")
trapFilePath := filepath.Join(trapFolder, srcarchive.AppendablePath(path)+".trap.gz")
trapFileDir := filepath.Dir(trapFilePath)
err = os.MkdirAll(trapFileDir, 0755)
if err != nil {
@@ -41,8 +43,11 @@ func NewWriter(path string, pkg *packages.Package) (*Writer, error) {
if err != nil {
return nil, err
}
bufioWriter := bufio.NewWriter(tmpFile)
zipWriter := gzip.NewWriter(bufioWriter)
tw := &Writer{
bufio.NewWriter(tmpFile),
zipWriter,
bufioWriter,
tmpFile,
nil,
path,
@@ -70,7 +75,13 @@ func trapFolder() (string, error) {
// Close the underlying file writer
func (tw *Writer) Close() error {
err := tw.w.Flush()
err := tw.zip.Close()
if err != nil {
// return zip-close error, but ignore file-close error
tw.file.Close()
return err
}
err = tw.w.Flush()
if err != nil {
// throw away close error because write errors are likely to be more important
tw.file.Close()
@@ -110,22 +121,22 @@ func capStringLength(s string) string {
// Emit writes out a tuple of values for the given `table`
func (tw *Writer) Emit(table string, values []interface{}) error {
fmt.Fprintf(tw.w, "%s(", table)
fmt.Fprintf(tw.zip, "%s(", table)
for i, value := range values {
if i > 0 {
fmt.Fprint(tw.w, ", ")
fmt.Fprint(tw.zip, ", ")
}
switch value := value.(type) {
case Label:
fmt.Fprint(tw.w, value.id)
fmt.Fprint(tw.zip, value.id)
case string:
fmt.Fprintf(tw.w, "\"%s\"", escapeString(capStringLength(value)))
fmt.Fprintf(tw.zip, "\"%s\"", escapeString(capStringLength(value)))
case int:
fmt.Fprintf(tw.w, "%d", value)
fmt.Fprintf(tw.zip, "%d", value)
default:
return errors.New("Cannot emit value")
}
}
fmt.Fprintf(tw.w, ")\n")
fmt.Fprintf(tw.zip, ")\n")
return nil
}