Igor Canadi 0738ae6dc9 Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc

2014-03-05 12:25:05 -08:00

..

c.h

A few more C API functions.

2014-02-25 10:32:28 -08:00

cache.h

Merge branch 'master' into performance

2014-01-28 10:35:55 -08:00

compaction_filter.h

CompactionContext to include is_manual_compaction

2014-02-12 12:24:18 -08:00

comparator.h

Add License message to public header files.

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

db.h

Merge branch 'master' into columnfamilies

2014-03-03 18:29:03 -08:00

env.h

Merge branch 'master' into columnfamilies

2014-03-03 18:29:03 -08:00

filter_policy.h

Add License message to public header files.

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

flush_block_policy.h

Remove the terrible hack in for flush_block_policy_factory

2014-02-28 16:39:27 -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

Reduce malloc of iterators in Get() code paths

2014-02-11 10:32:51 -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 columnfamilies

2014-03-03 18:29:03 -08:00

perf_context.h

output perf_context in db_bench readrandom

2014-03-05 10:32:54 -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

cache SuperVersion in thread local storage to avoid mutex lock

2014-02-27 11:38:55 -08:00

status.h

IOError cleanup

2014-02-12 11:42:54 -08:00

table_properties.h

Support prefix seek in UserCollectedProperties

2014-02-12 13:14:59 -08:00

table.h

Make the block-based table's index pluggable

2014-02-28 18:19:07 -08:00

transaction_log.h

Add ReadOptions to TransactionLogIterator.

2014-02-28 11:50:36 -08:00

types.h

Add License message to public header files.

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

universal_compaction.h

Moving Some includes from options.h to forward declaration

2014-01-24 17:16:22 -08:00

write_batch.h

[CF] Handle failure in WriteBatch::Handler

2014-02-26 10:10:00 -08:00