Merge pull request #238 from scylladb/issue_232

Namespacing index names with table names

Author: Henrik Johansson

schema.go

@@ -234,7 +234,7 @@ func (t *Table) GetCreateTable(ks Keyspace) string {
 			stmt = stmt + " WITH compaction = " + t.CompactionStrategy.ToCQL() + ";"
 		}*/
 	if len(t.TableOptions) > 0 {
-		stmt = stmt + "WITH " + strings.Join(t.TableOptions, " AND ") + ";"
+		stmt = stmt + " WITH " + strings.Join(t.TableOptions, " AND ") + ";"
 	}
 	return stmt
 }
@@ -469,7 +469,7 @@ func createTable(sc SchemaConfig, tableName string) Table {
 		}
 		var indexes []IndexDef
 		if sc.CQLFeature > CQL_FEATURE_BASIC {
-			indexes = createIndexes(numColumns, columns)
+			indexes = createIndexes(tableName, numColumns, columns)
 		}
 
 		var mvs []MaterializedView
@@ -484,7 +484,7 @@ func createTable(sc SchemaConfig, tableName string) Table {
 	return table
 }
 
-func createIndexes(numColumns int, columns []ColumnDef) []IndexDef {
+func createIndexes(tableName string, numColumns int, columns []ColumnDef) []IndexDef {
 	if numColumns <= 0 {
 		return nil
 	}
@@ -497,7 +497,7 @@ func createIndexes(numColumns int, columns []ColumnDef) []IndexDef {
 	indexes := make([]IndexDef, 0, numIndexes)
 	for i, col := range columns {
 		if col.Type.Indexable() && typeIn(col, typesForIndex) {
-			indexes = append(indexes, IndexDef{Name: genIndexName("col", i), Column: col.Name, ColumnIdx: i})
+			indexes = append(indexes, IndexDef{Name: genIndexName(tableName+"_col", i), Column: col.Name, ColumnIdx: i})
 			createdCount++
 		}
 		if createdCount == numIndexes {

schema_test.go

@@ -18,6 +18,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/scylladb/gemini/tableopts"
 )
 
 func TestSchemaConfigValidate(t *testing.T) {
@@ -96,6 +97,11 @@ func TestSchemaConfigValidate(t *testing.T) {
 	}
 }
 
+func options(cql string) []string {
+	opt, _ := tableopts.FromCQL(cql)
+	return []string{opt.ToCQL()}
+}
+
 func TestGetCreateSchema(t *testing.T) {
 	ks := Keyspace{Name: "ks1"}
 	tests := map[string]struct {
@@ -111,11 +117,11 @@ func TestGetCreateSchema(t *testing.T) {
 		},
 		"single_partition_key_compact": {
 			table: &Table{
-				Name:               "tbl0",
-				PartitionKeys:      createColumns(1, "pk"),
-				CompactionStrategy: NewLeveledCompactionStrategy(),
+				Name:          "tbl0",
+				PartitionKeys: createColumns(1, "pk"),
+				TableOptions:  options("compaction = {'class':'LeveledCompactionStrategy','enabled':true,'tombstone_threshold':0.2,'tombstone_compaction_interval':86400,'sstable_size_in_mb':160}"),
 			},
-			want: "CREATE TABLE IF NOT EXISTS ks1.tbl0 (pk0 text, PRIMARY KEY ((pk0))) WITH compaction = {'class':'LeveledCompactionStrategy','enabled':true,'tombstone_threshold':0.2,'tombstone_compaction_interval':86400,'sstable_size_in_mb':160};",
+			want: "CREATE TABLE IF NOT EXISTS ks1.tbl0 (pk0 text, PRIMARY KEY ((pk0))) WITH compaction = {'class':'LeveledCompactionStrategy','enabled':true,'sstable_size_in_mb':160,'tombstone_compaction_interval':86400,'tombstone_threshold':0.2};",
 		},
 		"single_partition_key_single_column": {
 			table: &Table{
@@ -151,12 +157,12 @@ func TestGetCreateSchema(t *testing.T) {
 		},
 		"single_partition_key_single_clustering_key_compact": {
 			table: &Table{
-				Name:               "tbl0",
-				PartitionKeys:      createColumns(1, "pk"),
-				ClusteringKeys:     createColumns(1, "ck"),
-				CompactionStrategy: NewLeveledCompactionStrategy(),
+				Name:           "tbl0",
+				PartitionKeys:  createColumns(1, "pk"),
+				ClusteringKeys: createColumns(1, "ck"),
+				TableOptions:   options("compaction = {'class':'LeveledCompactionStrategy','enabled':true,'tombstone_threshold':0.2,'tombstone_compaction_interval':86400,'sstable_size_in_mb':160}"),
 			},
-			want: "CREATE TABLE IF NOT EXISTS ks1.tbl0 (pk0 text,ck0 text, PRIMARY KEY ((pk0), ck0)) WITH compaction = {'class':'LeveledCompactionStrategy','enabled':true,'tombstone_threshold':0.2,'tombstone_compaction_interval':86400,'sstable_size_in_mb':160};",
+			want: "CREATE TABLE IF NOT EXISTS ks1.tbl0 (pk0 text,ck0 text, PRIMARY KEY ((pk0), ck0)) WITH compaction = {'class':'LeveledCompactionStrategy','enabled':true,'sstable_size_in_mb':160,'tombstone_compaction_interval':86400,'tombstone_threshold':0.2};",
 		},
 		"single_partition_key_single_clustering_key_single_column": {
 			table: &Table{