style: enable superfluous-else check and fix (#1742)

* enable superfluous-else check

Signed-off-by: yisaer <disxiaofei@163.com>

* address the comment

Signed-off-by: yisaer <disxiaofei@163.com>

---------

Signed-off-by: yisaer <disxiaofei@163.com>

cmd/kuiper/main.go

@@ -122,28 +122,27 @@ func main() {
 						if err != nil {
 							fmt.Println(err)
 							continue
-						} else {
-							fmt.Println(reply)
-							go func() {
-								err := infra.SafeRun(func() error {
-									for {
-										<-ticker.C
-										var result string
-										e := client.Call("Server.GetQueryResult", "", &result)
-										if e != nil {
-											return e
-										}
-										if result != "" {
-											fmt.Println(result)
-										}
+						}
+						fmt.Println(reply)
+						go func() {
+							err := infra.SafeRun(func() error {
+								for {
+									<-ticker.C
+									var result string
+									e := client.Call("Server.GetQueryResult", "", &result)
+									if e != nil {
+										return e
+									}
+									if result != "" {
+										fmt.Println(result)
 									}
-								})
-								if err != nil {
-									fmt.Println(err)
-									fmt.Print("kuiper > ")
 								}
-							}()
-						}
+							})
+							if err != nil {
+								fmt.Println(err)
+								fmt.Print("kuiper > ")
+							}
+						}()
 					}
 				}
 				return nil

internal/binder/function/binder.go

@@ -69,9 +69,8 @@ func GetFunctionPlugin(name string) (plugin.EXTENSION_TYPE, string, string) {
 		t, s1, s2 := sf.FunctionPluginInfo(name)
 		if t == plugin.NONE_EXTENSION {
 			continue
-		} else {
-			return t, s1, s2
 		}
+		return t, s1, s2
 	}
 	return plugin.NONE_EXTENSION, "", ""
 }

internal/binder/io/binder.go

@@ -74,9 +74,8 @@ func GetSourcePlugin(name string) (plugin.EXTENSION_TYPE, string, string) {
 		t, s1, s2 := sf.SourcePluginInfo(name)
 		if t == plugin.NONE_EXTENSION {
 			continue
-		} else {
-			return t, s1, s2
 		}
+		return t, s1, s2
 	}
 	return plugin.NONE_EXTENSION, "", ""
 }
@@ -100,9 +99,8 @@ func GetSinkPlugin(name string) (plugin.EXTENSION_TYPE, string, string) {
 		t, s1, s2 := sf.SinkPluginInfo(name)
 		if t == plugin.NONE_EXTENSION {
 			continue
-		} else {
-			return t, s1, s2
 		}
+		return t, s1, s2
 	}
 	return plugin.NONE_EXTENSION, "", ""
 }

internal/conf/path.go

