From c766887458e794956e7f605340dcb959b34a0507 Mon Sep 17 00:00:00 2001 From: Tomas Kolda Date: Mon, 18 Jun 2018 14:38:50 -0700 Subject: [PATCH] Fix ExternalSSTFileTest::OverlappingRanges test on Solaris Sparc (#4012) Summary: Fix of #4011 Closes https://github.com/facebook/rocksdb/pull/4012 Differential Revision: D8499173 Pulled By: sagar0 fbshipit-source-id: cbb2b90c544ed364a3640ea65835d577b2dbc5df --- db/external_sst_file_test.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/external_sst_file_test.cc b/db/external_sst_file_test.cc index c70b5c053..dc2ac5b11 100644 --- a/db/external_sst_file_test.cc +++ b/db/external_sst_file_test.cc @@ -897,11 +897,11 @@ TEST_F(ExternalSSTFileTest, MultiThreaded) { TEST_F(ExternalSSTFileTest, OverlappingRanges) { Random rnd(301); - int picked_level = 0; + SequenceNumber assigned_seqno = 0; rocksdb::SyncPoint::GetInstance()->SetCallBack( - "ExternalSstFileIngestionJob::Run", [&picked_level](void* arg) { + "ExternalSstFileIngestionJob::Run", [&assigned_seqno](void* arg) { ASSERT_TRUE(arg != nullptr); - picked_level = *(static_cast(arg)); + assigned_seqno = *(static_cast(arg)); }); bool need_flush = false; rocksdb::SyncPoint::GetInstance()->SetCallBack( @@ -982,7 +982,7 @@ TEST_F(ExternalSSTFileTest, OverlappingRanges) { } } else { if ((it != true_data.end() && it->first <= Key(range_end)) || - need_flush || picked_level > 0 || overlap_with_db) { + need_flush || assigned_seqno > 0 || overlap_with_db) { // This range overlap with data already exist in DB ASSERT_NOK(s); failed_add_file++;