Virtual keyspace metadata support was immplemented

Author: tengu-alt

cassandra_test.go

@@ -44,7 +44,7 @@ import (
 	"time"
 	"unicode"
 
-	inf "gopkg.in/inf.v0"
+	"gopkg.in/inf.v0"
 )
 
 func TestEmptyHosts(t *testing.T) {
@@ -2019,6 +2019,24 @@ func TestGetKeyspaceMetadata(t *testing.T) {
 	}
 }
 
+func TestGetVirtualKeyspaceMetadata(t *testing.T) {
+	session := createSession(t)
+	defer session.Close()
+
+	virtualKeyspaceMatadata, err := session.VirtualKeyspaceMetadata("system_views")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(virtualKeyspaceMatadata.Tables) == 0 {
+		t.Fatal("virtualKeyspaceMatadata.Tables is empty")
+	}
+	for _, table := range virtualKeyspaceMatadata.Tables {
+		if table.Keyspace != "system_views" {
+			t.Fatalf("Expected table keyspace to be 'system_views' but got '%s'", table.Keyspace)
+		}
+	}
+}
+
 // Integration test of just querying for data from the system.schema_keyspace table where the keyspace DOES NOT exist.
 func TestGetKeyspaceMetadataFails(t *testing.T) {
 	session := createSession(t)

metadata.go

@@ -52,6 +52,12 @@ type KeyspaceMetadata struct {
 	UserTypes         map[string]*UserTypeMetadata
 }
 
+// schema metadata for a virtual keyspace
+type VirtualKeyspaceMetadata struct {
+	Name   string
+	Tables map[string]*VirtualTableMetadata
+}
+
 // schema metadata for a table (a.k.a. column family)
 type TableMetadata struct {
 	Keyspace          string
@@ -68,6 +74,13 @@ type TableMetadata struct {
 	OrderedColumns    []string
 }
 
+type VirtualTableMetadata struct {
+	Keyspace string
+	Name     string
+	Comment  string
+	Columns  map[string]*VirtualColumnMetadata
+}
+
 // schema metadata for a column
 type ColumnMetadata struct {
 	Keyspace        string
@@ -82,6 +95,15 @@ type ColumnMetadata struct {
 	Index           ColumnIndexMetadata
 }
 
+type VirtualColumnMetadata struct {
+	Keyspace        string
+	Table           string
+	Name            string
+	ClusteringOrder string
+	Kind            ColumnKind
+	Type            TypeInfo
+}
+
 // FunctionMetadata holds metadata for function constructs
 type FunctionMetadata struct {
 	Keyspace          string
@@ -240,6 +262,13 @@ type schemaDescriber struct {
 	cache map[string]*KeyspaceMetadata
 }
 
+// queries the cluster for schema information for a virtual keyspace
+type virtualSchemaDescriber struct {
+	session *Session
+	mu      sync.Mutex
+	cache   map[string]*VirtualKeyspaceMetadata
+}
+
 // creates a session bound schema describer which will query and cache
 // keyspace metadata
 func newSchemaDescriber(session *Session) *schemaDescriber {
@@ -249,6 +278,15 @@ func newSchemaDescriber(session *Session) *schemaDescriber {
 	}
 }
 
+// creates a session bound schema describer which will query and cache
+// virtual keyspace metadata
+func newVirtualSchemaDescriber(session *Session) *virtualSchemaDescriber {
+	return &virtualSchemaDescriber{
+		session: session,
+		cache:   map[string]*VirtualKeyspaceMetadata{},
+	}
+}
+
 // returns the cached KeyspaceMetadata held by the describer for the named
 // keyspace.
 func (s *schemaDescriber) getSchema(keyspaceName string) (*KeyspaceMetadata, error) {
@@ -269,6 +307,23 @@ func (s *schemaDescriber) getSchema(keyspaceName string) (*KeyspaceMetadata, err
 	return metadata, nil
 }
 
+// returns the cached VirtualKeyspaceMetadata held by the describer for the named
+// keyspace.
+func (s *virtualSchemaDescriber) getSchema(keyspaceName string) (*VirtualKeyspaceMetadata, error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	metadata, found := s.cache[keyspaceName]
+	if !found {
+		err := s.refreshSchema(keyspaceName)
+		if err != nil {
+			return nil, err
+		}
+		metadata = s.cache[keyspaceName]
+	}
+
+	return metadata, nil
+}
+
 // clears the already cached keyspace metadata
 func (s *schemaDescriber) clearSchema(keyspaceName string) {
 	s.mu.Lock()
@@ -323,6 +378,42 @@ func (s *schemaDescriber) refreshSchema(keyspaceName string) error {
 	return nil
 }
 
+// forcibly updates the current VirtualKeyspaceMetadata held by the virtual schema describer
+// for a given named keyspace.
+func (s *virtualSchemaDescriber) refreshSchema(keyspaceName string) error {
+	var wg sync.WaitGroup
+	var tables []VirtualTableMetadata
+	var columns []VirtualColumnMetadata
+	var err error
+
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		tables, err = getVirtualTableMetadata(s.session, keyspaceName)
+		if err != nil {
+			return
+		}
+	}()
+	go func() {
+		defer wg.Done()
+		columns, err = getVirtualColumnMetadata(s.session, keyspaceName)
+		if err != nil {
+			return
+		}
+	}()
+	wg.Wait()
+	if err != nil {
+		return err
+	}
+
+	keyspaceMetadata := &VirtualKeyspaceMetadata{Name: keyspaceName}
+	compileVirtualMetadata(keyspaceMetadata, tables, columns)
+
+	s.cache[keyspaceName] = keyspaceMetadata
+
+	return nil
+}
+
 // "compiles" derived information about keyspace, table, and column metadata
 // for a keyspace from the basic queried metadata objects returned by
 // getKeyspaceMetadata, getTableMetadata, and getColumnMetadata respectively;
@@ -417,6 +508,33 @@ func compileMetadata(
 	}
 }
 
+// "compiles" derived information about virtual keyspace, table, and column metadata
+// for a keyspace from the basic queried metadata objects returned by
+// getVirtualTableMetadata, and getVirtualColumnMetadata respectively;
+// Links the metadata objects together.
+func compileVirtualMetadata(
+	keyspace *VirtualKeyspaceMetadata,
+	tables []VirtualTableMetadata,
+	columns []VirtualColumnMetadata,
+) {
+	keyspace.Tables = make(map[string]*VirtualTableMetadata)
+	for i := range tables {
+		tables[i].Columns = make(map[string]*VirtualColumnMetadata)
+
+		keyspace.Tables[tables[i].Name] = &tables[i]
+	}
+
+	for i := range columns {
+		col := &columns[i]
+		table, ok := keyspace.Tables[col.Table]
+		if !ok {
+			continue
+		}
+
+		table.Columns[col.Name] = col
+	}
+}
+
 // Compiles derived information from TableMetadata which have had
 // ColumnMetadata added already. V1 protocol does not return as much
 // column metadata as V2+ (because V1 doesn't support the "type" column in the
@@ -760,6 +878,28 @@ func getTableMetadata(session *Session, keyspaceName string) ([]TableMetadata, e
 	return tables, nil
 }
 
+// query for only the table metadata in the specified keyspace from system_virtual_schema.tables
+func getVirtualTableMetadata(s *Session, keyspaceName string) ([]VirtualTableMetadata, error) {
+	const stmt = `
+		SELECT
+				table_name,
+				comment
+			FROM system_virtual_schema.tables
+			WHERE keyspace_name = ?`
+
+	tables := []VirtualTableMetadata{}
+	table := VirtualTableMetadata{Keyspace: keyspaceName}
+
+	iter := s.control.query(stmt, keyspaceName)
+
+	for iter.Scan(&table.Name, &table.Comment) {
+		tables = append(tables, table)
+		table = VirtualTableMetadata{Keyspace: keyspaceName}
+	}
+
+	return tables, nil
+}
+
 func (s *Session) scanColumnMetadataV1(keyspace string) ([]ColumnMetadata, error) {
 	// V1 does not support the type column, and all returned rows are
 	// of kind "regular".
@@ -947,6 +1087,47 @@ func getColumnMetadata(session *Session, keyspaceName string) ([]ColumnMetadata,
 	return columns, nil
 }
 
+// query for only the column metadata in the specified keyspace from system_virtual_schema.columns
+func getVirtualColumnMetadata(s *Session, keyspaceName string) ([]VirtualColumnMetadata, error) {
+	const stmt = `
+		SELECT
+				table_name,
+				column_name,
+				clustering_order,
+				kind,
+				type
+			FROM system_virtual_schema.columns
+			WHERE keyspace_name = ?`
+
+	var columns []VirtualColumnMetadata
+
+	rows := s.control.query(stmt, keyspaceName).Scanner()
+	for rows.Next() {
+		var (
+			column     = VirtualColumnMetadata{Keyspace: keyspaceName}
+			columnType string
+		)
+
+		err := rows.Scan(
+			&column.Table,
+			&column.Name,
+			&column.ClusteringOrder,
+			&column.Kind,
+			&columnType,
+		)
+
+		if err != nil {
+			return nil, err
+		}
+
+		column.Type = getCassandraType(columnType, s.logger)
+
+		columns = append(columns, column)
+	}
+
+	return columns, nil
+}
+
 func getTypeInfo(t string, logger StdLogger) TypeInfo {
 	if strings.HasPrefix(t, apacheCassandraTypePrefix) {
 		t = apacheToCassandraType(t)