[
https://issues.apache.org/jira/browse/DRILL-5260?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15881578#comment-15881578
]
ASF GitHub Bot commented on DRILL-5260:
---------------------------------------
Github user paul-rogers commented on a diff in the pull request:
https://github.com/apache/drill/pull/753#discussion_r102841504
--- Diff:
exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java ---
@@ -99,33 +111,83 @@
// behavior. Production default is DEFAULT_SCAN_THREADS
put(ExecConstants.SCAN_THREADPOOL_SIZE, 4);
+
+ // Define a useful root location for the ZK persistent
+ // storage. Profiles will go here when running in distributed
+ // mode.
+
+
put(ZookeeperPersistentStoreProvider.DRILL_EXEC_SYS_STORE_PROVIDER_ZK_BLOBROOT,
"/tmp/drill/log");
}
};
public static final String DEFAULT_BIT_NAME = "drillbit";
private DrillConfig config;
- private Map<String,Drillbit> bits = new HashMap<>();
+ private Map<String, Drillbit> bits = new HashMap<>();
private Drillbit defaultDrillbit;
private BufferAllocator allocator;
private boolean ownsZK;
private ZookeeperHelper zkHelper;
private RemoteServiceSet serviceSet;
- private String dfsTestTmpSchemaLocation;
+ private File dfsTestTempDir;
protected List<ClientFixture> clients = new ArrayList<>();
+ private boolean usesZk;
+ private boolean preserveLocalFiles;
+ private boolean isLocal;
+
+ /**
+ * Temporary directories created for this test cluster.
+ * Each is removed when closing the cluster.
+ */
+
+ private List<File> tempDirs = new ArrayList<>();
+
+ ClusterFixture(FixtureBuilder builder) {
+
+ String zkConnect = configureZk(builder);
+ try {
+ createConfig(builder, zkConnect);
--- End diff --
Good catch. Moved creating the allocator earlier.
The `getServiceSetWithFullCache` thing is existing code. Only used in the
original `BaseTestQuery` and here (which I adapted from `BaseTestQuery`.) Went
ahead and cleaned up the signature in both places.
Not only that, but `getServiceSetWithFullCache()` is the same as
`getLocalServiceSet()`. Probably some legacy reason the "cache" version
existed. Since none of us know that reason, went ahead and removed the "cache"
version.
Also removed the config option that enable the (no op) cached version.
> Refinements to new "Cluster Fixture" test framework
> ---------------------------------------------------
>
> Key: DRILL-5260
> URL: https://issues.apache.org/jira/browse/DRILL-5260
> Project: Apache Drill
> Issue Type: Improvement
> Affects Versions: 1.10
> Reporter: Paul Rogers
> Assignee: Paul Rogers
> Priority: Minor
> Fix For: 1.10
>
>
> Roll-up of a number of enhancements to the cluster fixture framework.
> * Config option to suppress printing of CSV and other output. (Allows
> printing for single tests, not printing when running from Maven.)
> * Parsing of query profiles to extract plan and run time information.
> * Fix bug in log fixture when enabling logging for a package.
> * Improved ZK support.
> * Set up the new CTTAS default temporary workspace for tests.
> * Revise TestDrillbitResiliance to use the new framework.
> * Revise TestWindowFrame to to use the new framework.
> * Revise TestMergeJoinWithSchemaChanges to use the new framework.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
