DRILL-2021: In ProjectRecordBatch, for the case where expr != ref, allow duplicates; when projecting, keep track of the used output names

11 files changed, 197 insertions, 16 deletions

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
index fa983aa3c..539d02835 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectRecordBatch.java
@@ -510,9 +510,10 @@ public class ProjectRecordBatch extends AbstractSingleRecordBatch<Project> {
     }
     // create a new name
     Integer newSeq = currentSeq + 1;
+    String newName = name + newSeq;
     result.sequenceMap.put(name, newSeq);
+    result.sequenceMap.put(newName, -1);
 
-    String newName = name + newSeq;
     return newName;
   }
 
@@ -700,26 +701,16 @@ public class ProjectRecordBatch extends AbstractSingleRecordBatch<Project> {
     else {
       // if the incoming schema's column name matches the expression name of the Project,
       // then we just want to pick the ref name as the output column name
-      result.outputNames = Lists.newArrayListWithCapacity(incomingSchemaSize);
-      for (int j=0; j < incomingSchemaSize; j++) {
-        result.outputNames.add(EMPTY_STRING);  // initialize
-      }
 
-      int k = 0;
+      result.outputNames = Lists.newArrayList();
       for (VectorWrapper<?> wrapper : incoming) {
         ValueVector vvIn = wrapper.getValueVector();
         String incomingName = vvIn.getField().getPath().getRootSegment().getPath();
-
         if (expr.getPath().equals(incomingName)) {
           String newName = ref.getPath();
-          if (!result.outputMap.containsKey(newName)) {
-            result.outputNames.set(k, newName);
-            result.outputMap.put(newName,  newName);
-          }
+          addToResultMaps(newName, result, true);
         }
-        k++;
       }
     }
   }
-
 }
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestStarQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestStarQueries.java
index ee55c5cf5..243317005 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestStarQueries.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestStarQueries.java
@@ -17,21 +17,101 @@
  */
 package org.apache.drill;
 
+import org.apache.drill.common.types.TypeProtos;
 import org.junit.Test;
 import org.apache.drill.exec.rpc.RpcException;
 
 public class TestStarQueries extends BaseTestQuery{
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestStarQueries.class);
 
