Skip to content

Commit 7dcecff

Browse files
committed
fix: ineffectual assignments
from go report card
1 parent da3b94e commit 7dcecff

10 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎analyze.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func AnalyzeFuncGraph(funcFiles []*extractor.FunctionFileResult, symbolFiles []*
5050
symbolMap[each.Path] = make(map[string][]*extractor.Symbol)
5151
for _, eachSymbol := range validSymbols {
5252
if symbolList, ok := symbolMap[each.Path][eachSymbol.GetIndexName()]; ok {
53-
symbolList = append(symbolList, eachSymbol)
53+
symbolMap[each.Path][eachSymbol.GetIndexName()] = append(symbolList, eachSymbol)
5454
} else {
5555
symbolList := make([]*extractor.Symbol, 0)
5656
symbolList = append(symbolList, eachSymbol)

‎cmd/sibyl/subs/server/cmd_server_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ func TestServer(t *testing.T) {
3232
configuration.Scheme = "http"
3333
configuration.Host = "127.0.0.1:9876"
3434
apiClient := openapi.NewAPIClient(configuration)
35-
strings, _, err := apiClient.SCOPEApi.ApiV1RepoGet(ctx).Execute()
35+
repos, _, err := apiClient.SCOPEApi.ApiV1RepoGet(ctx).Execute()
3636
if err != nil {
3737
panic(err)
3838
}
39-
repo := strings[0]
39+
repo := repos[0]
4040
revs, _, err := apiClient.SCOPEApi.ApiV1RevGet(ctx).Repo(repo).Execute()
4141
if err != nil {
4242
return
@@ -79,6 +79,7 @@ func TestServer(t *testing.T) {
7979
}
8080

8181
signatures, _, err := apiClient.EXPERIMENTALApi.ApiV1FuncSignatureGet(ctx).Repo(repo).Rev(rev).Regex(".*").Execute()
82+
assert.Nil(t, err)
8283
assert.NotEqual(t, 0, len(signatures))
8384
f, _, err := apiClient.EXPERIMENTALApi.ApiV1FuncWithSignatureGet(ctx).Repo(repo).Rev(rev).Signature(signatures[0]).Execute()
8485
assert.Nil(t, err)

‎cmd/sibyl/subs/upload/execute.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func execWithConfig(c *uploadConfig) {
5555
}
5656

5757
cIter, err := repo.Log(&git.LogOptions{From: head.Hash()})
58+
panicIfErr(err)
5859
var commits = make([]*object2.Commit, 0, c.Depth)
5960
count := 0
6061
_ = cIter.ForEach(func(commit *object2.Commit) error {
@@ -251,10 +252,9 @@ func uploadFuncUnits(url string, units []*object.FunctionUploadUnit) {
251252
url,
252253
"application/json",
253254
bytes.NewBuffer(jsonStr))
254-
if err != nil {
255-
panic(err)
256-
}
255+
panicIfErr(err)
257256
data, err := io.ReadAll(resp.Body)
257+
panicIfErr(err)
258258
if resp.StatusCode != http.StatusOK {
259259
core.Log.Errorf("upload failed: %v", string(data))
260260
}
@@ -308,6 +308,7 @@ func uploadFunctionContextUnits(url string, wc *object.WorkspaceConfig, ctxs []*
308308
bytes.NewBuffer(jsonStr))
309309
panicIfErr(err)
310310
data, err := io.ReadAll(resp.Body)
311+
panicIfErr(err)
311312
if resp.StatusCode != http.StatusOK {
312313
core.Log.Errorf("upload resp: %v", string(data))
313314
}
@@ -359,10 +360,9 @@ func uploadClazzUnits(url string, units []*object.ClazzUploadUnit) {
359360
url,
360361
"application/json",
361362
bytes.NewBuffer(jsonStr))
362-
if err != nil {
363-
panic(err)
364-
}
363+
panicIfErr(err)
365364
data, err := io.ReadAll(resp.Body)
365+
panicIfErr(err)
366366
if resp.StatusCode != http.StatusOK {
367367
core.Log.Errorf("upload failed: %v", string(data))
368368
}

‎pkg/extractor/golang/extractor_golang_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,11 @@ func TestGolangExtractor_Serialize(t *testing.T) {
9393
func TestExtractor_ExtractClasses(t *testing.T) {
9494
parser := core.NewParser(core.LangGo)
9595
units, err := parser.Parse([]byte(goCode))
96-
if err != nil {
97-
panic(err)
98-
}
96+
assert.Nil(t, err)
9997

10098
extractor := &Extractor{}
10199
data, err := extractor.ExtractClasses(units)
100+
assert.Nil(t, err)
102101
for _, eachType := range data {
103102
core.Log.Infof("clazz: %v", eachType.GetSignature())
104103

‎pkg/extractor/java/extractor_java_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ func TestExtractor_ExtractClasses(t *testing.T) {
8787

8888
extractor := &Extractor{}
8989
data, err := extractor.ExtractClasses(units)
90+
assert.Nil(t, err)
9091
for _, each := range data {
9192
core.Log.Infof("find class: %v", each.GetSignature())
9293
for _, field := range each.Extras.(*ClassExtras).Fields {

‎pkg/server/binding/binding_tikv_read_clazz.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ func (t *tikvDriver) ReadClasses(wc *object.WorkspaceConfig, path string, ctx co
2828

2929
txn := t.client.GetSnapshot(math.MaxUint64)
3030
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
31+
if err != nil {
32+
return nil, err
33+
}
3134
defer iter.Close()
3235

3336
for iter.Valid() {
@@ -85,6 +88,9 @@ func (t *tikvDriver) ReadClassesWithRule(wc *object.WorkspaceConfig, rule Rule,
8588

8689
txn := t.client.GetSnapshot(math.MaxUint64)
8790
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
91+
if err != nil {
92+
return nil, err
93+
}
8894
defer iter.Close()
8995

9096
for iter.Valid() {

‎pkg/server/binding/binding_tikv_read_func.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ func (t *tikvDriver) ReadFunctionWithSignature(wc *object.WorkspaceConfig, signa
6363

6464
txn := t.client.GetSnapshot(math.MaxUint64)
6565
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
66+
if err != nil {
67+
return nil, err
68+
}
6669
defer iter.Close()
6770

6871
var ret *sibyl2.FunctionWithPath
@@ -114,6 +117,9 @@ func (t *tikvDriver) ReadFunctions(wc *object.WorkspaceConfig, path string, _ co
114117

115118
txn := t.client.GetSnapshot(math.MaxUint64)
116119
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
120+
if err != nil {
121+
return nil, err
122+
}
117123
defer iter.Close()
118124

119125
for iter.Valid() {
@@ -157,6 +163,9 @@ func (t *tikvDriver) ReadFunctionsWithRule(wc *object.WorkspaceConfig, rule Rule
157163

158164
txn := t.client.GetSnapshot(math.MaxUint64)
159165
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
166+
if err != nil {
167+
return nil, err
168+
}
160169
defer iter.Close()
161170

162171
for iter.Valid() {

‎pkg/server/binding/binding_tikv_read_funcctx.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ func (t *tikvDriver) ReadFunctionContextsWithRule(wc *object.WorkspaceConfig, ru
3838

3939
txn := t.client.GetSnapshot(math.MaxUint64)
4040
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
41+
if err != nil {
42+
return nil, err
43+
}
4144
defer iter.Close()
4245

4346
for iter.Valid() {
@@ -94,6 +97,9 @@ func (t *tikvDriver) ReadFunctionContextWithSignature(wc *object.WorkspaceConfig
9497

9598
txn := t.client.GetSnapshot(math.MaxUint64)
9699
iter, err := txn.Iter(prefix, kv.PrefixNextKey(prefix))
100+
if err != nil {
101+
return nil, err
102+
}
97103
defer iter.Close()
98104

99105
for iter.Valid() {

‎pkg/server/binding/binding_tikv_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ func TestTikvFunc(t *testing.T) {
7070

7171
// check
7272
files, err := tikvTestDriver.ReadFiles(wc, ctx)
73+
assert.Nil(t, err)
7374
assert.Equal(t, 1, len(files))
7475

7576
// functions

‎pkg/server/service/service_query_normal.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func handleFunctionQuery(repo string, rev string, file string, lines string) ([]
5050
if err := wc.Verify(); err != nil {
5151
return nil, err
5252
}
53-
functions := make([]*sibyl2.FunctionWithPath, 0)
53+
var functions []*sibyl2.FunctionWithPath
5454
var err error
5555
if lines == "" {
5656
functions, err = sharedDriver.ReadFunctions(wc, file, sharedContext)
@@ -149,7 +149,7 @@ func handleClazzQuery(repo string, rev string, file string) ([]*sibyl2.ClazzWith
149149
if err := wc.Verify(); err != nil {
150150
return nil, err
151151
}
152-
functions := make([]*sibyl2.ClazzWithPath, 0)
152+
var functions []*sibyl2.ClazzWithPath
153153
var err error
154154
functions, err = sharedDriver.ReadClasses(wc, file, sharedContext)
155155
if err != nil {

0 commit comments

Comments
 (0)
⌂ 换网址