andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade Appveyor to VS2017

Browse Source 
Summary:
Per some discussions, this will switch our Appveyor testing to use Visual Studio 2017.
Closes https://github.com/facebook/rocksdb/pull/3445

Differential Revision: D6874918

Pulled By: gfosco

fbshipit-source-id: c5a0032ca9f37f0d3baeae35c59d850d528c3176
This commit is contained in:
Fosco Marotto 2018-02-01 13:54:50 -08:00 committed by Facebook Github Bot
parent b78ed0460b
commit ba8aa8fdc8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -1,9 +1,9 @@
version: 1.0.{build} version: 1.0.{build}
image: Visual Studio 2015 image: Visual Studio 2017
before_build: before_build:
- md %APPVEYOR_BUILD_FOLDER%\build - md %APPVEYOR_BUILD_FOLDER%\build
- cd %APPVEYOR_BUILD_FOLDER%\build - cd %APPVEYOR_BUILD_FOLDER%\build
- cmake -G "Visual Studio 14 Win64" -DOPTDBG=1 -DWITH_XPRESS=1 -DPORTABLE=1 .. - cmake -G "Visual Studio 15 Win64" -DOPTDBG=1 -DWITH_XPRESS=1 -DPORTABLE=1 ..
- cd .. - cd ..
build: build:
project: build\rocksdb.sln project: build\rocksdb.sln

3
db/external_sst_file_test.cc
View File

@ -388,9 +388,10 @@ class SstFileWriterCollector : public TablePropertiesCollector {
const char* Name() const override { return name_.c_str(); } const char* Name() const override { return name_.c_str(); }
Status Finish(UserCollectedProperties* properties) override { Status Finish(UserCollectedProperties* properties) override {
std::string count = std::to_string(count_);
*properties = UserCollectedProperties{ *properties = UserCollectedProperties{
{prefix_ + "_SstFileWriterCollector", "YES"}, {prefix_ + "_SstFileWriterCollector", "YES"},
{prefix_ + "_Count", std::to_string(count_)}, {prefix_ + "_Count", count},
}; };
return Status::OK(); return Status::OK();
} }