-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Add support for Oracle fault tolerant execution #17200
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.
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
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
62 changes: 62 additions & 0 deletions
62
plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/BaseOracleFailureRecoveryTest.java
This file contains hidden or 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,62 @@ | ||
| /* | ||
| * Licensed 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 io.trino.plugin.oracle; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
| import io.trino.operator.RetryPolicy; | ||
| import io.trino.plugin.exchange.filesystem.FileSystemExchangePlugin; | ||
| import io.trino.plugin.jdbc.BaseJdbcFailureRecoveryTest; | ||
| import io.trino.testing.QueryRunner; | ||
| import io.trino.tpch.TpchTable; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static io.trino.plugin.oracle.OracleQueryRunner.createOracleQueryRunner; | ||
| import static io.trino.plugin.oracle.TestingOracleServer.TEST_PASS; | ||
| import static io.trino.plugin.oracle.TestingOracleServer.TEST_USER; | ||
|
|
||
| public abstract class BaseOracleFailureRecoveryTest | ||
| extends BaseJdbcFailureRecoveryTest | ||
| { | ||
| public BaseOracleFailureRecoveryTest(RetryPolicy retryPolicy) | ||
| { | ||
| super(retryPolicy); | ||
| } | ||
|
|
||
| @Override | ||
| protected QueryRunner createQueryRunner( | ||
| List<TpchTable<?>> requiredTpchTables, | ||
| Map<String, String> configProperties, | ||
| Map<String, String> coordinatorProperties) | ||
| throws Exception | ||
| { | ||
| TestingOracleServer oracleServer = new TestingOracleServer(); | ||
| return createOracleQueryRunner( | ||
| closeAfterClass(oracleServer), | ||
| configProperties, | ||
| coordinatorProperties, | ||
| ImmutableMap.<String, String>builder() | ||
| .put("connection-url", oracleServer.getJdbcUrl()) | ||
| .put("connection-user", TEST_USER) | ||
| .put("connection-password", TEST_PASS) | ||
| .buildOrThrow(), | ||
| requiredTpchTables, | ||
| runner -> { | ||
| runner.installPlugin(new FileSystemExchangePlugin()); | ||
| runner.loadExchangeManager("filesystem", ImmutableMap.of( | ||
| "exchange.base-directories", System.getProperty("java.io.tmpdir") + "/trino-local-file-system-exchange-manager")); | ||
| }); | ||
| } | ||
| } |
This file contains hidden or 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
25 changes: 25 additions & 0 deletions
25
...trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleQueryFailureRecoveryTest.java
This file contains hidden or 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,25 @@ | ||
| /* | ||
| * Licensed 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 io.trino.plugin.oracle; | ||
|
|
||
| import io.trino.operator.RetryPolicy; | ||
|
|
||
| public class TestOracleQueryFailureRecoveryTest | ||
| extends BaseOracleFailureRecoveryTest | ||
| { | ||
| public TestOracleQueryFailureRecoveryTest() | ||
| { | ||
| super(RetryPolicy.QUERY); | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
.../trino-oracle/src/test/java/io/trino/plugin/oracle/TestOracleTaskFailureRecoveryTest.java
This file contains hidden or 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,25 @@ | ||
| /* | ||
| * Licensed 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 io.trino.plugin.oracle; | ||
|
|
||
| import io.trino.operator.RetryPolicy; | ||
|
|
||
| public class TestOracleTaskFailureRecoveryTest | ||
| extends BaseOracleFailureRecoveryTest | ||
| { | ||
| public TestOracleTaskFailureRecoveryTest() | ||
| { | ||
| super(RetryPolicy.TASK); | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please rebase on master and see a9aa9d0 to combine fte-tests together as normal module tests if they don't take very long to run.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So didn't it make sense to combine fte and non-fte tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be combined. It's 18m for normal test + 8min for FTE.