summaryrefslogtreecommitdiff
path: root/internal/mapr
diff options
context:
space:
mode:
authorPaul Buetow <git@mx.buetow.org>2020-12-26 10:48:51 +0000
committerPaul Buetow <git@mx.buetow.org>2020-12-26 10:48:51 +0000
commitab676c2b484225ed22765b23d8f0545088ecd610 (patch)
tree5292e21339fef551f19e8fdd90beeb35d676381d /internal/mapr
parentb4db37d8cbae8f0c3dec289b2e1b0cfe83731415 (diff)
code cleanup and minor refactorings
Diffstat (limited to 'internal/mapr')
-rw-r--r--internal/mapr/funcs/function.go1
-rw-r--r--internal/mapr/query.go6
-rw-r--r--internal/mapr/selectcondition.go1
-rw-r--r--internal/mapr/token.go3
-rw-r--r--internal/mapr/wherecondition.go2
5 files changed, 7 insertions, 6 deletions
diff --git a/internal/mapr/funcs/function.go b/internal/mapr/funcs/function.go
index 52aaa98..1a89c3a 100644
--- a/internal/mapr/funcs/function.go
+++ b/internal/mapr/funcs/function.go
@@ -12,6 +12,7 @@ type CallbackFunc func(text string) string
type Function struct {
// Name of the callback function
Name string
+ // The Go-callback function to call for this DTail function.
call CallbackFunc
}
diff --git a/internal/mapr/query.go b/internal/mapr/query.go
index 7f6b63c..01852da 100644
--- a/internal/mapr/query.go
+++ b/internal/mapr/query.go
@@ -177,12 +177,6 @@ func (q *Query) parse(tokens []token) error {
}
}
- // Comment out for empty table support, which is "all" log lines.
- /*
- if q.Table == "" {
- return errors.New(invalidQuery + "Empty table specified in 'from' clause")
- }
- */
if len(q.Select) < 1 {
return errors.New(invalidQuery + "Expected at least one field in 'select' clause but got none")
}
diff --git a/internal/mapr/selectcondition.go b/internal/mapr/selectcondition.go
index 1882b7e..d6aa0d4 100644
--- a/internal/mapr/selectcondition.go
+++ b/internal/mapr/selectcondition.go
@@ -92,5 +92,6 @@ func makeSelectConditions(tokens []token) ([]selectCondition, error) {
}
sel = append(sel, sc)
}
+
return sel, nil
}
diff --git a/internal/mapr/token.go b/internal/mapr/token.go
index d337bd2..8972188 100644
--- a/internal/mapr/token.go
+++ b/internal/mapr/token.go
@@ -22,6 +22,7 @@ func (t token) isKeyword() bool {
return true
}
}
+
return false
}
@@ -94,6 +95,7 @@ func tokensConsumeStr(tokens []token) ([]token, []string) {
for _, token := range found {
strings = append(strings, token.str)
}
+
return tokens, strings
}
@@ -104,5 +106,6 @@ func tokensConsumeOptional(tokens []token, optional string) []token {
if strings.ToLower(tokens[0].str) == strings.ToLower(optional) {
return tokens[1:]
}
+
return tokens
}
diff --git a/internal/mapr/wherecondition.go b/internal/mapr/wherecondition.go
index 70e9c32..7a60dba 100644
--- a/internal/mapr/wherecondition.go
+++ b/internal/mapr/wherecondition.go
@@ -170,6 +170,7 @@ func (wc *whereCondition) floatClause(lValue float64, rValue float64) bool {
default:
logger.Error("Unknown float operation", lValue, wc.Operation, rValue)
}
+
return false
}
@@ -194,5 +195,6 @@ func (wc *whereCondition) stringClause(lValue string, rValue string) bool {
default:
logger.Error("Unknown string operation", lValue, wc.Operation, rValue)
}
+
return false
}