impl(bigtable): update query plan refresh offset to 1s (#15683)

Author: scotthart

google/cloud/bigtable/internal/query_plan.cc

@@ -22,7 +22,7 @@ namespace cloud {
 namespace bigtable_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 namespace {
-auto constexpr kRefreshDeadlineOffset = 120;
+auto constexpr kRefreshDeadlineOffsetMs = 1000;
 }  // namespace
 
 std::shared_ptr<QueryPlan> QueryPlan::Create(
@@ -45,7 +45,7 @@ void QueryPlan::ScheduleRefresh(std::unique_lock<std::mutex> const&) {
   // We want to start the refresh process before the query plan expires.
   auto refresh_deadline =
       internal::ToChronoTimePoint(response_->valid_until()) -
-      std::chrono::seconds(kRefreshDeadlineOffset);
+      std::chrono::milliseconds(kRefreshDeadlineOffsetMs);
   std::weak_ptr<QueryPlan> plan = shared_from_this();
   refresh_timer_ =
       cq_.MakeDeadlineTimer(refresh_deadline)

google/cloud/bigtable/internal/query_plan_test.cc

@@ -18,7 +18,6 @@
 #include "google/cloud/testing_util/fake_clock.h"
 #include "google/cloud/testing_util/fake_completion_queue_impl.h"
 #include "google/cloud/testing_util/is_proto_equal.h"
-#include "google/cloud/testing_util/mock_completion_queue_impl.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include <google/bigtable/v2/data.pb.h>
 #include <google/protobuf/text_format.h>
@@ -32,12 +31,10 @@ namespace bigtable_internal {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 namespace {
 
-using ::google::cloud::internal::ToProtoTimestamp;
 using ::google::cloud::testing_util::FakeCompletionQueueImpl;
 using ::google::cloud::testing_util::FakeSystemClock;
 using ::google::cloud::testing_util::IsProtoEqual;
 using ::google::cloud::testing_util::StatusIs;
-using ::google::protobuf::util::TimeUtil;
 
 TEST(QueryPlanTest, ResponseDataWithOriginalValidQueryPlan) {
   auto fake_cq_impl = std::make_shared<FakeCompletionQueueImpl>();
@@ -57,8 +54,6 @@ TEST(QueryPlanTest, ResponseDataWithOriginalValidQueryPlan) {
   ASSERT_TRUE(google::protobuf::TextFormat::ParseFromString(kResultMetadataText,
                                                             &metadata));
   *response.mutable_metadata() = metadata;
-  *response.mutable_valid_until() =
-      TimeUtil::GetCurrentTime() + TimeUtil::SecondsToDuration(300);
 
   auto plan = QueryPlan::Create(cq, response, [] {
     return make_ready_future(
@@ -88,8 +83,6 @@ TEST(QueryPlanTest, RefreshExpiredPlan) {
 
   google::bigtable::v2::PrepareQueryResponse response;
   response.set_prepared_query("original-query-plan");
-  *response.mutable_valid_until() =
-      ToProtoTimestamp(now + std::chrono::seconds(600));
 
   auto query_plan = QueryPlan::Create(CompletionQueue(fake_cq_impl), response,
                                       refresh_fn, fake_clock);
@@ -98,7 +91,6 @@ TEST(QueryPlanTest, RefreshExpiredPlan) {
   ASSERT_STATUS_OK(data);
   EXPECT_EQ(data->prepared_query(), "original-query-plan");
 
-  fake_clock->AdvanceTime(std::chrono::seconds(500));
   fake_cq_impl->SimulateCompletion(true);
 
   data = query_plan->response();
@@ -123,8 +115,6 @@ TEST(QueryPlanTest, FailedRefreshExpiredPlan) {
 
   google::bigtable::v2::PrepareQueryResponse response;
   response.set_prepared_query("original-query-plan");
-  *response.mutable_valid_until() =
-      ToProtoTimestamp(now + std::chrono::seconds(600));
 
   auto query_plan = QueryPlan::Create(CompletionQueue(fake_cq_impl), response,
                                       refresh_fn, fake_clock);
@@ -133,7 +123,6 @@ TEST(QueryPlanTest, FailedRefreshExpiredPlan) {
   ASSERT_STATUS_OK(data);
   EXPECT_EQ(data->prepared_query(), "original-query-plan");
 
-  fake_clock->AdvanceTime(std::chrono::seconds(500));
   fake_cq_impl->SimulateCompletion(true);
 
   data = query_plan->response();
@@ -157,8 +146,6 @@ TEST(QueryPlanTest, RefreshInvalidatedPlan) {
 
   google::bigtable::v2::PrepareQueryResponse response;
   response.set_prepared_query("original-query-plan");
-  *response.mutable_valid_until() =
-      ToProtoTimestamp(now + std::chrono::seconds(600));
 
   auto query_plan = QueryPlan::Create(CompletionQueue(fake_cq_impl), response,
                                       refresh_fn, fake_clock);
@@ -192,8 +179,6 @@ TEST(QueryPlanTest, FailedRefreshInvalidatedPlan) {
 
   google::bigtable::v2::PrepareQueryResponse response;
   response.set_prepared_query("original-query-plan");
-  *response.mutable_valid_until() =
-      ToProtoTimestamp(now + std::chrono::seconds(600));
 
   auto query_plan = QueryPlan::Create(CompletionQueue(fake_cq_impl), response,
                                       refresh_fn, fake_clock);