You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by bu...@apache.org on 2015/11/29 18:03:12 UTC
svn commit: r973930 - in /websites/staging/thrift/trunk/content: ./
about.html index.html test/ThriftTest.html tutorial/py.html
Author: buildbot
Date: Sun Nov 29 17:03:12 2015
New Revision: 973930
Log:
Staging update by buildbot for thrift
Modified:
websites/staging/thrift/trunk/content/ (props changed)
websites/staging/thrift/trunk/content/about.html
websites/staging/thrift/trunk/content/index.html
websites/staging/thrift/trunk/content/test/ThriftTest.html
websites/staging/thrift/trunk/content/tutorial/py.html
Propchange: websites/staging/thrift/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Nov 29 17:03:12 2015
@@ -1 +1 @@
-1708007
+1717095
Modified: websites/staging/thrift/trunk/content/about.html
==============================================================================
--- websites/staging/thrift/trunk/content/about.html (original)
+++ websites/staging/thrift/trunk/content/about.html Sun Nov 29 17:03:12 2015
@@ -337,6 +337,11 @@ h2:hover > .headerlink, h3:hover > .head
<td class="website"><a href="http://uber.com">http://uber.com</a></td>
</tr>
+ <tr class="">
+ <td class="company">Microsoft Open Source</td>
+ <td class="website"><a href="https://github.com/Microsoft/rDSN">https://github.com/Microsoft/rDSN</a></td>
+ </tr>
+
</tbody>
</table>
</div>
Modified: websites/staging/thrift/trunk/content/index.html
==============================================================================
--- websites/staging/thrift/trunk/content/index.html (original)
+++ websites/staging/thrift/trunk/content/index.html Sun Nov 29 17:03:12 2015
@@ -210,10 +210,10 @@ h2:hover > .headerlink, h3:hover > .head
<span class="n">transport</span><span class="o">.</span><span class="n">open</span><span class="p">()</span>
<span class="n">client</span><span class="o">.</span><span class="n">ping</span><span class="p">()</span>
- <span class="k">print</span> <span class="s">'ping()'</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'ping()'</span><span class="p">)</span>
<span class="nb">sum</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="mi">1</span><span class="p">)</span>
- <span class="k">print</span> <span class="s">'1+1=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="nb">sum</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'1+1=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="nb">sum</span><span class="p">)))</span>
</pre></div>
<p class='snippet_footer'>
This snippet was generated by Apache Thrift's <strong>source tree docs</strong>:
Modified: websites/staging/thrift/trunk/content/test/ThriftTest.html
==============================================================================
--- websites/staging/thrift/trunk/content/test/ThriftTest.html (original)
+++ websites/staging/thrift/trunk/content/test/ThriftTest.html Sun Nov 29 17:03:12 2015
@@ -495,7 +495,10 @@ h2:hover > .headerlink, h3:hover > .head
397
398
399
-400</pre></div></td><td class="code"><div class="codehilite"><pre>/*
+400
+401
+402
+403</pre></div></td><td class="code"><div class="codehilite"><pre>/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -533,6 +536,7 @@ namespace php ThriftTest
namespace delphi Thrift.Test
namespace cocoa ThriftTest
namespace lua ThriftTest
+namespace xsd test (uri = 'http://thrift.apache.org/ns/ThriftTest')
// Presence of namespaces and sub-namespaces for which there is
// no generator should compile with warnings only
@@ -583,7 +587,7 @@ struct Xtruct
struct Xtruct2
{
- 1: byte byte_thing,
+ 1: i8 byte_thing, // used to be byte, hence the name
2: Xtruct struct_thing,
3: i32 i32_thing
}
@@ -601,12 +605,13 @@ struct Insanity
{
1: map<Numberz, UserId> userMap,
2: list<Xtruct> xtructs
-}
+} (python.immutable= "")
struct CrazyNesting {
1: string string_field,
2: optional set<Insanity> set_field,
- 3: required list< map<set<i32>,map<i32,set<list<map<Insanity,string>>>>>> list_field,
+ // Do not insert line break as test/go/Makefile.am is removing this line with pattern match
+ 3: required list<map<set<i32> (python.immutable = ""), map<i32,set<list<map<Insanity,string>(python.immutable = "")> (python.immutable = "")>>>> list_field,
4: binary binary_field
}
@@ -649,10 +654,11 @@ service ThriftTest
/**
* Prints 'testByte("%d")' with thing as '%d'
- * @param byte thing - the byte to print
- * @return byte - returns the byte 'thing'
+ * The types i8 and byte are synonyms, use of i8 is encouraged, byte still exists for the sake of compatibility.
+ * @param byte thing - the i8/byte to print
+ * @return i8 - returns the i8/byte 'thing'
*/
- byte testByte(1: byte thing),
+ i8 testByte(1: byte thing),
/**
* Prints 'testI32("%d")' with thing as '%d'
Modified: websites/staging/thrift/trunk/content/tutorial/py.html
==============================================================================
--- websites/staging/thrift/trunk/content/tutorial/py.html (original)
+++ websites/staging/thrift/trunk/content/tutorial/py.html Sun Nov 29 17:03:12 2015
@@ -117,7 +117,7 @@ h2:hover > .headerlink, h3:hover > .head
<div class="codehilite"><pre><span class="kn">import</span> <span class="nn">sys</span><span class="o">,</span> <span class="nn">glob</span>
<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s">'gen-py'</span><span class="p">)</span>
-<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s">'../../lib/py/build/lib.*'</span><span class="p">)[</span><span class="mi">0</span><span class="p">])</span>
+<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s">'../../lib/py/build/lib*'</span><span class="p">)[</span><span class="mi">0</span><span class="p">])</span>
<span class="kn">from</span> <span class="nn">tutorial</span> <span class="kn">import</span> <span class="n">Calculator</span>
<span class="kn">from</span> <span class="nn">tutorial.ttypes</span> <span class="kn">import</span> <span class="o">*</span>
@@ -145,10 +145,10 @@ h2:hover > .headerlink, h3:hover > .head
<span class="n">transport</span><span class="o">.</span><span class="n">open</span><span class="p">()</span>
<span class="n">client</span><span class="o">.</span><span class="n">ping</span><span class="p">()</span>
- <span class="k">print</span> <span class="s">'ping()'</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'ping()'</span><span class="p">)</span>
<span class="nb">sum</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span><span class="mi">1</span><span class="p">)</span>
- <span class="k">print</span> <span class="s">'1+1=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="nb">sum</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'1+1=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="nb">sum</span><span class="p">)))</span>
<span class="n">work</span> <span class="o">=</span> <span class="n">Work</span><span class="p">()</span>
@@ -158,25 +158,25 @@ h2:hover > .headerlink, h3:hover > .head
<span class="k">try</span><span class="p">:</span>
<span class="n">quotient</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">calculate</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">work</span><span class="p">)</span>
- <span class="k">print</span> <span class="s">'Whoa? You know how to divide by zero?'</span>
- <span class="k">except</span> <span class="n">InvalidOperation</span><span class="p">,</span> <span class="n">io</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">'InvalidOperation: </span><span class="si">%r</span><span class="s">'</span> <span class="o">%</span> <span class="n">io</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'Whoa? You know how to divide by zero?'</span><span class="p">)</span>
+ <span class="k">except</span> <span class="n">InvalidOperation</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'InvalidOperation: </span><span class="si">%r</span><span class="s">'</span> <span class="o">%</span> <span class="n">e</span><span class="p">))</span>
<span class="n">work</span><span class="o">.</span><span class="n">op</span> <span class="o">=</span> <span class="n">Operation</span><span class="o">.</span><span class="n">SUBTRACT</span>
<span class="n">work</span><span class="o">.</span><span class="n">num1</span> <span class="o">=</span> <span class="mi">15</span>
<span class="n">work</span><span class="o">.</span><span class="n">num2</span> <span class="o">=</span> <span class="mi">10</span>
<span class="n">diff</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">calculate</span><span class="p">(</span><span class="mi">1</span><span class="p">,</span> <span class="n">work</span><span class="p">)</span>
- <span class="k">print</span> <span class="s">'15-10=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">diff</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'15-10=</span><span class="si">%d</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">diff</span><span class="p">)))</span>
<span class="n">log</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">getStruct</span><span class="p">(</span><span class="mi">1</span><span class="p">)</span>
- <span class="k">print</span> <span class="s">'Check log: </span><span class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">log</span><span class="o">.</span><span class="n">value</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'Check log: </span><span class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">log</span><span class="o">.</span><span class="n">value</span><span class="p">)))</span>
<span class="c"># Close!</span>
<span class="n">transport</span><span class="o">.</span><span class="n">close</span><span class="p">()</span>
-<span class="k">except</span> <span class="n">Thrift</span><span class="o">.</span><span class="n">TException</span><span class="p">,</span> <span class="n">tx</span><span class="p">:</span>
- <span class="k">print</span> <span class="s">'</span><span class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">tx</span><span class="o">.</span><span class="n">message</span><span class="p">)</span>
+<span class="k">except</span> <span class="n">Thrift</span><span class="o">.</span><span class="n">TException</span> <span class="k">as</span> <span class="n">tx</span><span class="p">:</span>
+ <span class="k">print</span><span class="p">((</span><span class="s">'</span><span class="si">%s</span><span class="s">'</span> <span class="o">%</span> <span class="p">(</span><span class="n">tx</span><span class="o">.</span><span class="n">message</span><span class="p">)))</span>
</pre></div>
<p class='snippet_footer'>
@@ -199,7 +199,7 @@ h2:hover > .headerlink, h3:hover > .head
<div class="codehilite"><pre><span class="kn">import</span> <span class="nn">sys</span><span class="o">,</span> <span class="nn">glob</span>
<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s">'gen-py'</span><span class="p">)</span>
-<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s">'../../lib/py/build/lib.*'</span><span class="p">)[</span><span class="mi">0</span><span class="p">])</span>
+<span class="n">sys</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">insert</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="n">glob</span><span class="o">.</span><span class="n">glob</span><span class="p">(</span><span class="s">'../../lib/py/build/lib*'</span><span class="p">)[</span><span class="mi">0</span><span class="p">])</span>
<span class="kn">from</span> <span class="nn">tutorial</span> <span class="kn">import</span> <span class="n">Calculator</span>
<span class="kn">from</span> <span class="nn">tutorial.ttypes</span> <span class="kn">import</span> <span class="o">*</span>
@@ -216,14 +216,14 @@ h2:hover > .headerlink, h3:hover > .head
<span class="bp">self</span><span class="o">.</span><span class="n">log</span> <span class="o">=</span> <span class="p">{}</span>
<span class="k">def</span> <span class="nf">ping</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
- <span class="k">print</span> <span class="s">'ping()'</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'ping()'</span><span class="p">)</span>
<span class="k">def</span> <span class="nf">add</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">n1</span><span class="p">,</span> <span class="n">n2</span><span class="p">):</span>
- <span class="k">print</span> <span class="s">'add(</span><span class="si">%d</span><span class="s">,</span><span class="si">%d</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">n1</span><span class="p">,</span> <span class="n">n2</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'add(</span><span class="si">%d</span><span class="s">,</span><span class="si">%d</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">n1</span><span class="p">,</span> <span class="n">n2</span><span class="p">))</span>
<span class="k">return</span> <span class="n">n1</span><span class="o">+</span><span class="n">n2</span>
<span class="k">def</span> <span class="nf">calculate</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">logid</span><span class="p">,</span> <span class="n">work</span><span class="p">):</span>
- <span class="k">print</span> <span class="s">'calculate(</span><span class="si">%d</span><span class="s">, </span><span class="si">%r</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">logid</span><span class="p">,</span> <span class="n">work</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'calculate(</span><span class="si">%d</span><span class="s">, </span><span class="si">%r</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">logid</span><span class="p">,</span> <span class="n">work</span><span class="p">))</span>
<span class="k">if</span> <span class="n">work</span><span class="o">.</span><span class="n">op</span> <span class="o">==</span> <span class="n">Operation</span><span class="o">.</span><span class="n">ADD</span><span class="p">:</span>
<span class="n">val</span> <span class="o">=</span> <span class="n">work</span><span class="o">.</span><span class="n">num1</span> <span class="o">+</span> <span class="n">work</span><span class="o">.</span><span class="n">num2</span>
@@ -252,11 +252,11 @@ h2:hover > .headerlink, h3:hover > .head
<span class="k">return</span> <span class="n">val</span>
<span class="k">def</span> <span class="nf">getStruct</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">key</span><span class="p">):</span>
- <span class="k">print</span> <span class="s">'getStruct(</span><span class="si">%d</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">key</span><span class="p">)</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'getStruct(</span><span class="si">%d</span><span class="s">)'</span> <span class="o">%</span> <span class="p">(</span><span class="n">key</span><span class="p">))</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">log</span><span class="p">[</span><span class="n">key</span><span class="p">]</span>
<span class="k">def</span> <span class="nf">zip</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
- <span class="k">print</span> <span class="s">'zip()'</span>
+ <span class="k">print</span><span class="p">(</span><span class="s">'zip()'</span><span class="p">)</span>
<span class="n">handler</span> <span class="o">=</span> <span class="n">CalculatorHandler</span><span class="p">()</span>
<span class="n">processor</span> <span class="o">=</span> <span class="n">Calculator</span><span class="o">.</span><span class="n">Processor</span><span class="p">(</span><span class="n">handler</span><span class="p">)</span>
@@ -270,9 +270,9 @@ h2:hover > .headerlink, h3:hover > .head
<span class="c">#server = TServer.TThreadedServer(processor, transport, tfactory, pfactory)</span>
<span class="c">#server = TServer.TThreadPoolServer(processor, transport, tfactory, pfactory)</span>
-<span class="k">print</span> <span class="s">'Starting the server...'</span>
+<span class="k">print</span><span class="p">(</span><span class="s">'Starting the server...'</span><span class="p">)</span>
<span class="n">server</span><span class="o">.</span><span class="n">serve</span><span class="p">()</span>
-<span class="k">print</span> <span class="s">'done.'</span>
+<span class="k">print</span><span class="p">(</span><span class="s">'done.'</span><span class="p">)</span>
</pre></div>
<p class='snippet_footer'>