@@ -95,7 +95,7 @@ func (s *S3Cache) init() {
9595}
9696
9797// Get implements the corresponding callback of the cache protocol.
98- func (s * S3Cache ) Get (ctx context.Context , actionID string ) (objectID , diskPath string , _ error ) {
98+ func (s * S3Cache ) Get (ctx context.Context , actionID string ) (outputID , diskPath string , _ error ) {
9999 s .init ()
100100
101101 objID , diskPath , err := s .Local .Get (ctx , actionID )
@@ -116,29 +116,29 @@ func (s *S3Cache) Get(ctx context.Context, actionID string) (objectID, diskPath
116116 }
117117
118118 // We got an action hit remotely, try to update the local copy.
119- objectID , mtime , err := parseAction (action )
119+ outputID , mtime , err := parseAction (action )
120120 if err != nil {
121121 return "" , "" , err
122122 }
123123
124- object , err := s .S3Client .GetData (ctx , s .objectKey ( objectID ))
124+ object , err := s .S3Client .GetData (ctx , s .outputKey ( outputID ))
125125 if err != nil {
126126 // At this point we know the action exists, so if we can't read the
127127 // object report it as an error rather than a cache miss.
128- return "" , "" , fmt .Errorf ("[s3] read object %s: %w" , objectID , err )
128+ return "" , "" , fmt .Errorf ("[s3] read object %s: %w" , outputID , err )
129129 }
130130 s .getFaultHit .Add (1 )
131131
132132 // Now we should have the body; poke it into the local cache. Preserve the
133133 // modification timestamp recorded with the original action.
134134 diskPath , err = s .Local .Put (ctx , gocache.Object {
135135 ActionID : actionID ,
136- ObjectID : objectID ,
136+ OutputID : outputID ,
137137 Size : int64 (len (object )),
138138 Body : bytes .NewReader (object ),
139139 ModTime : mtime ,
140140 })
141- return objectID , diskPath , err
141+ return outputID , diskPath , err
142142}
143143
144144// Put implements the corresponding callback of the cache protocol.
@@ -168,14 +168,14 @@ func (s *S3Cache) Put(ctx context.Context, obj gocache.Object) (diskPath string,
168168
169169 // Stage 1: Maybe write the object. Do this before writing the action
170170 // record so we are less likely to get a spurious miss later.
171- mtime , err := s .maybePutObject (sctx , obj .ObjectID , diskPath , etr .ETag ())
171+ mtime , err := s .maybePutObject (sctx , obj .OutputID , diskPath , etr .ETag ())
172172 if err != nil {
173173 return err
174174 }
175175
176176 // Stage 2: Write the action record.
177177 if err := s .S3Client .Put (ctx , s .actionKey (obj .ActionID ),
178- strings .NewReader (fmt .Sprintf ("%s %d" , obj .ObjectID , mtime .UnixNano ()))); err != nil {
178+ strings .NewReader (fmt .Sprintf ("%s %d" , obj .OutputID , mtime .UnixNano ()))); err != nil {
179179 gocache .Logf (ctx , "write action %s: %v" , obj .ActionID , err )
180180 return err
181181 }
@@ -212,10 +212,10 @@ func (s *S3Cache) SetMetrics(_ context.Context, m *expvar.Map) {
212212// maybePutObject writes the specified object contents to S3 if there is not
213213// already a matching key with the same etag. It returns the modified time of
214214// the object file, whether or not it was sent to S3.
215- func (s * S3Cache ) maybePutObject (ctx context.Context , objectID , diskPath , etag string ) (time.Time , error ) {
215+ func (s * S3Cache ) maybePutObject (ctx context.Context , outputID , diskPath , etag string ) (time.Time , error ) {
216216 f , err := os .Open (diskPath )
217217 if err != nil {
218- gocache .Logf (ctx , "[s3] open local object %s: %v" , objectID , err )
218+ gocache .Logf (ctx , "[s3] open local object %s: %v" , outputID , err )
219219 return time.Time {}, err
220220 }
221221 defer f .Close ()
@@ -224,10 +224,10 @@ func (s *S3Cache) maybePutObject(ctx context.Context, objectID, diskPath, etag s
224224 return time.Time {}, err
225225 }
226226
227- written , err := s .S3Client .PutCond (ctx , s .objectKey ( objectID ), etag , f )
227+ written , err := s .S3Client .PutCond (ctx , s .outputKey ( outputID ), etag , f )
228228 if err != nil {
229229 s .putS3Error .Add (1 )
230- gocache .Logf (ctx , "[s3] put object %s: %v" , objectID , err )
230+ gocache .Logf (ctx , "[s3] put object %s: %v" , outputID , err )
231231 return fi .ModTime (), err
232232 }
233233 if written {
@@ -245,7 +245,7 @@ func (s *S3Cache) makeKey(parts ...string) string {
245245}
246246
247247func (s * S3Cache ) actionKey (id string ) string { return s .makeKey ("action" , id [:2 ], id ) }
248- func (s * S3Cache ) objectKey (id string ) string { return s .makeKey ("object " , id [:2 ], id ) }
248+ func (s * S3Cache ) outputKey (id string ) string { return s .makeKey ("output " , id [:2 ], id ) }
249249
250250func (s * S3Cache ) uploadConcurrency () int {
251251 if s .UploadConcurrency <= 0 {
@@ -254,7 +254,7 @@ func (s *S3Cache) uploadConcurrency() int {
254254 return s .UploadConcurrency
255255}
256256
257- func parseAction (data []byte ) (objectID string , mtime time.Time , _ error ) {
257+ func parseAction (data []byte ) (outputID string , mtime time.Time , _ error ) {
258258 fs := strings .Fields (string (data ))
259259 if len (fs ) != 2 {
260260 return "" , time.Time {}, errors .New ("invalid action record" )
0 commit comments