groot/rsql/rsqldrv: apply staticcheck fixes

go-hep · May 22, 2020 · 4723470 · 4723470
1 parent 889375c
commit 4723470
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/groot/rsql/rsqldrv/driver.go b/groot/rsql/rsqldrv/driver.go
@@ -124,8 +124,6 @@ type driverConn struct {
 	drv  *rootDriver
 	stop map[*driverStmt]struct{}
 	refs int
-
-	tx driver.Tx
 }
 
 // Prepare returns a prepared statement, bound to this connection.

diff --git a/groot/rsql/rsqldrv/expr.go b/groot/rsql/rsqldrv/expr.go
@@ -10,7 +10,6 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"sync"
 
 	"github.com/xwb1989/sqlparser"
 )
@@ -23,10 +22,7 @@ type expression interface {
 }
 
 type execCtx struct {
-	db    *driverConn
-	args  []interface{}
-	cache map[interface{}]interface{}
-	mu    sync.RWMutex
+	db *driverConn
 }
 
 func newExecCtx(db *driverConn, args []driver.NamedValue) *execCtx {

diff --git a/groot/rsql/rsqldrv/rsqldrv_example_test.go b/groot/rsql/rsqldrv/rsqldrv_example_test.go
@@ -11,7 +11,6 @@ import (
 
 	"go-hep.org/x/hep/groot"
 	"go-hep.org/x/hep/groot/rsql/rsqldrv"
-	_ "go-hep.org/x/hep/groot/rsql/rsqldrv"
 	"go-hep.org/x/hep/groot/rtree"
 )
 

diff --git a/groot/rsql/rsqldrv/types.go b/groot/rsql/rsqldrv/types.go
@@ -159,15 +159,15 @@ func coerce1(inVal, otherVal interface{}) (coercedInVal interface{}) {
 			}
 		//case string:
 		case uint8:
-			if x >= 0 && x <= math.MaxUint8 {
+			if x <= math.MaxUint8 {
 				return uint8(int64(x))
 			}
 		case uint16:
-			if x >= 0 && x <= math.MaxUint16 {
+			if x <= math.MaxUint16 {
 				return uint16(int64(x))
 			}
 		case uint32:
-			if x >= 0 && x <= math.MaxUint32 {
+			if x <= math.MaxUint32 {
 				return uint32(int64(x))
 			}
 		case uint64: