From 898a6b1e8579d04eb5852eac298371df180c0a73 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Tue, 5 Dec 2017 13:32:57 -0500 Subject: [PATCH] fix errcheck issues --- index/scorch/segment/bolt/build.go | 30 ++++++++++++++++++++----- index/scorch/segment/bolt/build_test.go | 2 +- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/index/scorch/segment/bolt/build.go b/index/scorch/segment/bolt/build.go index 6ed5719d..0c68bab5 100644 --- a/index/scorch/segment/bolt/build.go +++ b/index/scorch/segment/bolt/build.go @@ -438,18 +438,36 @@ func persistStored(memSegment *mem.Segment, tx *bolt.Tx) error { // process each value for i := 0; i < num; i++ { // encode field - metaEncoder.PutU64(uint64(fieldID)) + _, err2 := metaEncoder.PutU64(uint64(fieldID)) + if err2 != nil { + return err2 + } // encode type - metaEncoder.PutU64(uint64(memSegment.StoredTypes[docNum][uint16(fieldID)][i])) + _, err2 = metaEncoder.PutU64(uint64(memSegment.StoredTypes[docNum][uint16(fieldID)][i])) + if err2 != nil { + return err2 + } // encode start offset - metaEncoder.PutU64(uint64(curr)) + _, err2 = metaEncoder.PutU64(uint64(curr)) + if err2 != nil { + return err2 + } // end len - metaEncoder.PutU64(uint64(len(storedFieldValues[i]))) + _, err2 = metaEncoder.PutU64(uint64(len(storedFieldValues[i]))) + if err2 != nil { + return err2 + } // encode number of array pos - metaEncoder.PutU64(uint64(len(memSegment.StoredPos[docNum][uint16(fieldID)][i]))) + _, err2 = metaEncoder.PutU64(uint64(len(memSegment.StoredPos[docNum][uint16(fieldID)][i]))) + if err2 != nil { + return err2 + } // encode all array positions for j := 0; j < len(memSegment.StoredPos[docNum][uint16(fieldID)][i]); j++ { - metaEncoder.PutU64(memSegment.StoredPos[docNum][uint16(fieldID)][i][j]) + _, err2 = metaEncoder.PutU64(memSegment.StoredPos[docNum][uint16(fieldID)][i][j]) + if err2 != nil { + return err2 + } } // append data data = append(data, storedFieldValues[i]...) diff --git a/index/scorch/segment/bolt/build_test.go b/index/scorch/segment/bolt/build_test.go index d4b93f15..3f869d86 100644 --- a/index/scorch/segment/bolt/build_test.go +++ b/index/scorch/segment/bolt/build_test.go @@ -25,7 +25,7 @@ import ( ) func TestBuild(t *testing.T) { - os.RemoveAll("/tmp/scorch.bolt") + _ = os.RemoveAll("/tmp/scorch.bolt") memSegment := buildMemSegment() err := persistSegment(memSegment, "/tmp/scorch.bolt", 1024)