Improvements/add testcode modify cadinality

builder/aggregation/cardinality.go

@@ -1,10 +1,12 @@
 package aggregation
 
+// Cardinality Each individual element of the "fields" list can be a String or DimensionSpec.
+// A String dimension in the fields list is equivalent to a DefaultDimensionSpec (no transformations).
 type Cardinality struct {
 	Base
-	Fields []string `json:"fields,omitempty"`
-	ByRow  *bool    `json:"byRow,omitempty"`
-	Round  *bool    `json:"round,omitempty"`
+	Fields []interface{} `json:"fields,omitempty"`
+	ByRow  *bool         `json:"byRow,omitempty"`
+	Round  *bool         `json:"round,omitempty"`
 }
 
 func NewCardinality() *Cardinality {
@@ -18,7 +20,7 @@ func (c *Cardinality) SetName(name string) *Cardinality {
 	return c
 }
 
-func (c *Cardinality) SetFields(fields []string) *Cardinality {
+func (c *Cardinality) SetFields(fields []interface{}) *Cardinality {
 	c.Fields = fields
 	return c
 }

builder/aggregation/cardinality_test.go

@@ -0,0 +1,37 @@
+package aggregation
+
+import (
+	"encoding/json"
+	"github.com/grafadruid/go-druid/builder/dimension"
+	"github.com/grafadruid/go-druid/builder/extractionfn"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestCardinality(t *testing.T) {
+	cardinality := NewCardinality()
+	substringExtra := extractionfn.NewSubstring().SetIndex(0).SetLength(1)
+	extraction := dimension.NewExtraction().SetDimension("last_name").
+		SetOutputName("last_name_first_char").
+		SetExtractionFn(substringExtra)
+
+	cardinality.SetName("distinct_last_name_first_char").
+		SetFields([]interface{}{extraction}).SetByRow(true).SetRound(false)
+	expected := `{
+  "type": "cardinality",
+  "name": "distinct_last_name_first_char",
+  "fields": [
+    {
+     "type" : "extraction",
+     "dimension" : "last_name",
+     "outputName" :  "last_name_first_char",
+     "extractionFn" : { "type" : "substring", "index" : 0, "length" : 1 }
+    }
+  ],
+  "byRow" : true,
+  "round" : false
+}`
+	cardinalityJSON, err := json.Marshal(cardinality)
+	assert.Nil(t, err)
+	assert.JSONEq(t, expected, string(cardinalityJSON))
+}

builder/aggregation/javascript_test.go

@@ -0,0 +1,27 @@
+package aggregation
+
+import (
+	"encoding/json"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestJavascript(t *testing.T) {
+	javaScript := NewJavascript()
+	javaScript.SetName("sum(log(x)*y) + 10").
+		SetFieldNames([]string{"x", "y"}).
+		SetFnAggregate("function(current, a, b)      { return current + (Math.log(a) * b); }").
+		SetFnCombine("function(partialA, partialB) { return partialA + partialB; }").
+		SetFnReset("function()                   { return 10; }")
+	expected := `{
+  "type": "javascript",
+  "name": "sum(log(x)*y) + 10",
+  "fieldNames": ["x", "y"],
+  "fnAggregate" : "function(current, a, b)      { return current + (Math.log(a) * b); }",
+  "fnCombine"   : "function(partialA, partialB) { return partialA + partialB; }",
+  "fnReset"     : "function()                   { return 10; }"
+}`
+	javaScriptJSON, err := json.Marshal(javaScript)
+	assert.Nil(t, err)
+	assert.JSONEq(t, expected, string(javaScriptJSON))
+}

builder/dimension/extraction_test.go

@@ -0,0 +1,29 @@
+package dimension
+
+import (
+	"encoding/json"
+	"github.com/grafadruid/go-druid/builder/extractionfn"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestNewExtraction(t *testing.T) {
+	substringExtra := extractionfn.NewSubstring().SetIndex(0).SetLength(1)
+	extraction := NewExtraction().SetDimension("last_name").
+		SetOutputName("last_name_first_char").
+		SetExtractionFn(substringExtra)
+	expected := `{
+  "type": "extraction",
+  "dimension": "last_name",
+  "outputName": "last_name_first_char",
+  "extractionFn": {
+    "type": "substring",
+    "index": 0,
+    "length": 1
+  }
+}`
+	extractionJSON, err := json.Marshal(extraction)
+	assert.Nil(t, err)
+	assert.JSONEq(t, expected, string(extractionJSON))
+
+}

builder/dimension/lookup.go

@@ -37,6 +37,11 @@ func (l *Lookup) SetOutputName(outputName string) *Lookup {
 	return l
 }
 
+func (l *Lookup) SetDimension(dimensionName string) *Lookup {
+	l.Base.SetDimension(dimensionName)
+	return l
+}
+
 func (l *Lookup) SetReplaceMissingValueWith(replaceMissingValueWith string) *Lookup {
 	l.ReplaceMissingValueWith = replaceMissingValueWith
 	return l

builder/dimension/lookup_test.go

@@ -2,6 +2,7 @@ package dimension
 
 import (
 	"encoding/json"
+	lookup2 "github.com/grafadruid/go-druid/builder/lookup"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,3 +18,22 @@ func TestDimensionLookup(t *testing.T) {
 	assert.Nil(t, err)
 	assert.JSONEq(t, expected, string(lookupJSON))
 }
+
+func TestNewLookup(t *testing.T) {
+	expected := `{
+	 "type":"lookup",
+	 "dimension":"dimensionName",
+	 "outputName":"dimensionOutputName",
+	 "replaceMissingValueWith":"missing_value",
+	 "retainMissingValue":false,
+	 "lookup":{"type": "map", "map":{"key":"value"}, "isOneToOne":false}
+	}`
+	mapFn := lookup2.NewMap().SetMap(map[string]string{"key": "value"}).SetIsOneToOne(false)
+	lookup := NewLookup().SetOutputName("dimensionOutputName").SetRetainMissingValue(false).
+		SetDimension("dimensionName").
+		SetReplaceMissingValueWith("missing_value").SetLookup(mapFn)
+
+	lookupJSON, err := json.Marshal(lookup)
+	assert.Nil(t, err)
+	assert.JSONEq(t, expected, string(lookupJSON))
+}

builder/extractionfn/substring.go

@@ -2,7 +2,7 @@ package extractionfn
 
 type Substring struct {
 	Base
-	Index  int64 `json:"index,omitempty"`
+	Index  int64 `json:"index"` // If omitempty is present, it disappears from json when index is 0
 	Length int64 `json:"length,omitempty"`
 }