@@ -112,10 +112,9 @@ func relativePath(subdir string) (dir string, err error) {
 			if _, err := os.Stat(confDir); os.IsNotExist(err) {
 				lastdir = dir
 				continue
-			} else {
-				//Log.Printf("Trying to load file from %s", confDir)
-				return confDir, nil
 			}
+			//Log.Printf("Trying to load file from %s", confDir)
+			return confDir, nil
 		}
 	} else {
 		//Log.Printf("Trying to load file from %s", confDir)

internal/io/neuron/neuron_test.go

@@ -46,9 +46,8 @@ func mockNeuron(send bool, recv bool, url string) (mangos.Socket, chan []byte) {
 	}
 	if err = sock.Listen(url); err != nil {
 		log.Fatalf("can't listen on pair socket: %s", err.Error())
-	} else {
-		log.Printf("listen on pair socket")
 	}
+	log.Printf("listen on pair socket")
 	if recv {
 		ch = make(chan []byte)
 		go func() {

internal/plugin/wasm/runtime/function.go

@@ -113,10 +113,9 @@ func (f *WasmFunc) ExecWasmFunc(args []interface{}) []interface{} {
 		res, err = vm.Execute(funcname)
 		if err != nil {
 			log.Fatalln("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Run function failed： ", err.Error())
-		} else {
-			fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
-			fmt.Println(res[0].(int32))
 		}
+		fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
+		fmt.Println(res[0].(int32))
 		exitcode := wasi.WasiGetExitCode()
 		if exitcode != 0 {
 			fmt.Println("Go: Running wasm failed, exit code:", exitcode)
@@ -126,10 +125,9 @@ func (f *WasmFunc) ExecWasmFunc(args []interface{}) []interface{} {
 		res, err = vm.Execute(funcname, uint32(Args[0]))
 		if err != nil {
 			log.Fatalln("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Run function failed： ", err.Error())
-		} else {
-			fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
-			fmt.Println(res[0].(int32))
 		}
+		fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
+		fmt.Println(res[0].(int32))
 		exitcode := wasi.WasiGetExitCode()
 		if exitcode != 0 {
 			fmt.Println("Go: Running wasm failed, exit code:", exitcode)
@@ -139,10 +137,9 @@ func (f *WasmFunc) ExecWasmFunc(args []interface{}) []interface{} {
 		res, err = vm.Execute(funcname, uint32(Args[0]), uint32(Args[1]))
 		if err != nil {
 			log.Fatalln("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Run function failed： ", err.Error())
-		} else {
-			fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
-			fmt.Println(res[0].(int32))
 		}
+		fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
+		fmt.Println(res[0].(int32))
 		exitcode := wasi.WasiGetExitCode()
 		if exitcode != 0 {
 			fmt.Println("Go: Running wasm failed, exit code:", exitcode)
@@ -152,10 +149,9 @@ func (f *WasmFunc) ExecWasmFunc(args []interface{}) []interface{} {
 		res, err = vm.Execute(funcname, uint32(Args[0]), uint32(Args[1]), uint32(Args[2]))
 		if err != nil {
 			log.Fatalln("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Run function failed： ", err.Error())
-		} else {
-			fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
-			fmt.Println(res[0].(int32))
 		}
+		fmt.Print("[wasm][manager-AddWasmPlugin-NewWasmPlugin] Get res: ")
+		fmt.Println(res[0].(int32))
 		exitcode := wasi.WasiGetExitCode()
 		if exitcode != 0 {
 			fmt.Println("Go: Running wasm failed, exit code:", exitcode)

internal/processor/ruleset.go

@@ -161,9 +161,8 @@ func (rs *RulesetProcessor) ImportRuleSet(all Ruleset) Ruleset {
 			_ = rs.s.streamStatusDb.Set(k, e.Error())
 			ruleSetRsp.Streams[k] = e.Error()
 			continue
-		} else {
-			counts[0]++
 		}
+		counts[0]++
 	}
 	// restore tables
 	for k, v := range all.Tables {
@@ -173,9 +172,8 @@ func (rs *RulesetProcessor) ImportRuleSet(all Ruleset) Ruleset {
 			_ = rs.s.tableStatusDb.Set(k, e.Error())
 			ruleSetRsp.Tables[k] = e.Error()
 			continue
-		} else {
-			counts[1]++
 		}
+		counts[1]++
 	}
 	var rules []string
 	// restore rules
@@ -186,10 +184,9 @@ func (rs *RulesetProcessor) ImportRuleSet(all Ruleset) Ruleset {
 			_ = rs.r.ruleStatusDb.Set(k, e.Error())
 			ruleSetRsp.Rules[k] = e.Error()
 			continue
-		} else {
-			rules = append(rules, k)
-			counts[2]++
 		}
+		rules = append(rules, k)
+		counts[2]++
 	}
 	return ruleSetRsp
 }

internal/service/schemaHttp.go

@@ -159,9 +159,8 @@ func (d *wrappedProtoDescriptor) ConvertHttpMapping(method string, params []inte
 				if v.prefix != "" {
 					if strings.HasPrefix(args[i].(string), v.prefix) {
 						continue
-					} else {
-						return nil, fmt.Errorf("invalid field %s(%s) as http option, must have prefix %s", v.name, args[i], v.prefix)
 					}
+					return nil, fmt.Errorf("invalid field %s(%s) as http option, must have prefix %s", v.name, args[i], v.prefix)
 				}
 			}
 			hcm.Uri = fmt.Sprintf(ho.UriTemplate.Template, args...)

internal/topo/node/join_align_node.go

@@ -127,10 +127,9 @@ func (n *JoinAlignNode) Exec(ctx api.StreamContext, errCh chan<- error) {
 								n.Broadcast(e)
 								n.statManager.IncTotalExceptions(e.Error())
 								break
-							} else {
-								n.batch[emitter] = d.Content
-								ctx.PutState(BatchKey, n.batch)
 							}
+							n.batch[emitter] = d.Content
+							ctx.PutState(BatchKey, n.batch)
 						}
 					default:
 						e := fmt.Errorf("run JoinAlignNode error: invalid input type but got %[1]T(%[1]v)", d)

internal/topo/node/sink_node.go

@@ -157,10 +157,10 @@ func (m *SinkNode) Open(ctx api.StreamContext, result chan<- error) {
 							for {
 								select {
 								case data := <-m.input:
-									if temp, processed := m.preprocess(data); processed {
-										break
-									} else {
+									if temp, processed := m.preprocess(data); !processed {
 										data = temp
+									} else {
+										break
 									}
 									stats.SetBufferLength(int64(len(m.input)))
 									stats.IncTotalRecordsIn()
@@ -202,10 +202,10 @@ func (m *SinkNode) Open(ctx api.StreamContext, result chan<- error) {
 								for {
 									select {
 									case data := <-m.input:
-										if temp, processed := m.preprocess(data); processed {
-											break
-										} else {
+										if temp, processed := m.preprocess(data); !processed {
 											data = temp
+										} else {
+											break
 										}
 										stats.IncTotalRecordsIn()
 										outs := itemToMap(data)

internal/topo/node/window_op.go

@@ -303,9 +303,8 @@ func (o *WindowOperator) execProcessingWindow(ctx api.StreamContext, inputs []*x
 					log.Debugf(fmt.Sprintf("msgCount: %d", o.msgCount))
 					if o.msgCount%o.window.Interval != 0 {
 						continue
-					} else {
-						o.msgCount = 0
 					}
+					o.msgCount = 0
 
 					if tl, er := NewTupleList(inputs, o.window.Length); er != nil {
 						log.Error(fmt.Sprintf("Found error when trying to "))

internal/topo/topotest/mock_topo.go

@@ -63,9 +63,8 @@ func CompareMetrics(tp *topo.Topo, m map[string]interface{}) (err error) {
 					if values[index].(int64) >= v.(int64) {
 						matched = true
 						continue
-					} else {
-						break
 					}
+					break
 				}
 				if values[index] == v {
 					matched = true
@@ -209,11 +208,11 @@ func sendData(t *testing.T, dataLength int, metrics map[string]interface{}, data
 	time.Sleep(10 * time.Millisecond)
 	var retry int
 	for retry = 4; retry > 0; retry-- {
-		if err := CompareMetrics(tp, metrics); err == nil {
+		var err error
+		if err = CompareMetrics(tp, metrics); err == nil {
 			break
-		} else {
-			conf.Log.Errorf("check metrics error at %d: %s", retry, err)
 		}
+		conf.Log.Errorf("check metrics error at %d: %s", retry, err)
 		time.Sleep(1000 * time.Millisecond)
 	}
 	if retry == 0 {
@@ -420,9 +419,8 @@ func DoCheckpointRuleTest(t *testing.T, tests []RuleCheckpointTest, j int, opt *
 			actual := tp.GetCoordinator().GetCompleteCount()
 			if tt.Cc == actual {
 				break
-			} else {
-				conf.Log.Debugf("check checkpointCount error at %d: %d\n", retry, actual)
 			}
+			conf.Log.Debugf("check checkpointCount error at %d: %d\n", retry, actual)
 			time.Sleep(200 * time.Millisecond)
 		}
 		cc := tp.GetCoordinator().GetCompleteCount()

internal/xsql/lexical.go

@@ -324,9 +324,8 @@ func (s *Scanner) ScanBackquoteIdent() (tok ast.Token, lit string) {
 		ch := s.read()
 		if isBackquote(ch) || ch == eof {
 			break
-		} else {
-			buf.WriteRune(ch)
 		}
+		buf.WriteRune(ch)
 	}
 	return ast.IDENT, buf.String()
 }

internal/xsql/parser.go

@@ -327,10 +327,9 @@ func (p *Parser) parseDimensions() (ast.Dimensions, error) {
 				}
 				if tok, _ := p.scanIgnoreWhitespace(); tok == ast.COMMA {
 					continue
-				} else {
-					p.unscan()
-					break
 				}
+				p.unscan()
+				break
 			}
 		} else {
 			return nil, fmt.Errorf("found %q, expected BY statement.", l1)
@@ -828,9 +827,8 @@ func (p *Parser) parseCall(n string) (ast.Expr, error) {
 	for {
 		if tok, _ := p.scanIgnoreWhitespace(); tok == ast.RPAREN {
 			break
-		} else {
-			p.unscan()
 		}
+		p.unscan()
 
 		if exp, err := p.ParseExpr(); err != nil {
 			return nil, err
@@ -935,9 +933,8 @@ loop:
 		case ast.END:
 			if c.WhenClauses != nil {
 				break loop
-			} else {
-				return nil, fmt.Errorf("invalid CASE expression, WHEN expected before END")
 			}
+			return nil, fmt.Errorf("invalid CASE expression, WHEN expected before END")
 		default:
 			return nil, fmt.Errorf("invalid CASE expression, END expected")
 		}
@@ -1463,9 +1460,8 @@ func (p *Parser) parseStreamOptions() (*ast.Options, error) {
 			} else if tok1 == ast.RPAREN {
 				if lStack.Pop(); lStack.Len() == 0 {
 					break
-				} else {
-					return nil, fmt.Errorf("Parenthesis is not matched in options definition.")
 				}
+				return nil, fmt.Errorf("Parenthesis is not matched in options definition.")
 			} else {
 				return nil, fmt.Errorf("found %q, unknown option keys(DATASOURCE|FORMAT|KEY|CONF_KEY|SHARED|STRICT_VALIDATION|TYPE|TIMESTAMP|TIMESTAMP_FORMAT|RETAIN_SIZE|SCHEMAID).", lit1)
 			}
@@ -1531,10 +1527,9 @@ func (p *Parser) parseOver(c *ast.Call) error {
 						}
 						if tok, _ := p.scanIgnoreWhitespace(); tok == ast.COMMA {
 							continue
-						} else {
-							p.unscan()
-							break
 						}
+						p.unscan()
+						break
 					}
 					if len(pe.Exprs) == 0 {
 						return fmt.Errorf("PARTITION BY must have at least one expression.")

tools/check/revive.toml

@@ -17,7 +17,7 @@ warningCode = -1
 [rule.range]
 [rule.receiver-naming]
 #[rule.indent-error-flow]
-#[rule.superfluous-else]
+[rule.superfluous-else]
 [rule.modifies-parameter]
 
 # This can be checked by other tools like megacheck