Add config option to load external DDL file instead of default #192
Conversation
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 commit adds a configuration option to the xml configuration files that specifies a path to a ddl script. If the configuration option is specified then that ddl script will be used instead of the default script for the benchmark and database. This could be useful for selecting between a row store and column store layout or other alternative indexing options. The xml tag is 'ddlpath'. Resolves cmu-db#153
|
Just realized this has no tests, working on that now. |
Ok, I added some. Let me know if there's a better way to test this. |
apavlo
requested changes
Jun 21, 2022
| /** | ||
| * Return the path in which we can find the ddl script. | ||
| */ | ||
| public String getDdlPath() { |
| /** | ||
| * Set the path in which we can find the ddl script. | ||
| */ | ||
| public void setDdlPath(String ddlPath) { |
| ScriptRunner runner = new ScriptRunner(conn, true, true); | ||
|
|
||
| if (LOG.isDebugEnabled()) { | ||
| if (workConf.getDdlPath() != null) { | ||
| String ddlPath = workConf.getDdlPath(); |
There was a problem hiding this comment.
I would add a WARN message to indicate you are overriding the default DDL path.
| import java.sql.Statement; | ||
| import java.util.List; | ||
|
|
||
| public abstract class AbstractTestCreator<T extends BenchmarkModule> extends AbstractTestCase<T> { |
Comment on lines
63
to
84
| private void validateCreate() throws SQLException { | ||
| assertFalse("Failed to get table names for " + benchmark.getBenchmarkName().toUpperCase(), this.catalog.getTables().isEmpty()); | ||
|
|
||
| for (Table table : this.catalog.getTables()) { | ||
| String tableName = table.getName(); | ||
| Table catalog_tbl = this.catalog.getTable(tableName); | ||
|
|
||
| String sql = SQLUtil.getCountSQL(this.workConf.getDatabaseType(), catalog_tbl); | ||
|
|
||
| try (Statement stmt = conn.createStatement(); | ||
| ResultSet result = stmt.executeQuery(sql);) { | ||
|
|
||
| assertNotNull(result); | ||
|
|
||
| boolean adv = result.next(); | ||
| assertTrue(sql, adv); | ||
|
|
||
| int count = result.getInt(1); | ||
| assertEquals(0, count); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Do we need to test this for every benchmark? It seems like we just need to test the functionality once that should be good enough.
There was a problem hiding this comment.
I deleted these and just added a single test that uses the MockBenchmark let me know if that's what you had in mind.
|
I know what the issue is here, I just haven't had the time to fix it. I'll update it sometime this week. |
apavlo
changed the title
Merged
bpkroth
added a commit
that referenced
this pull request
Feb 14, 2025
This PR introduces functionality for configuring a session by executing predefined statements before the benchmark execution begins. Users should specify the file containing these statements within the tag `<sessionsetupfile> </sessionsetupfile>` in the benchmarks' config files. CC: @bpkroth For example, ```xml <?xml version="1.0"?> <parameters> <!-- Connection details --> <type>sqlserver</type> ... <!-- Session setup statements file --> <sessionsetupfile>config/sqlserver/session_setup_sqlserver_cmds_example.sql</sessionsetupfile> ... ``` See Also: #192 --------- Co-authored-by: Rana Alotaibi <[email protected]> Co-authored-by: Rana Alotaibi <[email protected]> Co-authored-by: Brian Kroth <[email protected]> Co-authored-by: Brian Kroth <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds a configuration option to the xml configuration files
that specifies a path to a ddl script. If the configuration option is
specified then that ddl script will be used instead of the default
script for the benchmark and database.
This could be useful for selecting between a row store and column store
layout or other alternative indexing options.
The xml tag is 'ddlpath'.
Resolves #153