Igor Canadi 76c048183c Merge branch 'master' into columnfamilies ...

Conflicts:
	db/db_impl.cc
	db/db_test.cc
	include/rocksdb/db.h

2014-02-14 16:46:03 -08:00

..

c.h

Support for LZ4 compression.

2014-02-08 14:15:51 -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-02-14 16:46:03 -08:00

env.h

Merge branch 'master' into columnfamilies

2014-02-06 15:58:20 -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

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-02-12 14:01:30 -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

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

Expose the table properties to application

2014-02-13 16:28:21 -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

Add more black-box tests for PlainTable and explicitly support total order mode

2014-02-12 17:37:22 -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

Moving Some includes from options.h to forward declaration

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

write_batch.h

[CF] Rethinking ColumnFamilyHandle and fix to dropping column families

2014-02-12 13:47:09 -08:00