diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2019-07-04 00:53:07 +0300 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2019-07-04 00:53:07 +0300 |
commit | c17b0b734c277882252f3e26c934b64ce12a2468 (patch) | |
tree | 262128be452cc9cb56b122a5d7d708f73a7d0d01 | |
parent | 69e1d65ccef105d385f00e99555efa22bb6daf66 (diff) | |
download | mariadb-git-c17b0b734c277882252f3e26c934b64ce12a2468.tar.gz |
MDEV-19936: MyRocks: compile fails on Windows
(Cumulative diff, back-port to 10.2)
Remove other unneeded files which cause compile
warnings-treated-as-errors errors on Windows.
-rw-r--r-- | storage/rocksdb/build_rocksdb.cmake | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index 49d249c0eb3..3ee915393df 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -171,7 +171,20 @@ set(LIBS ${ROCKSDB_LIBS} ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) #add_subdirectory(${ROCKSDB_SOURCE_DIR}/tools) # Main library source code - +# Note : RocksDB has a lot of unittests. We should not include these files +# in the build, because 1. they are not needed and 2. gtest causes warnings +# in windows build, which are treated as errors and cause the build to fail. +# +# Unit tests themselves: +# - *_test.cc +# - *_bench.cc +# +# - table/mock_table.cc +# - utilities/cassandra/cassandra_compaction_filter.cc +# - utilities/cassandra/format.cc +# - utilities/cassandra/merge_operator.cc +# - utilities/cassandra/test_utils.cc +# set(ROCKSDB_SOURCES cache/clock_cache.cc cache/lru_cache.cc @@ -251,7 +264,6 @@ set(ROCKSDB_SOURCES memtable/alloc_tracker.cc memtable/hash_linklist_rep.cc memtable/hash_skiplist_rep.cc - memtable/memtablerep_bench.cc memtable/skiplistrep.cc memtable/vectorrep.cc memtable/write_buffer_manager.cc @@ -298,7 +310,6 @@ set(ROCKSDB_SOURCES table/iterator.cc table/merging_iterator.cc table/meta_blocks.cc - table/mock_table.cc table/persistent_cache_helper.cc table/plain/plain_table_builder.cc table/plain/plain_table_factory.cc @@ -308,7 +319,6 @@ set(ROCKSDB_SOURCES table/sst_file_reader.cc table/sst_file_writer.cc table/table_properties.cc - table/table_reader_bench.cc table/two_level_iterator.cc test_util/sync_point.cc test_util/sync_point_impl.cc @@ -338,10 +348,6 @@ set(ROCKSDB_SOURCES utilities/blob_db/blob_log_format.cc utilities/blob_db/blob_log_reader.cc utilities/blob_db/blob_log_writer.cc - utilities/cassandra/cassandra_compaction_filter.cc - utilities/cassandra/format.cc - utilities/cassandra/merge_operator.cc - utilities/cassandra/test_utils.cc utilities/checkpoint/checkpoint_impl.cc utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc utilities/convenience/info_log_finder.cc @@ -361,8 +367,6 @@ set(ROCKSDB_SOURCES utilities/persistent_cache/block_cache_tier.cc utilities/persistent_cache/block_cache_tier_file.cc utilities/persistent_cache/block_cache_tier_metadata.cc - utilities/persistent_cache/hash_table_bench.cc - utilities/persistent_cache/persistent_cache_bench.cc utilities/persistent_cache/persistent_cache_tier.cc utilities/persistent_cache/volatile_tier_impl.cc utilities/simulator_cache/sim_cache.cc @@ -384,7 +388,6 @@ set(ROCKSDB_SOURCES utilities/ttl/db_ttl_impl.cc utilities/write_batch_with_index/write_batch_with_index.cc utilities/write_batch_with_index/write_batch_with_index_internal.cc - util/log_write_bench.cc util/murmurhash.cc util/random.cc util/rate_limiter.cc |