From 4c1059dc98b3acf2fd985aec8a181c2e3117cbe9 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Thu, 27 Jan 2022 17:08:13 +0000 Subject: Dont auto lowercase all mapreduce keys --- internal/mapr/logformat/default.go | 2 +- internal/mapr/logformat/generickv.go | 2 +- internal/mapr/query_test.go | 4 ++-- internal/mapr/selectcondition.go | 2 +- internal/mapr/token.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'internal') diff --git a/internal/mapr/logformat/default.go b/internal/mapr/logformat/default.go index f066f6e..a44b49a 100644 --- a/internal/mapr/logformat/default.go +++ b/internal/mapr/logformat/default.go @@ -52,7 +52,7 @@ func (p *Parser) MakeFieldsDEFAULT(maprLine string) (map[string]string, error) { if len(keyAndValue) != 2 { return fields, fmt.Errorf("Unable to parse key-value token '%s'", kv) } - fields[strings.ToLower(keyAndValue[0])] = keyAndValue[1] + fields[keyAndValue[0]] = keyAndValue[1] } return fields, nil diff --git a/internal/mapr/logformat/generickv.go b/internal/mapr/logformat/generickv.go index 65351f5..3452e97 100644 --- a/internal/mapr/logformat/generickv.go +++ b/internal/mapr/logformat/generickv.go @@ -25,7 +25,7 @@ func (p *Parser) MakeFieldsGENERIGKV(maprLine string) (map[string]string, error) //dlog.Common.Debug("Unable to parse key-value token, ignoring it", kv) continue } - fields[strings.ToLower(keyAndValue[0])] = keyAndValue[1] + fields[keyAndValue[0]] = keyAndValue[1] } return fields, nil diff --git a/internal/mapr/query_test.go b/internal/mapr/query_test.go index 88f7387..a0913fd 100644 --- a/internal/mapr/query_test.go +++ b/internal/mapr/query_test.go @@ -57,9 +57,9 @@ func TestParseQueryDeep(t *testing.T) { "\"free beer\" group by g1, g2 order by count(s3) interval 10 limit 23 " + "set $foo = maskdigits(bar), $baz = 12, $bay = $foo logformat generic", - "SELECT s1, `from`, COUNT(s3) FROM table WHERE w1 == 2 AND w2 eq " + + "SELECT s1, `from`, count(s3) FROM table WHERE w1 == 2 AND w2 EQ " + "\"free beer\" GROUP g1, g2 ORDER count(s3) INTERVAL 10 LIMIT 23 " + - "SET $foo = maskdigits(bar), $baz = 12, $bay = $foo logformat generic", + "SET $foo = maskdigits(bar), $baz = 12, $bay = $foo LOGFORMAT generic", } for _, queryStr := range dialects { diff --git a/internal/mapr/selectcondition.go b/internal/mapr/selectcondition.go index 5cfb8c7..45fc16b 100644 --- a/internal/mapr/selectcondition.go +++ b/internal/mapr/selectcondition.go @@ -40,7 +40,7 @@ func makeSelectConditions(tokens []token) ([]selectCondition, error) { // Parse select aggregation, e.g. sum(foo) parse := func(token token) (selectCondition, error) { var sc selectCondition - tokenStr := strings.ToLower(token.str) + tokenStr := token.str if !strings.Contains(tokenStr, "(") && !strings.Contains(tokenStr, ")") { sc.Field = tokenStr diff --git a/internal/mapr/token.go b/internal/mapr/token.go index bbf4890..6ac7631 100644 --- a/internal/mapr/token.go +++ b/internal/mapr/token.go @@ -37,7 +37,7 @@ func tokenize(queryStr string) []token { commasStripped := strings.Replace(part, ",", " ", -1) for _, tokenStr := range strings.Fields(commasStripped) { token := token{ - str: strings.ToLower(tokenStr), + str: tokenStr, isBareword: true, } tokens = append(tokens, token) @@ -71,7 +71,7 @@ func tokensConsume(tokens []token) ([]token, []token) { stripped := t.str[1 : length-1] //dlog.Common.Trace("stripped", stripped) t := token{ - str: strings.ToLower(stripped), + str: stripped, isBareword: t.isBareword, } consumed = append(consumed, t) -- cgit v1.2.3