@@ -768,43 +768,43 @@ TEST_P(DataIntegrationTest, ClientQueryColumnFamilyWithHistory) {
768768
769769 // Verify cells returned ordered from newest to oldest.
770770 auto const & c1_entry0 = (*history_map)[" c1" ][0 ];
771- auto ts_new =
771+ auto c1_ts_new =
772772 std::get<0 >(c1_entry0).get <sys_time<std::chrono::microseconds>>();
773- ASSERT_STATUS_OK (ts_new );
773+ ASSERT_STATUS_OK (c1_ts_new );
774774 auto expected_current_time_ms =
775775 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
776- EXPECT_EQ (duration_cast<milliseconds>(ts_new ->time_since_epoch ()),
776+ EXPECT_EQ (duration_cast<milliseconds>(c1_ts_new ->time_since_epoch ()),
777777 expected_current_time_ms);
778778 EXPECT_EQ (std::get<1 >(c1_entry0), column_1_value_new);
779779
780780 auto const & c1_entry1 = (*history_map)[" c1" ][1 ];
781- auto ts_old =
781+ auto c1_ts_old =
782782 std::get<0 >(c1_entry1).get <sys_time<std::chrono::microseconds>>();
783- ASSERT_STATUS_OK (ts_old );
783+ ASSERT_STATUS_OK (c1_ts_old );
784784 auto expected_old_time_ms =
785785 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
786- EXPECT_EQ (duration_cast<milliseconds>(ts_old ->time_since_epoch ()),
786+ EXPECT_EQ (duration_cast<milliseconds>(c1_ts_old ->time_since_epoch ()),
787787 expected_old_time_ms);
788788 EXPECT_EQ (std::get<1 >(c1_entry1), column_1_value_old);
789789
790790 // Verify cells returned ordered from newest to oldest.
791791 auto const & c2_entry0 = (*history_map)[" c2" ][0 ];
792- auto ts_new =
792+ auto c2_ts_new =
793793 std::get<0 >(c2_entry0).get <sys_time<std::chrono::microseconds>>();
794- ASSERT_STATUS_OK (ts_new );
794+ ASSERT_STATUS_OK (c2_ts_new );
795795 auto expected_current_time_ms =
796796 duration_cast<milliseconds>(std::chrono::microseconds (current_time));
797- EXPECT_EQ (duration_cast<milliseconds>(ts_new ->time_since_epoch ()),
797+ EXPECT_EQ (duration_cast<milliseconds>(c2_ts_new ->time_since_epoch ()),
798798 expected_current_time_ms);
799799 EXPECT_EQ (std::get<1 >(c2_entry0), column_2_value_new);
800800
801801 auto const & c2_entry1 = (*history_map)[" c2" ][1 ];
802- auto ts_old =
802+ auto c2_ts_old =
803803 std::get<0 >(c2_entry1).get <sys_time<std::chrono::microseconds>>();
804- ASSERT_STATUS_OK (ts_old );
804+ ASSERT_STATUS_OK (c2_ts_old );
805805 auto expected_old_time_ms =
806806 duration_cast<milliseconds>(std::chrono::microseconds (old_time));
807- EXPECT_EQ (duration_cast<milliseconds>(ts_old ->time_since_epoch ()),
807+ EXPECT_EQ (duration_cast<milliseconds>(c2_ts_old ->time_since_epoch ()),
808808 expected_old_time_ms);
809809 EXPECT_EQ (std::get<1 >(c2_entry1), column_2_value_old);
810810}
0 commit comments