fix: fix reviews

.licenserc.yaml

@@ -80,7 +80,6 @@ header: # `header` section is configurations for source codes license header.
     - 'pkg/resolver/mysql/encoding.go'
     - 'pkg/resolver/mysql/sql_error.go'
     - 'pkg/resolver/mysql/type.go'
-    - 'testdata'
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 
   # license-location-threshold specifies the index threshold where the license header can be located,

pkg/proto/rule/database_table.go

@@ -73,10 +73,9 @@ func (dt DatabaseTables) Or(other DatabaseTables) DatabaseTables {
 	if dt == nil || other == nil {
 		return nil
 	}
-	if dt.IsEmpty() {
+
+	if dt.IsEmpty() || other.IsEmpty() {
 		return other
-	}
-	if other.IsEmpty() {
 		return other
 	}
 

pkg/proto/rule/range.go

@@ -22,9 +22,13 @@ import (
 	"strconv"
 	"strings"
 	"time"
+)
 
+import (
 	"github.com/pkg/errors"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/util/rand2"
 )
 

pkg/proto/rule/rule.go

@@ -22,7 +22,9 @@ package rule
 import (
 	"fmt"
 	"sync"
+)
 
+import (
 	"github.com/pkg/errors"
 )
 

pkg/proto/rule/rule_test.go

@@ -20,10 +20,15 @@ package rule_test
 import (
 	"fmt"
 	"testing"
+)
 
+import (
 	"github.com/golang/mock/gomock"
+
 	"github.com/stretchr/testify/assert"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/proto/rule"
 	"github.com/dubbogo/arana/testdata"
 )

pkg/runtime/cmp/cmp.go

@@ -23,7 +23,9 @@ import (
 	"strconv"
 	"strings"
 	"time"
+)
 
+import (
 	"github.com/pkg/errors"
 )
 

pkg/runtime/logical/logical.go

@@ -22,7 +22,9 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/runtime/misc"
 )
 

pkg/runtime/logical/logical_test.go

@@ -19,9 +19,13 @@ package logical_test
 
 import (
 	"testing"
+)
 
+import (
 	"github.com/stretchr/testify/assert"
+)
 
+import (
 	. "github.com/dubbogo/arana/pkg/runtime/logical"
 )
 

pkg/runtime/misc/strings.go

@@ -96,11 +96,7 @@ func FirstNonZeroInt64(first, second int64, others ...int64) int64 {
 }
 
 func PadRight(str, pad string, length int) string {
-	if len(str) == length {
-		return str
-	}
-
-	if len(str) > length {
+	if len(str) >= length {
 		return str[:length]
 	}
 

pkg/runtime/rule/evaluator_test.go

@@ -21,9 +21,13 @@ import (
 	"fmt"
 	"strconv"
 	"testing"
+)
 
+import (
 	"github.com/stretchr/testify/assert"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/proto/rule"
 	"github.com/dubbogo/arana/pkg/runtime/cmp"
 	. "github.com/dubbogo/arana/pkg/runtime/rule"

pkg/runtime/rule/route.go

@@ -20,7 +20,9 @@ package rule
 
 import (
 	"github.com/pkg/errors"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/proto/rule"
 	"github.com/dubbogo/arana/pkg/runtime/cmp"
 )

pkg/runtime/rule/route_test.go

@@ -20,9 +20,13 @@ package rule_test
 import (
 	"sort"
 	"testing"
+)
 
+import (
 	"github.com/stretchr/testify/assert"
+)
 
+import (
 	"github.com/dubbogo/arana/pkg/runtime/cmp"
 	. "github.com/dubbogo/arana/pkg/runtime/rule"
 )

testdata/testdata.go

@@ -1,3 +1,21 @@
+// Licensed to Apache Software Foundation (ASF) under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Apache Software Foundation (ASF) licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
 // Package testdata 测试资源包
 package testdata