瀏覽代碼

HPCC-13195 Docs: Change term Farmer to Roxie server

Signed-off-by: Jim DeFabia <jamesdefabia@lexisnexis.com>
Jim DeFabia 9 年之前
父節點
當前提交
6b4c23bdf7

+ 6 - 6
docs/ECLProgrammersGuide/PRG_Mods/PrG_control_ROXIE_queries.xml

@@ -96,7 +96,7 @@
             <row>
               <entry><emphasis role="bold">Roxie</emphasis></entry>
 
-              <entry>Graphs execute on a single (farmer) node.</entry>
+              <entry>Graphs execute on a single (Roxie server) node.</entry>
             </row>
 
             <row>
@@ -110,8 +110,8 @@
             <row>
               <entry></entry>
 
-              <entry>Child queries might execute on a single slave node
-              instead of a farmer node.</entry>
+              <entry>Child queries might execute on a single agent node
+              instead of a Roxie server node.</entry>
             </row>
           </tbody>
         </tgroup>
@@ -121,9 +121,9 @@
   <sect2 id="ALLNODES_vs_THISNODE">
     <title>ALLNODES vs. THISNODE</title>
 
-    <para>In Roxie, graphs execute on a single farmer node unless the
+    <para>In Roxie, graphs execute on a single Roxie server node unless the
     ALLNODES() function is used. ALLNODES() causes the portion of the query it
-    encloses to execute on all slave nodes in parallel. The results are
+    encloses to execute on all agent nodes in parallel. The results are
     calculated independently on each node then merged together, without
     ordering the records. It is generally used to do some complex remote
     processing which only requires local index access, substantially reducing
@@ -157,7 +157,7 @@
     because each node is independently processing its associated parts.
     Specifying that an index read or a keyed JOIN is LOCAL means that only the
     local part is used on each node. A local read of a single part INDEX will
-    only be evaluated on the first slave node (or the farmer node if not
+    only be evaluated on the first agent node (or the farmer node if not
     within an ALLNODES)</para>
 
     <para>Local evaluation can be specified in two ways:</para>

+ 5 - 4
docs/RDDERef/RDDE_Mods/RoxieCopySettings.xml

@@ -96,11 +96,12 @@
     </informaltable></para>
 
   <para>When <emphasis role="bold">copyResources</emphasis> is enabled, data
-  files are copied from source locations to slave nodes. Index files are also
-  copied, with an extra file part that is a “key-of-keys” or a metakey.</para>
+  files are copied from source locations to Roxie agent nodes. Index files are
+  also copied, with an extra file part that is a “key-of-keys” or a
+  metakey.</para>
 
-  <para>A copy of the metakey is always stored on each Farmer and in most
-  cases is loaded into memory at startup to increase performance.</para>
+  <para>A copy of the metakey is always stored on each Roxie server and in
+  most cases is loaded into memory at startup to increase performance.</para>
 
   <sect3>
     <title><emphasis role="bold">Command Line support</emphasis></title>