LoadFromFileCacheTtlMs is not honored (*after* first request) (#1552)

Fix: LoadFromFileCacheTtlMs is not honored (*after* first request)

Fixes apache/incubator-pagespeed-ngx#1418

Author: oschaaf

net/instaweb/rewriter/in_place_rewrite_context.cc

@@ -402,8 +402,15 @@ void InPlaceRewriteContext::FixFetchFallbackHeaders(
       headers->Replace(HttpAttributes::kEtag, HTTPCache::FormatEtag(StrCat(
                                                   id(), "-", rewritten_hash_)));
     }
+
+    // Determine if we need to use the implicit cache ttl ms or the implicit
+    // load from file cache ttl ms.
+    int64 implicit_ttl_ms = IsLoadFromFileBased() ?
+        Options()->load_from_file_cache_ttl_ms() :
+        Options()->implicit_cache_ttl_ms();
+
     headers->RemoveAll(HttpAttributes::kLastModified);
-    headers->set_implicit_cache_ttl_ms(Options()->implicit_cache_ttl_ms());
+    headers->set_implicit_cache_ttl_ms(implicit_ttl_ms);
     headers->ComputeCaching();
     int64 expire_at_ms = kint64max;
     int64 date_ms = kint64max;
@@ -454,6 +461,16 @@ void InPlaceRewriteContext::RemoveRedundantRelCanonicalHeader(
                   ResponseHeaders::RelCanonicalHeaderValue(url_));
 }
 
+bool InPlaceRewriteContext::IsLoadFromFileBased() {
+  if (num_slots() == 1) {
+    ResourcePtr resource(slot(0)->resource());
+    if (!resource->UseHttpCache()) {
+      return true;
+    }
+  }
+  return false;
+}
+
 void InPlaceRewriteContext::UpdateDateAndExpiry(
     const protobuf::RepeatedPtrField<InputInfo>& inputs,
     int64* date_ms,

net/instaweb/rewriter/in_place_rewrite_context_test.cc

@@ -1682,18 +1682,15 @@ TEST_F(InPlaceRewriteContextTest, OptimizeForBrowserNegative) {
 }
 
 TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
+  const int64 kIproFileTtlMs = 15000;
   options()->file_load_policy()->Associate("http://www.example.com", "/test/");
+  options()->set_load_from_file_cache_ttl_ms(kIproFileTtlMs);
   WriteFile("/test/cacheable.js", cache_body_ /*"   alert ( 'foo ')   "*/);
 
   Init();
 
-  // TODO(jmarantz): currently we will not have caching headers on
-  // file-input-resources so we default to the implicit cache TTL.
-  // We should probably have a new config options for file-input
-  // TTL for use with in-place.
-  const int64 kIproFileTtl = RewriteOptions::kDefaultImplicitCacheTtlMs;
   FetchAndCheckResponse(cache_js_url_, cache_body_, true,
-                        kIproFileTtl, NULL, start_time_ms());
+                        kIproFileTtlMs, NULL, start_time_ms());
 
   // First fetch misses initial cache lookup, succeeds at fetch and inserts
   // result into cache. Also, the resource gets rewritten and the rewritten
@@ -1715,7 +1712,7 @@ TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
   ResetHeadersAndStats();
   SetTimeMs(start_time_ms() + ttl_ms_/2);
   FetchAndCheckResponse(cache_js_url_, "good:jm", true,
-                        kIproFileTtl, etag_,
+                        kIproFileTtlMs, etag_,
                         start_time_ms() + ttl_ms_/2);
   // Second fetch hits the metadata cache and the rewritten resource is served
   // out.
@@ -1737,7 +1734,7 @@ TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
   AdvanceTimeMs(2 * ttl_ms_);
   ResetHeadersAndStats();
   FetchAndCheckResponse(cache_js_url_, "good:jm", true,
-                        kIproFileTtl, etag_, timer()->NowMs());
+                        kIproFileTtlMs, etag_, timer()->NowMs());
   CheckWarmCache("third_fetch");
 
   // OK let's now move time forward a little and touch the file
@@ -1749,7 +1746,7 @@ TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
   WriteFile("/test/cacheable.js", cache_body_ /*"   alert ( 'foo ')   "*/);
   ResetHeadersAndStats();
   FetchAndCheckResponse(cache_js_url_, cache_body_, true,
-                        kIproFileTtl, NULL, timer()->NowMs());
+                        kIproFileTtlMs, NULL, timer()->NowMs());
   EXPECT_EQ(0, counting_url_async_fetcher()->fetch_count());
   EXPECT_EQ(0, http_cache()->cache_hits()->Get());
   EXPECT_EQ(0, http_cache()->cache_misses()->Get());
@@ -1764,15 +1761,15 @@ TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
   AdvanceTimeMs(1 * Timer::kSecondMs);
   ResetHeadersAndStats();
   FetchAndCheckResponse(cache_js_url_, "good:jm", true,
-                        kIproFileTtl, etag_, timer()->NowMs());
+                        kIproFileTtlMs, etag_, timer()->NowMs());
   CheckWarmCache("second_fetch_after_touch");
 
   // Now change the content.
   AdvanceTimeMs(1 * Timer::kSecondMs);
   WriteFile("/test/cacheable.js", "new_content");
   ResetHeadersAndStats();
   FetchAndCheckResponse(cache_js_url_, "new_content", true,
-                        kIproFileTtl, NULL, timer()->NowMs());
+                        kIproFileTtlMs, NULL, timer()->NowMs());
   EXPECT_EQ(0, counting_url_async_fetcher()->fetch_count());
   EXPECT_EQ(0, http_cache()->cache_hits()->Get());
   EXPECT_EQ(0, http_cache()->cache_misses()->Get());
@@ -1787,7 +1784,7 @@ TEST_F(InPlaceRewriteContextTest, LoadFromFile) {
   AdvanceTimeMs(1 * Timer::kSecondMs);
   ResetHeadersAndStats();
   FetchAndCheckResponse(cache_js_url_, "new_content:jm", true,
-                        kIproFileTtl, etag_, timer()->NowMs());
+                        kIproFileTtlMs, etag_, timer()->NowMs());
   CheckWarmCache("second_fetch_after_mutation");
 }
 

net/instaweb/rewriter/public/in_place_rewrite_context.h

@@ -152,6 +152,9 @@ class InPlaceRewriteContext : public SingleRewriteContext {
   void RemoveRedundantRelCanonicalHeader(const CachedResult& cached_result,
                                          ResponseHeaders* headers);
 
+  // Returns true iff the single underlying resource is mapped by LoadFromFile.
+  bool IsLoadFromFileBased();
+
   GoogleString url_;
   // Boolean indicating whether or not the resource was rewritten successfully.
   bool is_rewritten_;