[Payments] Set cached manifest expiration date

components/payments/android/payment_method_manifest_table.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/payments/android/payment_method_manifest_table.h"
 
+#include "base/time/time.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 namespace payments {
 namespace {
+// Data valid time in seconds.
+const time_t DATA_VALID_TIME_IN_SECONDS = 90 * 24 * 60;

[please use gerrit instead, 2017/04/27 15:45:17]

That's 1.5 days. You're missing an extra "* 60".

[please use gerrit instead, 2017/04/27 15:45:18]

#include <time.h>

[gogerald1, 2017/04/27 18:08:39]

Done.

[gogerald1, 2017/04/27 18:08:39]

Done. Good catch

+
 WebDatabaseTable::TypeKey GetKey() {
   // We just need a unique constant. Use the address of a static that
   // COMDAT folding won't touch in an optimizing linker.
   static int table_key = 0;
   return reinterpret_cast<void*>(&table_key);
 }
 }
 
 PaymentMethodManifestTable::PaymentMethodManifestTable() {}
 
 PaymentMethodManifestTable::~PaymentMethodManifestTable() {}
 
 PaymentMethodManifestTable* PaymentMethodManifestTable::FromWebDatabase(
     WebDatabase* db) {
   return static_cast<PaymentMethodManifestTable*>(db->GetTable(GetKey()));
 }
 
 WebDatabaseTable::TypeKey PaymentMethodManifestTable::GetTypeKey() const {
   return GetKey();
 }
 
 bool PaymentMethodManifestTable::CreateTablesIfNecessary() {
   if (!db_->Execute("CREATE TABLE IF NOT EXISTS payment_method_manifest ( "
+                    "expire_date INTEGER NOT NULL DEFAULT 0, "
                     "method_name VARCHAR, "
                     "web_app_id VARCHAR) ")) {
     NOTREACHED();
     return false;
   }
 
   return true;
 }
 
 bool PaymentMethodManifestTable::IsSyncable() {
@@ skipping 14 matching lines @@
     return false;
 
   sql::Statement s1(db_->GetUniqueStatement(
       "DELETE FROM payment_method_manifest WHERE method_name=? "));
   s1.BindString(0, payment_method);
   if (!s1.Run())
     return false;
 
   sql::Statement s2(
       db_->GetUniqueStatement("INSERT INTO payment_method_manifest "
-                              "(method_name, web_app_id) "
-                              "VALUES (?, ?) "));
+                              "(expire_date, method_name, web_app_id) "
+                              "VALUES (?, ?, ?) "));
+  const time_t expire_date_in_seconds =
+      base::Time::Now().ToTimeT() + DATA_VALID_TIME_IN_SECONDS;
   for (const auto& id : web_app_ids) {
     int index = 0;
+    s2.BindInt64(index++, expire_date_in_seconds);
     s2.BindString(index++, payment_method);
     s2.BindString(index, id);
     if (!s2.Run())
       return false;
     s2.Reset(true);
   }
 
   if (!transaction.Commit())
     return false;
 
   return true;
 }
 
 std::vector<std::string> PaymentMethodManifestTable::GetManifest(
     const std::string& payment_method) {
   std::vector<std::string> web_app_ids;
   sql::Statement s(
-      db_->GetUniqueStatement("SELECT web_app_id "
+      db_->GetUniqueStatement("SELECT expire_date, web_app_id "
                               "FROM payment_method_manifest "
                               "WHERE method_name=?"));
   s.BindString(0, payment_method);
 
+  const time_t now_date_in_seconds = base::Time::Now().ToTimeT();
   while (s.Step()) {
-    web_app_ids.emplace_back(s.ColumnString(0));
+    int index = 0;
+    if (now_date_in_seconds > s.ColumnInt64(index++)) {
+      web_app_ids.clear();

[please use gerrit instead, 2017/04/27 15:45:18]

You're leaving the stale data in the table, which will grow to large size as
time passes. Please clear the stale data from the table before querying it. You
should be able to clear the stale data using a single SQL statement.

[gogerald1, 2017/04/27 18:08:39]

Thought about this, but we have two tables, we might only be able to clear
expired data in one table if we clear it here.

Anyway, moved to remove expired data in web data service before query

+      break;
+    }
+    web_app_ids.emplace_back(s.ColumnString(index));
   }
 
   return web_app_ids;
 }
 
 }  // namespace payments