From 25d1c605c7341db6e4f06cccf6f485829597ac82 Mon Sep 17 00:00:00 2001 From: David Kagan Date: Thu, 9 Mar 2023 14:19:59 -0500 Subject: [PATCH] renamed 2 system tables --- sql3/planner/opfeaturebasetables.go | 2 +- sql3/planner/opsystemtable.go | 60 ++++++++++++++--------------- sql3/sql_complex_test.go | 4 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/sql3/planner/opfeaturebasetables.go b/sql3/planner/opfeaturebasetables.go index 0e439f0f0..00ea42b98 100644 --- a/sql3/planner/opfeaturebasetables.go +++ b/sql3/planner/opfeaturebasetables.go @@ -130,7 +130,7 @@ func (i *showTablesRowIter) Next(ctx context.Context) (types.Row, error) { var err error var spaceUsed pilosa.DiskUsage switch strings.ToLower(indexName) { - case "fb_cluster_info", "fb_cluster_nodes", "fb_performance_counters", "fb_exec_requests", "fb_table_ddl": + case fbDatabaseInfo, fbDatabaseNodes, fbPerformanceCounters, fbExecRequests, fbTableDDL: spaceUsed = pilosa.DiskUsage{ Usage: 0, } diff --git a/sql3/planner/opsystemtable.go b/sql3/planner/opsystemtable.go index 2f5c0f91c..d3a40ed07 100644 --- a/sql3/planner/opsystemtable.go +++ b/sql3/planner/opsystemtable.go @@ -17,8 +17,8 @@ import ( // exclude this file from SonarCloud dupe eval const ( - fbClusterInfo = "fb_cluster_info" - fbClusterNodes = "fb_cluster_nodes" + fbDatabaseInfo = "fb_database_info" + fbDatabaseNodes = "fb_database_nodes" fbExecRequests = "fb_exec_requests" fbPerformanceCounters = "fb_performance_counters" @@ -32,82 +32,82 @@ type systemTable struct { } var systemTables = map[string]*systemTable{ - fbClusterInfo: { - name: fbClusterInfo, + fbDatabaseInfo: { + name: fbDatabaseInfo, schema: types.Schema{ &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "id", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "name", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "platform", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "platform_version", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "db_version", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "state", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "node_count", Type: parser.NewDataTypeInt(), }, &types.PlannerColumn{ - RelationName: fbClusterInfo, + RelationName: fbDatabaseInfo, ColumnName: "replica_count", Type: parser.NewDataTypeInt(), }, }, requiresFanout: false, }, - fbClusterNodes: { - name: fbClusterNodes, + fbDatabaseNodes: { + name: fbDatabaseNodes, schema: types.Schema{ &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "id", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "state", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "uri", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "grpc_uri", Type: parser.NewDataTypeString(), }, &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "is_primary", Type: parser.NewDataTypeBool(), }, &types.PlannerColumn{ - RelationName: fbClusterNodes, + RelationName: fbDatabaseNodes, ColumnName: "space_used", Type: parser.NewDataTypeInt(), }, @@ -311,12 +311,12 @@ func (p *PlanOpSystemTable) Children() []types.PlanOperator { func (p *PlanOpSystemTable) Iterator(ctx context.Context, row types.Row) (types.RowIterator, error) { switch p.table.name { - case fbClusterInfo: - return &fbClusterInfoRowIter{ + case fbDatabaseInfo: + return &fbDatabaseInfoRowIter{ planner: p.planner, }, nil - case fbClusterNodes: - return &fbClusterNodesRowIter{ + case fbDatabaseNodes: + return &fbDatabaseNodesRowIter{ planner: p.planner, }, nil case fbExecRequests: @@ -343,14 +343,14 @@ func (p *PlanOpSystemTable) WithChildren(children ...types.PlanOperator) (types. return NewPlanOpSystemTable(p.planner, p.table), nil } -type fbClusterInfoRowIter struct { +type fbDatabaseInfoRowIter struct { planner *ExecutionPlanner rowIndex int } -var _ types.RowIterator = (*fbClusterInfoRowIter)(nil) +var _ types.RowIterator = (*fbDatabaseInfoRowIter)(nil) -func (i *fbClusterInfoRowIter) Next(ctx context.Context) (types.Row, error) { +func (i *fbDatabaseInfoRowIter) Next(ctx context.Context) (types.Row, error) { if i.rowIndex < 1 { row := []interface{}{ i.planner.systemAPI.ClusterName(), @@ -368,14 +368,14 @@ func (i *fbClusterInfoRowIter) Next(ctx context.Context) (types.Row, error) { return nil, types.ErrNoMoreRows } -type fbClusterNodesRowIter struct { +type fbDatabaseNodesRowIter struct { planner *ExecutionPlanner result []pilosa.ClusterNode } -var _ types.RowIterator = (*fbClusterNodesRowIter)(nil) +var _ types.RowIterator = (*fbDatabaseNodesRowIter)(nil) -func (i *fbClusterNodesRowIter) Next(ctx context.Context) (types.Row, error) { +func (i *fbDatabaseNodesRowIter) Next(ctx context.Context) (types.Row, error) { if i.result == nil { i.result = i.planner.systemAPI.ClusterNodes() } diff --git a/sql3/sql_complex_test.go b/sql3/sql_complex_test.go index ab9568895..3274db0e5 100644 --- a/sql3/sql_complex_test.go +++ b/sql3/sql_complex_test.go @@ -156,7 +156,7 @@ func TestPlanner_Show(t *testing.T) { } t.Run("SystemTablesInfo", func(t *testing.T) { - results, columns, _, err := sql_test.MustQueryRows(t, c.GetNode(0).Server, `select name, platform, platform_version, db_version, state, node_count, replica_count from fb_cluster_info`) + results, columns, _, err := sql_test.MustQueryRows(t, c.GetNode(0).Server, `select name, platform, platform_version, db_version, state, node_count, replica_count from fb_database_info`) if err != nil { t.Fatal(err) } @@ -178,7 +178,7 @@ func TestPlanner_Show(t *testing.T) { }) t.Run("SystemTablesNode", func(t *testing.T) { - _, columns, _, err := sql_test.MustQueryRows(t, c.GetNode(0).Server, `select * from fb_cluster_nodes`) + _, columns, _, err := sql_test.MustQueryRows(t, c.GetNode(0).Server, `select * from fb_database_nodes`) if err != nil { t.Fatal(err) }