examples: use fieldNames

Author: arl

examples/advanced/main.go

@@ -25,6 +25,9 @@ const (
 	Target    baker.FieldIndex = 2
 )
 
+// And their respective names
+var fieldNames = []string{"timestamp", "source", "target"}
+
 var components = baker.Components{
 	Inputs:        input.All,
 	Filters:       filter.All,
@@ -33,13 +36,7 @@ var components = baker.Components{
 	ShardingFuncs: shardingFuncs,
 	Validate:      validateLogLine,
 	FieldByName:   fieldByName,
-	FieldName:     fieldName,
-}
-
-var fields = map[string]baker.FieldIndex{
-	"timestamp": Timestamp,
-	"source":    Source,
-	"target":    Target,
+	FieldNames:    fieldNames,
 }
 
 var shardingFuncs = map[baker.FieldIndex]baker.ShardingFunc{
@@ -71,16 +68,12 @@ func validateLogLine(baker.Record) (bool, baker.FieldIndex) {
 	return true, 0
 }
 
-func fieldByName(key string) (baker.FieldIndex, bool) {
-	idx, ok := fields[key]
-	return idx, ok
-}
-
-func fieldName(idx baker.FieldIndex) string {
-	for k, v := range fields {
-		if v == idx {
-			return k
+func fieldByName(name string) (baker.FieldIndex, bool) {
+	for idx, n := range fieldNames {
+		if n == name {
+			return baker.FieldIndex(idx), true
 		}
 	}
-	return ""
+
+	return 0, false
 }

examples/sharding/main.go

@@ -30,7 +30,8 @@ const (
 	Dollar    baker.FieldIndex = 6
 )
 
-var fieldNames = [...]string{
+// And their respective names
+var fieldNames = []string{
 	"id",
 	"first_name",
 	"last_name",
@@ -50,16 +51,12 @@ func fieldByName(name string) (baker.FieldIndex, bool) {
 	return 0, false
 }
 
-func fieldName(idx baker.FieldIndex) string {
-	return fieldNames[idx]
-}
-
 var components = baker.Components{
 	Inputs:        input.All,
 	Outputs:       []baker.OutputDesc{ShardableDesc},
 	ShardingFuncs: shardingFuncs,
 	FieldByName:   fieldByName,
-	FieldName:     fieldName,
+	FieldNames:    fieldNames,
 }
 
 func main() {