Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
ccache -sz -M 8Gi
source /opt/rh/gcc-toolset-9/enable
cd presto-native-execution
cmake -B _build/debug -GNinja -DTREAT_WARNINGS_AS_ERRORS=1 -DENABLE_ALL_WARNINGS=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
cmake -B _build/debug -GNinja -DTREAT_WARNINGS_AS_ERRORS=1 -DENABLE_ALL_WARNINGS=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DPRESTO_ENABLE_PARQUET=ON
ninja -C _build/debug -j 8
ccache -s
- save_cache:
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,16 @@
public class AbstractTestHiveQueries
extends AbstractTestQueryFramework
{
static final String PARQUET_STORAGE_FORMAT = "PARQUET";
static final String DWARF_STORAGE_FORMAT = "DWRF";

private final boolean useThrift;
private final String storageFormat;

protected AbstractTestHiveQueries(boolean useThrift)
protected AbstractTestHiveQueries(boolean useThrift, String storageFormat)
{
this.useThrift = useThrift;
this.storageFormat = storageFormat;
}

@Override
Expand All @@ -45,14 +50,14 @@ protected QueryRunner createQueryRunner()
assertNotNull(prestoServerPath, "Native worker binary path is missing. Add -DPRESTO_SERVER=<path/to/presto_server> to your JVM arguments.");
assertNotNull(dataDirectory, "Data directory path is missing. Add -DDATA_DIR=<path/to/data> to your JVM arguments.");

return HiveExternalWorkerQueryRunner.createNativeQueryRunner(dataDirectory, prestoServerPath, Optional.ofNullable(workerCount).map(Integer::parseInt), cacheMaxSize, useThrift);
return HiveExternalWorkerQueryRunner.createNativeQueryRunner(dataDirectory, prestoServerPath, Optional.ofNullable(workerCount).map(Integer::parseInt), cacheMaxSize, useThrift, storageFormat);
}

@Override
protected ExpectedQueryRunner createExpectedQueryRunner()
throws Exception
{
String dataDirectory = System.getProperty("DATA_DIR");
return HiveExternalWorkerQueryRunner.createJavaQueryRunner(Optional.of(Paths.get(dataDirectory)));
return HiveExternalWorkerQueryRunner.createJavaQueryRunner(Optional.of(Paths.get(dataDirectory)), storageFormat);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class TestHiveAggregationQueries
{
public TestHiveAggregationQueries()
{
super(true);
super(true, DWARF_STORAGE_FORMAT);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit : Spelling "DWRF"

}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class TestHiveBitwiseFunctionQueries
{
public TestHiveBitwiseFunctionQueries()
{
super(false);
super(false, DWARF_STORAGE_FORMAT);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class TestHiveJoinQueries
{
public TestHiveJoinQueries()
{
super(true);
super(true, DWARF_STORAGE_FORMAT);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ abstract class TestHiveQueries
{
protected TestHiveQueries(boolean useThrift)
{
super(useThrift);
super(useThrift, DWARF_STORAGE_FORMAT);
}

@Test
Expand Down
Loading