-
Notifications
You must be signed in to change notification settings - Fork 984
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DRILL-2292: CTAS broken when we have repeated maps
- Loading branch information
Showing
8 changed files
with
234 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 110 additions & 0 deletions
110
exec/java-exec/src/test/java/org/apache/drill/exec/TestRepeatedReaders.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.drill.exec; | ||
|
||
import org.apache.drill.BaseTestQuery; | ||
import org.apache.hadoop.conf.Configuration; | ||
import org.apache.hadoop.fs.FileSystem; | ||
import org.apache.hadoop.fs.Path; | ||
import org.junit.BeforeClass; | ||
import org.junit.Test; | ||
|
||
public class TestRepeatedReaders extends BaseTestQuery { | ||
|
||
static FileSystem fs; | ||
|
||
@BeforeClass | ||
public static void initFs() throws Exception { | ||
Configuration conf = new Configuration(); | ||
conf.set(FileSystem.FS_DEFAULT_NAME_KEY, "local"); | ||
|
||
fs = FileSystem.get(conf); | ||
} | ||
|
||
private static void deleteTableIfExists(String tableName) { | ||
try { | ||
Path path = new Path(getDfsTestTmpSchemaLocation(), tableName); | ||
if (fs.exists(path)) { | ||
fs.delete(path, true); | ||
} | ||
} catch (Exception e) { | ||
// ignore exceptions. | ||
} | ||
} | ||
|
||
private void createAndQuery(String datafile) throws Exception { | ||
String query = String.format("select * from cp.`parquet/%s`", datafile); | ||
String tableName = "test_repeated_readers_"+datafile; | ||
|
||
try { | ||
test("create table dfs_test.tmp.`%s` as %s", tableName, query); | ||
|
||
testBuilder() | ||
.sqlQuery("select * from dfs_test.tmp.`%s` d", tableName) | ||
.ordered() | ||
.jsonBaselineFile("parquet/" + datafile) | ||
.go(); | ||
} finally { | ||
deleteTableIfExists(tableName); | ||
} | ||
} | ||
|
||
@Test //DRILL-2292 | ||
public void testNestedRepeatedMapInsideRepeatedMap() throws Exception { | ||
createAndQuery("2292.rm_rm.json"); | ||
} | ||
|
||
@Test //DRILL-2292 | ||
public void testNestedRepeatedMapInsideMapInsideRepeatedMap() throws Exception { | ||
createAndQuery("2292.rm_m_rm.json"); | ||
} | ||
|
||
@Test //DRILL-2292 | ||
public void testNestedRepeatedListInsideRepeatedMap() throws Exception { | ||
runSQL("alter session set `store.format` = 'json'"); | ||
|
||
try { | ||
createAndQuery("2292.rl_rm.json"); | ||
} finally { | ||
runSQL("alter session set `store.format` = 'parquet'"); | ||
} | ||
} | ||
|
||
@Test //DRILL-2292 | ||
public void testNestedRepeatedMapInsideRepeatedList() throws Exception { | ||
runSQL("alter session set `store.format` = 'json'"); | ||
|
||
try { | ||
createAndQuery("2292.rm_rl.json"); | ||
} finally { | ||
runSQL("alter session set `store.format` = 'parquet'"); | ||
} | ||
} | ||
|
||
@Test //DRILL-2292 | ||
public void testNestedRepeatedListInsideRepeatedList() throws Exception { | ||
runSQL("alter session set `store.format` = 'json'"); | ||
|
||
try { | ||
createAndQuery("2292.rl_rl.json"); | ||
} finally { | ||
runSQL("alter session set `store.format` = 'parquet'"); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[ | ||
[ | ||
[ | ||
["a","b"] | ||
] | ||
] | ||
] | ||
} | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[ | ||
{ | ||
"rp_list": [ | ||
["a","b"] | ||
] | ||
} | ||
] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} |
23 changes: 23 additions & 0 deletions
23
exec/java-exec/src/test/resources/parquet/2292.rm_m_rm.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[ | ||
{ | ||
"map":{ | ||
"rp_map":[ | ||
{"b":"boo"} | ||
] | ||
} | ||
} | ||
] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[ | ||
[ | ||
{ | ||
"rp_map":[ | ||
{"b":"boo"} | ||
] | ||
} | ||
] | ||
] | ||
} | ||
{ | ||
"rp_list":[] | ||
} | ||
{ | ||
"rp_list":[] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[ | ||
{ | ||
"rp_map":[ | ||
{"b":"boo"} | ||
] | ||
} | ||
] | ||
} | ||
{ | ||
"rp_map":[] | ||
} | ||
{ | ||
"rp_map":[] | ||
} |