From c9df05d1e4dd28d23200422813f2238842899f58 Mon Sep 17 00:00:00 2001
From: Dmitri Smirnov <dmitrism@microsoft.com>
Date: Wed, 8 Mar 2017 17:00:04 -0800
Subject: [PATCH] Fix random access alignment

Summary:
This fixes an issue when the most recent readers assume that alignment is always set even if direct io is off.
Also adjust slightly appveyor script to run db_basic_test cases concurrently.
Closes https://github.com/facebook/rocksdb/pull/1959

Differential Revision: D4671972

Pulled By: IslamAbdelRahman

fbshipit-source-id: 1886620
---
 build_tools/run_ci_db_test.ps1 | 11 +++++++----
 port/win/io_win.cc             |  9 +++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build_tools/run_ci_db_test.ps1 b/build_tools/run_ci_db_test.ps1
index 94d81cc24..6ff95b70b 100644
--- a/build_tools/run_ci_db_test.ps1
+++ b/build_tools/run_ci_db_test.ps1
@@ -50,7 +50,8 @@ Write-Output "Root: $RootFolder, WorkFolder: $WorkFolder"
 
 # Use JEMALLOC executables
 if($Run -ceq "db_test" -or
-   $Run -ceq "db_test2" ) {
+   $Run -ceq "db_test2" -or
+   $Run -ceq "db_basic_test") {
 
    $file_name = $Run
 
@@ -150,7 +151,7 @@ function MakeAndAdd([string]$token, $HashTable) {
 # Test executable name -> Log file
 function Discover-TestBinaries([string]$Pattern, $HashTable) {
 
-    $Exclusions = @("db_test*", "db_sanity_test*")
+    $Exclusions = @("db_test*", "db_sanity_test*", "db_basic_test*")
 
     $p = -join ($BinariesFolder, $pattern)
 
@@ -164,7 +165,8 @@ function Discover-TestBinaries([string]$Pattern, $HashTable) {
 $TestsToRun = [ordered]@{}
 
 if($Run -ceq "db_test" -or
-   $Run -ceq "db_test2") {
+   $Run -ceq "db_test2" -or
+   $Run -ceq "db_basic_test") {
     Normalize-DbTests -HashTable $TestsToRun
 } elseif($Run -ceq "tests") {
     if($EnableJE) {
@@ -237,7 +239,8 @@ function RunJobs($TestToLog, [int]$ConcurrencyVal, [bool]$AddForRerun)
             $log_path = ($TestToLog.$k)
 
             if($Run -ceq "db_test" -or
-               $Run -ceq "db_test2") {
+               $Run -ceq "db_test2" -or
+               $Run -ceq "db_basic_test") {
               $job = Start-Job -Name $k -ScriptBlock $InvokeTestCase -ArgumentList @($db_test,$k,$log_path)
             } else {
               [string]$Exe =  -Join ($BinariesFolder, $k)
diff --git a/port/win/io_win.cc b/port/win/io_win.cc
index 7c0818660..f5a3ff8a4 100644
--- a/port/win/io_win.cc
+++ b/port/win/io_win.cc
@@ -723,12 +723,9 @@ WinRandomAccessImpl::WinRandomAccessImpl(WinFileData* file_base,
 
   assert(!options.use_mmap_reads);
 
-  // Direct access, use internal buffer for reads
-  if (file_base_->use_direct_io()) {
-    // Do not allocate the buffer either until the first request or
-    // until there is a call to allocate a read-ahead buffer
-    buffer_.Alignment(alignment);
-  }
+  // Do not allocate the buffer either until the first request or
+  // until there is a call to allocate a read-ahead buffer
+  buffer_.Alignment(alignment);
 }
 
 inline