You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2009/08/19 23:03:05 UTC
svn commit: r805973 [17/19] - in /hadoop/hive/trunk: ./ data/files/
eclipse-templates/
metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/gen-py/hive_metastore/ ql/ ql/if/ ql/src/gen-javabean/
ql/src/gen-javabean/org/ ql/src...
Modified: hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original)
+++ hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Wed Aug 19 21:02:57 2009
@@ -33,7 +33,7 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/190958347/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/2013588798/10000</string>
</void>
<void property="targetDir">
<string>../build/ql/test/data/warehouse/union.out</string>
@@ -64,10 +64,10 @@
<boolean>true</boolean>
</void>
<void property="sourceDir">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
</void>
<void property="targetDir">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/190958347/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/2013588798/10000</string>
</void>
</object>
</void>
@@ -85,7 +85,7 @@
<void property="aliasToWork">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
<object id="TableScanOperator0" class="org.apache.hadoop.hive.ql.exec.TableScanOperator">
<void property="childOperators">
<object class="java.util.ArrayList">
@@ -237,6 +237,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_RS_774_NUM_INPUT_ROWS</string>
+ <object id="Operator$ProgressCounter0" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C4</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_RS_774_NUM_OUTPUT_ROWS</string>
+ <object id="Operator$ProgressCounter1" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C5</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_RS_774_TIME_TAKEN</string>
+ <object id="Operator$ProgressCounter2" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C6</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_RS_774_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_RS_774_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_RS_774_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>RS_774</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -276,6 +314,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_TS_773_NUM_OUTPUT_ROWS</string>
+ <object id="Operator$ProgressCounter3" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C2</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_773_TIME_TAKEN</string>
+ <object id="Operator$ProgressCounter4" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C3</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_773_NUM_INPUT_ROWS</string>
+ <object id="Operator$ProgressCounter5" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C1</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_TS_773_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_773_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_773_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>TS_773</string>
+ </void>
<void property="schema">
<object idref="RowSchema0"/>
</void>
@@ -292,10 +368,10 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
<object class="java.util.ArrayList">
<void method="add">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
</void>
</object>
</void>
@@ -304,7 +380,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="tableDesc">
<object id="tableDesc2" class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -348,7 +424,7 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.fileSinkDesc">
<void property="dirName">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/190958347/10000</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/2013588798/10000</string>
</void>
<void property="tableInfo">
<object class="org.apache.hadoop.hive.ql.plan.tableDesc">
@@ -381,6 +457,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FS_776_TIME_TAKEN</string>
+ <object id="Operator$ProgressCounter6" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C12</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FS_776_NUM_INPUT_ROWS</string>
+ <object id="Operator$ProgressCounter7" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C10</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FS_776_NUM_OUTPUT_ROWS</string>
+ <object id="Operator$ProgressCounter8" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C11</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FS_776_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FS_776_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FS_776_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FS_776</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -412,6 +526,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_OP_775_TIME_TAKEN</string>
+ <object id="Operator$ProgressCounter9" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C9</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_OP_775_NUM_INPUT_ROWS</string>
+ <object id="Operator$ProgressCounter10" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C7</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_OP_775_NUM_OUTPUT_ROWS</string>
+ <object id="Operator$ProgressCounter11" class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C8</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_OP_775_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_OP_775_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_OP_775_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>OP_775</string>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -468,7 +620,7 @@
<void property="resolverCtx">
<object class="org.apache.hadoop.hive.ql.plan.ConditionalResolverMergeFiles$ConditionalResolverMergeFilesCtx">
<void property="dir">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
</void>
<void property="listTasks">
<object idref="ArrayList0"/>
@@ -556,7 +708,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -624,7 +776,7 @@
</void>
<void method="put">
<string>location</string>
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
</void>
</object>
</void>
@@ -671,13 +823,51 @@
<int>1</int>
</void>
<void property="dirName">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/tmp/547267680/10001</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/tmp/1247088422/10001</string>
</void>
<void property="tableInfo">
<object idref="tableDesc2"/>
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FS_770_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C20</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FS_770_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C19</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FS_770_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C21</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FS_770_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FS_770_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FS_770_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FS_770</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -751,6 +941,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_SEL_769_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C16</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_769_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C17</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_769_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C18</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_SEL_769_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_769_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_769_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>SEL_769</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -793,6 +1021,44 @@
<void property="conf">
<object class="org.apache.hadoop.hive.ql.plan.unionDesc"/>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_UNION_768_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C13</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_UNION_768_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C14</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_UNION_768_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C15</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_UNION_768_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_UNION_768_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_UNION_768_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>UNION_768</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -866,6 +1132,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_SEL_767_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C31</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_767_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C33</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_767_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C32</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_SEL_767_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_767_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_767_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>SEL_767</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -936,6 +1240,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FIL_766_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C28</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_766_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C29</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_766_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C30</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FIL_766_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_766_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_766_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FIL_766</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -998,6 +1340,44 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FIL_772_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C26</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_772_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C25</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_772_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C27</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FIL_772_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_772_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_772_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FIL_772</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1016,6 +1396,41 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_TS_765_TIME_TAKEN</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C24</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_765_NUM_INPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C22</string>
+ </object>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_765_NUM_OUTPUT_ROWS</string>
+ <object class="org.apache.hadoop.hive.ql.exec.Operator$ProgressCounter" method="valueOf">
+ <string>C23</string>
+ </object>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_TS_765_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_765_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_765_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
<void property="neededColumnIDs">
<object class="java.util.ArrayList">
<void method="add">
@@ -1026,6 +1441,9 @@
</void>
</object>
</void>
+ <void property="operatorId">
+ <string>TS_765</string>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -1200,6 +1618,38 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_SEL_764_NUM_INPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter7"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_764_NUM_OUTPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter8"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_SEL_764_TIME_TAKEN</string>
+ <object idref="Operator$ProgressCounter6"/>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_SEL_764_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_764_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_SEL_764_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>SEL_764</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1276,6 +1726,38 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FIL_763_TIME_TAKEN</string>
+ <object idref="Operator$ProgressCounter9"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_763_NUM_OUTPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter11"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_763_NUM_INPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter10"/>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FIL_763_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_763_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_763_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FIL_763</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1366,6 +1848,38 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_FIL_771_TIME_TAKEN</string>
+ <object idref="Operator$ProgressCounter2"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_771_NUM_OUTPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter1"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_FIL_771_NUM_INPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter0"/>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_FIL_771_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_771_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_FIL_771_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
+ <void property="operatorId">
+ <string>FIL_771</string>
+ </void>
<void property="parentOperators">
<object class="java.util.ArrayList">
<void method="add">
@@ -1391,6 +1905,35 @@
</void>
</object>
</void>
+ <void property="counterNameToEnum">
+ <object class="java.util.HashMap">
+ <void method="put">
+ <string>CNTR_NAME_TS_762_NUM_INPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter5"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_762_NUM_OUTPUT_ROWS</string>
+ <object idref="Operator$ProgressCounter3"/>
+ </void>
+ <void method="put">
+ <string>CNTR_NAME_TS_762_TIME_TAKEN</string>
+ <object idref="Operator$ProgressCounter4"/>
+ </void>
+ </object>
+ </void>
+ <void property="counterNames">
+ <object class="java.util.ArrayList">
+ <void method="add">
+ <string>CNTR_NAME_TS_762_NUM_INPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_762_NUM_OUTPUT_ROWS</string>
+ </void>
+ <void method="add">
+ <string>CNTR_NAME_TS_762_TIME_TAKEN</string>
+ </void>
+ </object>
+ </void>
<void property="neededColumnIDs">
<object class="java.util.ArrayList">
<void method="add">
@@ -1401,6 +1944,9 @@
</void>
</object>
</void>
+ <void property="operatorId">
+ <string>TS_762</string>
+ </void>
<void property="schema">
<object class="org.apache.hadoop.hive.ql.exec.RowSchema">
<void property="signature">
@@ -1419,7 +1965,7 @@
<void property="pathToAliases">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="java.util.ArrayList">
<void method="add">
<string>null-subquery1:unioninput-subquery1:src</string>
@@ -1434,7 +1980,7 @@
<void property="pathToPartitionInfo">
<object class="java.util.LinkedHashMap">
<void method="put">
- <string>file:/data/users/zshao/tools/699-trunk-apache-hive/.ptest_3/build/ql/test/data/warehouse/src</string>
+ <string>file:/data/users/njain/hive3/hive3/build/ql/test/data/warehouse/src</string>
<object class="org.apache.hadoop.hive.ql.plan.partitionDesc">
<void property="partSpec">
<object idref="LinkedHashMap0"/>
Modified: hadoop/hive/trunk/service/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/build.xml?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/build.xml (original)
+++ hadoop/hive/trunk/service/build.xml Wed Aug 19 21:02:57 2009
@@ -26,7 +26,7 @@
<property name="test.junit.output.format" value="plain"/>
<property name="test.output" value="false"/>
<property name="test.junit.output.usefile" value="false"/>
-
+ <property name="thrift.args" value="--gen java:beans --gen php --gen py -I ${basedir}/include -I ${basedir}/.. -o ${src.dir}"/>
<import file="../build-common.xml"/>
@@ -42,9 +42,9 @@
</path>
<target name="thriftif">
- <echo>Executing thrift (which needs to be in your path) to build java metastore APIs.... </echo>
+ <echo>Executing thrift (which needs to be in your path) on if/hive_service.thrift</echo>
<exec executable="thrift" failonerror="true" dir=".">
- <arg line="--gen java:beans --gen php --gen py -I ${basedir}/include -I ${basedir}/.. -o ${src.dir} if/hive_service.thrift " />
+ <arg line="${thrift.args} if/hive_service.thrift " />
</exec>
</target>
Modified: hadoop/hive/trunk/service/if/hive_service.thrift
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/if/hive_service.thrift?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/if/hive_service.thrift (original)
+++ hadoop/hive/trunk/service/if/hive_service.thrift Wed Aug 19 21:02:57 2009
@@ -26,6 +26,7 @@
include "thrift/fb303/if/fb303.thrift"
include "metastore/if/hive_metastore.thrift"
+include "ql/if/queryplan.thrift"
namespace java org.apache.hadoop.hive.service
@@ -73,5 +74,8 @@
# Get the status information about the Map-Reduce cluster
HiveClusterStatus getClusterStatus() throws(1:HiveServerException ex)
+
+ # Get the queryplan annotated with counter information
+ queryplan.QueryPlan getQueryPlan() throws(1:HiveServerException ex)
}
Modified: hadoop/hive/trunk/service/lib/php/Thrift.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/Thrift.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/Thrift.php (original)
+++ hadoop/hive/trunk/service/lib/php/Thrift.php Wed Aug 19 21:02:57 2009
@@ -1,16 +1,26 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Data types that can be sent via Thrift
*/
@@ -41,6 +51,7 @@
const CALL = 1;
const REPLY = 2;
const EXCEPTION = 3;
+ const ONEWAY = 4;
}
/**
Modified: hadoop/hive/trunk/service/lib/php/autoload.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/autoload.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/autoload.php (original)
+++ hadoop/hive/trunk/service/lib/php/autoload.php Wed Aug 19 21:02:57 2009
@@ -1,16 +1,26 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Include this file if you wish to use autoload with your PHP generated Thrift
* code. The generated code will *not* include any defined Thrift classes by
Modified: hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/config.m4
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/config.m4?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/config.m4 (original)
+++ hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/config.m4 Wed Aug 19 21:02:57 2009
@@ -1,8 +1,15 @@
+dnl Copyright (C) 2009 Facebook
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
PHP_ARG_ENABLE(thrift_protocol, whether to enable the thrift_protocol extension,
[ --enable-thrift_protocol Enable the fbthrift_protocol extension])
if test "$PHP_THRIFT_PROTOCOL" != "no"; then
PHP_REQUIRE_CXX()
+ PHP_ADD_LIBRARY_WITH_PATH(stdc++, "", THRIFT_PROTOCOL_SHARED_LIBADD)
+ PHP_SUBST(THRIFT_PROTOCOL_SHARED_LIBADD)
PHP_NEW_EXTENSION(thrift_protocol, php_thrift_protocol.cpp, $ext_shared)
fi
Modified: hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.cpp
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.cpp?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.cpp (original)
+++ hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.cpp Wed Aug 19 21:02:57 2009
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -422,23 +441,23 @@
case T_BYTE: {
uint8_t c;
transport.readBytes(&c, 1);
- RETURN_LONG(c);
+ RETURN_LONG((int8_t)c);
}
case T_I16: {
uint16_t c;
transport.readBytes(&c, 2);
- RETURN_LONG(ntohs(c));
+ RETURN_LONG((int16_t)ntohs(c));
}
case T_I32: {
uint32_t c;
transport.readBytes(&c, 4);
- RETURN_LONG(ntohl(c));
+ RETURN_LONG((int32_t)ntohl(c));
}
case T_U64:
case T_I64: {
uint64_t c;
transport.readBytes(&c, 8);
- RETURN_LONG(ntohll(c));
+ RETURN_LONG((int64_t)ntohll(c));
}
case T_DOUBLE: {
union {
@@ -697,6 +716,9 @@
throw_tprotocolexception("Attempt to send non-object type as a T_STRUCT", INVALID_DATA);
}
zval* spec = zend_read_static_property(zend_get_class_entry(*value TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
+ if (Z_TYPE_P(spec) != IS_ARRAY) {
+ throw_tprotocolexception("Attempt to send non-Thrift object as a T_STRUCT", INVALID_DATA);
+ }
binary_serialize_spec(*value, transport, Z_ARRVAL_P(spec));
} return;
case T_BOOL:
@@ -898,6 +920,9 @@
}
zval* spec = zend_read_static_property(zend_get_class_entry(request_struct TSRMLS_CC), "_TSPEC", 6, false TSRMLS_CC);
+ if (Z_TYPE_P(spec) != IS_ARRAY) {
+ throw_tprotocolexception("Attempt to send non-Thrift object", INVALID_DATA);
+ }
binary_serialize_spec(request_struct, transport, Z_ARRVAL_P(spec));
} catch (const PHPExceptionWrapper& ex) {
zend_throw_exception_object(ex TSRMLS_CC);
Modified: hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.h
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.h?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.h (original)
+++ hadoop/hive/trunk/service/lib/php/ext/thrift_protocol/php_thrift_protocol.h Wed Aug 19 21:02:57 2009
@@ -1,3 +1,22 @@
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
#pragma once
PHP_FUNCTION(thrift_protocol_write_binary);
Modified: hadoop/hive/trunk/service/lib/php/protocol/TBinaryProtocol.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/protocol/TBinaryProtocol.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/protocol/TBinaryProtocol.php (original)
+++ hadoop/hive/trunk/service/lib/php/protocol/TBinaryProtocol.php Wed Aug 19 21:02:57 2009
@@ -1,22 +1,30 @@
<?php
-include_once $GLOBALS['THRIFT_ROOT'].'/transport/TBufferedTransport.php';
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.protocol
- * @author Mark Slee <mc...@facebook.com>
*/
+include_once $GLOBALS['THRIFT_ROOT'].'/transport/TBufferedTransport.php';
+
/**
* Binary implementation of the Thrift protocol.
*
- * @author Mark Slee <mc...@facebook.com>
- * @author Marc Kwiatkowski <ma...@facebook.com>
*/
class TBinaryProtocol extends TProtocol {
Modified: hadoop/hive/trunk/service/lib/php/protocol/TProtocol.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/protocol/TProtocol.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/protocol/TProtocol.php (original)
+++ hadoop/hive/trunk/service/lib/php/protocol/TProtocol.php Wed Aug 19 21:02:57 2009
@@ -1,23 +1,31 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.protocol
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Protocol module. Contains all the types and definitions needed to implement
* a protocol encoder/decoder.
*
* @package thrift.protocol
- * @author Mark Slee <mc...@facebook.com>
- * @author Aditya Agarwal <ad...@facebook.com>
*/
/**
Modified: hadoop/hive/trunk/service/lib/php/transport/TBufferedTransport.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TBufferedTransport.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TBufferedTransport.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TBufferedTransport.php Wed Aug 19 21:02:57 2009
@@ -1,23 +1,32 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Buffered transport. Stores data to an internal buffer that it doesn't
* actually write out until flush is called. For reading, we do a greedy
* read and then serve data out of the internal buffer.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class TBufferedTransport extends TTransport {
Modified: hadoop/hive/trunk/service/lib/php/transport/TFramedTransport.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TFramedTransport.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TFramedTransport.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TFramedTransport.php Wed Aug 19 21:02:57 2009
@@ -1,22 +1,31 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Framed transport. Writes and reads data in chunks that are stamped with
* their length.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class TFramedTransport extends TTransport {
Modified: hadoop/hive/trunk/service/lib/php/transport/THttpClient.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/THttpClient.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/THttpClient.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/THttpClient.php Wed Aug 19 21:02:57 2009
@@ -1,21 +1,30 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* HTTP client for Thrift
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class THttpClient extends TTransport {
Modified: hadoop/hive/trunk/service/lib/php/transport/TMemoryBuffer.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TMemoryBuffer.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TMemoryBuffer.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TMemoryBuffer.php Wed Aug 19 21:02:57 2009
@@ -1,16 +1,26 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Levy Klots <lk...@facebook.com>
*/
+
/**
* A memory buffer is a tranpsort that simply reads from and writes to an
* in-memory string buffer. Anytime you call write on it, the data is simply
@@ -18,7 +28,6 @@
* buffer.
*
* @package thrift.transport
- * @author Levy Klots <lk...@facebook.com>
*/
class TMemoryBuffer extends TTransport {
Modified: hadoop/hive/trunk/service/lib/php/transport/TNullTransport.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TNullTransport.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TNullTransport.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TNullTransport.php Wed Aug 19 21:02:57 2009
@@ -1,22 +1,31 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Transport that only accepts writes and ignores them.
* This is useful for measuring the serialized size of structures.
*
* @package thrift.transport
- * @author David Reiss <dr...@facebook.com>
*/
class TNullTransport extends TTransport {
Modified: hadoop/hive/trunk/service/lib/php/transport/TPhpStream.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TPhpStream.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TPhpStream.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TPhpStream.php Wed Aug 19 21:02:57 2009
@@ -1,22 +1,31 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Php stream transport. Reads to and writes from the php standard streams
* php://input and php://output
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class TPhpStream extends TTransport {
@@ -38,7 +47,7 @@
public function open() {
if ($this->read_) {
- $this->inStream_ = @fopen('php://input', 'r');
+ $this->inStream_ = @fopen(self::inStreamName(), 'r');
if (!is_resource($this->inStream_)) {
throw new TException('TPhpStream: Could not open php://input');
}
@@ -90,6 +99,13 @@
@fflush($this->outStream_);
}
+ private static function inStreamName() {
+ if (php_sapi_name() == 'cli') {
+ return 'php://stdin';
+ }
+ return 'php://input';
+ }
+
}
?>
Modified: hadoop/hive/trunk/service/lib/php/transport/TSocket.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TSocket.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TSocket.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TSocket.php Wed Aug 19 21:02:57 2009
@@ -1,21 +1,30 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Sockets implementation of the TTransport interface.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class TSocket extends TTransport {
@@ -103,7 +112,7 @@
/**
* Sets the send timeout.
*
- * @param int $timeout
+ * @param int $timeout Timeout in milliseconds.
*/
public function setSendTimeout($timeout) {
$this->sendTimeout_ = $timeout;
@@ -112,7 +121,7 @@
/**
* Sets the receive timeout.
*
- * @param int $timeout
+ * @param int $timeout Timeout in milliseconds.
*/
public function setRecvTimeout($timeout) {
$this->recvTimeout_ = $timeout;
@@ -213,7 +222,7 @@
$pre = null;
while (TRUE) {
$buf = @fread($this->handle_, $len);
- if ($buf === FALSE) {
+ if ($buf === FALSE || $buf === '') {
$md = stream_get_meta_data($this->handle_);
if ($md['timed_out']) {
throw new TException('TSocket: timed out reading '.$len.' bytes from '.
@@ -224,7 +233,7 @@
}
} else if (($sz = strlen($buf)) < $len) {
$md = stream_get_meta_data($this->handle_);
- if (true === $md['timed_out'] && false === $md['blocked']) {
+ if ($md['timed_out']) {
throw new TException('TSocket: timed out reading '.$len.' bytes from '.
$this->host_.':'.$this->port_);
} else {
Modified: hadoop/hive/trunk/service/lib/php/transport/TSocketPool.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TSocketPool.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TSocketPool.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TSocketPool.php Wed Aug 19 21:02:57 2009
@@ -1,16 +1,26 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/** Inherits from Socket */
include_once $GLOBALS['THRIFT_ROOT'].'/transport/TSocket.php';
@@ -30,7 +40,6 @@
* to a pool of servers.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
class TSocketPool extends TSocket {
Modified: hadoop/hive/trunk/service/lib/php/transport/TTransport.php
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/php/transport/TTransport.php?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/php/transport/TTransport.php (original)
+++ hadoop/hive/trunk/service/lib/php/transport/TTransport.php Wed Aug 19 21:02:57 2009
@@ -1,16 +1,26 @@
<?php
-
-/**
- * Copyright (c) 2006- Facebook
- * Distributed under the Thrift Software License
+/*
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * See accompanying file LICENSE or visit the Thrift site at:
- * http://developers.facebook.com/thrift/
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
+
/**
* Transport exceptions
*/
@@ -31,7 +41,6 @@
* Base interface for a transport agent.
*
* @package thrift.transport
- * @author Mark Slee <mc...@facebook.com>
*/
abstract class TTransport {
Modified: hadoop/hive/trunk/service/lib/py/fb303/FacebookBase.py
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/lib/py/fb303/FacebookBase.py?rev=805973&r1=805972&r2=805973&view=diff
==============================================================================
--- hadoop/hive/trunk/service/lib/py/fb303/FacebookBase.py (original)
+++ hadoop/hive/trunk/service/lib/py/fb303/FacebookBase.py Wed Aug 19 21:02:57 2009
@@ -1,10 +1,23 @@
#!/usr/bin/env python
+
+#
+# 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
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
#
-# See accompanying file LICENSE or visit the Thrift site at:
-# http://developers.facebook.com/thrift/
import time
import FacebookService
@@ -17,7 +30,7 @@
self.name = name
self.alive = int(time.time())
self.counters = {}
-
+
def getName(self, ):
return self.name
@@ -56,6 +69,9 @@
def aliveSince(self):
return self.alive
+ def getCpuProfile(self, duration):
+ return ""
+
def getLimitedReflection(self):
return thrift.reflection.limited.Service()