Skip to content

Commit

Permalink
Merge branch 'cassandra-3.11' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
iamaleksey committed Apr 30, 2018
2 parents 9fecf94 + b67d6fb commit 2fe4b9d
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ public void testOpeningSSTable() throws Exception
long bloomModified = Files.getLastModifiedTime(bloomPath).toMillis(); long bloomModified = Files.getLastModifiedTime(bloomPath).toMillis();
long summaryModified = Files.getLastModifiedTime(summaryPath).toMillis(); long summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();


Thread.sleep(TimeUnit.MILLISECONDS.toMillis(1000)); // sleep to ensure modified time will be different TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different


// Offline tests // Offline tests
// check that bloomfilter/summary ARE NOT regenerated // check that bloomfilter/summary ARE NOT regenerated
Expand Down Expand Up @@ -428,7 +428,7 @@ public void testOpeningSSTable() throws Exception
summaryModified = Files.getLastModifiedTime(summaryPath).toMillis(); summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();
summaryFile.delete(); summaryFile.delete();


Thread.sleep(TimeUnit.MILLISECONDS.toMillis(1000)); // sleep to ensure modified time will be different TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different
bloomModified = Files.getLastModifiedTime(bloomPath).toMillis(); bloomModified = Files.getLastModifiedTime(bloomPath).toMillis();


target = SSTableReader.open(desc, components, store.metadata); target = SSTableReader.open(desc, components, store.metadata);
Expand All @@ -445,7 +445,7 @@ public void testOpeningSSTable() throws Exception
summaryModified = Files.getLastModifiedTime(summaryPath).toMillis(); summaryModified = Files.getLastModifiedTime(summaryPath).toMillis();
target = SSTableReader.open(desc, components, store.metadata, false, false); target = SSTableReader.open(desc, components, store.metadata, false, false);


Thread.sleep(TimeUnit.MILLISECONDS.toMillis(10)); // sleep to ensure modified time will be different TimeUnit.MILLISECONDS.sleep(1000); // sleep to ensure modified time will be different
assertEquals(bloomModified, Files.getLastModifiedTime(bloomPath).toMillis()); assertEquals(bloomModified, Files.getLastModifiedTime(bloomPath).toMillis());
assertEquals(summaryModified, Files.getLastModifiedTime(summaryPath).toMillis()); assertEquals(summaryModified, Files.getLastModifiedTime(summaryPath).toMillis());


Expand Down

0 comments on commit 2fe4b9d

Please sign in to comment.