Skip to content

Commit 2faf49d

Browse files
author
Lei Jin
committed
use GetContext to replace callback function pointer
Summary: Intead of passing callback function pointer and its arg on Table::Get() interface, passing GetContext. This makes the interface cleaner and possible better perf. Also adding a fast pass for SaveValue() Test Plan: make all check Reviewers: igor, yhchiang, sdong Reviewed By: sdong Subscribers: leveldb Differential Revision: https://reviews.facebook.net/D24057
1 parent 983d2de commit 2faf49d

20 files changed

+275
-1116
lines changed

Makefile

+4-8
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ TESTS = \
122122
reduce_levels_test \
123123
plain_table_db_test \
124124
prefix_test \
125-
simple_table_db_test \
126125
skiplist_test \
127126
stringappend_test \
128127
ttl_test \
@@ -371,9 +370,6 @@ log_write_bench: util/log_write_bench.o $(LIBOBJECTS) $(TESTHARNESS)
371370
plain_table_db_test: db/plain_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS)
372371
$(CXX) db/plain_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
373372

374-
simple_table_db_test: db/simple_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS)
375-
$(CXX) db/simple_table_db_test.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
376-
377373
table_reader_bench: table/table_reader_bench.o $(LIBOBJECTS) $(TESTHARNESS)
378374
$(CXX) table/table_reader_bench.o $(LIBOBJECTS) $(TESTHARNESS) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS) -pg
379375

@@ -523,11 +519,11 @@ libz.a:
523519
curl -O http://zlib.net/zlib-1.2.8.tar.gz
524520
tar xvzf zlib-1.2.8.tar.gz
525521
cd zlib-1.2.8 && CFLAGS='-fPIC' ./configure --static && make
526-
cp zlib-1.2.8/libz.a .
522+
cp zlib-1.2.8/libz.a .
527523

528524
libbz2.a:
529525
-rm -rf bzip2-1.0.6
530-
curl -O http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
526+
curl -O http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
531527
tar xvzf bzip2-1.0.6.tar.gz
532528
cd bzip2-1.0.6 && make CFLAGS='-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64'
533529
cp bzip2-1.0.6/libbz2.a .
@@ -539,15 +535,15 @@ libsnappy.a:
539535
cd snappy-1.1.1 && ./configure --with-pic --enable-static
540536
cd snappy-1.1.1 && make
541537
cp snappy-1.1.1/.libs/libsnappy.a .
542-
538+
543539

544540
rocksdbjavastatic: libz.a libbz2.a libsnappy.a
545541
OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j
546542
cd java;$(MAKE) java;
547543
rm -f ./java/$(ROCKSDBJNILIB)
548544
$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIBOBJECTS) $(COVERAGEFLAGS) libz.a libbz2.a libsnappy.a
549545
cd java;jar -cf $(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class HISTORY*.md $(ROCKSDBJNILIB)
550-
546+
551547

552548
rocksdbjava:
553549
OPT="-fPIC -DNDEBUG -O2" $(MAKE) $(LIBRARY) -j32

0 commit comments

Comments
 (0)