Skip to content

Commit adcd253

Browse files
author
Lei Jin
committed
fix asan check
Summary: PlainTable takes reference instead of a copy. Keep a copy in the test code Test Plan: make asan_check Reviewers: sdong, igor Reviewed By: igor Subscribers: leveldb Differential Revision: https://reviews.facebook.net/D22899
1 parent 4092b7a commit adcd253

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

db/table_properties_collector_test.cc

+8-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "db/dbformat.h"
1212
#include "db/table_properties_collector.h"
1313
#include "rocksdb/table.h"
14+
#include "rocksdb/immutable_options.h"
1415
#include "table/block_based_table_factory.h"
1516
#include "table/meta_blocks.h"
1617
#include "table/plain_table_factory.h"
@@ -85,12 +86,13 @@ class DumbLogger : public Logger {
8586
// Utilities test functions
8687
namespace {
8788
void MakeBuilder(const Options& options,
89+
const ImmutableCFOptions& ioptions,
8890
const InternalKeyComparator& internal_comparator,
8991
std::unique_ptr<FakeWritableFile>* writable,
9092
std::unique_ptr<TableBuilder>* builder) {
9193
writable->reset(new FakeWritableFile);
92-
builder->reset(options.table_factory->NewTableBuilder(
93-
ImmutableCFOptions(options), internal_comparator, writable->get(),
94+
builder->reset(ioptions.table_factory->NewTableBuilder(
95+
ioptions, internal_comparator, writable->get(),
9496
options.compression, options.compression_opts));
9597
}
9698
} // namespace
@@ -154,7 +156,8 @@ void TestCustomizedTablePropertiesCollector(
154156
// -- Step 1: build table
155157
std::unique_ptr<TableBuilder> builder;
156158
std::unique_ptr<FakeWritableFile> writable;
157-
MakeBuilder(options, internal_comparator, &writable, &builder);
159+
const ImmutableCFOptions ioptions(options);
160+
MakeBuilder(options, ioptions, internal_comparator, &writable, &builder);
158161

159162
for (const auto& kv : kvs) {
160163
if (encode_as_internal) {
@@ -265,9 +268,10 @@ void TestInternalKeyPropertiesCollector(
265268
options.table_properties_collector_factories = {
266269
std::make_shared<InternalKeyPropertiesCollectorFactory>()};
267270
}
271+
const ImmutableCFOptions ioptions(options);
268272

269273
for (int iter = 0; iter < 2; ++iter) {
270-
MakeBuilder(options, pikc, &writable, &builder);
274+
MakeBuilder(options, ioptions, pikc, &writable, &builder);
271275
for (const auto& k : keys) {
272276
builder->Add(k.Encode(), "val");
273277
}

0 commit comments

Comments
 (0)