You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/07/25 15:25:09 UTC
[1/2] thrift git commit: THRIFT-3256 Some D test timings are too
aggressive for slow machines Client: D language Patch: Jens Geyer
Repository: thrift
Updated Branches:
refs/heads/master b141fd080 -> e33d16520
THRIFT-3256 Some D test timings are too aggressive for slow machines
Client: D language
Patch: Jens Geyer
This closes #558
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bf0b483d
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bf0b483d
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bf0b483d
Branch: refs/heads/master
Commit: bf0b483d4f7f15cb88566f9be0c6c796fa05651d
Parents: b141fd0
Author: Jens Geyer <je...@apache.org>
Authored: Thu Jul 23 22:57:50 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Jul 25 15:23:02 2015 +0200
----------------------------------------------------------------------
lib/d/src/thrift/internal/test/server.d | 2 +-
lib/d/src/thrift/transport/file.d | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf0b483d/lib/d/src/thrift/internal/test/server.d
----------------------------------------------------------------------
diff --git a/lib/d/src/thrift/internal/test/server.d b/lib/d/src/thrift/internal/test/server.d
index b5393f0..fc5e86b 100644
--- a/lib/d/src/thrift/internal/test/server.d
+++ b/lib/d/src/thrift/internal/test/server.d
@@ -102,7 +102,7 @@ void testServeCancel(Server)(void delegate(Server) serverSetup = null) if (
servingCondition.wait();
cancel.trigger();
- enforce(doneCondition.wait(dur!"msecs"(100)));
+ enforce(doneCondition.wait(dur!"msecs"(3*1000)));
serverThread.join();
}
}
http://git-wip-us.apache.org/repos/asf/thrift/blob/bf0b483d/lib/d/src/thrift/transport/file.d
----------------------------------------------------------------------
diff --git a/lib/d/src/thrift/transport/file.d b/lib/d/src/thrift/transport/file.d
index 9aebd82..cb8bcd7 100644
--- a/lib/d/src/thrift/transport/file.d
+++ b/lib/d/src/thrift/transport/file.d
@@ -1076,7 +1076,7 @@ unittest {
// If any attempt takes more than 500ms, treat that as a fatal failure to
// avoid looping over a potentially very slow operation.
- enforce(sw.peek().msecs < 500,
+ enforce(sw.peek().msecs < 1500,
text("close() took ", sw.peek().msecs, "ms."));
// Normally, it takes less than 5ms on my dev box.
@@ -1084,7 +1084,7 @@ unittest {
// longer. Additionally, on a Windows Server 2008 instance running in
// a VirtualBox VM, it has been observed that about a quarter of the runs
// takes (217 ± 1) ms, for reasons not yet known.
- if (sw.peek().msecs > 5) {
+ if (sw.peek().msecs > 50) {
++numOver;
}
[2/2] thrift git commit: THRIFT-3255 Thrift generator doesn't exclude
'package' keyword for thrift property names breaking java builds Client:
Compiler General Patch: Jens Geyer
Posted by je...@apache.org.
THRIFT-3255 Thrift generator doesn't exclude 'package' keyword for thrift property names breaking java builds
Client: Compiler General
Patch: Jens Geyer
This closes #561
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/e33d1652
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/e33d1652
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/e33d1652
Branch: refs/heads/master
Commit: e33d16520a483e49e5f73a9ea2091cfc686fb619
Parents: bf0b483
Author: Jens Geyer <je...@apache.org>
Authored: Fri Jul 24 02:14:43 2015 +0200
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Jul 25 15:23:45 2015 +0200
----------------------------------------------------------------------
compiler/cpp/src/thriftl.ll | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/e33d1652/compiler/cpp/src/thriftl.ll
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index 11ba1b9..08b5c59 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -258,6 +258,7 @@ literal_begin (['\"])
"nil" { thrift_reserved_keyword(yytext); }
"not" { thrift_reserved_keyword(yytext); }
"or" { thrift_reserved_keyword(yytext); }
+"package" { thrift_reserved_keyword(yytext); }
"pass" { thrift_reserved_keyword(yytext); }
"public" { thrift_reserved_keyword(yytext); }
"print" { thrift_reserved_keyword(yytext); }