Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow a custom executor to be specified through a property on existing Executor implementations DAT-7531 #2374

Merged
merged 10 commits into from Jan 25, 2022
Merged

Allow a custom executor to be specified through a property on existing Executor implementations DAT-7531 #2374

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49b71fb
Added an Executor services file to examples
wwillard7800 Jan 14, 2022
f6b763b
Using the runWith=<name> attribute value, look for a property that
wwillard7800 Jan 14, 2022
2f4ec5c
Merge remote-tracking branch 'origin/master' into DAT-7531
wwillard7800 Jan 14, 2022
ceb18cf
Merge remote-tracking branch 'origin/DAT-7447' into DAT-7531
wwillard7800 Jan 14, 2022
6555933
Updated example conf files
wwillard7800 Jan 19, 2022
65f2978
Updated .conf files
wwillard7800 Jan 19, 2022
c58b33e
Added a message to indicate that which Executor is in use
wwillard7800 Jan 20, 2022
07ca508
Merge remote-tracking branch 'origin/DAT-7447' into DAT-7531
wwillard7800 Jan 20, 2022
99352ec
WIP on timeout
wwillard7800 Jan 20, 2022
dbef2bc
Work on SQLCMD timeout issues
wwillard7800 Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions liquibase-core/src/main/java/liquibase/changelog/ChangeLogIterator.java
View file
Open in desktop
@@ -1,13 +1,11 @@
package liquibase.changelog;

import liquibase.ContextExpression;
import liquibase.Labels;
import liquibase.RuntimeEnvironment;
import liquibase.Scope;
import liquibase.*;
import liquibase.changelog.filter.ChangeSetFilter;
import liquibase.changelog.filter.ChangeSetFilterResult;
import liquibase.changelog.visitor.ChangeSetVisitor;
import liquibase.changelog.visitor.SkippedChangeSetVisitor;
import liquibase.configuration.LiquibaseConfiguration;
import liquibase.exception.LiquibaseException;
import liquibase.exception.UnexpectedLiquibaseException;
import liquibase.exception.ValidationErrors;
Expand Down Expand Up @@ -137,7 +135,8 @@ private void validateChangeSetExecutor(ChangeSet changeSet, RuntimeEnvironment e
if (changeSet.getRunWith() == null) {
return;
}
String executorName = changeSet.getRunWith();
String executorName = ChangeSet.lookupExecutor(changeSet.getRunWith());

Executor executor;
try {
executor = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor(executorName, env.getTargetDatabase());
Expand Down
17 changes: 16 additions & 1 deletion liquibase-core/src/main/java/liquibase/changelog/ChangeSet.java
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
import liquibase.change.core.EmptyChange;
import liquibase.change.core.RawSQLChange;
import liquibase.changelog.visitor.ChangeExecListener;
import liquibase.configuration.LiquibaseConfiguration;
import liquibase.database.Database;
import liquibase.database.DatabaseList;
import liquibase.database.ObjectQuotingStrategy;
Expand Down Expand Up @@ -719,7 +720,8 @@ private Executor setupCustomExecutorIfNecessary(Database database) {
if (getRunWith() == null || originalExecutor instanceof LoggingExecutor) {
return originalExecutor;
}
Executor customExecutor = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor(getRunWith(), database);
String executorName = ChangeSet.lookupExecutor(getRunWith());
Executor customExecutor = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor(executorName, database);
Scope.getCurrentScope().getSingleton(ExecutorService.class).setExecutor("jdbc", database, customExecutor);
List<Change> changes = getChanges();
for (Change change : changes) {
Expand All @@ -735,6 +737,19 @@ private Executor setupCustomExecutorIfNecessary(Database database) {
return originalExecutor;
}

public static String lookupExecutor(String executorName) {
if (StringUtil.isEmpty(executorName)) {
return null;
}
String key = "liquibase." + executorName + ".executor";
String replacementExecutorName =
(String)Scope.getCurrentScope().getSingleton(LiquibaseConfiguration.class).getCurrentConfiguredValue(null, null, key).getValue();
if (replacementExecutorName != null) {
return replacementExecutorName;
}
return executorName;
}

public void rollback(Database database) throws RollbackFailedException {
rollback(database, null);
}
Expand Down
1 change: 1 addition & 0 deletions ...ibase-extension-examples/src/main/resources/META-INF/services/liquibase.executor.Executor
View file
Open in desktop
@@ -0,0 +1 @@
liquibase.executor.jvm.ExampleExecutor
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this class be committed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It should be okay. The liquibase-extension-examples are not shipped.