Misc windows fixes #37
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This cleans all ignored files, which is what we (always) want.
bdarnell
approved these changes
Feb 24, 2017
There was a problem hiding this comment.
I'm OK with moving ahead with 5.1.2 but @petermattis should weigh in too.
import.sh
Outdated
| # TODO(tamird,petermattis): remove when | ||
| # https://github.com/facebook/rocksdb/commit/4a17b47bb5a2cc09f95acb53ec565bccd171ee4e | ||
| # is released. | ||
| patch -p1 < testharness.patch |
There was a problem hiding this comment.
Delete the file testharness.patch
There was a problem hiding this comment.
It's already deleted here.
import.sh
Outdated
| grep -lR '#include <.*[A-Z].*>' internal | while IFS= read -r source_file; do | ||
| grep -o '#include <.*[A-Z].*>' "$source_file" | while IFS= read -r original; do | ||
| downcased=$(echo "$original" | tr '[:upper:]' '[:lower:]') | ||
| sed -i~ "s!$original!$downcased!g" "$source_file" |
There was a problem hiding this comment.
This is much easier in awk: awk '/#include/ { print tolower($0); next; } { print; }'. Unfortunately awk doesn't have the handy -i option unless we're willing to rely on gnu extensions (and speaking of which, gnu sed has an extension for upper- and lower-casing).
There was a problem hiding this comment.
That's not quite equivalent (it produced this diff):
diff --git a/internal/port/win/env_win.cc b/internal/port/win/env_win.cc
index 61d5cf1..df4a57c 100644
--- a/internal/port/win/env_win.cc
+++ b/internal/port/win/env_win.cc
@@ -32,7 +32,7 @@
#include "util/thread_status_updater.h"
#include "util/thread_status_util.h"
-#include <rpc.h> // For UUID generation
+#include <rpc.h> // for uuid generation
#include <windows.h>
namespace rocksdb {
But done anyway.
tamird
force-pushed
the
misc-windows-fixes
branch
from
36a5312
to
b1cd428
Compare
tamird
force-pushed
the
misc-windows-fixes
branch
from
b1cd428
to
48ff7ca
Compare
petermattis
reviewed
Feb 24, 2017
tamird
force-pushed
the
misc-windows-fixes
branch
from
48ff7ca
to
1e1dbe9
Compare
|
Done.
…On Fri, Feb 24, 2017 at 8:39 AM, Peter Mattis ***@***.***> wrote:
***@***.**** commented on this pull request.
I'd prefer a separate change for the 5.1.2 bump, though I do want to do
that.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#37 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ABdsPM1xlsVqGMKRHveCiD-n8MVtDheCks5rft16gaJpZM4MKq58>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Decided to update to 5.1.2 while I'm here, but let me know if you'd prefer that as a separate change.