fix compileMetadata bug for aggregate views (apache#1528)

Fixes apache#1526

cassandra_test.go

@@ -2310,10 +2310,9 @@ func TestAggregateMetadata(t *testing.T) {
 	if aggregates == nil {
 		t.Fatal("failed to query aggregate metadata, nil returned")
 	}
-	if len(aggregates) != 1 {
-		t.Fatal("expected only a single aggregate")
+	if len(aggregates) != 2 {
+		t.Fatal("expected two aggregates")
 	}
-	aggregate := aggregates[0]
 
 	expectedAggregrate := AggregateMetadata{
 		Keyspace:      "gocql_test",
@@ -2338,8 +2337,12 @@ func TestAggregateMetadata(t *testing.T) {
 		expectedAggregrate.InitCond = string([]byte{0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0})
 	}
 
-	if !reflect.DeepEqual(aggregate, expectedAggregrate) {
-		t.Fatalf("aggregate is %+v, but expected %+v", aggregate, expectedAggregrate)
+	if !reflect.DeepEqual(aggregates[0], expectedAggregrate) {
+		t.Fatalf("aggregate 'average' is %+v, but expected %+v", aggregates[0], expectedAggregrate)
+	}
+	expectedAggregrate.Name = "average2"
+	if !reflect.DeepEqual(aggregates[1], expectedAggregrate) {
+		t.Fatalf("aggregate 'average2' is %+v, but expected %+v", aggregates[1], expectedAggregrate)
 	}
 }
 
@@ -2486,7 +2489,17 @@ func TestKeyspaceMetadata(t *testing.T) {
 
 	aggregate, found := keyspaceMetadata.Aggregates["average"]
 	if !found {
-		t.Fatal("failed to find the aggreate in metadata")
+		t.Fatal("failed to find the aggregate 'average' in metadata")
+	}
+	if aggregate.FinalFunc.Name != "avgfinal" {
+		t.Fatalf("expected final function %s, but got %s", "avgFinal", aggregate.FinalFunc.Name)
+	}
+	if aggregate.StateFunc.Name != "avgstate" {
+		t.Fatalf("expected state function %s, but got %s", "avgstate", aggregate.StateFunc.Name)
+	}
+	aggregate, found = keyspaceMetadata.Aggregates["average2"]
+	if !found {
+		t.Fatal("failed to find the aggregate 'average2' in metadata")
 	}
 	if aggregate.FinalFunc.Name != "avgfinal" {
 		t.Fatalf("expected final function %s, but got %s", "avgFinal", aggregate.FinalFunc.Name)

common_test.go

@@ -249,6 +249,15 @@ func createAggregate(t *testing.T, session *Session) {
 	`).Exec(); err != nil {
 		t.Fatalf("failed to create aggregate with err: %v", err)
 	}
+	if err := session.Query(`
+		CREATE OR REPLACE AGGREGATE gocql_test.average2(int)
+		SFUNC avgState
+		STYPE tuple<int,bigint>
+		FINALFUNC avgFinal
+		INITCOND (0,0);
+	`).Exec(); err != nil {
+		t.Fatalf("failed to create aggregate with err: %v", err)
+	}
 }
 
 func staticAddressTranslator(newAddr net.IP, newPort int) AddressTranslator {

metadata.go

@@ -324,10 +324,10 @@ func compileMetadata(
 		keyspace.Functions[functions[i].Name] = &functions[i]
 	}
 	keyspace.Aggregates = make(map[string]*AggregateMetadata, len(aggregates))
-	for _, aggregate := range aggregates {
-		aggregate.FinalFunc = *keyspace.Functions[aggregate.finalFunc]
-		aggregate.StateFunc = *keyspace.Functions[aggregate.stateFunc]
-		keyspace.Aggregates[aggregate.Name] = &aggregate
+	for i, _ := range aggregates {
+		aggregates[i].FinalFunc = *keyspace.Functions[aggregates[i].finalFunc]
+		aggregates[i].StateFunc = *keyspace.Functions[aggregates[i].stateFunc]
+		keyspace.Aggregates[aggregates[i].Name] = &aggregates[i]
 	}
 	keyspace.Views = make(map[string]*ViewMetadata, len(views))
 	for i := range views {