update storage/operation/prefix.go and chunk data packs

Author: zhangchiqing

storage/operation/prefix.go

@@ -98,8 +98,15 @@ const (
 	codeTransactionIDByScheduledTransactionID = 82 // index of transaction ID by scheduled transaction ID
 	codeBlockIDByScheduledTransactionID       = 83 // index of block ID by scheduled transaction ID
 
+	// The storage prefixes `codeChunkDataPack` and `codeIndexChunkDataPackByChunkID` are used primarily by execution nodes
+	// to persist their own results for chunks they executed.
+	//  - `codeIndexChunkDataPackByChunkID` stores the chunkID → chunkDataPackID index, and
+	//  - `codeChunkDataPack` stores the chunk data pack by its own ID.
+	// This breakup allows us to store chunk data packs in a different database in a concurrent safe way.
+	codeIndexChunkDataPackByChunkID = 99
+	codeChunkDataPack               = 100
+
 	// legacy codes (should be cleaned up)
-	codeChunkDataPack                      = 100
 	codeCommit                             = 101
 	codeEvent                              = 102
 	codeExecutionStateInteractions         = 103
@@ -111,15 +118,10 @@ const (
 	codeLightTransactionResultIndex        = 109
 	codeTransactionResultErrorMessage      = 110
 	codeTransactionResultErrorMessageIndex = 111
-	// Compared to the deprecated `codeChunkDataPack`, which stored chunkID -> storedChunkDataPack relationship:
-	//  - `codeIndexChunkDataPackByChunkID` stores the chunkID->chunkDataPackID index, and
-	//  - `codeChunkDataPack` stores chunkDataPackID -> storedChunkDataPack relationship.
-	// This breakup allows us to store chunk data packs in a different database in a concurrent safe way
-	codeIndexChunkDataPackByChunkID  = 112
-	codeIndexCollection              = 200
-	codeIndexExecutionResultByBlock  = 202
-	codeIndexCollectionByTransaction = 203
-	codeIndexResultApprovalByChunk   = 204
+	codeIndexCollection                    = 200
+	codeIndexExecutionResultByBlock        = 202
+	codeIndexCollectionByTransaction       = 203
+	codeIndexResultApprovalByChunk         = 204
 
 	// TEMPORARY codes
 	disallowedNodeIDs = 205 // manual override for adding node IDs to list of ejected nodes, applies to networking layer only

storage/store/chunk_data_packs.go

@@ -244,16 +244,10 @@ func (ch *ChunkDataPacks) BatchRemoveChunkDataPacksOnly(chunkIDs []flow.Identifi
 		}
 	}
 
-	// Remove from cache and protocol DB
-	return ch.protocolDB.WithReaderBatchWriter(func(rw storage.ReaderBatchWriter) error {
-		for _, chunkID := range chunkIDs {
-			err := ch.chunkIDToChunkDataPackIDCache.RemoveTx(rw, chunkID)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
+	// The chunk data pack pruner only removes the stored chunk data packs (in ch.stored).
+	// It does not delete the corresponding index mappings from the protocol database.
+	// These mappings should be cleaned up by the protocol DB pruner, which will be implemented later.
+	return nil
 }
 
 // ByChunkID returns the chunk data for the given chunk ID.