Refactoring

Co-authored-by: Hugo Blanc <eze-kiel@users.noreply.github.com>

cmd/example/main.go

@@ -6,6 +6,8 @@ import (
 	"time"
 
 	"github.com/devops-works/slowql"
+	"github.com/devops-works/slowql/query"
+	"github.com/devops-works/slowql/server"
 )
 
 func main() {
@@ -27,7 +29,7 @@ func main() {
 	start := time.Now()
 	for {
 		q := p.GetNext()
-		if q == (slowql.Query{}) {
+		if q == (query.Query{}) {
 			break
 		}
 
@@ -39,7 +41,7 @@ func main() {
 	fmt.Printf("\nparsed %d queries in %s\n", count, elapsed)
 }
 
-func showQueries(q slowql.Query) {
+func showQueries(q query.Query) {
 	fmt.Printf("Time: %s\nUser: %s\nHost: %s\nID: %d\nSchema: %s\nLast_errno: %d\nKilled: %d\nQuery_time: %f\nLock_time: %f\nRows_sent: %d\nRows_examined: %d\nRows_affected: %d\nBytes_sent: %d\nQuery: %s\n",
 		q.Time,
 		q.User,
@@ -58,7 +60,7 @@ func showQueries(q slowql.Query) {
 	)
 }
 
-func showServer(srv slowql.Server) {
+func showServer(srv server.Server) {
 	fmt.Printf("Binary: %s\nVersion short: %s\nVersion: %s\nVersion description: %s\nSocket: %s\nPort: %d\n",
 		srv.Binary,
 		srv.VersionShort,

mariadb.go → database/mariadb/mariadb.go

@@ -1,4 +1,4 @@
-package slowql
+package mariadb
 
 import (
 	"regexp"
@@ -7,17 +7,18 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-)
 
-// MariaDB is the MariaDB kind
-const MariaDB Kind = 1
+	"github.com/devops-works/slowql/query"
+	"github.com/devops-works/slowql/server"
+)
 
-type mariadbParser struct {
-	wl chan Query
-	sm chan Server
+// Database holds parser structure
+type Database struct {
+	WaitingList chan query.Query
+	ServerMeta  chan server.Server
 }
 
-func (p *mariadbParser) parseBlocs(rawBlocs chan []string) {
+func (p *Parser) parseBlocs(rawBlocs chan []string) {
 	for {
 		select {
 		case bloc := <-rawBlocs:
@@ -35,7 +36,7 @@ func (p *mariadbParser) parseBlocs(rawBlocs chan []string) {
 	}
 }
 
-func (p *mariadbParser) GetNext() Query {
+func (p *Parser) GetNext() Query {
 	var q Query
 	select {
 	case q = <-p.wl:
@@ -138,7 +139,7 @@ func (q *Query) parseMariaDBHeader(line string) {
 	}
 }
 
-func (p *mariadbParser) parseServerMeta(lines chan []string) {
+func (p *Parser) parseServerMeta(lines chan []string) {
 	for {
 		select {
 		case header := <-lines:
@@ -169,6 +170,6 @@ func (p *mariadbParser) parseServerMeta(lines chan []string) {
 	}
 }
 
-func (p *mariadbParser) GetServerMeta() Server {
+func (p *Parser) GetServerMeta() Server {
 	return srv
 }

mysql.go → database/mysql/mysql.go

@@ -1,4 +1,4 @@
-package slowql
+package mysql
 
 import (
 	"regexp"
@@ -7,49 +7,49 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-)
 
-// MySQL is the MySQL kind
-const MySQL Kind = 0
+	"github.com/devops-works/slowql/query"
+	"github.com/devops-works/slowql/server"
+)
 
-type mysqlParser struct {
-	wl chan Query
-	sm chan Server
+// Database holds parser structure
+type Database struct {
+	WaitingList      chan query.Query
+	ServerMeta       chan server.Server
+	stringInBrackets *regexp.Regexp
+	srv              server.Server
 }
 
-// srv holds the server configuration so we can access it multiple times
-var srv Server
+// New instance of parser
+func New(qc chan query.Query) *Database {
+	p := Database{
+		WaitingList:      qc,
+		stringInBrackets: regexp.MustCompile(`\[(.*?)\]`),
+	}
+
+	return &p
+}
 
-func (p *mysqlParser) parseBlocs(rawBlocs chan []string) {
+// ParseBlocs parses query blocks
+func (p *Database) ParseBlocs(rawBlocs chan []string) {
 	for {
 		select {
 		case bloc := <-rawBlocs:
-			var q Query
+			var q query.Query
 
 			for _, line := range bloc {
 				if line[0] == '#' {
-					q.parseMySQLHeader(line)
+					p.parseMySQLHeader(line, &q)
 				} else {
 					q.Query = q.Query + line
 				}
 			}
-			p.wl <- q
+			p.WaitingList <- q
 		}
 	}
 }
 
-func (p *mysqlParser) GetNext() Query {
-	var q Query
-	select {
-	case q = <-p.wl:
-		return q
-	case <-time.After(2 * time.Second):
-		close(p.wl)
-	}
-	return q
-}
-
-func (q *Query) parseMySQLHeader(line string) {
+func (p *Database) parseMySQLHeader(line string, q *query.Query) {
 	var err error
 	parts := strings.Split(line, " ")
 
@@ -111,7 +111,7 @@ func (q *Query) parseMySQLHeader(line string) {
 			}
 
 		} else if strings.Contains(part, "user@host:") {
-			items := stringInBrackets.FindAllString(line, -1)
+			items := p.stringInBrackets.FindAllString(line, -1)
 			// We remove first and last bytes of the strings because they are
 			// square brackets
 			q.User = items[0][1 : len(items[0])-1]
@@ -141,7 +141,8 @@ func (q *Query) parseMySQLHeader(line string) {
 	}
 }
 
-func (p *mysqlParser) parseServerMeta(lines chan []string) {
+// ParseServerMeta parses server meta information
+func (p *Database) ParseServerMeta(lines chan []string) {
 	for {
 		select {
 		case header := <-lines:
@@ -153,25 +154,26 @@ func (p *mysqlParser) parseServerMeta(lines chan []string) {
 			matches := versionre.FindStringSubmatch(versions)
 
 			if len(matches) != 5 {
-				srv.Binary = "unable to parse line"
-				srv.VersionShort = srv.Binary
-				srv.Version = srv.Binary
-				srv.VersionDescription = srv.Binary
-				srv.Port = 0
-				srv.Socket = srv.Binary
+				p.srv.Binary = "unable to parse line"
+				p.srv.VersionShort = p.srv.Binary
+				p.srv.Version = p.srv.Binary
+				p.srv.VersionDescription = p.srv.Binary
+				p.srv.Port = 0
+				p.srv.Socket = p.srv.Binary
 			}
 
-			srv.Binary = matches[1]
-			srv.VersionShort = matches[2]
-			srv.Version = srv.VersionShort + matches[3]
-			srv.VersionDescription = matches[4]
-			srv.Port, _ = strconv.Atoi(strings.Split(net, " ")[2])
-			srv.Socket = strings.TrimLeft(strings.Split(net, ":")[2], " ")
+			p.srv.Binary = matches[1]
+			p.srv.VersionShort = matches[2]
+			p.srv.Version = p.srv.VersionShort + matches[3]
+			p.srv.VersionDescription = matches[4]
+			p.srv.Port, _ = strconv.Atoi(strings.Split(net, " ")[2])
+			p.srv.Socket = strings.TrimLeft(strings.Split(net, ":")[2], " ")
 			return
 		}
 	}
 }
 
-func (p *mysqlParser) GetServerMeta() Server {
-	return srv
+// GetServerMeta returns server meta information
+func (p *Database) GetServerMeta() server.Server {
+	return p.srv
 }

query/query.go

@@ -0,0 +1,21 @@
+package query
+
+import "time"
+
+// Query is a single SQL query and the data associated
+type Query struct {
+	Time         time.Time
+	QueryTime    float64
+	LockTime     float64
+	ID           int
+	RowsSent     int
+	RowsExamined int
+	RowsAffected int
+	LastErrNo    int
+	Killed       int
+	BytesSent    int
+	User         string
+	Host         string
+	Schema       string
+	Query        string
+}

server/server.go

@@ -0,0 +1,11 @@
+package server
+
+// Server holds the SQL server informations that are parsed from the header
+type Server struct {
+	Binary             string
+	Port               int
+	Socket             string
+	Version            string
+	VersionShort       string
+	VersionDescription string
+}