johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace getStorageForRequest with s.storage (bd-32)

Browse Source 
- Replaced all getStorageForRequest(req) calls with direct s.storage access
- Updated 5 handler files: server_issues_epics.go (~8 calls), server_labels_deps_comments.go (~4 calls), server_compact.go (~2 calls), server_export_import_auto.go (~2 calls), server_routing_validation_diagnostics.go (~1 call)
- Only remaining references are in server_cache_storage.go (to be deleted in bd-33) and server_eviction_test.go (to be deleted in bd-34)
- Part of bd-29 epic to remove daemon storage cache

Amp-Thread-ID: https://ampcode.com/threads/T-239a5531-68a5-4c98-b85d-0e3512b2553c
Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
Steve Yegge
2025-10-27 23:14:38 -07:00
parent 085a64f573
commit bbb1725c32
6 changed files with 19 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/rpc/server_compact.go
View File

@@ -18,13 +18,7 @@ func (s *Server) handleCompact(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("failed to get storage: %v", err),
}
}
store := s.storage
sqliteStore, ok := store.(*sqlite.SQLiteStorage)
if !ok {
@@ -233,13 +227,7 @@ func (s *Server) handleCompactStats(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("failed to get storage: %v", err),
}
}
store := s.storage
sqliteStore, ok := store.(*sqlite.SQLiteStorage)
if !ok {

13
internal/rpc/server_export_import_auto.go
View File

@@ -25,13 +25,7 @@ func (s *Server) handleExport(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("failed to get storage: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
@@ -171,10 +165,7 @@ func (s *Server) handleImport(req *Request) Response {
// This fixes bd-132: daemon shows stale data after git pull
func (s *Server) checkAndAutoImportIfStale(req *Request) error {
// Get storage for this request
store, err := s.getStorageForRequest(req)
if err != nil {
return fmt.Errorf("failed to get storage: %w", err)
}
store := s.storage
ctx := s.reqCtx(req)

64
internal/rpc/server_issues_epics.go
View File

@@ -71,13 +71,7 @@ func (s *Server) handleCreate(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
var design, acceptance, assignee *string
if createArgs.Design != "" {
@@ -181,13 +175,7 @@ func (s *Server) handleUpdate(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
updates := updatesFromArgs(updateArgs)
@@ -226,13 +214,7 @@ func (s *Server) handleClose(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
if err := store.CloseIssue(ctx, closeArgs.ID, closeArgs.Reason, s.reqActor(req)); err != nil {
@@ -259,13 +241,7 @@ func (s *Server) handleList(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
filter := types.IssueFilter{
Limit: listArgs.Limit,
@@ -343,13 +319,7 @@ func (s *Server) handleShow(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
issue, err := store.GetIssue(ctx, showArgs.ID)
@@ -396,13 +366,7 @@ func (s *Server) handleReady(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
wf := types.WorkFilter{
Status: types.StatusOpen,
@@ -431,13 +395,7 @@ func (s *Server) handleReady(req *Request) Response {
}
func (s *Server) handleStats(req *Request) Response {
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
stats, err := store.GetStatistics(ctx)
@@ -464,13 +422,7 @@ func (s *Server) handleEpicStatus(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
epics, err := store.GetEpicsEligibleForClosure(ctx)

32
internal/rpc/server_labels_deps_comments.go
View File

@@ -18,13 +18,7 @@ func (s *Server) handleDepAdd(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
dep := &types.Dependency{
IssueID: depArgs.FromID,
@@ -53,13 +47,7 @@ func (s *Server) handleSimpleStoreOp(req *Request, argsPtr interface{}, argDesc
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
if err := opFunc(ctx, store, s.reqActor(req)); err != nil {
@@ -102,13 +90,7 @@ func (s *Server) handleCommentList(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
comments, err := store.GetIssueComments(ctx, commentArgs.ID)
@@ -135,13 +117,7 @@ func (s *Server) handleCommentAdd(req *Request) Response {
}
}
store, err := s.getStorageForRequest(req)
if err != nil {
return Response{
Success: false,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
ctx := s.reqCtx(req)
comment, err := store.AddIssueComment(ctx, commentArgs.ID, commentArgs.Author, commentArgs.Text)

15
internal/rpc/server_routing_validation_diagnostics.go
View File

@@ -294,20 +294,7 @@ func (s *Server) handleHealth(req *Request) Response {
var m runtime.MemStats
runtime.ReadMemStats(&m)
store, err := s.getStorageForRequest(req)
if err != nil {
data, _ := json.Marshal(HealthResponse{
Status: "unhealthy",
Version: ServerVersion,
Uptime: time.Since(s.startTime).Seconds(),
Error: fmt.Sprintf("storage error: %v", err),
})
return Response{
Success: false,
Data: data,
Error: fmt.Sprintf("storage error: %v", err),
}
}
store := s.storage
healthCtx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
defer cancel()