arina-ielchiieva commented on a change in pull request #1618: DRILL-6950: Row
set-based scan framework
URL: https://github.com/apache/drill/pull/1618#discussion_r253460539
##########
File path:
exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/scan/TestFileMetadataColumnParser.java
##########
@@ -154,93 +148,85 @@ public void testWildcard() {
Lists.newArrayList(metadataManager.projectionParser()));
List<ColumnProjection> cols = scanProj.columns();
- assertEquals(7, cols.size());
+ assertEquals(1, cols.size());
assertEquals(UnresolvedColumn.WILDCARD, cols.get(0).nodeType());
- for (int i = 0; i < 4; i++) {
- assertEquals(FileMetadataColumn.ID, cols.get(1+i).nodeType());
- }
- assertEquals(PartitionColumn.ID, cols.get(5).nodeType());
- assertEquals(PartitionColumn.ID, cols.get(6).nodeType());
}
/**
- * Drill 1.1 - 1.11 and Drill 1.13 or later put metadata columns after
- * data columns. Drill 1.12 moved them before data columns. For testing
- * and compatibility, the client can request to use the Drill 1.12 position,
- * though the after-data position is the default.
+ * Combine wildcard and file metadata columms. The wildcard expands
+ * table columns but not metadata columns.
*/
@Test
- public void testDrill1_12Wildcard() {
+ public void testWildcardAndFileMetaata() {
Path filePath = new Path("hdfs:///w/x/y/z.csv");
FileMetadataManager metadataManager = new FileMetadataManager(
- fixture.getOptionManager(), true,
+ fixture.getOptionManager(),
new Path("hdfs:///w"),
Lists.newArrayList(filePath));
ScanLevelProjection scanProj = new ScanLevelProjection(
- RowSetTestUtils.projectAll(),
- Lists.newArrayList(metadataManager.projectionParser()),
- true);
+ RowSetTestUtils.projectList(
+ SchemaPath.DYNAMIC_STAR,
+ ScanTestUtils.FILE_NAME_COL,
+ ScanTestUtils.SUFFIX_COL),
+ Lists.newArrayList(metadataManager.projectionParser()));
List<ColumnProjection> cols = scanProj.columns();
- assertEquals(7, cols.size());
- for (int i = 0; i < 4; i++) {
- assertEquals(FileMetadataColumn.ID, cols.get(i).nodeType());
- }
- assertEquals(PartitionColumn.ID, cols.get(4).nodeType());
- assertEquals(PartitionColumn.ID, cols.get(5).nodeType());
- assertEquals(UnresolvedColumn.WILDCARD, cols.get(6).nodeType());
+ assertEquals(3, cols.size());
+ assertEquals(UnresolvedColumn.WILDCARD, cols.get(0).nodeType());
+ assertEquals(FileMetadataColumn.ID, cols.get(1).nodeType());
+ assertEquals(FileMetadataColumn.ID, cols.get(2).nodeType());
}
/**
- * Can't explicitly list file metadata columns with a wildcard in
- * "legacy" mode: that is, when the wildcard already includes partition
- * and file metadata columns.
+ * As above, but include implicit columns before and after the
+ * wildcard.
*/
@Test
- public void testErrorWildcardLegacyAndFileMetaata() {
-
+ public void testWildcardAndFileMetaataMixed() {
Review comment:
`Metaata` -> `Metadata`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
