Shorten receiver names, adhering to Go conventions

Signed-off-by: Alejandro García Montoro <alejandro.garciamontoro@gmail.com>

Author: agarciamontoro

sql/plan/create_view.go

@@ -39,78 +39,78 @@ func NewCreateView(
 }
 
 // View returns the view that will be created by this node.
-func (create *CreateView) View() sql.View {
-	return sql.NewView(create.Name, create.Child)
+func (cv *CreateView) View() sql.View {
+	return sql.NewView(cv.Name, cv.Child)
 }
 
 // Children implements the Node interface. It returns the Child of the
 // CreateView node; i.e., the definition of the view that will be created.
-func (create *CreateView) Children() []sql.Node {
-	return []sql.Node{create.Child}
+func (cv *CreateView) Children() []sql.Node {
+	return []sql.Node{cv.Child}
 }
 
 // Resolved implements the Node interface. This node is resolved if and only if
 // the database and the Child are both resolved.
-func (create *CreateView) Resolved() bool {
-	_, ok := create.database.(sql.UnresolvedDatabase)
-	return !ok && create.Child.Resolved()
+func (cv *CreateView) Resolved() bool {
+	_, ok := cv.database.(sql.UnresolvedDatabase)
+	return !ok && cv.Child.Resolved()
 }
 
 // RowIter implements the Node interface. When executed, this function creates
 // (or replaces) the view. It can error if the CraeteView's IsReplace member is
 // set to false and the view already exists. The RowIter returned is always
 // empty.
-func (create *CreateView) RowIter(ctx *sql.Context) (sql.RowIter, error) {
-	view := sql.NewView(create.Name, create.Child)
-	registry := create.Catalog.ViewRegistry
+func (cv *CreateView) RowIter(ctx *sql.Context) (sql.RowIter, error) {
+	view := sql.NewView(cv.Name, cv.Child)
+	registry := cv.Catalog.ViewRegistry
 
-	if create.IsReplace {
-		err := registry.Delete(create.database.Name(), view.Name())
+	if cv.IsReplace {
+		err := registry.Delete(cv.database.Name(), view.Name())
 		if err != nil && !sql.ErrNonExistingView.Is(err) {
 			return sql.RowsToRowIter(), err
 		}
 	}
 
-	return sql.RowsToRowIter(), registry.Register(create.database.Name(), view)
+	return sql.RowsToRowIter(), registry.Register(cv.database.Name(), view)
 }
 
 // Schema implements the Node interface. It always returns nil.
-func (create *CreateView) Schema() sql.Schema { return nil }
+func (cv *CreateView) Schema() sql.Schema { return nil }
 
 // String implements the fmt.Stringer interface, using sql.TreePrinter to
 // generate the string.
-func (create *CreateView) String() string {
+func (cv *CreateView) String() string {
 	pr := sql.NewTreePrinter()
-	_ = pr.WriteNode("CreateView(%s)", create.Name)
+	_ = pr.WriteNode("CreateView(%s)", cv.Name)
 	_ = pr.WriteChildren(
-		fmt.Sprintf("Columns (%s)", strings.Join(create.Columns, ", ")),
-		create.Child.String(),
+		fmt.Sprintf("Columns (%s)", strings.Join(cv.Columns, ", ")),
+		cv.Child.String(),
 	)
 	return pr.String()
 }
 
 // WithChildren implements the Node interface. It only succeeds if the length
 // of the specified children equals 1.
-func (create *CreateView) WithChildren(children ...sql.Node) (sql.Node, error) {
+func (cv *CreateView) WithChildren(children ...sql.Node) (sql.Node, error) {
 	if len(children) != 1 {
-		return nil, sql.ErrInvalidChildrenNumber.New(create, len(children), 1)
+		return nil, sql.ErrInvalidChildrenNumber.New(cv, len(children), 1)
 	}
 
-	newCreate := create
+	newCreate := cv
 	newCreate.Child = children[0]
 	return newCreate, nil
 }
 
 // Database implements the Databaser interface, and it returns the database in
 // which CreateView will create the view.
-func (create *CreateView) Database() sql.Database {
-	return create.database
+func (cv *CreateView) Database() sql.Database {
+	return cv.database
 }
 
 // Database implements the Databaser interface, and it returns a copy of this
 // node with the specified database.
-func (create *CreateView) WithDatabase(database sql.Database) (sql.Node, error) {
-	newCreate := *create
+func (cv *CreateView) WithDatabase(database sql.Database) (sql.Node, error) {
+	newCreate := *cv
 	newCreate.database = database
 	return &newCreate, nil
 }

sql/viewregistry.go

@@ -24,13 +24,13 @@ func NewView(name string, definition Node) View {
 }
 
 // Name returns the name of the view.
-func (view *View) Name() string {
-	return view.name
+func (v *View) Name() string {
+	return v.name
 }
 
 // Definition returns the definition of the view.
-func (view *View) Definition() Node {
-	return view.definition
+func (v *View) Definition() Node {
+	return v.definition
 }
 
 // Views are scoped by the databases in which they were defined, so a key in
@@ -60,66 +60,66 @@ func NewViewRegistry() *ViewRegistry {
 
 // Register adds the view specified by the pair {database, view.Name()},
 // returning an error if there is already an element with that key.
-func (registry *ViewRegistry) Register(database string, view View) error {
-	registry.mutex.Lock()
-	defer registry.mutex.Unlock()
+func (r *ViewRegistry) Register(database string, view View) error {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 
 	key := newViewKey(database, view.Name())
 
-	if _, ok := registry.views[key]; ok {
+	if _, ok := r.views[key]; ok {
 		return ErrExistingView.New(database, view.Name())
 	}
 
-	registry.views[key] = view
+	r.views[key] = view
 	return nil
 }
 
 // Delete deletes the view specified by the pair {databaseName, viewName},
 // returning an error if it does not exist.
-func (registry *ViewRegistry) Delete(databaseName, viewName string) error {
-	registry.mutex.Lock()
-	defer registry.mutex.Unlock()
+func (r *ViewRegistry) Delete(databaseName, viewName string) error {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
 
 	key := newViewKey(databaseName, viewName)
 
-	if _, ok := registry.views[key]; !ok {
+	if _, ok := r.views[key]; !ok {
 		return ErrNonExistingView.New(databaseName, viewName)
 	}
 
-	delete(registry.views, key)
+	delete(r.views, key)
 	return nil
 }
 
 // View returns a pointer to the view specified by the pair {databaseName,
 // viewName}, returning an error if it does not exist.
-func (registry *ViewRegistry) View(databaseName, viewName string) (*View, error) {
-	registry.mutex.RLock()
-	defer registry.mutex.RUnlock()
+func (r *ViewRegistry) View(databaseName, viewName string) (*View, error) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
 
 	key := newViewKey(databaseName, viewName)
 
-	if view, ok := registry.views[key]; ok {
+	if view, ok := r.views[key]; ok {
 		return &view, nil
 	}
 
 	return nil, ErrNonExistingView.New(databaseName, viewName)
 }
 
 // AllViews returns the map of all views in the registry.
-func (registry *ViewRegistry) AllViews() map[viewKey]View {
-	registry.mutex.RLock()
-	defer registry.mutex.RUnlock()
+func (r *ViewRegistry) AllViews() map[viewKey]View {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
 
-	return registry.views
+	return r.views
 }
 
 // ViewsInDatabase returns an array of all the views registered under the
 // specified database.
-func (registry *ViewRegistry) ViewsInDatabase(databaseName string) (views []View) {
-	registry.mutex.RLock()
-	defer registry.mutex.RUnlock()
+func (r *ViewRegistry) ViewsInDatabase(databaseName string) (views []View) {
+	r.mutex.RLock()
+	defer r.mutex.RUnlock()
 
-	for key, value := range registry.views {
+	for key, value := range r.views {
 		if key.dbName == databaseName {
 			views = append(views, value)
 		}