Skip to content

PHOENIX-6231 Update Omid to 1.0.2#984

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

Closed
stoty wants to merge 1 commit into from
Closed

PHOENIX-6231 Update Omid to 1.0.2 #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,7 +119,7 @@ public void close() throws IOException {}
public CommitTable.Client getCommitTableClient() {
return commitTableClient;
}

@Override
public PhoenixTransactionService getTransactionService(Configuration config, ConnectionInfo connectionInfo, int port) throws SQLException{
TSOServerConfig tsoConfig = new TSOServerConfig();
Expand All@@ -132,7 +132,8 @@ public PhoenixTransactionService getTransactionService(Configuration config, Con

Injector injector = Guice.createInjector(new TSOMockModule(tsoConfig));
tso = injector.getInstance(TSOServer.class);
tso.startAndWait();
tso.startAsync();
tso.awaitRunning();

OmidClientConfiguration clientConfig = new OmidClientConfiguration();
clientConfig.setConnectionString("localhost:" + port);
Expand DownExpand Up@@ -183,7 +184,8 @@ public void close() throws IOException {
transactionManager.close();
}
if (tso != null) {
tso.stopAndWait();
tso.stopAsync();
tso.awaitTerminated();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,7 @@
<avatica.version>1.12.0</avatica.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
<tephra.version>0.15.0-incubating</tephra.version>
<omid.version>1.0.1</omid.version>
<omid.version>1.0.2</omid.version>
<spark.version>2.4.0</spark.version>
<scala.version>2.11.8</scala.version>
<scala.binary.version>2.11</scala.binary.version>
Expand Down