You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by oh...@apache.org on 2018/03/22 14:31:54 UTC
incubator-omid git commit: [OMID-70] - reopen in order to bind
WorldClockOracleImpl in TSOMockModule.
Repository: incubator-omid
Updated Branches:
refs/heads/phoenix-integration ea4c73954 -> f3d980c75
[OMID-70] - reopen in order to bind WorldClockOracleImpl in TSOMockModule.
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/f3d980c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/f3d980c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/f3d980c7
Branch: refs/heads/phoenix-integration
Commit: f3d980c75bb5b667222c95b1216b3de672b4209c
Parents: ea4c739
Author: Ohad Shacham <oh...@yahoo-inc.com>
Authored: Thu Mar 22 16:28:46 2018 +0200
Committer: Ohad Shacham <oh...@yahoo-inc.com>
Committed: Thu Mar 22 16:28:46 2018 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/omid/tso/TSOMockModule.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/f3d980c7/tso-server/src/test/java/org/apache/omid/tso/TSOMockModule.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TSOMockModule.java b/tso-server/src/test/java/org/apache/omid/tso/TSOMockModule.java
index 17fd2e0..fc30e60 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TSOMockModule.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TSOMockModule.java
@@ -26,6 +26,7 @@ import org.apache.omid.committable.InMemoryCommitTable;
import org.apache.omid.metrics.MetricsRegistry;
import org.apache.omid.metrics.NullMetricsProvider;
import org.apache.omid.timestamp.storage.TimestampStorage;
+import org.apache.omid.tso.TSOServerConfig.TIMESTAMP_TYPE;
import org.apache.omid.tso.TimestampOracleImpl.InMemoryTimestampStorage;
import javax.inject.Named;
@@ -51,7 +52,11 @@ public class TSOMockModule extends AbstractModule {
bind(TSOStateManager.class).to(TSOStateManagerImpl.class).in(Singleton.class);
bind(CommitTable.class).to(InMemoryCommitTable.class).in(Singleton.class);
bind(TimestampStorage.class).to(InMemoryTimestampStorage.class).in(Singleton.class);
- bind(TimestampOracle.class).to(PausableTimestampOracle.class).in(Singleton.class);
+ if (config.getTimestampTypeEnum() == TIMESTAMP_TYPE.WORLD_TIME) {
+ bind(TimestampOracle.class).to(WorldClockOracleImpl.class).in(Singleton.class);
+ } else {
+ bind(TimestampOracle.class).to(PausableTimestampOracle.class).in(Singleton.class);
+ }
bind(Panicker.class).to(MockPanicker.class).in(Singleton.class);
install(new BatchPoolModule(config));