+  @Test // see DRILL-2021
+  public void testSelStarCommaSameColumnRepeated() throws Exception {
+    testBuilder()
+      .sqlQuery("select n_name, *, n_name, n_name from cp.`tpch/nation.parquet`")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q1.tsv")
+      .baselineTypes(TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_name", "n_nationkey", "n_name0", "n_regionkey", "n_comment", "n_name00", "n_name1")
+      .build().run();
+
+    testBuilder()
+      .sqlQuery("select n_name, *, n_name, n_name from cp.`tpch/nation.parquet` limit 2")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q2.tsv")
+      .baselineTypes(TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_name", "n_nationkey", "n_name0", "n_regionkey", "n_comment", "n_name00", "n_name1")
+      .build().run();
+
+    testBuilder()
+      .sqlQuery("select *, n_name, *, n_name, n_name from cp.`tpch/nation.parquet`")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q3.tsv")
+      .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR,
+            TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "n_name0",
+            "n_nationkey0", "n_name1", "n_regionkey0", "n_comment0", "n_name00", "n_name10")
+      .build().run();
+
+    testBuilder()
+      .sqlQuery("select *, n_name, *, n_name, n_name from cp.`tpch/nation.parquet` limit 2")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q4.tsv")
+      .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR,
+            TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "n_name0",
+            "n_nationkey0", "n_name1", "n_regionkey0", "n_comment0", "n_name00", "n_name10")
+      .build().run();
+  }
+
+  @Test // see DRILL-1979
+  public void testSelStarMultipleStarsRegularColumnAsAlias() throws Exception {
+    testBuilder()
+      .sqlQuery("select *, n_name as extra, *, n_name as extra from cp.`tpch/nation.parquet`")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q1.tsv")
+      .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR,
+              TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "extra", "n_nationkey0", "n_name0", "n_regionkey0", "n_comment0", "extra0")
+      .build().run();
+
+      testBuilder()
+      .sqlQuery("select *, n_name as extra, *, n_name as extra from cp.`tpch/nation.parquet` limit 2")
+      .ordered()
+      .csvBaselineFile("testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q2.tsv")
+      .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR,
+              TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+      .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "extra", "n_nationkey0", "n_name0", "n_regionkey0", "n_comment0", "extra0")
+      .build().run();
+  }
+
   @Test // see DRILL-1828
   public void testSelStarMultipleStars() throws Exception {
-    test("select *, * from cp.`employee.json`;");
-    test("select *, * from cp.`employee.json` limit 2;");
+    testBuilder()
+    .sqlQuery("select *, *, n_name from cp.`tpch/nation.parquet`")
+    .ordered()
+    .csvBaselineFile("testframework/testStarQueries/testSelStarMultipleStars/q1.tsv")
+    .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+    .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "n_nationkey0", "n_name0", "n_regionkey0", "n_comment0", "n_name1")
+    .build().run();
+
+    testBuilder()
+    .sqlQuery("select *, *, n_name from cp.`tpch/nation.parquet` limit 2")
+    .ordered()
+    .csvBaselineFile("testframework/testStarQueries/testSelStarMultipleStars/q2.tsv")
+    .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+    .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "n_nationkey0", "n_name0", "n_regionkey0", "n_comment0", "n_name1")
+    .build().run();
   }
 
   @Test // see DRILL-1825
   public void testSelStarWithAdditionalColumnLimit() throws Exception {
-    test("select *, first_name, *, last_name from cp.`employee.json` limit 2;");
+    testBuilder()
+    .sqlQuery("select *, n_nationkey, *, n_name from cp.`tpch/nation.parquet` limit 2")
+    .ordered()
+    .csvBaselineFile("testframework/testStarQueries/testSelStarWithAdditionalColumnLimit/q1.tsv")
+    .baselineTypes(TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.INT, TypeProtos.MinorType.VARCHAR, TypeProtos.MinorType.VARCHAR)
+    .baselineColumns("n_nationkey", "n_name", "n_regionkey", "n_comment", "n_nationkey0", "n_nationkey1", "n_name0", "n_regionkey0", "n_comment0", "n_name1")
+    .build().run();
   }
 
   @Test
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q1.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q1.tsv
new file mode 100644
index 000000000..c995bca5f
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q1.tsv
@@ -0,0 +1,25 @@
+ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	ALGERIA
+ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	ARGENTINA
+BRAZIL	2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL	BRAZIL
+CANADA	3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA	CANADA
+EGYPT	4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT	EGYPT
+ETHIOPIA	5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA	ETHIOPIA
+FRANCE	6	FRANCE	3	refully final requests. regular, ironi	FRANCE	FRANCE
+GERMANY	7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY	GERMANY
+INDIA	8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA	INDIA
+INDONESIA	9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA	INDONESIA
+IRAN	10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN	IRAN
+IRAQ	11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ	IRAQ
+JAPAN	12	JAPAN	2	ously. final, express gifts cajole a	JAPAN	JAPAN
+JORDAN	13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN	JORDAN
+KENYA	14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA	KENYA
+MOROCCO	15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO	MOROCCO
+MOZAMBIQUE	16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE	MOZAMBIQUE
+PERU	17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU	PERU
+CHINA	18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA	CHINA
+ROMANIA	19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA	ROMANIA
+SAUDI ARABIA	20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA	SAUDI ARABIA
+VIETNAM	21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM	VIETNAM
+RUSSIA	22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA	RUSSIA
+UNITED KINGDOM	23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM	UNITED KINGDOM
+UNITED STATES	24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES	UNITED STATES
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q2.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q2.tsv
new file mode 100644
index 000000000..0d73b3fde
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q2.tsv
@@ -0,0 +1,2 @@
+ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	ALGERIA
+ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	ARGENTINA
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q3.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q3.tsv
new file mode 100644
index 000000000..c0c136f74
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q3.tsv
@@ -0,0 +1,25 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	ARGENTINA
+2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL	2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL	BRAZIL
+3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA	3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA	CANADA
+4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT	4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT	EGYPT
+5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA	5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA	ETHIOPIA
+6	FRANCE	3	refully final requests. regular, ironi	FRANCE	6	FRANCE	3	refully final requests. regular, ironi	FRANCE	FRANCE
+7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY	7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY	GERMANY
+8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA	8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA	INDIA
+9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA	9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA	INDONESIA
+10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN	10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN	IRAN
+11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ	11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ	IRAQ
+12	JAPAN	2	ously. final, express gifts cajole a	JAPAN	12	JAPAN	2	ously. final, express gifts cajole a	JAPAN	JAPAN
+13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN	13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN	JORDAN
+14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA	14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA	KENYA
+15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO	15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO	MOROCCO
+16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE	16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE	MOZAMBIQUE
+17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU	17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU	PERU
+18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA	18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA	CHINA
+19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA	19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA	ROMANIA
+20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA	20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA	SAUDI ARABIA
+21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM	21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM	VIETNAM
+22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA	22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA	RUSSIA
+23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM	23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM	UNITED KINGDOM
+24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES	24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES	UNITED STATES
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q4.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q4.tsv
new file mode 100644
index 000000000..b0415e175
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarCommaSameColumnRepeated/q4.tsv
@@ -0,0 +1,2 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	ARGENTINA
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q1.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q1.tsv
new file mode 100644
index 000000000..cb17b3a9a
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q1.tsv
@@ -0,0 +1,25 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA
+2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL
+3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA
+4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT
+5	ETHIOPIA	0	ven packages wake quickly. regu	5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA
+6	FRANCE	3	refully final requests. regular, ironi	6	FRANCE	3	refully final requests. regular, ironi	FRANCE
+7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY
+8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA
+9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA
+10	IRAN	4	efully alongside of the slyly final dependencies. 	10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN
+11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ
+12	JAPAN	2	ously. final, express gifts cajole a	12	JAPAN	2	ously. final, express gifts cajole a	JAPAN
+13	JORDAN	4	ic deposits are blithely about the carefully regular pa	13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN
+14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA
+15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO
+16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE
+17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU
+18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA
+19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA
+20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA
+21	VIETNAM	2	hely enticingly express accounts. even, final 	21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM
+22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA
+23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM
+24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q2.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q2.tsv
new file mode 100644
index 000000000..09a4ce309
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStars/q2.tsv
@@ -0,0 +1,2 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q1.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q1.tsv
new file mode 100644
index 000000000..c8e1e78ed
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q1.tsv
@@ -0,0 +1,25 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA
+2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL	2	BRAZIL	1	y alongside of the pending deposits. carefully special packages are about the ironic forges. slyly special 	BRAZIL
+3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA	3	CANADA	1	eas hang ironic, silent packages. slyly regular packages are furiously over the tithes. fluffily bold	CANADA
+4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT	4	EGYPT	4	y above the carefully unusual theodolites. final dugouts are quickly across the furiously regular d	EGYPT
+5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA	5	ETHIOPIA	0	ven packages wake quickly. regu	ETHIOPIA
+6	FRANCE	3	refully final requests. regular, ironi	FRANCE	6	FRANCE	3	refully final requests. regular, ironi	FRANCE
+7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY	7	GERMANY	3	l platelets. regular accounts x-ray: unusual, regular acco	GERMANY
+8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA	8	INDIA	2	ss excuses cajole slyly across the packages. deposits print aroun	INDIA
+9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA	9	INDONESIA	2	 slyly express asymptotes. regular deposits haggle slyly. carefully ironic hockey players sleep blithely. carefull	INDONESIA
+10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN	10	IRAN	4	efully alongside of the slyly final dependencies. 	IRAN
+11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ	11	IRAQ	4	nic deposits boost atop the quickly final requests? quickly regula	IRAQ
+12	JAPAN	2	ously. final, express gifts cajole a	JAPAN	12	JAPAN	2	ously. final, express gifts cajole a	JAPAN
+13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN	13	JORDAN	4	ic deposits are blithely about the carefully regular pa	JORDAN
+14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA	14	KENYA	0	 pending excuses haggle furiously deposits. pending, express pinto beans wake fluffily past t	KENYA
+15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO	15	MOROCCO	0	rns. blithely bold courts among the closely regular packages use furiously bold platelets?	MOROCCO
+16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE	16	MOZAMBIQUE	0	s. ironic, unusual asymptotes wake blithely r	MOZAMBIQUE
+17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU	17	PERU	1	platelets. blithely pending dependencies use fluffily across the even pinto beans. carefully silent accoun	PERU
+18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA	18	CHINA	2	c dependencies. furiously express notornis sleep slyly regular accounts. ideas sleep. depos	CHINA
+19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA	19	ROMANIA	3	ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account	ROMANIA
+20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA	20	SAUDI ARABIA	4	ts. silent requests haggle. closely express packages sleep across the blithely	SAUDI ARABIA
+21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM	21	VIETNAM	2	hely enticingly express accounts. even, final 	VIETNAM
+22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA	22	RUSSIA	3	 requests against the platelets use never according to the quickly regular pint	RUSSIA
+23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM	23	UNITED KINGDOM	3	eans boost carefully special requests. accounts are. carefull	UNITED KINGDOM
+24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES	24	UNITED STATES	1	y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be	UNITED STATES
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q2.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q2.tsv
new file mode 100644
index 000000000..c8234c77f
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarMultipleStarsRegularColumnAsAlias/q2.tsv
@@ -0,0 +1,2 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA
\ No newline at end of file
diff --git a/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarWithAdditionalColumnLimit/q1.tsv b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarWithAdditionalColumnLimit/q1.tsv
new file mode 100644
index 000000000..25977a18e
--- /dev/null
+++ b/exec/java-exec/src/test/resources/testframework/testStarQueries/testSelStarWithAdditionalColumnLimit/q1.tsv
@@ -0,0 +1,2 @@
+0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	0	0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai	ALGERIA
+1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	1	1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon	ARGENTINA
\ No newline at end of file