diff --git a/Makefile b/Makefile index bd5fec22..6b546c97 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=0.3.4 +VERSION=0.3.6 USER=$(shell id -u -n) TIME=$(shell date) diff --git a/config/jrconfig.json b/config/jrconfig.json index ad3bb570..b683068c 100644 --- a/config/jrconfig.json +++ b/config/jrconfig.json @@ -14,39 +14,39 @@ "topic": "shoes" }, { - "name": "shoe_customer", + "name": "shoecustomer", "locale": "us", "num": 1, "frequency": "1s", "duration": "1s", "preload": 5, - "valueTemplate": "shoe_customer", + "valueTemplate": "shoecustomer", "output": "kafka", "keyTemplate": "null", "outputTemplate": "{{.V}}\n", "topic": "shoe_customers" }, { - "name": "shoe_order", + "name": "shoeorder", "locale": "us", "num": 1, "frequency": "500ms", "duration": "1s", "preload": 0, - "valueTemplate": "shoe_order", + "valueTemplate": "shoeorder", "output": "kafka", "keyTemplate": "null", "outputTemplate": "{{.V}}\n", "topic": "shoe_orders" }, { - "name": "shoe_clickstream", + "name": "shoeclickstream", "locale": "us", "num": 1, "frequency": "100ms", "duration": "1s", "preload": 0, - "valueTemplate": "shoe_clickstream", + "valueTemplate": "shoeclickstream", "output": "kafka", "keyTemplate": "null", "outputTemplate": "{{.V}}\n", diff --git a/pkg/types/address.go b/pkg/types/address.go index 9dc0c428..d4a5d4c5 100644 --- a/pkg/types/address.go +++ b/pkg/types/address.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/array_orderline.go b/pkg/types/array_orderline.go index d25da444..cd316410 100644 --- a/pkg/types/array_orderline.go +++ b/pkg/types/array_orderline.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/bytes.go b/pkg/types/bytes.go index 4d654317..a56f2918 100644 --- a/pkg/types/bytes.go +++ b/pkg/types/bytes.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/campaignfinance.go b/pkg/types/campaignfinance.go index f44eed2b..76a4e6d1 100644 --- a/pkg/types/campaignfinance.go +++ b/pkg/types/campaignfinance.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/clickstream.go b/pkg/types/clickstream.go index db0076e6..4ec98ca4 100644 --- a/pkg/types/clickstream.go +++ b/pkg/types/clickstream.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/clickstreamusers.go b/pkg/types/clickstreamusers.go index 58c951f5..1ec1b570 100644 --- a/pkg/types/clickstreamusers.go +++ b/pkg/types/clickstreamusers.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/codes.go b/pkg/types/codes.go index c1d8bfe8..172c99de 100644 --- a/pkg/types/codes.go +++ b/pkg/types/codes.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/creditcards.go b/pkg/types/creditcards.go index 931eae77..d97fd233 100644 --- a/pkg/types/creditcards.go +++ b/pkg/types/creditcards.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/destination.go b/pkg/types/destination.go index 3f97f324..2e01628c 100644 --- a/pkg/types/destination.go +++ b/pkg/types/destination.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/deviceinformation.go b/pkg/types/deviceinformation.go index f26eacaa..87f768ad 100644 --- a/pkg/types/deviceinformation.go +++ b/pkg/types/deviceinformation.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/fleetmgmtdescription.go b/pkg/types/fleetmgmtdescription.go index 2e283f04..cc8db74c 100644 --- a/pkg/types/fleetmgmtdescription.go +++ b/pkg/types/fleetmgmtdescription.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/fleetmgmtlocation.go b/pkg/types/fleetmgmtlocation.go index fccf1b4e..e101a66d 100644 --- a/pkg/types/fleetmgmtlocation.go +++ b/pkg/types/fleetmgmtlocation.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/fleetmgmtsensors.go b/pkg/types/fleetmgmtsensors.go index fb9a66af..43106061 100644 --- a/pkg/types/fleetmgmtsensors.go +++ b/pkg/types/fleetmgmtsensors.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/gaminggames.go b/pkg/types/gaminggames.go index b33558de..c07e30d5 100644 --- a/pkg/types/gaminggames.go +++ b/pkg/types/gaminggames.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/gamingplayeractivity.go b/pkg/types/gamingplayeractivity.go index c8089a12..ba868c37 100644 --- a/pkg/types/gamingplayeractivity.go +++ b/pkg/types/gamingplayeractivity.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/gamingplayers.go b/pkg/types/gamingplayers.go index 599e4e3a..dc529735 100644 --- a/pkg/types/gamingplayers.go +++ b/pkg/types/gamingplayers.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/insurancecustomeractivity.go b/pkg/types/insurancecustomeractivity.go index 2eaa1d2c..c6c9dbdb 100644 --- a/pkg/types/insurancecustomeractivity.go +++ b/pkg/types/insurancecustomeractivity.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/insurancecustomers.go b/pkg/types/insurancecustomers.go index 48419132..65a4b9b4 100644 --- a/pkg/types/insurancecustomers.go +++ b/pkg/types/insurancecustomers.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/insuranceoffers.go b/pkg/types/insuranceoffers.go index 88445897..2a01aeae 100644 --- a/pkg/types/insuranceoffers.go +++ b/pkg/types/insuranceoffers.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/inventory.go b/pkg/types/inventory.go index be679daa..df2df3a8 100644 --- a/pkg/types/inventory.go +++ b/pkg/types/inventory.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/location.go b/pkg/types/location.go index f0420d03..45ddd658 100644 --- a/pkg/types/location.go +++ b/pkg/types/location.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_bool.go b/pkg/types/map_bool.go index f1297efa..444efb69 100644 --- a/pkg/types/map_bool.go +++ b/pkg/types/map_bool.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_bytes.go b/pkg/types/map_bytes.go index 8af312e3..a6e6b469 100644 --- a/pkg/types/map_bytes.go +++ b/pkg/types/map_bytes.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_float.go b/pkg/types/map_float.go index f10789e7..817d1764 100644 --- a/pkg/types/map_float.go +++ b/pkg/types/map_float.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_int.go b/pkg/types/map_int.go index 39346cc0..536dfdb1 100644 --- a/pkg/types/map_int.go +++ b/pkg/types/map_int.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_long.go b/pkg/types/map_long.go index b9385b98..5c8abc57 100644 --- a/pkg/types/map_long.go +++ b/pkg/types/map_long.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/map_string.go b/pkg/types/map_string.go index 670667c9..26bd4071 100644 --- a/pkg/types/map_string.go +++ b/pkg/types/map_string.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/my_map_test_record.go b/pkg/types/my_map_test_record.go index f24d98c7..e6f4d20d 100644 --- a/pkg/types/my_map_test_record.go +++ b/pkg/types/my_map_test_record.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/net_device.go b/pkg/types/net_device.go index f3334d65..10931ded 100644 --- a/pkg/types/net_device.go +++ b/pkg/types/net_device.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/orderline.go b/pkg/types/orderline.go index 09c3c064..8362faa0 100644 --- a/pkg/types/orderline.go +++ b/pkg/types/orderline.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/orders.go b/pkg/types/orders.go index 4de4ea8f..34ec2618 100644 --- a/pkg/types/orders.go +++ b/pkg/types/orders.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/pageviews.go b/pkg/types/pageviews.go index 8d08a431..8aaeff87 100644 --- a/pkg/types/pageviews.go +++ b/pkg/types/pageviews.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/payrollbonus.go b/pkg/types/payrollbonus.go index fc4af4b8..4221f271 100644 --- a/pkg/types/payrollbonus.go +++ b/pkg/types/payrollbonus.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/payrollemployee.go b/pkg/types/payrollemployee.go index 45ebaf63..5bbd320e 100644 --- a/pkg/types/payrollemployee.go +++ b/pkg/types/payrollemployee.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/payrollemployeelocation.go b/pkg/types/payrollemployeelocation.go index 2672ac8f..ab9ef4a5 100644 --- a/pkg/types/payrollemployeelocation.go +++ b/pkg/types/payrollemployeelocation.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/pizzaorders.go b/pkg/types/pizzaorders.go index 87e2c7bc..3af66ce9 100644 --- a/pkg/types/pizzaorders.go +++ b/pkg/types/pizzaorders.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/pizzaorderscancelled.go b/pkg/types/pizzaorderscancelled.go index da4a316b..5cf7cc4c 100644 --- a/pkg/types/pizzaorderscancelled.go +++ b/pkg/types/pizzaorderscancelled.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/pizzaorderscompleted.go b/pkg/types/pizzaorderscompleted.go index 1732b170..9c705ee2 100644 --- a/pkg/types/pizzaorderscompleted.go +++ b/pkg/types/pizzaorderscompleted.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/product.go b/pkg/types/product.go index 17bad0e1..d5283a9d 100644 --- a/pkg/types/product.go +++ b/pkg/types/product.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/purchase.go b/pkg/types/purchase.go index 4dc2155f..9ab6a1d2 100644 --- a/pkg/types/purchase.go +++ b/pkg/types/purchase.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/ratings.go b/pkg/types/ratings.go index 39531a35..a6509a6e 100644 --- a/pkg/types/ratings.go +++ b/pkg/types/ratings.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/shoe.avsc b/pkg/types/shoe.avsc index 93e040e3..a1def3f5 100644 --- a/pkg/types/shoe.avsc +++ b/pkg/types/shoe.avsc @@ -7,6 +7,6 @@ { "name" : "sale_price" , "type" : "string" }, { "name" : "brand" , "type" : "string" }, { "name" : "name" , "type" : "string" }, - { "name" : "rating" , "type" : "string" } + { "name" : "rating" , "type" : "float" } ] } \ No newline at end of file diff --git a/pkg/types/shoe.go b/pkg/types/shoe.go index 9fbe14f7..1ae78fa9 100644 --- a/pkg/types/shoe.go +++ b/pkg/types/shoe.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc @@ -65,10 +65,10 @@ type Shoe struct { Name string `json:"name"` - Rating string `json:"rating"` + Rating float32 `json:"rating"` } -const ShoeAvroCRC64Fingerprint = "oB\xcd\xe9\x7f\xc7,\xd6" +const ShoeAvroCRC64Fingerprint = "\xd4n\x94\xa5p\xb2\t\xe9" func NewShoe() Shoe { r := Shoe{} @@ -116,7 +116,7 @@ func writeShoe(r Shoe, w io.Writer) error { if err != nil { return err } - err = vm.WriteString(r.Rating, w) + err = vm.WriteFloat(r.Rating, w) if err != nil { return err } @@ -128,7 +128,7 @@ func (r Shoe) Serialize(w io.Writer) error { } func (r Shoe) Schema() string { - return "{\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"sale_price\",\"type\":\"string\"},{\"name\":\"brand\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"rating\",\"type\":\"string\"}],\"name\":\"shoes.shoe\",\"type\":\"record\"}" + return "{\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"sale_price\",\"type\":\"string\"},{\"name\":\"brand\",\"type\":\"string\"},{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"rating\",\"type\":\"float\"}],\"name\":\"shoes.shoe\",\"type\":\"record\"}" } func (r Shoe) SchemaName() string { @@ -167,7 +167,7 @@ func (r *Shoe) Get(i int) types.Field { return w case 4: - w := types.String{Target: &r.Rating} + w := types.Float{Target: &r.Rating} return w diff --git a/pkg/types/shoe_clickstream.avsc b/pkg/types/shoeclickstream.avsc similarity index 74% rename from pkg/types/shoe_clickstream.avsc rename to pkg/types/shoeclickstream.avsc index adb82be7..ccc5b48f 100644 --- a/pkg/types/shoe_clickstream.avsc +++ b/pkg/types/shoeclickstream.avsc @@ -4,8 +4,8 @@ "name" : "shoeclickstream", "fields" : [ { "name" : "product_id" , "type" : "string" }, - { "name" : "view_time" , "type" : "int"}, - { "name" : "user_id" , "type" : "string" }, + { "name" : "view_time" , "type" : "string"}, + { "name" : "user_id" , "type" : "long" }, { "name" : "page_url" , "type" : "string" }, { "name" : "ip" , "type" : "string" }, { "name" : "ts" , "type" : "long" } diff --git a/pkg/types/shoeclickstream.go b/pkg/types/shoeclickstream.go index af878d78..ca24ecbd 100644 --- a/pkg/types/shoeclickstream.go +++ b/pkg/types/shoeclickstream.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc @@ -59,9 +59,9 @@ var _ = fmt.Printf type Shoeclickstream struct { Product_id string `json:"product_id"` - View_time int32 `json:"view_time"` + View_time string `json:"view_time"` - User_id string `json:"user_id"` + User_id int64 `json:"user_id"` Page_url string `json:"page_url"` @@ -70,7 +70,7 @@ type Shoeclickstream struct { Ts int64 `json:"ts"` } -const ShoeclickstreamAvroCRC64Fingerprint = "\x0f\xea\xcaNŴ\x81\xd3" +const ShoeclickstreamAvroCRC64Fingerprint = "r\aB\xb6y \x86|" func NewShoeclickstream() Shoeclickstream { r := Shoeclickstream{} @@ -106,11 +106,11 @@ func writeShoeclickstream(r Shoeclickstream, w io.Writer) error { if err != nil { return err } - err = vm.WriteInt(r.View_time, w) + err = vm.WriteString(r.View_time, w) if err != nil { return err } - err = vm.WriteString(r.User_id, w) + err = vm.WriteLong(r.User_id, w) if err != nil { return err } @@ -134,7 +134,7 @@ func (r Shoeclickstream) Serialize(w io.Writer) error { } func (r Shoeclickstream) Schema() string { - return "{\"fields\":[{\"name\":\"product_id\",\"type\":\"string\"},{\"name\":\"view_time\",\"type\":\"int\"},{\"name\":\"user_id\",\"type\":\"string\"},{\"name\":\"page_url\",\"type\":\"string\"},{\"name\":\"ip\",\"type\":\"string\"},{\"name\":\"ts\",\"type\":\"long\"}],\"name\":\"shoes.shoeclickstream\",\"type\":\"record\"}" + return "{\"fields\":[{\"name\":\"product_id\",\"type\":\"string\"},{\"name\":\"view_time\",\"type\":\"string\"},{\"name\":\"user_id\",\"type\":\"long\"},{\"name\":\"page_url\",\"type\":\"string\"},{\"name\":\"ip\",\"type\":\"string\"},{\"name\":\"ts\",\"type\":\"long\"}],\"name\":\"shoes.shoeclickstream\",\"type\":\"record\"}" } func (r Shoeclickstream) SchemaName() string { @@ -158,12 +158,12 @@ func (r *Shoeclickstream) Get(i int) types.Field { return w case 1: - w := types.Int{Target: &r.View_time} + w := types.String{Target: &r.View_time} return w case 2: - w := types.String{Target: &r.User_id} + w := types.Long{Target: &r.User_id} return w diff --git a/pkg/types/shoe_customer.avsc b/pkg/types/shoecustomer.avsc similarity index 90% rename from pkg/types/shoe_customer.avsc rename to pkg/types/shoecustomer.avsc index 680ba27b..f0779160 100644 --- a/pkg/types/shoe_customer.avsc +++ b/pkg/types/shoecustomer.avsc @@ -7,7 +7,7 @@ { "name" : "first_name" , "type" : "string"}, { "name" : "last_name" , "type" : "string" }, { "name" : "email" , "type" : "string" }, - { "name" : "phone" , "type" : "string" }, + { "name" : "phone_number" , "type" : "string" }, { "name" : "street_address" , "type" : "string" }, { "name" : "state" , "type" : "string" }, { "name" : "zip_code" , "type" : "string" }, diff --git a/pkg/types/shoecustomer.go b/pkg/types/shoecustomer.go index 92077c82..11f4c82f 100644 --- a/pkg/types/shoecustomer.go +++ b/pkg/types/shoecustomer.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc @@ -65,7 +65,7 @@ type Shoecustomer struct { Email string `json:"email"` - Phone string `json:"phone"` + Phone_number string `json:"phone_number"` Street_address string `json:"street_address"` @@ -78,7 +78,7 @@ type Shoecustomer struct { Country_code string `json:"country_code"` } -const ShoecustomerAvroCRC64Fingerprint = "\v\x1dO1ѱ\xe6\xde" +const ShoecustomerAvroCRC64Fingerprint = "\xc1+\xe6E1\xb3\xa3\xe0" func NewShoecustomer() Shoecustomer { r := Shoecustomer{} @@ -126,7 +126,7 @@ func writeShoecustomer(r Shoecustomer, w io.Writer) error { if err != nil { return err } - err = vm.WriteString(r.Phone, w) + err = vm.WriteString(r.Phone_number, w) if err != nil { return err } @@ -158,7 +158,7 @@ func (r Shoecustomer) Serialize(w io.Writer) error { } func (r Shoecustomer) Schema() string { - return "{\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"first_name\",\"type\":\"string\"},{\"name\":\"last_name\",\"type\":\"string\"},{\"name\":\"email\",\"type\":\"string\"},{\"name\":\"phone\",\"type\":\"string\"},{\"name\":\"street_address\",\"type\":\"string\"},{\"name\":\"state\",\"type\":\"string\"},{\"name\":\"zip_code\",\"type\":\"string\"},{\"name\":\"country\",\"type\":\"string\"},{\"name\":\"country_code\",\"type\":\"string\"}],\"name\":\"shoes.shoecustomer\",\"type\":\"record\"}" + return "{\"fields\":[{\"name\":\"id\",\"type\":\"string\"},{\"name\":\"first_name\",\"type\":\"string\"},{\"name\":\"last_name\",\"type\":\"string\"},{\"name\":\"email\",\"type\":\"string\"},{\"name\":\"phone_number\",\"type\":\"string\"},{\"name\":\"street_address\",\"type\":\"string\"},{\"name\":\"state\",\"type\":\"string\"},{\"name\":\"zip_code\",\"type\":\"string\"},{\"name\":\"country\",\"type\":\"string\"},{\"name\":\"country_code\",\"type\":\"string\"}],\"name\":\"shoes.shoecustomer\",\"type\":\"record\"}" } func (r Shoecustomer) SchemaName() string { @@ -197,7 +197,7 @@ func (r *Shoecustomer) Get(i int) types.Field { return w case 4: - w := types.String{Target: &r.Phone} + w := types.String{Target: &r.Phone_number} return w @@ -270,7 +270,7 @@ func (r Shoecustomer) MarshalJSON() ([]byte, error) { if err != nil { return nil, err } - output["phone"], err = json.Marshal(r.Phone) + output["phone_number"], err = json.Marshal(r.Phone_number) if err != nil { return nil, err } @@ -361,18 +361,18 @@ func (r *Shoecustomer) UnmarshalJSON(data []byte) error { return fmt.Errorf("no value specified for email") } val = func() json.RawMessage { - if v, ok := fields["phone"]; ok { + if v, ok := fields["phone_number"]; ok { return v } return nil }() if val != nil { - if err := json.Unmarshal([]byte(val), &r.Phone); err != nil { + if err := json.Unmarshal([]byte(val), &r.Phone_number); err != nil { return err } } else { - return fmt.Errorf("no value specified for phone") + return fmt.Errorf("no value specified for phone_number") } val = func() json.RawMessage { if v, ok := fields["street_address"]; ok { diff --git a/pkg/types/shoe_order.avsc b/pkg/types/shoeorder.avsc similarity index 100% rename from pkg/types/shoe_order.avsc rename to pkg/types/shoeorder.avsc diff --git a/pkg/types/shoeorder.go b/pkg/types/shoeorder.go index 8123bc53..c5b89959 100644 --- a/pkg/types/shoeorder.go +++ b/pkg/types/shoeorder.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/siemlogs.go b/pkg/types/siemlogs.go index ecdbecd7..1743c13d 100644 --- a/pkg/types/siemlogs.go +++ b/pkg/types/siemlogs.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/source.go b/pkg/types/source.go index 3881c38f..d5765797 100644 --- a/pkg/types/source.go +++ b/pkg/types/source.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/stock_trade.go b/pkg/types/stock_trade.go index 119bae1c..ebc8c7b3 100644 --- a/pkg/types/stock_trade.go +++ b/pkg/types/stock_trade.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/stores.go b/pkg/types/stores.go index 4b58a446..9d04334d 100644 --- a/pkg/types/stores.go +++ b/pkg/types/stores.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/sysloglogs.go b/pkg/types/sysloglogs.go index 5f9c38a3..108d8dca 100644 --- a/pkg/types/sysloglogs.go +++ b/pkg/types/sysloglogs.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/transactions.go b/pkg/types/transactions.go index 7947e837..72b2c572 100644 --- a/pkg/types/transactions.go +++ b/pkg/types/transactions.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/user.go b/pkg/types/user.go index 2fb67755..d589a10e 100644 --- a/pkg/types/user.go +++ b/pkg/types/user.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/pkg/types/users.go b/pkg/types/users.go index f8bc455f..00f60b8d 100644 --- a/pkg/types/users.go +++ b/pkg/types/users.go @@ -32,9 +32,9 @@ * purchase.avsc * ratings.avsc * shoe.avsc - * shoe_clickstream.avsc - * shoe_customer.avsc - * shoe_order.avsc + * shoeclickstream.avsc + * shoecustomer.avsc + * shoeorder.avsc * siem_logs.avsc * stockTrades.avsc * stores.avsc diff --git a/templates/shoe.tpl b/templates/shoe.tpl index a3099655..84354b5f 100644 --- a/templates/shoe.tpl +++ b/templates/shoe.tpl @@ -3,5 +3,5 @@ "sale_price": "{{amount 200 2000 ""}}", "brand": "{{from "sport_brand"}}", "name": "{{randoms "Pro|Cool|Soft|Air|Perf"}} {{from "cool_name"}} {{integer 1 20}}", - "rating": "{{format_float "%.2f" (floating 1 5)}}" + "rating": {{format_float "%.2f" (floating 1 5)}} } diff --git a/templates/shoe_clickstream.tpl b/templates/shoeclickstream.tpl similarity index 100% rename from templates/shoe_clickstream.tpl rename to templates/shoeclickstream.tpl diff --git a/templates/shoe_customer.tpl b/templates/shoecustomer.tpl similarity index 100% rename from templates/shoe_customer.tpl rename to templates/shoecustomer.tpl index 0f660621..2de0b1aa 100644 --- a/templates/shoe_customer.tpl +++ b/templates/shoecustomer.tpl @@ -3,10 +3,10 @@ "first_name": "{{name}}", "last_name": "{{surname}}", "email": "{{email}}", + "phone_number": "{{phone}}", + "street_address": "{{city}}, {{street}} {{building 2}}, {{zip}}", "state": "{{state}}", "zip_code": "{{zip}}", - "street_address": "{{city}}, {{street}} {{building 2}}, {{zip}}", - "phone_number": "{{phone}}", "country": "United States", "country_code": "US" } diff --git a/templates/shoe_order.tpl b/templates/shoeorder.tpl similarity index 100% rename from templates/shoe_order.tpl rename to templates/shoeorder.tpl