You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/09/22 08:10:22 UTC

svn commit: r1525322 [2/7] - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/results/clientpositive/ hbase-handler/src/java/org/apache/hadoop/hive/hbase/ hbase-handler/src/test/results/positive/ hcatalog/core/src/mai...

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestRCFile.java Sun Sep 22 06:10:15 2013
@@ -18,6 +18,14 @@
 
 package org.apache.hadoop.hive.ql.io;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,8 +36,6 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
-import static org.junit.Assert.*;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -58,11 +64,11 @@ import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.hadoop.io.compress.DefaultCodec;
+import org.apache.hadoop.mapred.FileSplit;
 import org.apache.hadoop.mapred.InputSplit;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.RecordReader;
 import org.apache.hadoop.mapred.Reporter;
-import org.apache.hadoop.mapred.FileSplit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -83,20 +89,21 @@ public class TestRCFile {
 
   // Data
 
-  private Writable[] expectedFieldsData = {
+  private final Writable[] expectedFieldsData = {
       new ByteWritable((byte) 123), new ShortWritable((short) 456),
       new IntWritable(789), new LongWritable(1000), new DoubleWritable(5.3),
       new Text("hive and hadoop"), null, null};
 
-  private Object[] expectedPartitalFieldsData = {null, null,
+  private final Object[] expectedPartitalFieldsData = {null, null,
       new IntWritable(789), new LongWritable(1000), null, null, null, null};
-  private BytesRefArrayWritable patialS = new BytesRefArrayWritable();
+  private final BytesRefArrayWritable patialS = new BytesRefArrayWritable();
   private byte[][] bytesArray;
   private BytesRefArrayWritable s;
 
   @Before
   public void setup() throws Exception {
     conf = new Configuration();
+    ColumnProjectionUtils.setReadAllColumns(conf);
     fs = FileSystem.getLocal(conf);
     dir = new Path(System.getProperty("test.data.dir", ".") + "/mapred");
     file = new Path(dir, "test_rcfile");
@@ -511,7 +518,7 @@ public class TestRCFile {
       throws IOException, SerDeException {
     LOG.debug("reading " + count + " records");
     long start = System.currentTimeMillis();
-    ColumnProjectionUtils.setFullyReadColumns(conf);
+    ColumnProjectionUtils.setReadAllColumns(conf);
     RCFile.Reader reader = new RCFile.Reader(fs, file, conf);
 
     LongWritable rowID = new LongWritable();
@@ -556,7 +563,7 @@ public class TestRCFile {
     java.util.ArrayList<Integer> readCols = new java.util.ArrayList<Integer>();
     readCols.add(Integer.valueOf(2));
     readCols.add(Integer.valueOf(3));
-    ColumnProjectionUtils.setReadColumnIDs(conf, readCols);
+    ColumnProjectionUtils.appendReadColumns(conf, readCols);
     RCFile.Reader reader = new RCFile.Reader(fs, file, conf);
 
     LongWritable rowID = new LongWritable();

Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestInputOutputFormat.java Sun Sep 22 06:10:15 2013
@@ -17,6 +17,20 @@
  */
 package org.apache.hadoop.hive.ql.io.orc;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.BlockLocation;
 import org.apache.hadoop.fs.FSDataInputStream;
@@ -30,6 +44,7 @@ import org.apache.hadoop.hive.conf.HiveC
 import org.apache.hadoop.hive.ql.exec.FileSinkOperator;
 import org.apache.hadoop.hive.ql.io.HiveOutputFormat;
 import org.apache.hadoop.hive.ql.io.InputFormatChecker;
+import org.apache.hadoop.hive.serde2.ColumnProjectionUtils;
 import org.apache.hadoop.hive.serde2.SerDe;
 import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory;
 import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -54,21 +69,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-
 public class TestInputOutputFormat {
 
   Path workDir = new Path(System.getProperty("test.tmp.dir","target/test/tmp"));
@@ -574,7 +574,7 @@ public class TestInputOutputFormat {
     reader.close();
 
     // read just the first column
-    conf.set("hive.io.file.readcolumn.ids", "0");
+    ColumnProjectionUtils.appendReadColumns(conf, Collections.singletonList(0));
     reader = in.getRecordReader(splits[0], conf, Reporter.NULL);
     key = reader.createKey();
     value = (Writable) reader.createValue();
@@ -589,7 +589,7 @@ public class TestInputOutputFormat {
     reader.close();
 
     // test the mapping of empty string to all columns
-    conf.set("hive.io.file.readcolumn.ids", "");
+    ColumnProjectionUtils.setReadAllColumns(conf);
     reader = in.getRecordReader(splits[0], conf, Reporter.NULL);
     key = reader.createKey();
     value = (Writable) reader.createValue();
@@ -655,7 +655,7 @@ public class TestInputOutputFormat {
     FileInputFormat.setInputPaths(conf, testFilePath.toString());
     InputSplit[] splits = in.getSplits(conf, 1);
     assertEquals(1, splits.length);
-    conf.set("hive.io.file.readcolumn.ids", "1");
+    ColumnProjectionUtils.appendReadColumns(conf, Collections.singletonList(1));
     org.apache.hadoop.mapred.RecordReader reader =
         in.getRecordReader(splits[0], conf, Reporter.NULL);
     Object key = reader.createKey();

Modified: hive/trunk/ql/src/test/queries/clientpositive/binary_table_colserde.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/binary_table_colserde.q?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/binary_table_colserde.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/binary_table_colserde.q Sun Sep 22 06:10:15 2013
@@ -3,6 +3,7 @@ drop table ba_test;
 -- Everything in ba_table1.q + columnar serde in RCFILE.
 
 create table ba_test (ba_key binary, ba_val binary) stored as rcfile;
+alter table ba_test set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe';
 
 describe extended ba_test;
 

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out Sun Sep 22 06:10:15 2013
@@ -154,6 +154,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out Sun Sep 22 06:10:15 2013
@@ -126,6 +126,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out Sun Sep 22 06:10:15 2013
@@ -101,6 +101,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -116,6 +117,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -167,6 +169,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out Sun Sep 22 06:10:15 2013
@@ -109,6 +109,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -126,6 +127,7 @@ STAGE PLANS:
                     expr: _col2
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -179,6 +181,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out Sun Sep 22 06:10:15 2013
@@ -184,6 +184,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -213,7 +214,6 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-
 PREHOOK: query: select sum(hash(a.k1,a.v1,a.k2,a.v2,a.k3,a.v3))
 from (
 SELECT src1.key as k1, src1.value as v1, src2.key as k2, src2.value as v2 , src3.key as k3, src3.value as v3 
@@ -419,6 +419,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -448,7 +449,6 @@ STAGE PLANS:
     Fetch Operator
       limit: -1
 
-
 PREHOOK: query: select sum(hash(a.k1,a.v1,a.k2,a.v2,a.k3,a.v3))
 from (
 SELECT src1.key as k1, src1.value as v1, src2.key as k2, src2.value as v2 , src3.key as k3, src3.value as v3  

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out Sun Sep 22 06:10:15 2013
@@ -201,6 +201,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join30.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join30.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join30.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join30.q.out Sun Sep 22 06:10:15 2013
@@ -74,6 +74,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -88,6 +89,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -126,6 +128,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -159,6 +162,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -173,6 +177,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -211,6 +216,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -221,6 +227,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -395,6 +402,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -409,6 +417,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Left Outer Join0 to 1
@@ -447,6 +456,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -476,6 +486,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -486,6 +497,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -660,6 +672,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -674,6 +687,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Right Outer Join0 to 1
@@ -712,6 +726,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -741,6 +756,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -751,6 +767,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -939,6 +956,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -951,6 +969,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 0
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -967,6 +986,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -1008,6 +1028,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1044,6 +1065,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1056,6 +1078,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 1
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1072,6 +1095,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME2 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -1120,6 +1144,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1132,6 +1157,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 2
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1148,6 +1174,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -1189,6 +1216,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1199,6 +1227,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1209,6 +1238,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1436,6 +1466,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1448,6 +1479,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 0
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1464,6 +1496,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -1505,6 +1538,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1541,6 +1575,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1553,6 +1588,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 1
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1569,6 +1605,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME2 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -1610,6 +1647,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1620,6 +1658,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1630,6 +1669,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1855,6 +1895,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1867,6 +1908,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 0
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -1883,6 +1925,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Left Outer Join0 to 1
@@ -1924,6 +1967,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1953,6 +1997,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1963,6 +2008,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1973,6 +2019,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2198,6 +2245,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -2210,6 +2258,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 2
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -2226,6 +2275,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Left Outer Join0 to 1
@@ -2267,6 +2317,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2296,6 +2347,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2306,6 +2358,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2316,6 +2369,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2541,6 +2595,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -2553,6 +2608,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 2
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -2569,6 +2625,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Right Outer Join0 to 1
@@ -2610,6 +2667,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2639,6 +2697,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2649,6 +2708,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2659,6 +2719,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join31.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join31.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join31.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join31.q.out Sun Sep 22 06:10:15 2013
@@ -84,6 +84,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -96,6 +97,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 1
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -112,6 +114,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME2 
+          TableScan
             Map Join Operator
               condition map:
                    Right Outer Join0 to 1
@@ -153,6 +156,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -189,6 +193,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -201,6 +206,7 @@ STAGE PLANS:
                 2 [Column[_col0]]
               Position of Big Table: 2
         $INTNAME2 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 
@@ -217,6 +223,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Right Outer Join0 to 1
@@ -258,6 +265,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -268,6 +276,7 @@ STAGE PLANS:
                     type: string
               tag: 2
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -278,6 +287,7 @@ STAGE PLANS:
                     type: string
               tag: 0
         $INTNAME2 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out Sun Sep 22 06:10:15 2013
@@ -221,6 +221,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
+            GatherStats: false
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -347,6 +349,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
+            GatherStats: false
             Reduce Output Operator
               key expressions:
                     expr: _col10
@@ -470,6 +474,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
+            GatherStats: false
             Reduce Output Operator
               key expressions:
                     expr: _col18

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out Sun Sep 22 06:10:15 2013
@@ -238,6 +238,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -424,6 +425,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -439,6 +441,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -480,6 +483,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1255,6 +1259,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1834,6 +1839,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1847,6 +1853,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1888,6 +1895,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1901,6 +1909,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -2216,6 +2225,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -2229,6 +2239,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out Sun Sep 22 06:10:15 2013
@@ -201,6 +201,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -385,6 +386,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out Sun Sep 22 06:10:15 2013
@@ -170,6 +170,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -313,6 +314,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -456,6 +458,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -619,6 +622,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1071,6 +1075,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1210,6 +1215,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1373,6 +1379,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2114,6 +2121,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out Sun Sep 22 06:10:15 2013
@@ -236,6 +236,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -398,6 +399,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -596,6 +598,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
@@ -610,6 +613,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -644,6 +648,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -678,6 +683,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
@@ -692,6 +698,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -726,6 +733,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -741,6 +749,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2437,6 +2446,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2787,6 +2797,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -3178,6 +3189,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME1 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
@@ -3192,6 +3204,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -3226,6 +3239,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -3260,6 +3274,7 @@ STAGE PLANS:
             limit: -1
       Alias -> Map Local Operator Tree:
         $INTNAME 
+          TableScan
             HashTable Sink Operator
               condition expressions:
                 0 {_col0} {_col1}
@@ -3274,6 +3289,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME1 
+          TableScan
             Map Join Operator
               condition map:
                    Inner Join 0 to 1
@@ -3308,6 +3324,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -3323,6 +3340,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/binary_output_format.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/binary_output_format.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/binary_output_format.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/binary_output_format.q.out Sun Sep 22 06:10:15 2013
@@ -201,6 +201,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -269,6 +271,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/binary_table_colserde.q.out Sun Sep 22 06:10:15 2013
@@ -11,12 +11,20 @@ POSTHOOK: query: -- Everything in ba_tab
 create table ba_test (ba_key binary, ba_val binary) stored as rcfile
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: default@ba_test
+PREHOOK: query: alter table ba_test set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
+PREHOOK: type: ALTERTABLE_SERIALIZER
+PREHOOK: Input: default@ba_test
+PREHOOK: Output: default@ba_test
+POSTHOOK: query: alter table ba_test set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe'
+POSTHOOK: type: ALTERTABLE_SERIALIZER
+POSTHOOK: Input: default@ba_test
+POSTHOOK: Output: default@ba_test
 PREHOOK: query: describe extended ba_test
 PREHOOK: type: DESCTABLE
 POSTHOOK: query: describe extended ba_test
 POSTHOOK: type: DESCTABLE
-ba_key              	binary              	None                
-ba_val              	binary              	None                
+ba_key              	binary              	from deserializer   
+ba_val              	binary              	from deserializer   
 	 	 
 #### A masked pattern was here ####
 PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary)

Modified: hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucket5.q.out Sun Sep 22 06:10:15 2013
@@ -207,6 +207,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -316,6 +318,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -381,6 +385,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out Sun Sep 22 06:10:15 2013
@@ -98,6 +98,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col1
@@ -153,6 +154,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out Sun Sep 22 06:10:15 2013
@@ -563,6 +563,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -628,6 +630,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1063,6 +1067,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1143,6 +1149,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out Sun Sep 22 06:10:15 2013
@@ -309,6 +309,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -374,6 +376,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -859,6 +863,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -939,6 +945,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1643,6 +1651,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -1723,6 +1733,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out Sun Sep 22 06:10:15 2013
@@ -326,6 +326,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -391,6 +393,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -876,6 +880,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -956,6 +962,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out Sun Sep 22 06:10:15 2013
@@ -277,6 +277,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -342,6 +344,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -766,6 +770,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -846,6 +852,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out Sun Sep 22 06:10:15 2013
@@ -366,6 +366,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -431,6 +433,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -918,6 +922,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -998,6 +1004,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out Sun Sep 22 06:10:15 2013
@@ -281,6 +281,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -346,6 +348,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out Sun Sep 22 06:10:15 2013
@@ -341,6 +341,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -406,6 +408,8 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
+            GatherStats: false
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out Sun Sep 22 06:10:15 2013
@@ -77,6 +77,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -90,6 +91,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/cast1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cast1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cast1.q.out Sun Sep 22 06:10:15 2013
@@ -85,6 +85,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0
@@ -98,6 +99,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             File Output Operator
               compressed: false
               GlobalTableId: 0

Modified: hive/trunk/ql/src/test/results/clientpositive/cluster.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/cluster.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/cluster.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/cluster.q.out Sun Sep 22 06:10:15 2013
@@ -636,6 +636,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col1
@@ -766,6 +767,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col1
@@ -898,6 +900,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1026,6 +1029,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out Sun Sep 22 06:10:15 2013
@@ -515,6 +515,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -685,6 +686,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -825,6 +827,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -964,6 +967,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1022,6 +1026,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col1

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out Sun Sep 22 06:10:15 2013
@@ -94,6 +94,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -141,6 +142,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -294,6 +296,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -477,6 +480,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -633,6 +637,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -680,6 +685,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -845,6 +851,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -989,6 +996,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1036,6 +1044,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1189,6 +1198,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1333,6 +1343,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1380,6 +1391,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1518,6 +1530,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1565,6 +1578,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1709,6 +1723,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1756,6 +1771,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -1909,6 +1925,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2053,6 +2070,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2100,6 +2118,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2238,6 +2257,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2285,6 +2305,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2431,6 +2452,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2478,6 +2500,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2616,6 +2639,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2663,6 +2687,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -2809,6 +2834,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -2865,6 +2891,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -3014,6 +3041,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -3070,6 +3098,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -3223,6 +3252,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -3270,6 +3300,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1
@@ -3416,6 +3447,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -3463,6 +3495,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               sort order: 
               tag: -1

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out Sun Sep 22 06:10:15 2013
@@ -101,6 +101,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -141,6 +142,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -206,6 +208,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -424,6 +427,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -600,6 +604,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -653,6 +658,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -861,6 +867,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1027,6 +1034,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1080,6 +1088,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1300,6 +1309,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out Sun Sep 22 06:10:15 2013
@@ -134,6 +134,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -428,6 +429,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out Sun Sep 22 06:10:15 2013
@@ -67,6 +67,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -82,6 +83,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out Sun Sep 22 06:10:15 2013
@@ -134,6 +134,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -155,6 +156,7 @@ STAGE PLANS:
                     expr: _col2
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -210,6 +212,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out Sun Sep 22 06:10:15 2013
@@ -79,6 +79,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -94,6 +95,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -238,6 +240,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -253,6 +256,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -400,6 +404,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -415,6 +420,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -818,6 +824,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -833,6 +840,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -982,6 +990,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -997,6 +1006,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1144,6 +1154,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1159,6 +1170,7 @@ STAGE PLANS:
                     expr: _col1
                     type: string
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1582,6 +1594,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -1597,6 +1610,7 @@ STAGE PLANS:
                     expr: _col1
                     type: bigint
         $INTNAME1 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0

Modified: hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out?rev=1525322&r1=1525321&r2=1525322&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out Sun Sep 22 06:10:15 2013
@@ -93,6 +93,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -133,6 +134,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
         $INTNAME 
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -191,6 +193,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0
@@ -430,6 +433,7 @@ STAGE PLANS:
     Map Reduce
       Alias -> Map Operator Tree:
 #### A masked pattern was here ####
+          TableScan
             Reduce Output Operator
               key expressions:
                     expr: _col0