kailiu 1304d8c8ce Merge branch 'master' into performance ...

Conflicts:
	Makefile
	db/db_impl.cc
	db/db_impl.h
	db/db_test.cc
	db/memtable.cc
	db/memtable.h
	db/version_edit.h
	db/version_set.cc
	include/rocksdb/options.h
	util/hash_skiplist_rep.cc
	util/options.cc

2014-01-15 23:12:31 -08:00

..

arena.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

c.h

C API: add rocksdb_env_set_high_priority_background_threads

2013-12-31 15:14:18 -08:00

cache.h

Expose usage info for the cache

2013-12-13 12:53:45 -08:00

compaction_filter.h

Clarify CompactionFilter thread safety requirements

2013-12-02 16:41:43 -08:00

comparator.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

db.h

Fix CompactRange to apply filter to every key

2014-01-14 16:19:09 -08:00

env.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

filter_policy.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

flush_block_policy.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

iterator.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

ldb_tool.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

memtablerep.h

Merge branch 'master' into performance

2014-01-15 23:12:31 -08:00

merge_operator.h

Introduce MergeContext to Lazily Initialize merge operand list

2013-12-11 11:37:28 -08:00

options.h

Merge branch 'master' into performance

2014-01-15 23:12:31 -08:00

perf_context.h

Revert "Allow users to profile a query and see bottleneck of the query"

2013-11-21 17:40:39 -08:00

plain_table_factory.h

[RocksDB] [Performance Branch] Some Changes to PlainTable format

2013-12-20 12:08:35 -08:00

slice_transform.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

slice.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

statistics.h

Merge branch 'master' into performance

2013-12-27 12:23:17 -08:00

status.h

Avoid malloc in NotFound key status if no message is given.

2013-12-26 16:23:10 -08:00

table_properties.h

[RocksDB] [Performance Branch] Some Changes to PlainTable format

2013-12-20 12:08:35 -08:00

table.h

Improve the "table stats"

2013-11-19 16:29:42 -08:00

transaction_log.h

Initialize sequence number in BatchResult - issue #39

2013-12-20 10:01:12 -08:00

types.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

universal_compaction.h

Add License message to public header files.

2013-11-18 10:21:35 -08:00

write_batch.h

Fix the return type of WriteBatch::Data().

2014-01-14 20:24:48 -08:00