@@ -770,46 +770,54 @@ TEST_P(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) {
770770 ASSERT_EQ (history_map->size (), 2 );
771771
772772 // Verify cells returned ordered from newest to oldest.
773- auto const & c1_entry0 = (*history_map)[" c1" ][0 ];
773+ auto c1_entry0 = (*history_map)[" c1" ][0 ];
774774 auto c1_ts_new =
775- std::get<0 >(c1_entry0).get <sys_time<std::chrono::microseconds>>();
775+ bigtable_internal::TimestampFromRFC3339 (c1_entry0[" timestamp" ])
776+ .value ()
777+ .get <sys_time<std::chrono::microseconds>>();
776778 ASSERT_STATUS_OK (c1_ts_new);
777779 auto c1_expected_current_time_ms =
778780 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
779781 EXPECT_EQ (duration_cast<milliseconds>(c1_ts_new->time_since_epoch ()),
780782 c1_expected_current_time_ms);
781- EXPECT_EQ (std::get< 1 >( c1_entry0) , column_1_value_new);
783+ EXPECT_EQ (c1_entry0[ " value " ] , column_1_value_new);
782784
783- auto const & c1_entry1 = (*history_map)[" c1" ][1 ];
785+ auto c1_entry1 = (*history_map)[" c1" ][1 ];
784786 auto c1_ts_old =
785- std::get<0 >(c1_entry1).get <sys_time<std::chrono::microseconds>>();
787+ bigtable_internal::TimestampFromRFC3339 (c1_entry1[" timestamp" ])
788+ .value ()
789+ .get <sys_time<std::chrono::microseconds>>();
786790 ASSERT_STATUS_OK (c1_ts_old);
787791 auto c1_expected_old_time_ms =
788792 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
789793 EXPECT_EQ (duration_cast<milliseconds>(c1_ts_old->time_since_epoch ()),
790794 c1_expected_old_time_ms);
791- EXPECT_EQ (std::get< 1 >( c1_entry1) , column_1_value_old);
795+ EXPECT_EQ (c1_entry1[ " value " ] , column_1_value_old);
792796
793797 // Verify cells returned ordered from newest to oldest.
794- auto const & c2_entry0 = (*history_map)[" c2" ][0 ];
798+ auto c2_entry0 = (*history_map)[" c2" ][0 ];
795799 auto c2_ts_new =
796- std::get<0 >(c2_entry0).get <sys_time<std::chrono::microseconds>>();
800+ bigtable_internal::TimestampFromRFC3339 (c2_entry0[" timestamp" ])
801+ .value ()
802+ .get <sys_time<std::chrono::microseconds>>();
797803 ASSERT_STATUS_OK (c2_ts_new);
798804 auto c2_expected_current_time_ms =
799805 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
800806 EXPECT_EQ (duration_cast<milliseconds>(c2_ts_new->time_since_epoch ()),
801807 c2_expected_current_time_ms);
802- EXPECT_EQ (std::get< 1 >( c2_entry0) , column_2_value_new);
808+ EXPECT_EQ (c2_entry0[ " value " ] , column_2_value_new);
803809
804- auto const & c2_entry1 = (*history_map)[" c2" ][1 ];
810+ auto c2_entry1 = (*history_map)[" c2" ][1 ];
805811 auto c2_ts_old =
806- std::get<0 >(c2_entry1).get <sys_time<std::chrono::microseconds>>();
812+ bigtable_internal::TimestampFromRFC3339 (c2_entry1[" timestamp" ])
813+ .value ()
814+ .get <sys_time<std::chrono::microseconds>>();
807815 ASSERT_STATUS_OK (c2_ts_old);
808816 auto c2_expected_old_time_ms =
809817 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
810818 EXPECT_EQ (duration_cast<milliseconds>(c2_ts_old->time_since_epoch ()),
811819 c2_expected_old_time_ms);
812- EXPECT_EQ (std::get< 1 >( c2_entry1) , column_2_value_old);
820+ EXPECT_EQ (c2_entry1[ " value " ] , column_2_value_old);
813821}
814822
815823// TODO(#8800) - remove after deprecation is complete
0 commit comments