Return-Path: Delivered-To: apmail-incubator-thrift-commits-archive@minotaur.apache.org Received: (qmail 22362 invoked from network); 2 Apr 2009 19:24:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Apr 2009 19:24:26 -0000 Received: (qmail 51467 invoked by uid 500); 2 Apr 2009 19:24:26 -0000 Delivered-To: apmail-incubator-thrift-commits-archive@incubator.apache.org Received: (qmail 51436 invoked by uid 500); 2 Apr 2009 19:24:26 -0000 Mailing-List: contact thrift-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: thrift-dev@incubator.apache.org Delivered-To: mailing list thrift-commits@incubator.apache.org Received: (qmail 51427 invoked by uid 99); 2 Apr 2009 19:24:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 19:24:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Apr 2009 19:24:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AE6CD2388B67; Thu, 2 Apr 2009 19:24:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r761393 - in /incubator/thrift/trunk/test: DebugProtoTest.thrift DenseLinkingTest.thrift FastbinaryTest.py ThriftTest.thrift Date: Thu, 02 Apr 2009 19:24:02 -0000 To: thrift-commits@incubator.apache.org From: dreiss@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090402192402.AE6CD2388B67@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dreiss Date: Thu Apr 2 19:24:02 2009 New Revision: 761393 URL: http://svn.apache.org/viewvc?rev=761393&view=rev Log: THRIFT-420. Remove all negative structure field ids from the code Modified: incubator/thrift/trunk/test/DebugProtoTest.thrift incubator/thrift/trunk/test/DenseLinkingTest.thrift incubator/thrift/trunk/test/FastbinaryTest.py incubator/thrift/trunk/test/ThriftTest.thrift Modified: incubator/thrift/trunk/test/DebugProtoTest.thrift URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/DebugProtoTest.thrift?rev=761393&r1=761392&r2=761393&view=diff ============================================================================== --- incubator/thrift/trunk/test/DebugProtoTest.thrift (original) +++ incubator/thrift/trunk/test/DebugProtoTest.thrift Thu Apr 2 19:24:02 2009 @@ -163,7 +163,7 @@ service Srv { - i32 Janky(i32 arg); + i32 Janky(1: i32 arg); // return type only methods @@ -173,7 +173,7 @@ } service Inherited extends Srv { - i32 identity(i32 arg) + i32 identity(1: i32 arg) } service EmptyService {} Modified: incubator/thrift/trunk/test/DenseLinkingTest.thrift URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/DenseLinkingTest.thrift?rev=761393&r1=761392&r2=761393&view=diff ============================================================================== --- incubator/thrift/trunk/test/DenseLinkingTest.thrift (original) +++ incubator/thrift/trunk/test/DenseLinkingTest.thrift Thu Apr 2 19:24:02 2009 @@ -88,5 +88,5 @@ } service Srv { - i32 Janky(i32 arg) + i32 Janky(1: i32 arg) } Modified: incubator/thrift/trunk/test/FastbinaryTest.py URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/FastbinaryTest.py?rev=761393&r1=761392&r2=761393&view=diff ============================================================================== --- incubator/thrift/trunk/test/FastbinaryTest.py (original) +++ incubator/thrift/trunk/test/FastbinaryTest.py Thu Apr 2 19:24:02 2009 @@ -104,7 +104,6 @@ rshuge.myintlist=range(10000) my_zero = Srv.Janky_result({"arg":5}) -my_nega = Srv.Janky_args({"success":6}) def checkWrite(o): trans_fast = TTransport.TMemoryBuffer() @@ -159,12 +158,6 @@ checkWrite(my_zero) checkRead(my_zero) checkRead(Backwards({"first_tag2":4, "second_tag1":2})) - try: - checkWrite(my_nega) - print "Hey, did this get fixed?" - except AttributeError: - # Sorry, doesn't work with negative tags. - pass # One case where the serialized form changes, but only superficially. o = Backwards({"first_tag2":4, "second_tag1":2}) Modified: incubator/thrift/trunk/test/ThriftTest.thrift URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/ThriftTest.thrift?rev=761393&r1=761392&r2=761393&view=diff ============================================================================== --- incubator/thrift/trunk/test/ThriftTest.thrift (original) +++ incubator/thrift/trunk/test/ThriftTest.thrift Thu Apr 2 19:24:02 2009 @@ -120,15 +120,15 @@ map> testInsanity(1: Insanity argument), /* Multiple parameters */ - Xtruct testMulti(byte arg0, i32 arg1, i64 arg2, map arg3, Numberz arg4, UserId arg5), + Xtruct testMulti(1: byte arg0, 2: i32 arg1, 3: i64 arg2, 4: map arg3, 5: Numberz arg4, 6: UserId arg5), /* Exception specifier */ - void testException(string arg) throws(Xception err1), + void testException(1: string arg) throws(1: Xception err1), /* Multiple exceptions specifier */ - Xtruct testMultiException(string arg0, string arg1) throws(Xception err1, Xception2 err2) + Xtruct testMultiException(1: string arg0, 2: string arg1) throws(1: Xception err1, 2: Xception2 err2) /* Test oneway void */ oneway void testOneway(1:i32 secondsToSleep)