Modified: hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml Fri Mar 21 04:15:18 2014 @@ -122,6 +122,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -293,6 +297,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -447,6 +455,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -588,6 +600,10 @@ <string>1</string> </void> <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> + </void> + <void method="put"> <string>bucket_count</string> <string>2</string> </void> @@ -620,72 +636,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> @@ -1169,72 +1189,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void>
Modified: hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml Fri Mar 21 04:15:18 2014 @@ -122,6 +122,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -293,6 +297,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -447,6 +455,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -588,6 +600,10 @@ <string>1</string> </void> <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> + </void> + <void method="put"> <string>bucket_count</string> <string>2</string> </void> @@ -620,72 +636,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> @@ -1166,72 +1186,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml Fri Mar 21 04:15:18 2014 @@ -122,6 +122,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -293,6 +297,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -447,6 +455,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -588,6 +600,10 @@ <string>1</string> </void> <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> + </void> + <void method="put"> <string>bucket_count</string> <string>2</string> </void> @@ -620,72 +636,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> @@ -1169,72 +1189,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml Fri Mar 21 04:15:18 2014 @@ -122,6 +122,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -293,6 +297,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -447,6 +455,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -588,6 +600,10 @@ <string>1</string> </void> <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> + </void> + <void method="put"> <string>bucket_count</string> <string>2</string> </void> @@ -620,72 +636,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> @@ -1214,72 +1234,76 @@ <void property="properties"> <object class="java.util.Properties"> <void method="put"> - <string>name</string> - <string>default.srcbucket</string> - </void> - <void method="put"> - <string>numFiles</string> - <string>2</string> - </void> - <void method="put"> <string>columns.types</string> <string>int:string</string> </void> <void method="put"> - <string>bucket_field_name</string> - <string>key</string> - </void> - <void method="put"> - <string>serialization.ddl</string> - <string>struct srcbucket { i32 key, string value}</string> + <string>location</string> + #### A masked pattern was here #### </void> <void method="put"> <string>columns</string> <string>key,value</string> </void> <void method="put"> - <string>serialization.format</string> - <string>1</string> + <string>COLUMN_STATS_ACCURATE</string> + <string>true</string> </void> <void method="put"> - <string>rawDataSize</string> - <string>0</string> + <string>serialization.format</string> + <string>1</string> </void> <void method="put"> <string>numRows</string> <string>0</string> </void> <void method="put"> - <string>bucket_count</string> + <string>numFiles</string> <string>2</string> </void> <void method="put"> - <string>serialization.lib</string> - <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> + <string>serialization.ddl</string> + <string>struct srcbucket { i32 key, string value}</string> </void> <void method="put"> - <string>COLUMN_STATS_ACCURATE</string> - <string>true</string> + <string>transient_lastDdlTime</string> + #### A masked pattern was here #### </void> <void method="put"> - <string>file.inputformat</string> - <string>org.apache.hadoop.mapred.TextInputFormat</string> + <string>rawDataSize</string> + <string>0</string> + </void> + <void method="put"> + <string>columns.comments</string> + <string><char code="#0"/></string> </void> <void method="put"> <string>totalSize</string> <string>11603</string> </void> <void method="put"> + <string>bucket_count</string> + <string>2</string> + </void> + <void method="put"> <string>file.outputformat</string> <string>org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat</string> </void> <void method="put"> - <string>location</string> - #### A masked pattern was here #### + <string>serialization.lib</string> + <string>org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe</string> </void> <void method="put"> - <string>transient_lastDdlTime</string> - #### A masked pattern was here #### + <string>bucket_field_name</string> + <string>key</string> + </void> + <void method="put"> + <string>file.inputformat</string> + <string>org.apache.hadoop.mapred.TextInputFormat</string> + </void> + <void method="put"> + <string>name</string> + <string>default.srcbucket</string> </void> </object> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml Fri Mar 21 04:15:18 2014 @@ -416,6 +416,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -476,6 +480,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -937,6 +945,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml Fri Mar 21 04:15:18 2014 @@ -46,6 +46,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -106,6 +110,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -1957,6 +1965,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml Fri Mar 21 04:15:18 2014 @@ -46,6 +46,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -98,6 +102,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -1727,6 +1735,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml Fri Mar 21 04:15:18 2014 @@ -46,6 +46,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -106,6 +110,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -600,6 +608,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/udf_case.q.xml Fri Mar 21 04:15:18 2014 @@ -46,6 +46,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -106,6 +110,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -684,6 +692,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/udf_when.q.xml Fri Mar 21 04:15:18 2014 @@ -46,6 +46,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -106,6 +110,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -764,6 +772,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/ql/src/test/results/compiler/plan/union.q.xml URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/compiler/plan/union.q.xml (original) +++ hive/trunk/ql/src/test/results/compiler/plan/union.q.xml Fri Mar 21 04:15:18 2014 @@ -416,6 +416,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -476,6 +480,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> @@ -552,6 +560,10 @@ <string>key,value</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>bucket_count</string> <string>-1</string> </void> @@ -1501,6 +1513,10 @@ <string>0</string> </void> <void method="put"> + <string>columns.comments</string> + <string>default<char code="#0"/>default</string> + </void> + <void method="put"> <string>numRows</string> <string>0</string> </void> Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java (original) +++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java Fri Mar 21 04:15:18 2014 @@ -47,6 +47,9 @@ import org.apache.hadoop.hive.serde2.typ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; + /** * RegexSerDe uses regular expression (regex) to deserialize data. It doesn't * support data serialization. @@ -141,7 +144,7 @@ public class RegexSerDe extends Abstract // StandardStruct uses ArrayList to store the row. rowOI = ObjectInspectorFactory.getStandardStructObjectInspector( - columnNames, columnOIs); + columnNames,columnOIs,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty("columns.comments")))); row = new ArrayList<Object>(numColumns); // Constructing the row object, etc, which will be reused for all rows. Modified: hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=1579876&r1=1579875&r2=1579876&view=diff ============================================================================== --- hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original) +++ hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Fri Mar 21 04:15:18 2014 @@ -68,49 +68,6 @@ public final class SerDeUtils { public static final Log LOG = LogFactory.getLog(SerDeUtils.class.getName()); - public static void registerSerDe(String name, Class<?> serde) {} - - private static List<String> nativeSerDeNames = new ArrayList<String>(); - static { - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe.class - .getName()); - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class - .getName()); - // For backward compatibility - nativeSerDeNames.add("org.apache.hadoop.hive.serde.thrift.columnsetSerDe"); - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); - nativeSerDeNames.add(org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe.class.getName()); - } - - public static boolean shouldGetColsFromSerDe(String serde) { - return (serde != null) && !nativeSerDeNames.contains(serde); - } - - private static boolean initCoreSerDes = registerCoreSerDes(); - - protected static boolean registerCoreSerDes() { - // Eagerly load SerDes so they will register their symbolic names even on - // Lazy Loading JVMs - try { - // loading these classes will automatically register the short names - Class - .forName(org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class - .getName()); - Class.forName(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class - .getName()); - Class - .forName(org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer.class - .getName()); - } catch (ClassNotFoundException e) { - throw new RuntimeException( - "IMPOSSIBLE Exception: Unable to initialize core serdes", e); - } - return true; - } - /** * Escape a String in JSON format. */
