remove redundant db call

chilagrow · Jul 13, 2023 · 74d7b68 · 74d7b68
1 parent 5019b40
commit 74d7b68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/internal/handlers/pg/msg_aggregate.go b/internal/handlers/pg/msg_aggregate.go
@@ -402,21 +402,15 @@ func processStagesStats(ctx context.Context, closer *iterator.MultiCloser, p *st
 
 	if hasCount || hasStorage {
 		if err = p.dbPool.InTransactionRetry(ctx, func(tx pgx.Tx) error {
-			var exists bool
-
-			if exists, err = pgdb.CollectionExists(ctx, tx, p.db, p.collection); err != nil {
-				return err
-			}
-
-			if !exists {
+			collStats, err = pgdb.CalculateCollStats(ctx, tx, p.db, p.collection)
+			if errors.Is(err, pgdb.ErrTableNotExist) {
 				return commonerrors.NewCommandErrorMsgWithArgument(
 					commonerrors.ErrNamespaceNotFound,
 					fmt.Sprintf("ns not found: %s.%s", p.db, p.collection),
 					"aggregate",
 				)
 			}
 
-			collStats, err = pgdb.CalculateCollStats(ctx, tx, p.db, p.collection)
 			return err
 		}); err != nil {
 			return nil, lazyerrors.Error(err)

diff --git a/internal/handlers/pg/pgdb/stats.go b/internal/handlers/pg/pgdb/stats.go
@@ -16,7 +16,6 @@ package pgdb
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	"github.com/jackc/pgx/v5"
@@ -144,14 +143,8 @@ func CalculateCollStats(ctx context.Context, tx pgx.Tx, db, collection string) (
 	var res CollStats
 
 	metadata, err := newMetadataStorage(tx, db, collection).get(ctx, false)
-
-	switch {
-	case err == nil:
-		// do nothing
-	case errors.Is(err, ErrTableNotExist):
-		return &res, nil
-	default:
-		return nil, lazyerrors.Error(err)
+	if err != nil {
+		return nil, err
 	}
 
 	// Call ANALYZE to update statistics, the actual statistics are needed to estimate the number of rows in all tables,