Optimization of initial schema (#940)

baking-bad · Aug 24, 2022 · 661561b · 661561b
1 parent c01dfb7
commit 661561b
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 33 deletions.
diff --git a/cmd/api/handlers/storage.go b/cmd/api/handlers/storage.go
@@ -305,11 +305,6 @@ func getInitialOperation(c *gin.Context, ctx *config.Context, address string) (o
 		return operation.Operation{}, err
 	}
 
-	filters := map[string]interface{}{
-		"destination_id": destination.ID,
-		"status":         types.OperationStatusApplied,
-		"kind":           types.OperationKindOrigination,
-	}
-	return ctx.Operations.Last(filters, 0)
+	return ctx.Operations.Origination(destination.ID)
 
 }
diff --git a/cmd/indexer/indexer/indices.go b/cmd/indexer/indexer/indices.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/baking-bad/bcdhub/internal/logger"
+	"github.com/baking-bad/bcdhub/internal/models/account"
 	"github.com/baking-bad/bcdhub/internal/models/bigmapaction"
 	"github.com/baking-bad/bcdhub/internal/models/bigmapdiff"
 	"github.com/baking-bad/bcdhub/internal/models/block"
@@ -15,6 +16,11 @@ import (
 
 func createStartIndices(db pg.DBI) error {
 	return db.RunInTransaction(context.Background(), func(tx *pg.Tx) error {
+		// Accounts
+		if _, err := db.Model((*account.Account)(nil)).Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS accounts_address_idx ON ?TableName (address)`); err != nil {
+			return err
+		}
+
 		// Blocks
 		if _, err := db.Model((*block.Block)(nil)).Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS blocks_level_idx ON ?TableName (level)`); err != nil {
 			return err
@@ -47,6 +53,15 @@ func createStartIndices(db pg.DBI) error {
 			return err
 		}
 
+		// Operations
+		if _, err := db.Model((*operation.Operation)(nil)).Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_destination_idx ON ?TableName (destination_id)`); err != nil {
+			return err
+		}
+
+		if _, err := db.Model((*operation.Operation)(nil)).Exec(`CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_status_idx ON ?TableName (status)`); err != nil {
+			return err
+		}
+
 		return nil
 	})
 }
@@ -111,6 +126,12 @@ func (bi *BlockchainIndexer) createIndices() {
 		logger.Error().Err(err).Msg("can't create index")
 	}
 
+	if _, err := bi.Context.StorageDB.DB.Model((*contract.Contract)(nil)).Exec(`
+		CREATE INDEX CONCURRENTLY IF NOT EXISTS contracts_jakarta_id_idx ON ?TableName (jakarta_id)
+	`); err != nil {
+		logger.Error().Err(err).Msg("can't create index")
+	}
+
 	// Global constants
 	if _, err := bi.Context.StorageDB.DB.Model((*contract.GlobalConstant)(nil)).Exec(`
 		CREATE INDEX CONCURRENTLY IF NOT EXISTS global_constants_address_idx ON ?TableName (address)
@@ -144,12 +165,6 @@ func (bi *BlockchainIndexer) createIndices() {
 		logger.Error().Err(err).Msg("can't create index")
 	}
 
-	if _, err := bi.Context.StorageDB.DB.Model((*operation.Operation)(nil)).Exec(`
-		CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_destination_idx ON ?TableName (destination_id)
-	`); err != nil {
-		logger.Error().Err(err).Msg("can't create index")
-	}
-
 	if _, err := bi.Context.StorageDB.DB.Model((*operation.Operation)(nil)).Exec(`
 		CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_opg_idx ON ?TableName (hash, counter, content_index)
 	`); err != nil {
@@ -180,12 +195,6 @@ func (bi *BlockchainIndexer) createIndices() {
 		logger.Error().Err(err).Msg("can't create index")
 	}
 
-	if _, err := bi.Context.StorageDB.DB.Model((*operation.Operation)(nil)).Exec(`
-		CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_status_idx ON ?TableName (status)
-	`); err != nil {
-		logger.Error().Err(err).Msg("can't create index")
-	}
-
 	if _, err := bi.Context.StorageDB.DB.Model((*operation.Operation)(nil)).Exec(`
 		CREATE INDEX CONCURRENTLY IF NOT EXISTS operations_timestamp_idx ON ?TableName (timestamp)
 	`); err != nil {

diff --git a/internal/models/mock/operation/mock.go b/internal/models/mock/operation/mock.go
diff --git a/internal/models/operation/repository.go b/internal/models/operation/repository.go
@@ -13,6 +13,7 @@ type Repository interface {
 	GetByHashAndCounter(hash string, counter int64) ([]Operation, error)
 	GetImplicitOperation(counter int64) (Operation, error)
 	OPG(address string, size, lastID int64) ([]OPG, error)
+	Origination(accountID int64) (Operation, error)
 
 	// GetOperations - get operation by `filter`. `Size` - if 0 - return all, else certain `size` operations.
 	// `Sort` - sort by time and content index by desc

diff --git a/internal/postgres/operation/storage.go b/internal/postgres/operation/storage.go
@@ -360,6 +360,17 @@ func (storage *Storage) ContractStats(address string) (stats operation.ContractS
 	return
 }
 
+// Origination -
+func (storage *Storage) Origination(accountID int64) (operation.Operation, error) {
+	var result operation.Operation
+	err := storage.DB.Model((*operation.Operation)(nil)).
+		Where("destination_id = ?", accountID).
+		Where("kind = ?", types.OperationKindOrigination).
+		Limit(1).
+		Select(&result)
+	return result, err
+}
+
 func addOperationSorting(query *orm.Query) {
 	query.OrderExpr("operation.level desc, operation.counter desc, operation.id asc")
 }