projection supprt *

apache · May 23, 2018 · 315d669 · 315d669
1 parent bdc3757
commit 315d669
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonInputFormat.java b/hadoop/src/main/java/org/apache/carbondata/hadoop/api/CarbonInputFormat.java
@@ -41,6 +41,7 @@
 import org.apache.carbondata.core.metadata.schema.partition.PartitionType;
 import org.apache.carbondata.core.metadata.schema.table.CarbonTable;
 import org.apache.carbondata.core.metadata.schema.table.TableInfo;
+import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema;
 import org.apache.carbondata.core.mutate.UpdateVO;
 import org.apache.carbondata.core.profiler.ExplainCollector;
 import org.apache.carbondata.core.scan.expression.Expression;
@@ -504,7 +505,24 @@ public QueryModel createQueryModel(InputSplit inputSplit, TaskAttemptContext tas
     String projectionString = getColumnProjection(configuration);
     String[] projectColumns;
     if (projectionString != null) {
-      projectColumns = projectionString.split(",");
+      if (projectionString.equalsIgnoreCase("*")) {
+        // All Columns need to be Projected.
+        List<ColumnSchema> colList = carbonTable.getTableInfo().getFactTable().getListOfColumns();
+        List<String> projectColumn = new ArrayList<String>();
+        for (ColumnSchema cols : colList) {
+          if (cols.getSchemaOrdinal() != -1) {
+            projectColumn.add(cols.getColumnUniqueId());
+          }
+        }
+        projectColumns = new String[projectColumn.size()];
+        int i = 0;
+        for (String columnName : projectColumn) {
+          projectColumns[i] = columnName;
+          i++;
+        }
+      } else {
+        projectColumns = projectionString.split(",");
+      }
     } else {
       projectColumns = new String[]{};
     }

diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java b/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java
@@ -125,7 +125,7 @@ public void testReadFilesParallel() throws IOException, InterruptedException {
     // Reader 2
     CarbonReader reader2 = CarbonReader
         .builder(path, "_temp")
-        .projection(new String[]{"name", "age"})
+        .projection(new String[]{"*"})
         .build();
 
     while (reader.hasNext()) {
@@ -154,7 +154,7 @@ public void testReadAfterClose() throws IOException, InterruptedException {
     TestUtil.writeFilesAndVerify(new Schema(fields), path, true);
 
     CarbonReader reader = CarbonReader.builder(path, "_temp")
-        .projection(new String[]{"name", "age"}).build();
+        .projection(new String[]{"*"}).build();
 
     reader.close();
     String msg = "CarbonReader not initialise, please create it first.";