diff options
author | Bryan Duxbury <bryanduxbury@apache.org> | 2009-04-01 20:10:15 +0000 |
---|---|---|
committer | Bryan Duxbury <bryanduxbury@apache.org> | 2009-04-01 20:10:15 +0000 |
commit | 5b8b4845488b07007a311a0702107d6d8abe0052 (patch) | |
tree | 837129cbda8c93c270d6a6e33555fec805a07adf /test/DebugProtoTest.thrift | |
parent | 16b29a989e9af77130b626c011c56f07d197b8b5 (diff) | |
download | thrift-5b8b4845488b07007a311a0702107d6d8abe0052.tar.gz |
THRIFT-417. rb: BufferedTransport can enter an infinite loop
Switch native proto implementations to use read_all instead of read. Add a bunch of tests to verify.
Also:
- removed some commented code in binary_protocol_accelerated.c
- struct.c was missing one of the possible native method calls
- updates gem manifest (included files that didn't exist)
- fixed svn:ignores of test/rb/gen-rb and lib/java/gen-java
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@761037 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/DebugProtoTest.thrift')
-rw-r--r-- | test/DebugProtoTest.thrift | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/test/DebugProtoTest.thrift b/test/DebugProtoTest.thrift index d85bd5222..48a8d6ff5 100644 --- a/test/DebugProtoTest.thrift +++ b/test/DebugProtoTest.thrift @@ -97,25 +97,6 @@ struct Base64 { 7: binary b6, } -service Srv { - i32 Janky(i32 arg) -} - -service Inherited extends Srv { - i32 identity(i32 arg) -} - -service EmptyService {} - -// The only purpose of this thing is to increase the size of the generated code -// so that ZlibTest has more highly compressible data to play with. -struct BlowUp { - 1: map<list<i32>,set<map<i32,string>>> b1; - 2: map<list<i32>,set<map<i32,string>>> b2; - 3: map<list<i32>,set<map<i32,string>>> b3; - 4: map<list<i32>,set<map<i32,string>>> b4; -} - struct CompactProtoTestStruct { // primitive fields 1: byte a_byte = 127; @@ -178,3 +159,31 @@ struct CompactProtoTestStruct { 48: map<byte, set<byte>> byte_set_map = {0 : [], 1 : [1], 2 : [1, 2]}; 49: map<byte, list<byte>> byte_list_map = {0 : [], 1 : [1], 2 : [1, 2]}; } + + + +service Srv { + i32 Janky(i32 arg); + + // return type only methods + + void voidMethod(); + i32 primitiveMethod(); + CompactProtoTestStruct structMethod(); +} + +service Inherited extends Srv { + i32 identity(i32 arg) +} + +service EmptyService {} + +// The only purpose of this thing is to increase the size of the generated code +// so that ZlibTest has more highly compressible data to play with. +struct BlowUp { + 1: map<list<i32>,set<map<i32,string>>> b1; + 2: map<list<i32>,set<map<i32,string>>> b2; + 3: map<list<i32>,set<map<i32,string>>> b3; + 4: map<list<i32>,set<map<i32,string>>> b4; +} + |