You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/06/03 21:27:28 UTC
[01/23] incubator-omid git commit: [ci skip]prepare release
omid-0.8.2.1
Repository: incubator-omid
Updated Branches:
refs/heads/master b77cce396 -> 89fe337f4
[ci skip]prepare release omid-0.8.2.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/dad27243
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/dad27243
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/dad27243
Branch: refs/heads/master
Commit: dad2724311bedc37d45ab9a41521bf6650211729
Parents: b77cce3
Author: Omid CI <om...@yahoo-inc.com>
Authored: Wed May 18 19:49:30 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Wed May 18 19:49:30 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index e24d342..a3905ed 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index bafcdc8..ea03767 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index d904359..3ce1504 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index b0cbc79..e762121 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index fdfb0fa..14276f1 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 4e2e55d..fb00c16 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 4bd7a89..a186d02 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 3373702..25eb577 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index d14d8dc..000010b 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index 4593485..cc039b1 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index e16494e..20ea209 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 3d2aa99..c4300eb 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 7c57978..58bcefb 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 577b699..633751c 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d6137e9..5394514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>master</tag>
+ <tag>omid-0.8.2.1</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 3cf875b..8bd3f42 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index f0d777a..04cb58a 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 2be9e67..04c1532 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/dad27243/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 86800e5..0953ea5 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1-SNAPSHOT</version>
+ <version>0.8.2.1</version>
</parent>
<artifactId>tso-server</artifactId>
[03/23] incubator-omid git commit: [OMID-27] Increase test timeouts
in Tests
Posted by fp...@apache.org.
[OMID-27] Increase test timeouts in Tests
In some environments (e.g. slow machines) PersistenceProcessor or
LeaseManager tests fail because either the specified default timeout
or the lease period are not sufficiently high.
Default timeouts for tests have been increased to at least 30 seconds
and the default lease period in test to 5 seconds.
Change-Id: I4b4aef7570ee05fa6c3f67a2f10c9c1da4d37c28
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/a4e7f56f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/a4e7f56f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/a4e7f56f
Branch: refs/heads/master
Commit: a4e7f56fe442bcb93a8c8604f35be9109f99a255
Parents: 5eb385b
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Wed May 18 12:55:40 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Wed May 18 14:40:47 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/omid/tso/TestLeaseManager.java | 12 ++++++------
.../apache/omid/tso/TestPersistenceProcessor.java | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a4e7f56f/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
index 1fc93a3..baef807 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
@@ -63,7 +63,7 @@ public class TestLeaseManager {
private static final Logger LOG = LoggerFactory.getLogger(TestLeaseManager.class);
- private static final long TEST_LEASE_PERIOD_IN_MS = 1000; // 1 second
+ private static final long TEST_LEASE_PERIOD_IN_MS = 5000; // 5 seconds
private CuratorFramework zkClient;
private TestingServer zkServer;
@@ -96,7 +96,7 @@ public class TestLeaseManager {
}
- @Test(timeOut = 30_000)
+ @Test(timeOut = 80_000)
public void testErrorInitializingTSOStateExitsTheTSO() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test0_tsolease";
@@ -126,7 +126,7 @@ public class TestLeaseManager {
}
- @Test(timeOut = 60_000)
+ @Test(timeOut = 80_000)
public void testLeaseHolderDoesNotChangeWhenPausedForALongTimeAndTheresNoOtherInstance() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test1_tsolease";
@@ -177,7 +177,7 @@ public class TestLeaseManager {
}
- @Test(timeOut = 60_000)
+ @Test(timeOut = 80_000)
public void testLeaseHolderDoesNotChangeWhenANewLeaseManagerIsUp() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test2_tsolease";
@@ -230,7 +230,7 @@ public class TestLeaseManager {
assertFalse(leaseManager2.stillInLeasePeriod());
}
- @Test(timeOut = 60_000)
+ @Test(timeOut = 80_000)
public void testLeaseHolderChangesWhenActiveLeaseManagerIsPaused() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test3_tsolease";
@@ -324,7 +324,7 @@ public class TestLeaseManager {
}
- @Test(timeOut = 40_000)
+ @Test(timeOut = 80_000)
public void testLeaseManagerPanicsWhenUnexpectedInfoIsFoundInCurrentTSOZnode() throws Exception {
final String TEST_TSO_LEASE_PATH = "/test_wronginfo_tsolease";
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a4e7f56f/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
index 2bf7cf6..66381ba 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
@@ -95,7 +95,7 @@ public class TestPersistenceProcessor {
Mockito.reset(mockWriter);
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testLowWatermarkIsPersisted() throws Exception {
TSOServerConfig tsoConfig = new TSOServerConfig();
@@ -129,7 +129,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitPersistenceWithSingleCommitTableWriter() throws Exception {
final int NUM_CT_WRITERS = 1;
@@ -172,7 +172,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitPersistenceWithMultipleCommitTableWriters() throws Exception {
final int NUM_CT_WRITERS = 2;
@@ -242,7 +242,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitPersistenceWithNonHALeaseManager() throws Exception {
final int NUM_CT_WRITERS = 1;
@@ -285,7 +285,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitPersistenceWithHALeaseManagerAndMinimumCommitTableWriters() throws Exception {
final int NUM_PERSIST_HANDLERS = 2; // Minimum commit table writers is 2
@@ -300,7 +300,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitPersistenceWithHALeaseManagerAndMultipleCommitTableWriters() throws Exception {
final int NUM_CT_WRITERS = 4;
@@ -423,7 +423,7 @@ public class TestPersistenceProcessor {
return handlers;
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testCommitTableExceptionOnCommitPersistenceTakesDownDaemon() throws Exception {
// Init lease management (doesn't matter if HA or not)
@@ -464,7 +464,7 @@ public class TestPersistenceProcessor {
}
- @Test(timeOut = 10_000)
+ @Test(timeOut = 30_000)
public void testRuntimeExceptionOnCommitPersistenceTakesDownDaemon() throws Exception {
TSOServerConfig config = new TSOServerConfig();
[14/23] incubator-omid git commit: [ci skip]prepare release
omid-0.8.2.3
Posted by fp...@apache.org.
[ci skip]prepare release omid-0.8.2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/b253cde9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/b253cde9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/b253cde9
Branch: refs/heads/master
Commit: b253cde9b4f32e77c0866e1771044fe68556f0d7
Parents: 0030798
Author: Omid CI <om...@yahoo-inc.com>
Authored: Mon May 23 18:18:22 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Mon May 23 18:18:22 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 5ea5df5..f347e17 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index bb6fb9a..5441f17 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index d1234b4..e55d7de 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index f20f3f9..7e98efc 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 2b8583f..fe29aeb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 076c738..3f21003 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 669a536..26beca8 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index c44b72f..a58532b 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index ff2b33a..f6c1a37 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index 59a9abb..5cb2327 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index d059d3f..626db59 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index dc8ff16..5c4f4b4 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 269f453..318d61e 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index f99c5cf..9b7b31c 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 362f39c..6b677df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>master</tag>
+ <tag>omid-0.8.2.3</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 3ea5ee4..1cb06d3 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 5e7f6a7..bd97f6e 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 098e0d8..e1a8110 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/b253cde9/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index a47880f..c527a78 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3-SNAPSHOT</version>
+ <version>0.8.2.3</version>
</parent>
<artifactId>omid-tso-server</artifactId>
[18/23] incubator-omid git commit: [OMID-35] Fix and improve TSO
metrics
Posted by fp...@apache.org.
[OMID-35] Fix and improve TSO metrics
After refactoring the TSO pipeline the metrics, specially those related to
latencies, were not representative anymore. Also new specialized metrics,
have been added to measure special events.
Change-Id: Ie607872d0b2f3cf9e782eff70119e9d834979e43
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/c4c65aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/c4c65aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/c4c65aca
Branch: refs/heads/master
Commit: c4c65acaef18651b047a1038d96fdd8ff367be69
Parents: 1f989f8
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Tue May 24 10:44:33 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Tue May 24 15:05:30 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/omid/tso/Batch.java | 25 ++++++----
.../org/apache/omid/tso/MonitoringContext.java | 2 +-
.../omid/tso/PersistenceProcessorHandler.java | 48 ++++++++++++++------
.../org/apache/omid/tso/ReplyProcessorImpl.java | 46 ++++++++-----------
.../apache/omid/tso/RequestProcessorImpl.java | 25 +++++-----
.../org/apache/omid/tso/RetryProcessorImpl.java | 27 +++++++----
.../java/org/apache/omid/tso/TestBatch.java | 7 +++
.../org/apache/omid/tso/TestReplyProcessor.java | 26 ++++-------
8 files changed, 117 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/Batch.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/Batch.java b/tso-server/src/main/java/org/apache/omid/tso/Batch.java
index 496bca2..99d0c5c 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/Batch.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/Batch.java
@@ -93,36 +93,43 @@ public class Batch {
}
- void addCommit(long startTimestamp, long commitTimestamp, Channel c, MonitoringContext context) {
+ void addTimestamp(long startTimestamp, Channel c, MonitoringContext context) {
+
Preconditions.checkState(!isFull(), "batch is full");
int index = numEvents++;
PersistEvent e = events[index];
- e.makePersistCommit(startTimestamp, commitTimestamp, c, context);
+ context.timerStart("persistence.processor.timestamp.latency");
+ e.makePersistTimestamp(startTimestamp, c, context);
}
- public void addCommitRetry(long startTimestamp, Channel c, MonitoringContext context) {
+ void addCommit(long startTimestamp, long commitTimestamp, Channel c, MonitoringContext context) {
Preconditions.checkState(!isFull(), "batch is full");
int index = numEvents++;
PersistEvent e = events[index];
- e.makeCommitRetry(startTimestamp, c, context);
+ context.timerStart("persistence.processor.commit.latency");
+ e.makePersistCommit(startTimestamp, commitTimestamp, c, context);
}
- void addAbort(long startTimestamp, Channel c, MonitoringContext context) {
+ void addCommitRetry(long startTimestamp, Channel c, MonitoringContext context) {
+
Preconditions.checkState(!isFull(), "batch is full");
int index = numEvents++;
PersistEvent e = events[index];
- e.makePersistAbort(startTimestamp, c, context);
+ context.timerStart("persistence.processor.commit-retry.latency");
+ e.makeCommitRetry(startTimestamp, c, context);
}
- void addTimestamp(long startTimestamp, Channel c, MonitoringContext context) {
+ void addAbort(long startTimestamp, Channel c, MonitoringContext context) {
+
Preconditions.checkState(!isFull(), "batch is full");
int index = numEvents++;
PersistEvent e = events[index];
- e.makePersistTimestamp(startTimestamp, c, context);
+ context.timerStart("persistence.processor.abort.latency");
+ e.makePersistAbort(startTimestamp, c, context);
}
@@ -136,7 +143,7 @@ public class Batch {
.toString();
}
- public static class BatchFactory extends BasePooledObjectFactory<Batch> {
+ static class BatchFactory extends BasePooledObjectFactory<Batch> {
private static int batchId = 0;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/MonitoringContext.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/MonitoringContext.java b/tso-server/src/main/java/org/apache/omid/tso/MonitoringContext.java
index 4f448a5..426df27 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/MonitoringContext.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/MonitoringContext.java
@@ -37,7 +37,7 @@ public class MonitoringContext {
private static final Logger LOG = LoggerFactory.getLogger(MonitoringContext.class);
private volatile boolean flag;
- private Map<String, Long> elapsedTimeMsMap = new HashMap<>();
+ private Map<String, Long> elapsedTimeMsMap = new ConcurrentHashMap<>();
private Map<String, Stopwatch> timers = new ConcurrentHashMap<>();
private MetricsRegistry metrics;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
index bfe0036..07241f0 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorHandler.java
@@ -79,21 +79,24 @@ public class PersistenceProcessorHandler implements WorkHandler<PersistenceProce
Batch batch = batchEvent.getBatch();
int numOfBatchedEvents = batch.getNumEvents();
batchSizeHistogram.update(numOfBatchedEvents);
- for (int i=0; i < numOfBatchedEvents; ++i) {
+ for (int i=0; i < numOfBatchedEvents; i++) {
PersistEvent event = batch.get(i);
-
switch (event.getType()) {
- case COMMIT:
- event.getMonCtx().timerStart("commitPersistProcessor");
- // TODO: What happens when the IOException is thrown?
- writer.addCommittedTransaction(event.getStartTimestamp(), event.getCommitTimestamp());
- commitEventsToFlush++;
- break;
- case ABORT:
- break;
- case TIMESTAMP:
- event.getMonCtx().timerStart("timestampPersistProcessor");
- break;
+ case TIMESTAMP:
+ event.getMonCtx().timerStop("persistence.processor.timestamp.latency");
+ break;
+ case COMMIT:
+ writer.addCommittedTransaction(event.getStartTimestamp(), event.getCommitTimestamp());
+ commitEventsToFlush++;
+ break;
+ case COMMIT_RETRY:
+ event.getMonCtx().timerStop("persistence.processor.commit-retry.latency");
+ break;
+ case ABORT:
+ event.getMonCtx().timerStop("persistence.processor.abort.latency");
+ break;
+ default:
+ throw new IllegalStateException("Event not allowed in Persistent Processor Handler: " + event);
}
}
@@ -101,6 +104,25 @@ public class PersistenceProcessorHandler implements WorkHandler<PersistenceProce
// to filter commit retries in the batch to disambiguate them.
flush(commitEventsToFlush);
filterAndDissambiguateClientRetries(batch);
+ for (int i=0; i < batch.getNumEvents(); i++) { // Just for statistics
+ PersistEvent event = batch.get(i);
+ switch (event.getType()) {
+ case TIMESTAMP:
+ event.getMonCtx().timerStart("reply.processor.timestamp.latency");
+ break;
+ case COMMIT:
+ event.getMonCtx().timerStop("persistence.processor.commit.latency");
+ event.getMonCtx().timerStart("reply.processor.commit.latency");
+ break;
+ case COMMIT_RETRY:
+ throw new IllegalStateException("COMMIT_RETRY events must be filtered before this step: " + event);
+ case ABORT:
+ event.getMonCtx().timerStart("reply.processor.abort.latency");
+ break;
+ default:
+ throw new IllegalStateException("Event not allowed in Persistent Processor Handler: " + event);
+ }
+ }
replyProcessor.manageResponsesBatch(batchEvent.getBatchSequence(), batch);
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
index a46c240..ab257d6 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
@@ -96,32 +96,30 @@ class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEv
@VisibleForTesting
void handleReplyBatchEvent(ReplyBatchEvent replyBatchEvent) throws Exception {
- String name;
Batch batch = replyBatchEvent.getBatch();
for (int i = 0; i < batch.getNumEvents(); i++) {
PersistEvent event = batch.get(i);
switch (event.getType()) {
- case COMMIT:
- name = "commitReplyProcessor";
- event.getMonCtx().timerStart(name);
- sendCommitResponse(event.getStartTimestamp(), event.getCommitTimestamp(), event.getChannel());
- event.getMonCtx().timerStop(name);
- break;
- case ABORT:
- name = "abortReplyProcessor";
- event.getMonCtx().timerStart(name);
- sendAbortResponse(event.getStartTimestamp(), event.getChannel());
- event.getMonCtx().timerStop(name);
- break;
- case TIMESTAMP:
- name = "timestampReplyProcessor";
- event.getMonCtx().timerStart(name);
- sendTimestampResponse(event.getStartTimestamp(), event.getChannel());
- event.getMonCtx().timerStop(name);
- break;
- case COMMIT_RETRY:
- throw new RuntimeException("COMMIT_RETRY events must be filtered before this step. Event: {}");
+ case COMMIT:
+ sendCommitResponse(event.getStartTimestamp(), event.getCommitTimestamp(), event.getChannel());
+ event.getMonCtx().timerStop("reply.processor.commit.latency");
+ commitMeter.mark();
+ break;
+ case ABORT:
+ sendAbortResponse(event.getStartTimestamp(), event.getChannel());
+ event.getMonCtx().timerStop("reply.processor.abort.latency");
+ abortMeter.mark();
+ break;
+ case TIMESTAMP:
+ sendTimestampResponse(event.getStartTimestamp(), event.getChannel());
+ event.getMonCtx().timerStop("reply.processor.timestamp.latency");
+ timestampMeter.mark();
+ break;
+ case COMMIT_RETRY:
+ throw new IllegalStateException("COMMIT_RETRY events must be filtered before this step: " + event);
+ default:
+ throw new IllegalStateException("Event not allowed in Persistent Processor Handler: " + event);
}
event.getMonCtx().publish();
}
@@ -182,8 +180,6 @@ class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEv
builder.setCommitResponse(commitBuilder.build());
c.write(builder.build());
- commitMeter.mark();
-
}
@Override
@@ -196,8 +192,6 @@ class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEv
builder.setCommitResponse(commitBuilder.build());
c.write(builder.build());
- abortMeter.mark();
-
}
@Override
@@ -209,8 +203,6 @@ class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEv
builder.setTimestampResponse(respBuilder.build());
c.write(builder.build());
- timestampMeter.mark();
-
}
final static class ReplyBatchEvent {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
index 32f5b8c..94a3df5 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
@@ -98,21 +98,15 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
@Override
public void onEvent(RequestEvent event, long sequence, boolean endOfBatch) throws Exception {
- String name = null;
- try { // TODO this should be a switch. Re-check why it's NOT now
- if (event.getType() == RequestEvent.Type.TIMESTAMP) {
- name = "timestampReqProcessor";
- event.getMonCtx().timerStart(name);
+ switch (event.getType()) {
+ case TIMESTAMP:
handleTimestamp(event);
- } else if (event.getType() == RequestEvent.Type.COMMIT) {
- name = "commitReqProcessor";
- event.getMonCtx().timerStart(name);
+ break;
+ case COMMIT:
handleCommit(event);
- }
- } finally {
- if (null != name) {
- event.getMonCtx().timerStop(name);
- }
+ break;
+ default:
+ throw new IllegalStateException("Event not allowed in Request Processor: " + event);
}
}
@@ -133,6 +127,7 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
@Override
public void timestampRequest(Channel c, MonitoringContext monCtx) {
+ monCtx.timerStart("request.processor.timestamp.latency");
long seq = requestRing.next();
RequestEvent e = requestRing.get(seq);
RequestEvent.makeTimestampRequest(e, c, monCtx);
@@ -144,6 +139,7 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
public void commitRequest(long startTimestamp, Collection<Long> writeSet, boolean isRetry, Channel c,
MonitoringContext monCtx) {
+ monCtx.timerStart("request.processor.commit.latency");
long seq = requestRing.next();
RequestEvent e = requestRing.get(seq);
RequestEvent.makeCommitRequest(e, startTimestamp, monCtx, writeSet, isRetry, c);
@@ -154,6 +150,7 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
private void handleTimestamp(RequestEvent requestEvent) throws Exception {
long timestamp = timestampOracle.next();
+ requestEvent.getMonCtx().timerStop("request.processor.timestamp.latency");
persistProc.addTimestampToBatch(timestamp, requestEvent.getChannel(), requestEvent.getMonCtx());
}
@@ -203,10 +200,12 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
persistProc.persistLowWatermark(newLowWatermark); // Async persist
}
}
+ event.getMonCtx().timerStop("request.processor.commit.latency");
persistProc.addCommitToBatch(startTimestamp, commitTimestamp, c, event.getMonCtx());
} else {
+ event.getMonCtx().timerStop("request.processor.commit.latency");
if (isCommitRetry) { // Re-check if it was already committed but the client retried due to a lag replying
persistProc.addCommitRetryToBatch(startTimestamp, c, event.getMonCtx());
} else {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
index 5ac12ad..a23a913 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
@@ -62,7 +62,9 @@ class RetryProcessorImpl implements EventHandler<RetryProcessorImpl.RetryEvent>,
final ObjectPool<Batch> batchPool;
// Metrics
- final Meter retriesMeter;
+ private final Meter txAlreadyCommittedMeter;
+ private final Meter invalidTxMeter;
+ private final Meter noCTFoundMeter;
@Inject
RetryProcessorImpl(MetricsRegistry metrics,
@@ -87,42 +89,47 @@ class RetryProcessorImpl implements EventHandler<RetryProcessorImpl.RetryEvent>,
retryExec.submit(retryProcessor);
// Metrics configuration
- retriesMeter = metrics.meter(name("tso", "retries"));
+ this.txAlreadyCommittedMeter = metrics.meter(name("tso", "retries", "commits", "tx-already-committed"));
+ this.invalidTxMeter = metrics.meter(name("tso", "retries", "aborts", "tx-invalid"));
+ this.noCTFoundMeter = metrics.meter(name("tso", "retries", "aborts", "tx-without-commit-timestamp"));
}
@Override
- public void onEvent(final RetryEvent event, final long sequence, final boolean endOfBatch)
- throws Exception {
+ public void onEvent(final RetryEvent event, final long sequence, final boolean endOfBatch) throws Exception {
switch (event.getType()) {
case COMMIT:
- // TODO: What happens when the IOException is thrown?
handleCommitRetry(event);
+ event.getMonCtx().timerStop("retry.processor.commit-retry.latency");
break;
default:
assert (false);
break;
}
+ event.getMonCtx().publish();
}
- private void handleCommitRetry(RetryEvent event) throws Exception {
+ private void handleCommitRetry(RetryEvent event) {
long startTimestamp = event.getStartTimestamp();
try {
Optional<CommitTimestamp> commitTimestamp = commitTableClient.getCommitTimestamp(startTimestamp).get();
if(commitTimestamp.isPresent()) {
if (commitTimestamp.get().isValid()) {
- LOG.trace("Valid commit TS found in Commit Table. Replying Commit to the client...");
+ LOG.trace("Tx {}: Valid commit TS found in Commit Table. Sending Commit to client.", startTimestamp);
replyProc.sendCommitResponse(startTimestamp, commitTimestamp.get().getValue(), event.getChannel());
+ txAlreadyCommittedMeter.mark();
} else {
- LOG.trace("Invalid commit TS found in Commit Table. Replying Abort to the client...");
+ LOG.trace("Tx {}: Invalid tx marker found. Sending Abort to client.", startTimestamp);
replyProc.sendAbortResponse(startTimestamp, event.getChannel());
+ invalidTxMeter.mark();
}
} else {
- LOG.trace("No commit TS found in Commit Table. Replying Abort to the client..");
+ LOG.trace("Tx {}: No Commit TS found in Commit Table. Sending Abort to client.", startTimestamp);
replyProc.sendAbortResponse(startTimestamp, event.getChannel());
+ noCTFoundMeter.mark();
}
} catch (InterruptedException e) {
LOG.error("Interrupted reading from commit table");
@@ -131,13 +138,13 @@ class RetryProcessorImpl implements EventHandler<RetryProcessorImpl.RetryEvent>,
LOG.error("Error reading from commit table", e);
}
- retriesMeter.mark();
}
@Override
public void disambiguateRetryRequestHeuristically(long startTimestamp, Channel c, MonitoringContext monCtx) {
long seq = retryRing.next();
RetryEvent e = retryRing.get(seq);
+ monCtx.timerStart("retry.processor.commit-retry.latency");
RetryEvent.makeCommitRetry(e, startTimestamp, c, monCtx);
retryRing.publish(seq);
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/test/java/org/apache/omid/tso/TestBatch.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestBatch.java b/tso-server/src/test/java/org/apache/omid/tso/TestBatch.java
index 448eeaa..573cd89 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestBatch.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestBatch.java
@@ -22,8 +22,10 @@ import org.jboss.netty.channel.Channel;
import org.mockito.Mock;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import static org.mockito.MockitoAnnotations.initMocks;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -43,6 +45,11 @@ public class TestBatch {
@Mock
private MonitoringContext monCtx;
+ @BeforeMethod
+ void setup() {
+ initMocks(this);
+ }
+
@Test(timeOut = 10_000)
public void testBatchFunctionality() {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c4c65aca/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
----------------------------------------------------------------------
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
index d7bebd6..3ae59df 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
@@ -20,12 +20,10 @@ package org.apache.omid.tso;
import org.apache.commons.pool2.ObjectPool;
import org.apache.omid.metrics.MetricsRegistry;
import org.apache.omid.metrics.NullMetricsProvider;
-import org.apache.omid.tso.PersistenceProcessorImpl.PersistBatchEvent;
import org.apache.omid.tso.ReplyProcessorImpl.ReplyBatchEvent;
import org.jboss.netty.channel.Channel;
import org.mockito.InOrder;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,14 +31,8 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import java.io.IOException;
-
import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -48,7 +40,6 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertEqualsNoOrder;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@@ -76,6 +67,9 @@ public class TestReplyProcessor {
@Mock
private Panicker panicker;
+ @Mock
+ private MonitoringContext monCtx;
+
private MetricsRegistry metrics;
private ObjectPool<Batch> batchPool;
@@ -112,7 +106,7 @@ public class TestReplyProcessor {
// Prepare test batch
Batch batch = batchPool.borrowObject();
- batch.addCommitRetry(FIRST_ST, null, null );
+ batch.addCommitRetry(FIRST_ST, null, monCtx);
ReplyBatchEvent e = ReplyBatchEvent.EVENT_FACTORY.newInstance();
ReplyBatchEvent.makeReplyBatch(e, batch, 0);
@@ -124,7 +118,7 @@ public class TestReplyProcessor {
try {
replyProcessor.onEvent(e, ANY_DISRUPTOR_SEQUENCE, false);
fail();
- } catch(RuntimeException re) {
+ } catch (RuntimeException re) {
// Expected
}
@@ -192,8 +186,8 @@ public class TestReplyProcessor {
// Prepare first a delayed batch (Batch #3)
Batch thirdBatch = batchPool.borrowObject();
- thirdBatch.addTimestamp(FIRST_ST, mock(Channel.class), mock(MonitoringContext.class));
- thirdBatch.addCommit(SECOND_ST, SECOND_CT, mock(Channel.class), mock(MonitoringContext.class));
+ thirdBatch.addTimestamp(FIRST_ST, mock(Channel.class), monCtx);
+ thirdBatch.addCommit(SECOND_ST, SECOND_CT, mock(Channel.class), monCtx);
ReplyBatchEvent thirdBatchEvent = ReplyBatchEvent.EVENT_FACTORY.newInstance();
ReplyBatchEvent.makeReplyBatch(thirdBatchEvent, thirdBatch, 2); // Set a higher sequence than the initial one
@@ -213,8 +207,8 @@ public class TestReplyProcessor {
// Prepare another delayed batch (Batch #2)
Batch secondBatch = batchPool.borrowObject();
- secondBatch.addTimestamp(THIRD_ST, mock(Channel.class), mock(MonitoringContext.class));
- secondBatch.addCommit(FOURTH_ST, FOURTH_CT, mock(Channel.class), mock(MonitoringContext.class));
+ secondBatch.addTimestamp(THIRD_ST, mock(Channel.class), monCtx);
+ secondBatch.addCommit(FOURTH_ST, FOURTH_CT, mock(Channel.class), monCtx);
ReplyBatchEvent secondBatchEvent = ReplyBatchEvent.EVENT_FACTORY.newInstance();
ReplyBatchEvent.makeReplyBatch(secondBatchEvent, secondBatch, 1); // Set another higher sequence
@@ -229,7 +223,7 @@ public class TestReplyProcessor {
// Finally, prepare the batch that should trigger the execution of the other two
Batch firstBatch = batchPool.borrowObject();
- firstBatch.addAbort(FIFTH_ST, mock(Channel.class), mock(MonitoringContext.class));
+ firstBatch.addAbort(FIFTH_ST, mock(Channel.class), monCtx);
ReplyBatchEvent firstBatchEvent = ReplyBatchEvent.EVENT_FACTORY.newInstance();
ReplyBatchEvent.makeReplyBatch(firstBatchEvent, firstBatch, 0); // Set the first batch with a higher sequence
[12/23] incubator-omid git commit: [OMID-34] Fix Travis builds
Posted by fp...@apache.org.
[OMID-34] Fix Travis builds
HBase profile was missing in the maven commands after
we resolved [OMID-30]
Change-Id: I9c4570b185fe63a17ff273e352dbc1a2f6f679dd
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/c60aef17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/c60aef17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/c60aef17
Branch: refs/heads/master
Commit: c60aef1729ed6916f2a06c34012cbf53cb382d78
Parents: 5193038
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Fri May 20 14:21:00 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Fri May 20 14:56:54 2016 -0700
----------------------------------------------------------------------
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/c60aef17/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f4d2ff2..def7b94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ] ; then
git checkout master
&&
- mvn clean cobertura:cobertura
+ mvn clean cobertura:cobertura -Phbase-0
&&
mkdir failedTests
&&
@@ -43,13 +43,13 @@ script:
&&
[ ! -f failedTests/testng-failed.xml ]
&&
- mvn coveralls:report
+ mvn coveralls:report -Phbase-0
&&
mvn -B clean release:prepare release:perform -Prelease_profile,hbase-0 --settings bintray-settings.xml ;
else
git checkout -b tmp-build-branch
&&
- mvn clean test ;
+ mvn clean test -Phbase-0 ;
fi
after_success:
[04/23] incubator-omid git commit: [ci skip]prepare release
omid-0.8.2.2
Posted by fp...@apache.org.
[ci skip]prepare release omid-0.8.2.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/4dd4ece6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/4dd4ece6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/4dd4ece6
Branch: refs/heads/master
Commit: 4dd4ece68de4b302f545c70b64d061d0504d9cba
Parents: a4e7f56
Author: Omid CI <om...@yahoo-inc.com>
Authored: Wed May 18 21:58:41 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Wed May 18 21:58:41 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index c53c561..6bb6019 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index cca67de..759c887 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index d526141..e9f35da 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 0e4e3ee..6a8a141 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 5424ef3..5c12104 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 4a8db82..c7c62ba 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 5125a57..69433de 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index f46a84e..907c240 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 84aaa60..98b9fa6 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index e6a5567..4a353da 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index 415ff3b..5cef2b5 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 9d3839f..6f4181a 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 94e6054..fd01fb1 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index e0f52f2..e5925c9 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0da9d82..147d67a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>master</tag>
+ <tag>omid-0.8.2.2</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 448e7fe..a02147c 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index fee6ee7..4b3ed0a 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 2dfcb9b..b78251c 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4dd4ece6/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index bdd0527..49656f7 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2-SNAPSHOT</version>
+ <version>0.8.2.2</version>
</parent>
<artifactId>tso-server</artifactId>
[08/23] incubator-omid git commit: [OMID-28] Simple notice file
Posted by fp...@apache.org.
[OMID-28] Simple notice file
Change-Id: I9e372915e9d138aa624dbfbaa0f95e01d97418b0
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/5d5864ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/5d5864ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/5d5864ec
Branch: refs/heads/master
Commit: 5d5864eca21591eaf2b97c2a83caa005d16692fb
Parents: a2cf5c8
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Thu May 19 15:35:08 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Thu May 19 15:35:08 2016 -0700
----------------------------------------------------------------------
NOTICE | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5d5864ec/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 7e71dbc..8a71af0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -3,21 +3,3 @@ Copyright 2016 The Apache Software Foundation.
This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
-This distribution has a binary dependency on:
-
-Google Guava v11.0.2 (https://github.com/google/guava) [Apache 2.0]
-Guice v3.0 (https://github.com/google/guice/wiki) [Apache 2.0]
-Testng v6.8.8 (http://testng.org) [Apache 2.0]
-SLF4J (http://www.slf4j.org/) v1.7.7 [MIT License]
-Netty (http://netty.io) v3.2.6.Final [Apache 2.0]
-Google Protocol Buffers v2.5.0 (https://developers.google.com/protocol-buffers/) [BSD License]
-Mockito (http://mockito.org/) v1.9.5 [MIT License]
-LMAX Disruptor v3.2.0 (https://lmax-exchange.github.io/disruptor/) [Apache 2.0]
-Coda Hale/Yammer.com Dropwizard Metrics v3.0.1 (http://metrics.dropwizard.io/3.1.0/) [Apache 2.0]
-JCommander v1.35 (http://jcommander.org/) [Apache 2.0]
-Hamcrest v1.3 (http://hamcrest.org/JavaHamcrest/) [BSD License]
-Snakeyml v1.11 (https://bitbucket.org/asomov/snakeyaml) [Apache 2.0]
-Google FindBugs v3.0.1 (http://findbugs.sourceforge.net/) [Lesser GNU General Public License]
-
-
-
[05/23] incubator-omid git commit: [ci skip]prepare for next
development iteration
Posted by fp...@apache.org.
[ci skip]prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/110b64f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/110b64f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/110b64f4
Branch: refs/heads/master
Commit: 110b64f4a8b63dfc773f9dab13f3a6541dfb5bb5
Parents: 4dd4ece
Author: Omid CI <om...@yahoo-inc.com>
Authored: Wed May 18 21:58:43 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Wed May 18 21:58:43 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 6bb6019..e32812b 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index 759c887..3aa8892 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index e9f35da..dc48d74 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 6a8a141..9306936 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 5c12104..81310fd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index c7c62ba..f60a270 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 69433de..ba08de1 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 907c240..642cabf 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 98b9fa6..7a7e4f2 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index 4a353da..a2b5925 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index 5cef2b5..fa447cb 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 6f4181a..dc8ff16 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index fd01fb1..fa7d6d3 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index e5925c9..3334c83 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 147d67a..362f39c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>omid-0.8.2.2</tag>
+ <tag>master</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index a02147c..6369678 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 4b3ed0a..3236aeb 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index b78251c..48afeb6 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/110b64f4/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 49656f7..1968f8e 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.2</version>
+ <version>0.8.2.3-SNAPSHOT</version>
</parent>
<artifactId>tso-server</artifactId>
[13/23] incubator-omid git commit: Merge pull request #109 from
yahoo/omid-34
Posted by fp...@apache.org.
Merge pull request #109 from yahoo/omid-34
[OMID-34] Fix Travis builds
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/00307984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/00307984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/00307984
Branch: refs/heads/master
Commit: 003079841d589a265d220538d5ed57dc876a9f04
Parents: 5193038 c60aef1
Author: ikatkov <ik...@gmail.com>
Authored: Mon May 23 10:57:45 2016 -0700
Committer: ikatkov <ik...@gmail.com>
Committed: Mon May 23 10:57:45 2016 -0700
----------------------------------------------------------------------
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[22/23] incubator-omid git commit: [OMID-40] Fix java docs to comply
with Apache standards
Posted by fp...@apache.org.
[OMID-40] Fix java docs to comply with Apache standards
Change-Id: If0f388513ddae1620bf5269a494f1789f636e496
(cherry picked from commit 93144bd)
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/df2b4471
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/df2b4471
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/df2b4471
Branch: refs/heads/master
Commit: df2b44718016e9f3a101d89e8a305d94833cb4a0
Parents: a527447
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Tue May 31 17:10:31 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Tue May 31 17:33:36 2016 -0700
----------------------------------------------------------------------
.../apache/omid/benchmarks/utils/Generator.java | 6 +-
.../omid/benchmarks/utils/IntegerGenerator.java | 12 +-
.../utils/ScrambledZipfianGenerator.java | 2 +-
.../omid/benchmarks/utils/ZipfianGenerator.java | 6 +-
.../apache/omid/committable/CommitTable.java | 2 +-
.../org/apache/omid/examples/BasicExample.java | 8 +-
.../omid/examples/SnapshotIsolationExample.java | 15 +-
.../omid/transaction/HBaseTransaction.java | 1 +
.../org/apache/omid/transaction/TTable.java | 180 ++++++++++++-------
.../omid/committable/hbase/RegionSplitter.java | 45 ++---
.../org/apache/omid/transaction/CellUtils.java | 60 +++----
.../apache/omid/metrics/MetricsRegistry.java | 1 -
.../omid/transaction/AbstractTransaction.java | 2 +-
.../transaction/AbstractTransactionManager.java | 17 +-
.../apache/omid/transaction/Transaction.java | 5 +-
.../omid/transaction/TransactionManager.java | 29 ++-
.../tso/client/HandshakeFailedException.java | 2 +-
.../org/apache/omid/tso/client/TSOClient.java | 2 +-
.../org/apache/omid/tso/client/TSOProtocol.java | 8 +-
19 files changed, 224 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java
index ced6c82..82e9cec 100644
--- a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java
+++ b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/Generator.java
@@ -16,14 +16,16 @@ package org.apache.omid.benchmarks.utils;
*/
public abstract class Generator {
/**
- * Generate the next string in the distribution.
+ * Generate the next string in the distribution
+ * @return next String
*/
public abstract String nextString();
/**
* Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
* Calling lastString() should not advance the distribution or have any side effects. If nextString() has not yet
- * been called, lastString() should return something reasonable.
+ * been called, lastString() should return something reasonable
+ * @return last string
*/
public abstract String lastString();
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java
index 2c5e4a0..9850dd9 100644
--- a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java
+++ b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/IntegerGenerator.java
@@ -23,25 +23,27 @@ public abstract class IntegerGenerator extends Generator {
/**
* Set the last value generated. IntegerGenerator subclasses must use this call
* to properly set the last string value, or the lastString() and lastInt() calls won't work.
+ * @param last value
*/
protected void setLastInt(int last) {
lastint = last;
}
/**
- * Return the next value as an int. When overriding this method, be sure to call setLastString() properly, or the lastString() call won't work.
+ * When overriding this method, be sure to call setLastString() properly, or the lastString() call won't work
+ * @return Return the next value as an int.
*/
public abstract int nextInt();
/**
- * Generate the next string in the distribution.
+ * @return Generate the next string in the distribution.
*/
public String nextString() {
return "" + nextInt();
}
/**
- * Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
+ * @return the previous string generated by the distribution; e.g., returned from the last nextString() call.
* Calling lastString() should not advance the distribution or have any side effects. If nextString() has not yet
* been called, lastString() should return something reasonable.
*/
@@ -51,7 +53,7 @@ public abstract class IntegerGenerator extends Generator {
}
/**
- * Return the previous int generated by the distribution. This call is unique to IntegerGenerator subclasses, and assumes
+ * @return the previous int generated by the distribution. This call is unique to IntegerGenerator subclasses, and assumes
* IntegerGenerator subclasses always return ints for nextInt() (e.g. not arbitrary strings).
*/
public int lastInt() {
@@ -59,7 +61,7 @@ public abstract class IntegerGenerator extends Generator {
}
/**
- * Return the expected value (mean) of the values this generator will return.
+ * @return the expected value (mean) of the values this generator will return.
*/
public abstract double mean();
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java
index e5e484a..8b1d6cc 100644
--- a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java
+++ b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ScrambledZipfianGenerator.java
@@ -91,7 +91,7 @@ public class ScrambledZipfianGenerator extends IntegerGenerator {
}
/**
- * Return the next long in the sequence.
+ * @return the next long in the sequence.
*/
public long nextLong() {
long ret = gen.nextLong();
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java
----------------------------------------------------------------------
diff --git a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java
index 44c46ad..32eceb3 100644
--- a/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java
+++ b/benchmarks/src/main/java/org/apache/omid/benchmarks/utils/ZipfianGenerator.java
@@ -274,7 +274,7 @@ public class ZipfianGenerator extends IntegerGenerator {
}
/**
- * Return the next value, skewed by the Zipfian distribution. The 0th item will be the most popular, followed by the 1st, followed
+ * @return the next value, skewed by the Zipfian distribution. The 0th item will be the most popular, followed by the 1st, followed
* by the 2nd, etc. (Or, if min != 0, the min-th item is the most popular, the min+1th item the next most popular, etc.) If you want the
* popular items scattered throughout the item space, use ScrambledZipfianGenerator instead.
*/
@@ -282,9 +282,7 @@ public class ZipfianGenerator extends IntegerGenerator {
return nextLong(items);
}
- /**
- * @todo Implement ZipfianGenerator.mean()
- */
+ //TODO Implement ZipfianGenerator.mean()
@Override
public double mean() {
throw new UnsupportedOperationException("@todo implement ZipfianGenerator.mean()");
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/commit-table/src/main/java/org/apache/omid/committable/CommitTable.java
----------------------------------------------------------------------
diff --git a/commit-table/src/main/java/org/apache/omid/committable/CommitTable.java b/commit-table/src/main/java/org/apache/omid/committable/CommitTable.java
index c3f059f..91f590e 100644
--- a/commit-table/src/main/java/org/apache/omid/committable/CommitTable.java
+++ b/commit-table/src/main/java/org/apache/omid/committable/CommitTable.java
@@ -55,7 +55,7 @@ public interface CommitTable {
* transaction was invalidated and returns a commit timestamp type accordingly.
*
* @param startTimestamp the transaction start timestamp
- * @return Optional<CommitTimestamp> that represents a valid, invalid, or no timestamp.
+ * @return Optional of CommitTimestamp that represents a valid, invalid, or no timestamp.
*/
ListenableFuture<Optional<CommitTimestamp>> getCommitTimestamp(long startTimestamp);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/examples/src/main/java/org/apache/omid/examples/BasicExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/omid/examples/BasicExample.java b/examples/src/main/java/org/apache/omid/examples/BasicExample.java
index e9629e4..d5f68eb 100644
--- a/examples/src/main/java/org/apache/omid/examples/BasicExample.java
+++ b/examples/src/main/java/org/apache/omid/examples/BasicExample.java
@@ -34,8 +34,8 @@ import org.slf4j.LoggerFactory;
*
* ****************************************************************************************************
*
- * After building the package with 'mvn clean package' find the resulting examples-<version>-bin.tar.gz file in the
- * 'examples/target' folder. Copy it to the target host and expand with 'tar -zxvf examples-<version>-bin.tar.gz'.
+ * After building the package with 'mvn clean package' find the resulting examples-{version}-bin.tar.gz file in the
+ * 'examples/target' folder. Copy it to the target host and expand with 'tar -zxvf examples-{version}-bin.tar.gz'.
*
* Make sure that 'hbase-site.xml' and 'core-site.xml' are either in classpath (see run.sh) or explicitly referenced in
* configuration file. If a secure HBase deployment is needed, make sure to specify the principal (user) and keytab file.
@@ -44,12 +44,12 @@ import org.slf4j.LoggerFactory;
* the default configuration, and can be created with the following command using the 'hbase shell':
*
* <pre>
- * create 'MY_TX_TABLE', {NAME => 'MY_CF', VERSIONS => '2147483647', TTL => '2147483647'}
+ * create 'MY_TX_TABLE', {NAME => 'MY_CF', VERSIONS => '2147483647', TTL => '2147483647'}
* </pre>
*
* Make sure that the principal/user has RW permissions for the given table using also the 'hbase shell':
* <pre>
- * grant '<principal/user>', 'RW', 'MY_TX_TABLE'
+ * grant '{principal/user}', 'RW', 'MY_TX_TABLE'
* </pre>
*
* Alternatively, a table with a column family already created can be used by specifying the table name and column
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/examples/src/main/java/org/apache/omid/examples/SnapshotIsolationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/omid/examples/SnapshotIsolationExample.java b/examples/src/main/java/org/apache/omid/examples/SnapshotIsolationExample.java
index 60b82da..60ea22b 100644
--- a/examples/src/main/java/org/apache/omid/examples/SnapshotIsolationExample.java
+++ b/examples/src/main/java/org/apache/omid/examples/SnapshotIsolationExample.java
@@ -19,7 +19,6 @@ package org.apache.omid.examples;
import com.google.common.base.Preconditions;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
@@ -45,12 +44,12 @@ import java.util.Arrays;
*
* Please @see{BasicExample} first
*
- * In the code below, two concurrent transactions (Tx1 & Tx2), try to update the same column in HBase. This will result
- * in the rollback of Tx2 -the last one trying to commit- due to conflicts in the writeset with the previously committed
- * transaction Tx1. Also shows how Tx2 reads the right values from its own snapshot in HBase data.
+ * In the code below, two concurrent transactions (Tx1 and Tx2), try to update the same column in HBase. This will
+ * result in the rollback of Tx2 -the last one trying to commit- due to conflicts in the writeset with the previously
+ * committed transaction Tx1. Also shows how Tx2 reads the right values from its own snapshot in HBase data.
*
- * After building the package with 'mvn clean package' find the resulting examples-<version>-bin.tar.gz file in the
- * 'examples/target' folder. Copy it to the target host and expand with 'tar -zxvf examples-<version>-bin.tar.gz'.
+ * After building the package with 'mvn clean package' find the resulting examples-{version}-bin.tar.gz file in the
+ * 'examples/target' folder. Copy it to the target host and expand with 'tar -zxvf examples-{version}-bin.tar.gz'.
*
* Make sure that 'hbase-site.xml' and 'core-site.xml' are either in classpath (see run.sh) or explicitly referenced via
* command line arguments. If a secure HBase deployment is needed, use also command line arguments to specify the
@@ -60,12 +59,12 @@ import java.util.Arrays;
* default configuration, and can be created with the following command using the 'hbase shell':
*
* <pre>
- * create 'MY_TX_TABLE', {NAME => 'MY_CF', VERSIONS => '2147483647', TTL => '2147483647'}
+ * create 'MY_TX_TABLE', {NAME => 'MY_CF', VERSIONS => '2147483647', TTL => '2147483647'}
* </pre>
*
* Make sure that the principal/user has RW permissions for the given table using also the 'hbase shell':
* <pre>
- * grant '<principal/user>', 'RW', 'MY_TX_TABLE'
+ * grant '{principal/user}', 'RW', 'MY_TX_TABLE'
* </pre>
*
* Alternatively, a table with a column family already created can be used by specifying the table name and column
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransaction.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransaction.java b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransaction.java
index 46425aa..2bae5f5 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransaction.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransaction.java
@@ -54,6 +54,7 @@ public class HBaseTransaction extends AbstractTransaction<HBaseCellId> {
/**
* Flushes pending operations for tables touched by transaction
+ * @throws IOException in case of any I/O related issues
*/
public void flushTables() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
index 2c673ff..9b82148 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
@@ -23,6 +23,7 @@ import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimaps;
+
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
@@ -61,9 +62,8 @@ import java.util.NavigableMap;
import java.util.NavigableSet;
/**
- * Provides transactional methods for accessing and modifying a given snapshot
- * of data identified by an opaque {@link Transaction} object. It mimics the
- * behavior in {@link org.apache.hadoop.hbase.client.HTableInterface}
+ * Provides transactional methods for accessing and modifying a given snapshot of data identified by an opaque {@link
+ * Transaction} object. It mimics the behavior in {@link org.apache.hadoop.hbase.client.HTableInterface}
*/
public class TTable implements Closeable {
@@ -106,8 +106,7 @@ public class TTable implements Closeable {
/**
* Releases any resources held or pending changes in internal buffers.
*
- * @throws IOException
- * if a remote or network exception occurs.
+ * @throws IOException if a remote or network exception occurs.
*/
@Override
public void close() throws IOException {
@@ -121,6 +120,11 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#get(Get get)}
+ *
+ * @param get an instance of Get
+ * @param tx an instance of transaction to be used
+ * @return Result an instance of Result
+ * @throws IOException if a remote or network exception occurs.
*/
public Result get(Transaction tx, final Get get) throws IOException {
@@ -162,6 +166,10 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#delete(Delete delete)}
+ *
+ * @param delete an instance of Delete
+ * @param tx an instance of transaction to be used
+ * @throws IOException if a remote or network exception occurs.
*/
public void delete(Transaction tx, Delete delete) throws IOException {
@@ -188,11 +196,11 @@ public class TTable implements Closeable {
startTimestamp,
CellUtils.DELETE_TOMBSTONE);
transaction.addWriteSetElement(
- new HBaseCellId(table,
- delete.getRow(),
- CellUtil.cloneFamily(cell),
- CellUtil.cloneQualifier(cell),
- cell.getTimestamp()));
+ new HBaseCellId(table,
+ delete.getRow(),
+ CellUtil.cloneFamily(cell),
+ CellUtil.cloneQualifier(cell),
+ cell.getTimestamp()));
break;
case DeleteFamily:
deleteG.addFamily(CellUtil.cloneFamily(cell));
@@ -205,15 +213,15 @@ public class TTable implements Closeable {
startTimestamp,
CellUtils.DELETE_TOMBSTONE);
transaction.addWriteSetElement(
- new HBaseCellId(table,
- delete.getRow(),
- CellUtil.cloneFamily(cell),
- CellUtil.cloneQualifier(cell),
- cell.getTimestamp()));
+ new HBaseCellId(table,
+ delete.getRow(),
+ CellUtil.cloneFamily(cell),
+ CellUtil.cloneQualifier(cell),
+ cell.getTimestamp()));
break;
} else {
throw new UnsupportedOperationException(
- "Cannot delete specific versions on Snapshot Isolation.");
+ "Cannot delete specific versions on Snapshot Isolation.");
}
default:
break;
@@ -226,12 +234,13 @@ public class TTable implements Closeable {
Result result = this.get(transaction, deleteG);
if (!result.isEmpty()) {
for (Entry<byte[], NavigableMap<byte[], NavigableMap<Long, byte[]>>> entryF : result.getMap()
- .entrySet()) {
+ .entrySet()) {
byte[] family = entryF.getKey();
for (Entry<byte[], NavigableMap<Long, byte[]>> entryQ : entryF.getValue().entrySet()) {
byte[] qualifier = entryQ.getKey();
deleteP.add(family, qualifier, CellUtils.DELETE_TOMBSTONE);
- transaction.addWriteSetElement(new HBaseCellId(table, delete.getRow(), family, qualifier, transaction.getStartTimestamp()));
+ transaction.addWriteSetElement(new HBaseCellId(table, delete.getRow(), family, qualifier,
+ transaction.getStartTimestamp()));
}
}
}
@@ -245,6 +254,10 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#put(Put put)}
+ *
+ * @param put an instance of Put
+ * @param tx an instance of transaction to be used
+ * @throws IOException if a remote or network exception occurs.
*/
public void put(Transaction tx, Put put) throws IOException {
@@ -267,11 +280,11 @@ public class TTable implements Closeable {
tsput.add(kv);
transaction.addWriteSetElement(
- new HBaseCellId(table,
- CellUtil.cloneRow(kv),
- CellUtil.cloneFamily(kv),
- CellUtil.cloneQualifier(kv),
- kv.getTimestamp()));
+ new HBaseCellId(table,
+ CellUtil.cloneRow(kv),
+ CellUtil.cloneFamily(kv),
+ CellUtil.cloneQualifier(kv),
+ kv.getTimestamp()));
}
}
@@ -280,6 +293,11 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#getScanner(Scan scan)}
+ *
+ * @param scan an instance of Scan
+ * @param tx an instance of transaction to be used
+ * @return ResultScanner an instance of ResultScanner
+ * @throws IOException if a remote or network exception occurs.
*/
public ResultScanner getScanner(Transaction tx, Scan scan) throws IOException {
@@ -305,19 +323,14 @@ public class TTable implements Closeable {
}
/**
- * Filters the raw results returned from HBase and returns only those
- * belonging to the current snapshot, as defined by the transaction
- * object. If the raw results don't contain enough information for a
- * particular qualifier, it will request more versions from HBase.
+ * Filters the raw results returned from HBase and returns only those belonging to the current snapshot, as defined
+ * by the transaction object. If the raw results don't contain enough information for a particular qualifier, it
+ * will request more versions from HBase.
*
- * @param rawCells
- * Raw cells that we are going to filter
- * @param transaction
- * Defines the current snapshot
- * @param versionsToRequest
- * Number of versions requested from hbase
+ * @param rawCells Raw cells that we are going to filter
+ * @param transaction Defines the current snapshot
+ * @param versionsToRequest Number of versions requested from hbase
* @return Filtered KVs belonging to the transaction snapshot
- * @throws IOException
*/
List<Cell> filterCellsForSnapshot(List<Cell> rawCells, HBaseTransaction transaction,
int versionsToRequest) throws IOException {
@@ -359,7 +372,7 @@ public class TTable implements Closeable {
for (Result pendingGetResult : pendingGetsResults) {
if (!pendingGetResult.isEmpty()) {
keyValuesInSnapshot.addAll(
- filterCellsForSnapshot(pendingGetResult.listCells(), transaction, numberOfVersionsToFetch));
+ filterCellsForSnapshot(pendingGetResult.listCells(), transaction, numberOfVersionsToFetch));
}
}
}
@@ -384,7 +397,7 @@ public class TTable implements Closeable {
}
private boolean isCellInSnapshot(Cell kv, HBaseTransaction transaction, Map<Long, Long> commitCache)
- throws IOException {
+ throws IOException {
long startTimestamp = transaction.getStartTimestamp();
@@ -393,7 +406,8 @@ public class TTable implements Closeable {
}
Optional<Long> commitTimestamp =
- tryToLocateCellCommitTimestamp(transaction.getTransactionManager(), transaction.getEpoch(), kv, commitCache);
+ tryToLocateCellCommitTimestamp(transaction.getTransactionManager(), transaction.getEpoch(), kv,
+ commitCache);
return commitTimestamp.isPresent() && commitTimestamp.get() < startTimestamp;
}
@@ -415,19 +429,19 @@ public class TTable implements Closeable {
long epoch,
Cell cell,
Map<Long, Long> commitCache)
- throws IOException {
+ throws IOException {
CommitTimestamp tentativeCommitTimestamp =
- transactionManager.locateCellCommitTimestamp(
- cell.getTimestamp(),
- epoch,
- new CommitTimestampLocatorImpl(
- new HBaseCellId(table,
- CellUtil.cloneRow(cell),
- CellUtil.cloneFamily(cell),
- CellUtil.cloneQualifier(cell),
- cell.getTimestamp()),
- commitCache));
+ transactionManager.locateCellCommitTimestamp(
+ cell.getTimestamp(),
+ epoch,
+ new CommitTimestampLocatorImpl(
+ new HBaseCellId(table,
+ CellUtil.cloneRow(cell),
+ CellUtil.cloneFamily(cell),
+ CellUtil.cloneQualifier(cell),
+ cell.getTimestamp()),
+ commitCache));
// If transaction that added the cell was invalidated
if (!tentativeCommitTimestamp.isValid()) {
@@ -469,12 +483,13 @@ public class TTable implements Closeable {
}
protected class TransactionalClientScanner implements ResultScanner {
+
private HBaseTransaction state;
private ResultScanner innerScanner;
private int maxVersions;
TransactionalClientScanner(HBaseTransaction state, Scan scan, int maxVersions)
- throws IOException {
+ throws IOException {
this.state = state;
this.innerScanner = table.getScanner(scan);
this.maxVersions = maxVersions;
@@ -569,6 +584,8 @@ public class TTable implements Closeable {
/**
* Delegates to {@link HTable#getTableName()}
+ *
+ * @return array of byte
*/
public byte[] getTableName() {
return table.getTableName();
@@ -576,6 +593,8 @@ public class TTable implements Closeable {
/**
* Delegates to {@link HTable#getConfiguration()}
+ *
+ * @return standard configuration object
*/
public Configuration getConfiguration() {
return table.getConfiguration();
@@ -583,6 +602,9 @@ public class TTable implements Closeable {
/**
* Delegates to {@link HTable#getTableDescriptor()}
+ *
+ * @return HTableDescriptor an instance of HTableDescriptor
+ * @throws IOException if a remote or network exception occurs.
*/
public HTableDescriptor getTableDescriptor() throws IOException {
return table.getTableDescriptor();
@@ -590,6 +612,11 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#exists(Get get)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param get an instance of Get
+ * @return true if cell exists
+ * @throws IOException if a remote or network exception occurs.
*/
public boolean exists(Transaction transaction, Get get) throws IOException {
Result result = get(transaction, get);
@@ -612,7 +639,12 @@ public class TTable implements Closeable {
*/
/**
- * Transactional version of {@link HTableInterface#get(List<Get> gets)}
+ * Transactional version of {@link HTableInterface#get(List gets)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param gets list of Get instances
+ * @return array of Results
+ * @throws IOException if a remote or network exception occurs
*/
public Result[] get(Transaction transaction, List<Get> gets) throws IOException {
Result[] results = new Result[gets.size()];
@@ -625,6 +657,11 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#getScanner(byte[] family)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param family column family
+ * @return an instance of ResultScanner
+ * @throws IOException if a remote or network exception occurs
*/
public ResultScanner getScanner(Transaction transaction, byte[] family) throws IOException {
Scan scan = new Scan();
@@ -634,16 +671,26 @@ public class TTable implements Closeable {
/**
* Transactional version of {@link HTableInterface#getScanner(byte[] family, byte[] qualifier)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param family column family
+ * @param qualifier column name
+ * @return an instance of ResultScanner
+ * @throws IOException if a remote or network exception occurs
*/
public ResultScanner getScanner(Transaction transaction, byte[] family, byte[] qualifier)
- throws IOException {
+ throws IOException {
Scan scan = new Scan();
scan.addColumn(family, qualifier);
return getScanner(transaction, scan);
}
/**
- * Transactional version of {@link HTableInterface#put(List<Put> puts)}
+ * Transactional version of {@link HTableInterface#put(List puts)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param puts List of puts
+ * @throws IOException if a remote or network exception occurs
*/
public void put(Transaction transaction, List<Put> puts) throws IOException {
for (Put put : puts) {
@@ -652,7 +699,11 @@ public class TTable implements Closeable {
}
/**
- * Transactional version of {@link HTableInterface#delete(List<Delete> deletes)}
+ * Transactional version of {@link HTableInterface#delete(List deletes)}
+ *
+ * @param transaction an instance of transaction to be used
+ * @param deletes List of deletes
+ * @throws IOException if a remote or network exception occurs
*/
public void delete(Transaction transaction, List<Delete> deletes) throws IOException {
for (Delete delete : deletes) {
@@ -661,9 +712,8 @@ public class TTable implements Closeable {
}
/**
- * Provides access to the underliying HTable in order to configure it or to
- * perform unsafe (non-transactional) operations. The latter would break the
- * transactional guarantees of the whole system.
+ * Provides access to the underliying HTable in order to configure it or to perform unsafe (non-transactional)
+ * operations. The latter would break the transactional guarantees of the whole system.
*
* @return The underlying HTable object
*/
@@ -686,21 +736,21 @@ public class TTable implements Closeable {
}
/**
- * Delegates to {@link HTable.getWriteBufferSize()}
+ * Delegates to see HTable.getWriteBufferSize()
*/
public long getWriteBufferSize() {
return table.getWriteBufferSize();
}
/**
- * Delegates to {@link HTable.setWriteBufferSize()}
+ * Delegates to see HTable.setWriteBufferSize()
*/
public void setWriteBufferSize(long writeBufferSize) throws IOException {
table.setWriteBufferSize(writeBufferSize);
}
/**
- * Delegates to {@link HTable.flushCommits()}
+ * Delegates to see HTable.flushCommits()
*/
public void flushCommits() throws IOException {
table.flushCommits();
@@ -723,14 +773,14 @@ public class TTable implements Closeable {
private void checkTimerangeIsSetToDefaultValuesOrThrowException(TimeRange tr) {
if (tr.getMin() != 0L || tr.getMax() != Long.MAX_VALUE) {
throw new IllegalArgumentException(
- "Timestamp/timerange not allowed in transactional user operations");
+ "Timestamp/timerange not allowed in transactional user operations");
}
}
private void throwExceptionIfOpSetsTimerange(Mutation userOperation) {
if (userOperation.getTimeStamp() != HConstants.LATEST_TIMESTAMP) {
throw new IllegalArgumentException(
- "Timestamp not allowed in transactional user operations");
+ "Timestamp not allowed in transactional user operations");
}
}
@@ -739,8 +789,8 @@ public class TTable implements Closeable {
return (HBaseTransaction) tx;
} else {
throw new IllegalArgumentException(
- String.format("The transaction object passed %s is not an instance of HBaseTransaction",
- tx.getClass().getName()));
+ String.format("The transaction object passed %s is not an instance of HBaseTransaction",
+ tx.getClass().getName()));
}
}
@@ -765,7 +815,7 @@ public class TTable implements Closeable {
};
return Multimaps.index(Iterables.filter(rawCells, shadowCellFilter), cellToColumnWrapper)
- .asMap().values()
- .asList();
+ .asMap().values()
+ .asList();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/hbase-common/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java b/hbase-common/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java
index b821b31..e1654ae 100644
--- a/hbase-common/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java
+++ b/hbase-common/src/main/java/org/apache/omid/committable/hbase/RegionSplitter.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,6 +18,7 @@
package org.apache.omid.committable.hbase;
import com.google.common.base.Preconditions;
+
import org.apache.commons.lang.ArrayUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.util.Bytes;
@@ -35,13 +36,14 @@ public class RegionSplitter {
/**
* A generic interface for the RegionSplitter code to use for all it's functionality. Note that the original authors
- * of this code use {@link HexStringSplit} to partition their table and set it as default, but provided this for
+ * of this code use see org.apache.hadoop.hbase.util.HexStringSplit to partition their table and set it as default, but provided this for
* your custom algorithm. To use, create a new derived class from this interface and call
- * {@link RegionSplitter#createPresplitTable} or
- * {@link RegionSplitter#rollingSplit(String, SplitAlgorithm, Configuration)} with the argument splitClassName
+ * see RegionSplitter#createPresplitTable or
+ * see RegionSplitter#rollingSplit(String, SplitAlgorithm, Configuration)} with the argument splitClassName
* giving the name of your class.
*/
public interface SplitAlgorithm {
+
/**
* Split a pre-existing region into 2 regions.
*
@@ -97,8 +99,7 @@ public class RegionSplitter {
* understand how to evenly divide the last region. Note that this last row is inclusive for all rows sharing
* the same prefix.
*
- * @param userInput
- * raw user input (may throw RuntimeException on parse failure)
+ * @param userInput raw user input (may throw RuntimeException on parse failure)
*/
void setLastRow(String userInput);
@@ -110,9 +111,8 @@ public class RegionSplitter {
byte[] strToRow(String input);
/**
- * @param row
- * byte array representing a row in HBase
- * @return String to use for debug & file printing
+ * @param row byte array representing a row in HBase
+ * @return String to use for debug and file printing
*/
String rowToStr(byte[] row);
@@ -139,8 +139,10 @@ public class RegionSplitter {
}
/**
- * @throws IOException
- * if the specified SplitAlgorithm class couldn't be instantiated
+ * @param conf Hbase conf
+ * @param splitClassName split class name to be used
+ * @return an instance of SplitAlgorithm
+ * @throws IOException if the specified SplitAlgorithm class couldn't be instantiated
*/
public static SplitAlgorithm newSplitAlgoInstance(Configuration conf,
String splitClassName) throws IOException {
@@ -161,7 +163,7 @@ public class RegionSplitter {
}
if (!SplitAlgorithm.class.isAssignableFrom(splitClass)) {
throw new IOException(
- "Specified split class doesn't implement SplitAlgorithm");
+ "Specified split class doesn't implement SplitAlgorithm");
}
}
try {
@@ -173,15 +175,16 @@ public class RegionSplitter {
/**
* A SplitAlgorithm that divides the space of possible keys evenly. Useful when the keys are approximately uniform
- * random bytes (e.g. hashes). Rows are raw byte values in the range <b>00 => FF</b> and are right-padded with zeros
+ * random bytes (e.g. hashes). Rows are raw byte values in the range [00..FF] and are right-padded with zeros
* to keep the same memcmp() order. This is the natural algorithm to use for a byte[] environment and saves space,
* but is not necessarily the easiest for readability.
*/
public static class UniformSplit implements SplitAlgorithm {
+
static final byte xFF = (byte) 0xFF;
byte[] firstRowBytes = ArrayUtils.EMPTY_BYTE_ARRAY;
byte[] lastRowBytes =
- new byte[]{xFF, xFF, xFF, xFF, xFF, xFF, xFF, xFF};
+ new byte[]{xFF, xFF, xFF, xFF, xFF, xFF, xFF, xFF};
public byte[] split(byte[] start, byte[] end) {
return Bytes.split(start, end, 1)[1];
@@ -190,15 +193,15 @@ public class RegionSplitter {
@Override
public byte[][] split(int numRegions) {
Preconditions.checkArgument(
- Bytes.compareTo(lastRowBytes, firstRowBytes) > 0,
- "last row (%s) is configured less than first row (%s)",
- Bytes.toStringBinary(lastRowBytes),
- Bytes.toStringBinary(firstRowBytes));
+ Bytes.compareTo(lastRowBytes, firstRowBytes) > 0,
+ "last row (%s) is configured less than first row (%s)",
+ Bytes.toStringBinary(lastRowBytes),
+ Bytes.toStringBinary(firstRowBytes));
byte[][] splits = Bytes.split(firstRowBytes, lastRowBytes, true,
- numRegions - 1);
+ numRegions - 1);
Preconditions.checkState(splits != null,
- "Could not split region with given user input: " + this);
+ "Could not split region with given user input: " + this);
// remove endpoints, which are included in the splits list
return Arrays.copyOfRange(splits, 1, splits.length - 1);
@@ -252,7 +255,7 @@ public class RegionSplitter {
@Override
public String toString() {
return this.getClass().getSimpleName() + " [" + rowToStr(firstRow())
- + "," + rowToStr(lastRow()) + "]";
+ + "," + rowToStr(lastRow()) + "]";
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java b/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
index b3414c6..3f2425b 100644
--- a/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
+++ b/hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java
@@ -59,6 +59,11 @@ public final class CellUtils {
/**
* Returns true if the particular cell passed exists in the datastore.
+ * @param row row
+ * @param family column family
+ * @param qualifier columnn name
+ * @param version version
+ * @param cellGetter an instance of CellGetter
* @return true if the cell specified exists. false otherwise
* @throws IOException
*/
@@ -78,7 +83,12 @@ public final class CellUtils {
}
/**
- * Returns true if the particular cell passed has a corresponding shadow cell in the datastore.
+ * Returns true if the particular cell passed has a corresponding shadow cell in the datastore
+ * @param row row
+ * @param family column family
+ * @param qualifier columnn name
+ * @param version version
+ * @param cellGetter an instance of CellGetter
* @return true if it has a shadow cell. false otherwise.
* @throws IOException
*/
@@ -93,12 +103,9 @@ public final class CellUtils {
/**
* Builds a new qualifier composed of the HBase qualifier passed + the shadow cell suffix.
- * @param qualifierArray
- * the qualifier to be suffixed
- * @param qualOffset
- * the offset where the qualifier starts
- * @param qualLength
- * the qualifier length
+ * @param qualifierArray the qualifier to be suffixed
+ * @param qualOffset the offset where the qualifier starts
+ * @param qualLength the qualifier length
* @return the suffixed qualifier
*/
public static byte[] addShadowCellSuffix(byte[] qualifierArray, int qualOffset, int qualLength) {
@@ -122,12 +129,9 @@ public final class CellUtils {
/**
* Builds a new qualifier removing the shadow cell suffix from the
* passed HBase qualifier.
- * @param qualifier
- * the qualifier to remove the suffix from
- * @param qualOffset
- * the offset where the qualifier starts
- * @param qualLength
- * the qualifier length
+ * @param qualifier the qualifier to remove the suffix from
+ * @param qualOffset the offset where the qualifier starts
+ * @param qualLength the qualifier length
* @return the new qualifier without the suffix
*/
public static byte[] removeShadowCellSuffix(byte[] qualifier, int qualOffset, int qualLength) {
@@ -146,12 +150,9 @@ public final class CellUtils {
/**
* Returns the qualifier length removing the shadow cell suffix. In case that que suffix is not found,
* just returns the length of the qualifier passed.
- * @param qualifier
- * the qualifier to remove the suffix from
- * @param qualOffset
- * the offset where the qualifier starts
- * @param qualLength
- * the qualifier length
+ * @param qualifier the qualifier to remove the suffix from
+ * @param qualOffset the offset where the qualifier starts
+ * @param qualLength the qualifier length
* @return the qualifier length without the suffix
*/
public static int qualifierLengthFromShadowCellQualifier(byte[] qualifier, int qualOffset, int qualLength) {
@@ -166,14 +167,10 @@ public final class CellUtils {
/**
* Complement to matchingQualifier() methods in HBase's CellUtil.class
- * @param left
- * the cell to compare the qualifier
- * @param qualArray
- * the explicit qualifier array passed
- * @param qualOffset
- * the explicit qualifier offset passed
- * @param qualLen
- * the explicit qualifier length passed
+ * @param left the cell to compare the qualifier
+ * @param qualArray the explicit qualifier array passed
+ * @param qualOffset the explicit qualifier offset passed
+ * @param qualLen the explicit qualifier length passed
* @return whether the qualifiers are equal or not
*/
public static boolean matchingQualifier(final Cell left, final byte[] qualArray, int qualOffset, int qualLen) {
@@ -203,8 +200,7 @@ public final class CellUtils {
/**
* Returns whether a cell contains a qualifier that is a shadow cell
* column qualifier or not.
- * @param cell
- * the cell to check if contains the shadow cell qualifier
+ * @param cell the cell to check if contains the shadow cell qualifier
* @return whether the cell passed contains a shadow cell qualifier or not
*/
public static boolean isShadowCell(Cell cell) {
@@ -228,8 +224,7 @@ public final class CellUtils {
/**
* Returns if a cell is marked as a tombstone.
- * @param cell
- * the cell to check
+ * @param cell the cell to check
* @return whether the cell is marked as a tombstone or not
*/
public static boolean isTombstone(Cell cell) {
@@ -259,8 +254,7 @@ public final class CellUtils {
/**
* Analyzes a list of cells, associating the corresponding shadow cell if present.
*
- * @param cells
- * the list of cells to classify
+ * @param cells the list of cells to classify
* @return a sorted map associating each cell with its shadow cell
*/
public static SortedMap<Cell, Optional<Cell>> mapCellsToShadowCells(List<Cell> cells) {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/metrics/src/main/java/org/apache/omid/metrics/MetricsRegistry.java
----------------------------------------------------------------------
diff --git a/metrics/src/main/java/org/apache/omid/metrics/MetricsRegistry.java b/metrics/src/main/java/org/apache/omid/metrics/MetricsRegistry.java
index 0d7ac03..f7ecdaa 100644
--- a/metrics/src/main/java/org/apache/omid/metrics/MetricsRegistry.java
+++ b/metrics/src/main/java/org/apache/omid/metrics/MetricsRegistry.java
@@ -23,7 +23,6 @@ public interface MetricsRegistry {
* Registers the {@link Gauge} under the given name.
*
* @param name the name of the metric
- * @returns a new {@link Counter}
*/
<T extends Number> void gauge(String name, Gauge<T> gauge);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
index 7f4de9a..500c1e2 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransaction.java
@@ -29,7 +29,7 @@ import java.util.Set;
/**
* Omid's base abstract implementation of the {@link Transaction} interface.
* Provides extra methods to access other basic transaction state required by
- * {@link TransactionManagerExtension} implementations based on snapshot
+ * {@link TransactionManager} implementations based on snapshot
* isolation.
*
* So, this abstract class must be extended by particular implementations of
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransactionManager.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransactionManager.java b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransactionManager.java
index 4245917..e7dc8cf 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransactionManager.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/AbstractTransactionManager.java
@@ -113,7 +113,7 @@ public abstract class AbstractTransactionManager implements TransactionManager {
/**
* Allows transaction manager developers to perform actions before creating a transaction.
- * @throws TransactionManagerException
+ * @throws TransactionManagerException in case of any issues
*/
public void preBegin() throws TransactionManagerException {}
@@ -163,7 +163,7 @@ public abstract class AbstractTransactionManager implements TransactionManager {
* Allows transaction manager developers to perform actions after having started a transaction.
* @param transaction
* the transaction that was just created.
- * @throws TransactionManagerException
+ * @throws TransactionManagerException in case of any issues
*/
public void postBegin(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {}
@@ -171,7 +171,7 @@ public abstract class AbstractTransactionManager implements TransactionManager {
* Allows transaction manager developers to perform actions before committing a transaction.
* @param transaction
* the transaction that is going to be committed.
- * @throws TransactionManagerException
+ * @throws TransactionManagerException in case of any issues
*/
public void preCommit(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {}
@@ -217,15 +217,14 @@ public abstract class AbstractTransactionManager implements TransactionManager {
* Allows transaction manager developers to perform actions after committing a transaction.
* @param transaction
* the transaction that was committed.
- * @throws TransactionManagerException
+ * @throws TransactionManagerException in case of any issues
*/
public void postCommit(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {}
/**
* Allows transaction manager developers to perform actions before rolling-back a transaction.
- * @param transaction
- * the transaction that is going to be rolled-back.
- * @throws TransactionManagerException
+ * @param transaction the transaction that is going to be rolled-back.
+ * @throws TransactionManagerException in case of any issues
*/
public void preRollback(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {}
@@ -260,7 +259,7 @@ public abstract class AbstractTransactionManager implements TransactionManager {
* Allows transaction manager developers to perform actions after rolling-back a transaction.
* @param transaction
* the transaction that was rolled-back.
- * @throws TransactionManagerException
+ * @throws TransactionManagerException in case of any issues
*/
public void postRollback(AbstractTransaction<? extends CellId> transaction) throws TransactionManagerException {}
@@ -299,7 +298,7 @@ public abstract class AbstractTransactionManager implements TransactionManager {
* a locator to find the commit timestamp in the system.
* @return the commit timestamp joint with the location where it was found
* or an object indicating that it was not found in the system
- * @throws IOException
+ * @throws IOException in case of any I/O issues
*/
public CommitTimestamp locateCellCommitTimestamp(long cellStartTimestamp, long epoch,
CommitTimestampLocator locator) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/transaction/Transaction.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/Transaction.java b/transaction-client/src/main/java/org/apache/omid/transaction/Transaction.java
index 696bd3e..b9405c6 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/Transaction.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/Transaction.java
@@ -20,7 +20,7 @@ package org.apache.omid.transaction;
import com.google.common.base.Optional;
/**
- * This interface defines the transaction state & behavior exposed to users.
+ * This interface defines the transaction state and behavior exposed to users.
*/
public interface Transaction {
@@ -66,9 +66,12 @@ public interface Transaction {
*
* Expects they metadata stored under key "key" to be of the "Set" type,
* append "value" to the existing set or creates a new one
+ * @param key a key, like in hashtable
+ * @param value a value to associate with the given key
*/
void appendMetadata(String key, Object value);
+
void setMetadata(String key, Object value);
Optional<Object> getMetadata(String key);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/transaction/TransactionManager.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/transaction/TransactionManager.java b/transaction-client/src/main/java/org/apache/omid/transaction/TransactionManager.java
index b393e81..239aafc 100644
--- a/transaction-client/src/main/java/org/apache/omid/transaction/TransactionManager.java
+++ b/transaction-client/src/main/java/org/apache/omid/transaction/TransactionManager.java
@@ -27,29 +27,24 @@ public interface TransactionManager extends Closeable {
/**
* Starts a new transaction.
*
- * Creates & returns a {@link Transaction} interface implementation
- * that will be used in {@link TTable}'s methods for doing operations
- * on the transactional context defined by the returned object.
+ * Creates and returns a {@link Transaction} interface implementation that will be used in TTable's methods for
+ * doing operations on the transactional context defined by the returned object.
*
- * @return transaction
- * representation of the created transaction
- * @throws TransactionException
+ * @return transaction representation of the created transaction
+ * @throws TransactionException in case of any issues
*/
Transaction begin() throws TransactionException;
/**
* Commits a transaction.
*
- * If the transaction was marked for rollback or has conflicts
- * with another concurrent transaction it will be rolledback
- * automatically and a {@link RollbackException} will be thrown.
+ * If the transaction was marked for rollback or has conflicts with another concurrent transaction it will be
+ * rolledback automatically and a {@link RollbackException} will be thrown.
*
- * @param tx
- * transaction to be committed.
- * @throws RollbackException
- * thrown when transaction has conflicts with another transaction
- * or when was marked for rollback.
- * @throws TransactionException
+ * @param tx transaction to be committed.
+ * @throws RollbackException thrown when transaction has conflicts with another transaction or when was marked
+ * for rollback.
+ * @throws TransactionException in case of any issues
*/
void commit(Transaction tx) throws RollbackException, TransactionException;
@@ -58,8 +53,8 @@ public interface TransactionManager extends Closeable {
*
* Automatically rollbacks the changes performed by the transaction.
*
- * @param tx
- * transaction to be rolled-back.
+ * @param tx transaction to be rolled-back
+ * @throws TransactionException in case of any issues
*/
void rollback(Transaction tx) throws TransactionException;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/tso/client/HandshakeFailedException.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/tso/client/HandshakeFailedException.java b/transaction-client/src/main/java/org/apache/omid/tso/client/HandshakeFailedException.java
index d9acd83..9b36422 100644
--- a/transaction-client/src/main/java/org/apache/omid/tso/client/HandshakeFailedException.java
+++ b/transaction-client/src/main/java/org/apache/omid/tso/client/HandshakeFailedException.java
@@ -18,7 +18,7 @@
package org.apache.omid.tso.client;
/**
- * Thrown when some incompatibilities between the TSO client & server are
+ * Thrown when some incompatibilities between the TSO client and server are
* found
*/
public class HandshakeFailedException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
index 67260fa..1690ca6 100644
--- a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
+++ b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOClient.java
@@ -236,8 +236,8 @@ public class TSOClient implements TSOProtocol, NodeCacheListener {
// ----------------------------------------------------------------------------------------------------------------
/**
- * Returns the epoch of the TSO server that initialized this transaction.
* Used for high availability support.
+ * @return the epoch of the TSO server that initialized this transaction.
*/
public long getEpoch() {
return epoch;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/df2b4471/transaction-client/src/main/java/org/apache/omid/tso/client/TSOProtocol.java
----------------------------------------------------------------------
diff --git a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOProtocol.java b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOProtocol.java
index c5a32d7..198913a 100644
--- a/transaction-client/src/main/java/org/apache/omid/tso/client/TSOProtocol.java
+++ b/transaction-client/src/main/java/org/apache/omid/tso/client/TSOProtocol.java
@@ -28,8 +28,8 @@ public interface TSOProtocol {
* Returns a new timestamp assigned by on the server-side
* @return the newly assigned timestamp as a future. If an error was detected, the future will contain a
* corresponding protocol exception
- * @see TimestampOracle
- * @see TSOServer
+ * see org.apache.omid.tso.TimestampOracle
+ * see org.apache.omid.tso.TSOServer
*/
TSOFuture<Long> getNewStartTimestamp();
@@ -42,8 +42,8 @@ public interface TSOProtocol {
* @return the commit timestamp as a future if the transaction was committed. If the transaction was aborted due
* to conflicts with a concurrent transaction, the future will include an AbortException. If an error was detected,
* the future will contain a corresponding protocol exception
- * @see TimestampOracle
- * @see TSOServer
+ * see org.apache.omid.tso.TimestampOracle
+ * see org.apache.omid.tso.TSOServer
*/
TSOFuture<Long> commit(long transactionId, Set<? extends CellId> writeSet);
[16/23] incubator-omid git commit: Merge pull request #108 from
yahoo/omid-33
Posted by fp...@apache.org.
Merge pull request #108 from yahoo/omid-33
[OMID-33] Add HADOOP_CONF_DIR and HBASE_CONF_DIR evn variables into t\u2026
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/fda56669
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/fda56669
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/fda56669
Branch: refs/heads/master
Commit: fda566699c4b44d8f0c3d1c1ade64b6ff68c18bd
Parents: 5616acf 3ca14fc
Author: Francisco P�rez-Sorrosal <fp...@gmail.com>
Authored: Tue May 24 10:56:44 2016 -0700
Committer: Francisco P�rez-Sorrosal <fp...@gmail.com>
Committed: Tue May 24 10:56:44 2016 -0700
----------------------------------------------------------------------
tso-server/bin/omid.sh | 2 +-
tso-server/conf/omid-env.sh | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/fda56669/tso-server/bin/omid.sh
----------------------------------------------------------------------
[11/23] incubator-omid git commit: [OMID-33] Add HADOOP_CONF_DIR and
HBASE_CONF_DIR evn variables into tso server start scripts
Posted by fp...@apache.org.
[OMID-33] Add HADOOP_CONF_DIR and HBASE_CONF_DIR evn variables into tso server start scripts
Change-Id: Id0ac8745cbb1d34e6c2a00e5a8c706ce3370a8e3
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/3ca14fca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/3ca14fca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/3ca14fca
Branch: refs/heads/master
Commit: 3ca14fca12e3241f1b6ac487e79ce3d3ae0c38b2
Parents: 5d5864e
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Fri May 20 12:11:04 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Fri May 20 12:11:04 2016 -0700
----------------------------------------------------------------------
tso-server/bin/omid.sh | 2 +-
tso-server/conf/omid-env.sh | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/3ca14fca/tso-server/bin/omid.sh
----------------------------------------------------------------------
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index 66382d7..cede88c 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -2,7 +2,7 @@
SCRIPTDIR=`dirname $0`
cd $SCRIPTDIR;
-CLASSPATH=../conf
+CLASSPATH=../conf:$(HBASE_CONF_DIR):$(HADOOP_CONF_DIR)
. ../conf/omid-env.sh
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/3ca14fca/tso-server/conf/omid-env.sh
----------------------------------------------------------------------
diff --git a/tso-server/conf/omid-env.sh b/tso-server/conf/omid-env.sh
index 5828123..2d836bd 100644
--- a/tso-server/conf/omid-env.sh
+++ b/tso-server/conf/omid-env.sh
@@ -1,2 +1,9 @@
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx8096m
+# ---------------------------------------------------------------------------------------------------------------------
+# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi
+if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi
+
[10/23] incubator-omid git commit: [OMID-31] Add missing license
header
Posted by fp...@apache.org.
[OMID-31] Add missing license header
Change-Id: I09c99ccadb479b211882a1e09735da0fd4fc65a3
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/14c8f700
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/14c8f700
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/14c8f700
Branch: refs/heads/master
Commit: 14c8f700fc23c69671391607e567bc544940117c
Parents: 5d5864e
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Fri May 20 12:08:20 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Fri May 20 12:08:20 2016 -0700
----------------------------------------------------------------------
benchmarks/bin/benchmarks.sh | 18 ++++++++++++++++++
benchmarks/bin/omid-env.sh | 18 ++++++++++++++++++
doc/site/resources/css/site.css | 17 +++++++++++++++++
examples/run.sh | 18 ++++++++++++++++++
pom.xml | 5 ++---
tso-server/bin/omid.sh | 18 ++++++++++++++++++
tso-server/conf/omid-env.sh | 18 ++++++++++++++++++
7 files changed, 109 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/benchmarks/bin/benchmarks.sh
----------------------------------------------------------------------
diff --git a/benchmarks/bin/benchmarks.sh b/benchmarks/bin/benchmarks.sh
index c89e25f..51468dd 100755
--- a/benchmarks/bin/benchmarks.sh
+++ b/benchmarks/bin/benchmarks.sh
@@ -1,4 +1,22 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
SCRIPTDIR=`dirname $0`
cd $SCRIPTDIR;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/benchmarks/bin/omid-env.sh
----------------------------------------------------------------------
diff --git a/benchmarks/bin/omid-env.sh b/benchmarks/bin/omid-env.sh
index c76897c..1a9cb12 100644
--- a/benchmarks/bin/omid-env.sh
+++ b/benchmarks/bin/omid-env.sh
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx2048m
# ---------------------------------------------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/doc/site/resources/css/site.css
----------------------------------------------------------------------
diff --git a/doc/site/resources/css/site.css b/doc/site/resources/css/site.css
index 7b37a01..937a702 100644
--- a/doc/site/resources/css/site.css
+++ b/doc/site/resources/css/site.css
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
/* Basics */
a {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/examples/run.sh
----------------------------------------------------------------------
diff --git a/examples/run.sh b/examples/run.sh
index b9323c3..0cc93b9 100755
--- a/examples/run.sh
+++ b/examples/run.sh
@@ -1,4 +1,22 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
# ---------------------------------------------------------------------------------------------------------------------
# Helper functions
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 362f39c..0c2b457 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,6 +381,8 @@
<include>src/**/*.java</include>
<include>src/**/*.xml</include>
<include>src/**/*.proto</include>
+ <include>**/*.css</include>
+ <include>**/*.sh</include>
</includes>
<excludes>
<!-- Add files to exclude from licensing -->
@@ -389,10 +391,7 @@
<exclude>**/pom.xml</exclude>
<!-- Exclude config and scripts -->
- <exclude>**/doc/*</exclude>
<exclude>**/dev-utils/*</exclude>
- <exclude>**/bin/*</exclude>
- <exclude>**/conf/*</exclude>
<!-- Exclude assembly -->
<exclude>**/maven/assembly/*</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/tso-server/bin/omid.sh
----------------------------------------------------------------------
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index 66382d7..5feb371 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -1,4 +1,22 @@
#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
SCRIPTDIR=`dirname $0`
cd $SCRIPTDIR;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/14c8f700/tso-server/conf/omid-env.sh
----------------------------------------------------------------------
diff --git a/tso-server/conf/omid-env.sh b/tso-server/conf/omid-env.sh
index 5828123..2d01a1d 100644
--- a/tso-server/conf/omid-env.sh
+++ b/tso-server/conf/omid-env.sh
@@ -1,2 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx8096m
[21/23] incubator-omid git commit: Merge pull request #111 from
yahoo/omid-37
Posted by fp...@apache.org.
Merge pull request #111 from yahoo/omid-37
[OMID-37] Improve creation of Disruptor components
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/a527447e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/a527447e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/a527447e
Branch: refs/heads/master
Commit: a527447e8c80c2b7898a71916c2b8662d3d876b8
Parents: 3236900 9722e40
Author: ikatkov <ik...@gmail.com>
Authored: Thu May 26 13:17:34 2016 -0700
Committer: ikatkov <ik...@gmail.com>
Committed: Thu May 26 13:17:34 2016 -0700
----------------------------------------------------------------------
.../omid/tso/PersistenceProcessorImpl.java | 37 ++++++++---------
.../org/apache/omid/tso/ReplyProcessorImpl.java | 32 ++++++++-------
.../apache/omid/tso/RequestProcessorImpl.java | 42 +++++++++++---------
.../org/apache/omid/tso/RetryProcessorImpl.java | 36 +++++++++--------
4 files changed, 80 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
[07/23] incubator-omid git commit: [OMID-30] tso-server distribution
for hbase-1 carries omid-hbase0-shims.jar
Posted by fp...@apache.org.
[OMID-30] tso-server distribution for hbase-1 carries omid-hbase0-shims.jar
Change-Id: If699a73f0eea251b177890f4b3c4637b496c86d5
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/a2cf5c85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/a2cf5c85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/a2cf5c85
Branch: refs/heads/master
Commit: a2cf5c853d67f0bf7b85fb803ddc440d8ad00c72
Parents: 709e044
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Thu May 19 15:32:14 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Thu May 19 15:32:14 2016 -0700
----------------------------------------------------------------------
examples/pom.xml | 3 ---
hbase-client/pom.xml | 3 ---
hbase-commit-table/pom.xml | 3 ---
hbase-common/pom.xml | 3 ---
hbase-coprocessor/pom.xml | 3 ---
hbase-tools/pom.xml | 3 ---
timestamp-storage/pom.xml | 3 ---
tso-server/pom.xml | 3 ---
8 files changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index e7ca3cb..2b8583f 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -121,9 +121,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 8feb869..076c738 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -161,9 +161,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index ce11051..669a536 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -140,9 +140,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index a398833..c44b72f 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -81,9 +81,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 79fc36f..ff2b33a 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -146,9 +146,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 8526023..269f453 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -97,9 +97,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 37bbe6e..5e7f6a7 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -127,9 +127,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/a2cf5c85/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index e24cf16..a47880f 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -276,9 +276,6 @@
<profile>
<id>hbase-0</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
[09/23] incubator-omid git commit: [OMID-29] Fix missing updates to
omid package names in assembly and script files
Posted by fp...@apache.org.
[OMID-29] Fix missing updates to omid package names in assembly and script files
The first patch on this issue didn't include these updates, so when
unpacking the tar.gz file and running the TSO server not all the
required jars where found.
Change-Id: Iebb0f9acab40e9d4753874facf91cdc60067364b
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/5193038c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/5193038c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/5193038c
Branch: refs/heads/master
Commit: 5193038c268f669d8f9cbe1f0870b392abe8615d
Parents: 5d5864e
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Fri May 20 11:34:38 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Fri May 20 11:37:05 2016 -0700
----------------------------------------------------------------------
tso-server/bin/omid.sh | 4 ++--
tso-server/maven/assembly/bin.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5193038c/tso-server/bin/omid.sh
----------------------------------------------------------------------
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index 66382d7..a798b9d 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -7,12 +7,12 @@ CLASSPATH=../conf
. ../conf/omid-env.sh
# for source release
-for j in ../target/tso*.jar; do
+for j in ../target/omid-tso*.jar; do
CLASSPATH=$CLASSPATH:$j
done
# for binary release
-for j in ../tso*.jar; do
+for j in ../omid-tso*.jar; do
CLASSPATH=$CLASSPATH:$j
done
for j in ../lib/*.jar; do
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5193038c/tso-server/maven/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/tso-server/maven/assembly/bin.xml b/tso-server/maven/assembly/bin.xml
index 7fe4c22..f1afc28 100644
--- a/tso-server/maven/assembly/bin.xml
+++ b/tso-server/maven/assembly/bin.xml
@@ -17,9 +17,9 @@
<useAllReactorProjects>true</useAllReactorProjects>
<!-- Now, select which projects to include in this module-set. -->
<includes>
- <include>org.apache.omid:hbase-commit-table</include>
- <include>org.apache.omid:codahale-metrics</include>
- <include>org.apache.omid:hbase-tools</include>
+ <include>org.apache.omid:omid-hbase-commit-table</include>
+ <include>org.apache.omid:omid-codahale-metrics</include>
+ <include>org.apache.omid:omid-hbase-tools</include>
</includes>
<binaries>
<outputDirectory>/lib</outputDirectory>
[15/23] incubator-omid git commit: [ci skip]prepare for next
development iteration
Posted by fp...@apache.org.
[ci skip]prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/5616acfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/5616acfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/5616acfb
Branch: refs/heads/master
Commit: 5616acfbf8adbda4c29e92facf3cdbfcc7135b17
Parents: b253cde
Author: Omid CI <om...@yahoo-inc.com>
Authored: Mon May 23 18:18:25 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Mon May 23 18:18:25 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index f347e17..2229609 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index 5441f17..092e35a 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index e55d7de..a1ad01c 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 7e98efc..94f3300 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index fe29aeb..038e665 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 3f21003..c8ca959 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 26beca8..409bd8f 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index a58532b..6004041 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index f6c1a37..64f630c 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index 5cb2327..ce02e42 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index 626db59..75f4f8f 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 5c4f4b4..2fe6f33 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 318d61e..d44ae20 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 9b7b31c..fc4f346 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b677df..71531bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>omid-0.8.2.3</tag>
+ <tag>master</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 1cb06d3..160487e 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index bd97f6e..288cca4 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index e1a8110..e28057d 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5616acfb/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index c527a78..8cd4bd9 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.3</version>
+ <version>0.8.2.4-SNAPSHOT</version>
</parent>
<artifactId>omid-tso-server</artifactId>
[23/23] incubator-omid git commit: Merge pull request #115 from
yahoo/OMID-40
Posted by fp...@apache.org.
Merge pull request #115 from yahoo/OMID-40
[OMID-40] Fix java docs to comply with Apache standards
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/89fe337f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/89fe337f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/89fe337f
Branch: refs/heads/master
Commit: 89fe337f4274bf785b0b61906c7d175020fda3d0
Parents: a527447 df2b447
Author: Francisco P�rez-Sorrosal <fp...@gmail.com>
Authored: Tue May 31 17:37:45 2016 -0700
Committer: Francisco P�rez-Sorrosal <fp...@gmail.com>
Committed: Tue May 31 17:37:45 2016 -0700
----------------------------------------------------------------------
.../apache/omid/benchmarks/utils/Generator.java | 6 +-
.../omid/benchmarks/utils/IntegerGenerator.java | 12 +-
.../utils/ScrambledZipfianGenerator.java | 2 +-
.../omid/benchmarks/utils/ZipfianGenerator.java | 6 +-
.../apache/omid/committable/CommitTable.java | 2 +-
.../org/apache/omid/examples/BasicExample.java | 8 +-
.../omid/examples/SnapshotIsolationExample.java | 15 +-
.../omid/transaction/HBaseTransaction.java | 1 +
.../org/apache/omid/transaction/TTable.java | 180 ++++++++++++-------
.../omid/committable/hbase/RegionSplitter.java | 45 ++---
.../org/apache/omid/transaction/CellUtils.java | 60 +++----
.../apache/omid/metrics/MetricsRegistry.java | 1 -
.../omid/transaction/AbstractTransaction.java | 2 +-
.../transaction/AbstractTransactionManager.java | 17 +-
.../apache/omid/transaction/Transaction.java | 5 +-
.../omid/transaction/TransactionManager.java | 29 ++-
.../tso/client/HandshakeFailedException.java | 2 +-
.../org/apache/omid/tso/client/TSOClient.java | 2 +-
.../org/apache/omid/tso/client/TSOProtocol.java | 8 +-
19 files changed, 224 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
[17/23] incubator-omid git commit: Merge pull request #107 from
yahoo/omid-31
Posted by fp...@apache.org.
Merge pull request #107 from yahoo/omid-31
[OMID-31] Add missing license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/1f989f89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/1f989f89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/1f989f89
Branch: refs/heads/master
Commit: 1f989f899b34d03d53e4f50d9599cff586528d84
Parents: fda5666 14c8f70
Author: Francisco P�rez-Sorrosal <fp...@gmail.com>
Authored: Tue May 24 10:58:34 2016 -0700
Committer: Francisco P�rez-Sorrosal <fp...@gmail.com>
Committed: Tue May 24 10:58:34 2016 -0700
----------------------------------------------------------------------
benchmarks/bin/benchmarks.sh | 18 ++++++++++++++++++
benchmarks/bin/omid-env.sh | 18 ++++++++++++++++++
doc/site/resources/css/site.css | 17 +++++++++++++++++
examples/run.sh | 18 ++++++++++++++++++
pom.xml | 5 ++---
tso-server/bin/omid.sh | 18 ++++++++++++++++++
tso-server/conf/omid-env.sh | 18 ++++++++++++++++++
7 files changed, 109 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/tso-server/bin/omid.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/1f989f89/tso-server/conf/omid-env.sh
----------------------------------------------------------------------
diff --cc tso-server/conf/omid-env.sh
index 2d836bd,2d01a1d..578382c
--- a/tso-server/conf/omid-env.sh
+++ b/tso-server/conf/omid-env.sh
@@@ -1,9 -1,20 +1,27 @@@
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements. See the NOTICE file
+ # distributed with this work for additional information
+ # regarding copyright ownership. The ASF licenses this file
+ # to you 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.
+ #
+
# Set the flags to pass to the jvm when running omid
# export JVM_FLAGS=-Xmx8096m
+# ---------------------------------------------------------------------------------------------------------------------
+# Check if HADOOP_CONF_DIR and HBASE_CONF_DIR are set
+# ---------------------------------------------------------------------------------------------------------------------
+
+if [ -z ${HADOOP_CONF_DIR+x} ]; then echo "WARNING: HADOOP_CONF_DIR is unset"; else echo "HADOOP_CONF_DIR is set to '$HADOOP_CONF_DIR'"; fi
+if [ -z ${HBASE_CONF_DIR+x} ]; then echo "WARNING: HBASE_CONF_DIR is unset"; else echo "HBASE_CONF_DIR is set to '$HBASE_CONF_DIR'"; fi
+
[06/23] incubator-omid git commit: [OMID-29] Adding Omid prefix to
all artifacts
Posted by fp...@apache.org.
[OMID-29] Adding Omid prefix to all artifacts
Change-Id: I167444e285dd899aa0d981538b784f0adc6f2f26
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/709e0444
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/709e0444
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/709e0444
Branch: refs/heads/master
Commit: 709e0444b4022346c87ef995d75736370f849fb8
Parents: 110b64f
Author: Igor Katkov <ka...@yahoo-inc.com>
Authored: Thu May 19 15:30:52 2016 -0700
Committer: Igor Katkov <ka...@yahoo-inc.com>
Committed: Thu May 19 15:30:52 2016 -0700
----------------------------------------------------------------------
benchmarks/pom.xml | 12 ++++++------
codahale-metrics/pom.xml | 6 +++---
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 12 ++++++------
hbase-client/pom.xml | 18 +++++++++---------
hbase-commit-table/pom.xml | 12 ++++++------
hbase-common/pom.xml | 6 +++---
hbase-coprocessor/pom.xml | 14 +++++++-------
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-tools/pom.xml | 10 +++++-----
metrics/pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 10 +++++-----
transaction-client/pom.xml | 12 ++++++------
tso-server/pom.xml | 20 ++++++++++----------
17 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index e32812b..5ea5df5 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>benchmarks</artifactId>
+ <artifactId>omid-benchmarks</artifactId>
<name>Benchmarks</name>
<dependencies>
@@ -17,22 +17,22 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>transaction-client</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>metrics</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>codahale-metrics</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
@@ -115,4 +115,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index 3aa8892..bb6fb9a 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>codahale-metrics</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<name>Codahale Metrics</name>
<dependencies>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>metrics</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
@@ -62,4 +62,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index dc48d74..d1234b4 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<packaging>jar</packaging>
<name>Commit Table</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 9306936..f20f3f9 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>common</artifactId>
+ <artifactId>omid-common</artifactId>
<name>Common</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 81310fd..e7ca3cb 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -9,7 +9,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>examples</artifactId>
+ <artifactId>omid-examples</artifactId>
<name>Omid Client Examples</name>
<description>Includes some examples showing Omid features</description>
@@ -19,13 +19,13 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-client</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>codahale-metrics</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- End of Dependencies on Omid modules -->
@@ -127,7 +127,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -138,7 +138,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -146,4 +146,4 @@
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index f60a270..8feb869 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase-client</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<packaging>jar</packaging>
<name>HBase Client</name>
<description>HBase specific implementation of transaction-client module</description>
@@ -19,37 +19,37 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>transaction-client</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>tso-server</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>tso-server</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -167,7 +167,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -178,7 +178,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index ba08de1..ce11051 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<packaging>jar</packaging>
<name>HBase Commit Table</name>
@@ -18,17 +18,17 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>common</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-common</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -146,7 +146,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -157,7 +157,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 642cabf..a398833 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase-common</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<name>HBase Common</name>
<packaging>jar</packaging>
@@ -87,7 +87,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -98,7 +98,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 7a7e4f2..79fc36f 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase-coprocessor</artifactId>
+ <artifactId>omid-hbase-coprocessor</artifactId>
<packaging>jar</packaging>
<name>HBase Coprocessors</name>
@@ -18,24 +18,24 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>tso-server</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-client</artifactId>
+ <artifactId>omid-hbase-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>tso-server</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -152,7 +152,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -163,7 +163,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index a2b5925..59a9abb 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<name>Shims layer for HBase 0.x</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index fa447cb..d059d3f 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<name>Shims layer for HBase 1.x</name>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index fa7d6d3..8526023 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<name>HBase tools</name>
<packaging>jar</packaging>
@@ -18,13 +18,13 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-commit-table</artifactId>
+ <artifactId>omid-hbase-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>timestamp-storage</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<version>${project.version}</version>
</dependency>
<!-- End of Dependencies on Omid modules -->
@@ -103,7 +103,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -114,7 +114,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 3334c83..f99c5cf 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -9,7 +9,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>metrics</artifactId>
+ <artifactId>omid-metrics</artifactId>
<name>Metrics</name>
<dependencies>
@@ -67,4 +67,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 6369678..3ea5ee4 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -9,7 +9,7 @@
</parent>
<name>State Machine</name>
- <artifactId>statemachine</artifactId>
+ <artifactId>omid-statemachine</artifactId>
<packaging>jar</packaging>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 3236aeb..37bbe6e 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>timestamp-storage</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<name>Timestamp Storage</name>
<packaging>jar</packaging>
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-common</artifactId>
+ <artifactId>omid-hbase-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>common</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -133,7 +133,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -144,7 +144,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 48afeb6..098e0d8 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>transaction-client</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<packaging>jar</packaging>
<name>Transaction Client</name>
@@ -18,27 +18,27 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>common</artifactId>
+ <artifactId>omid-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>statemachine</artifactId>
+ <artifactId>omid-statemachine</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>metrics</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/709e0444/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 1968f8e..e24cf16 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -8,7 +8,7 @@
<version>0.8.2.3-SNAPSHOT</version>
</parent>
- <artifactId>tso-server</artifactId>
+ <artifactId>omid-tso-server</artifactId>
<packaging>jar</packaging>
<name>TSO and TO Servers</name>
<description>Omid Transaction Status Oracle server and Timestamp Oracle</description>
@@ -19,44 +19,44 @@
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>timestamp-storage</artifactId>
+ <artifactId>omid-timestamp-storage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>metrics</artifactId>
+ <artifactId>omid-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- The codahale-related dependency is added here just to include the jar in the final
tar.gz package assembled. -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>codahale-metrics</artifactId>
+ <artifactId>omid-codahale-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<!-- The hbase-related dependency is added here just to include the jar in the final tar.gz package assembled.
The hbase tools are handy to create the required Omid tables from the same script that starts the TSO server -->
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase-tools</artifactId>
+ <artifactId>omid-hbase-tools</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>commit-table</artifactId>
+ <artifactId>omid-commit-table</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>transaction-client</artifactId>
+ <artifactId>omid-transaction-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
@@ -282,7 +282,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase0-shims</artifactId>
+ <artifactId>omid-hbase0-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -293,7 +293,7 @@
<dependencies>
<dependency>
<groupId>org.apache.omid</groupId>
- <artifactId>hbase1-shims</artifactId>
+ <artifactId>omid-hbase1-shims</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
[02/23] incubator-omid git commit: [ci skip]prepare for next
development iteration
Posted by fp...@apache.org.
[ci skip]prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/5eb385bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/5eb385bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/5eb385bc
Branch: refs/heads/master
Commit: 5eb385bc97d8de2c5b194d0c1f4054d808dcb83a
Parents: dad2724
Author: Omid CI <om...@yahoo-inc.com>
Authored: Wed May 18 19:49:32 2016 +0000
Committer: Omid CI <om...@yahoo-inc.com>
Committed: Wed May 18 19:49:32 2016 +0000
----------------------------------------------------------------------
benchmarks/pom.xml | 2 +-
codahale-metrics/pom.xml | 2 +-
commit-table/pom.xml | 2 +-
common/pom.xml | 2 +-
examples/pom.xml | 2 +-
hbase-client/pom.xml | 2 +-
hbase-commit-table/pom.xml | 2 +-
hbase-common/pom.xml | 2 +-
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-0/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
pom.xml | 4 ++--
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
19 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/benchmarks/pom.xml
----------------------------------------------------------------------
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index a3905ed..c53c561 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>benchmarks</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/codahale-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index ea03767..cca67de 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index 3ce1504..d526141 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index e762121..0e4e3ee 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 14276f1..5424ef3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-client/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index fb00c16..4a8db82 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-commit-table/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index a186d02..5125a57 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase-commit-table</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-common/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 25eb577..f46a84e 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-coprocessor/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 000010b..84aaa60 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase-coprocessor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-shims/hbase-0/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-0/pom.xml b/hbase-shims/hbase-0/pom.xml
index cc039b1..e6a5567 100644
--- a/hbase-shims/hbase-0/pom.xml
+++ b/hbase-shims/hbase-0/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase0-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-shims/hbase-1/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index 20ea209..415ff3b 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase1-shims</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index c4300eb..9d3839f 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/hbase-tools/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index 58bcefb..94e6054 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>hbase-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 633751c..e0f52f2 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>metrics</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5394514..0da9d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
<organization>
<name>Apache Software Foundation</name>
@@ -105,7 +105,7 @@
<connection>scm:git:git://github.com/yahoo/omid.git</connection>
<developerConnection>scm:git:https://${GH_TOKEN}@github.com/yahoo/omid.git</developerConnection>
<url>https://github.com/yahoo/omid</url>
- <tag>omid-0.8.2.1</tag>
+ <tag>master</tag>
</scm>
<distributionManagement>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/statemachine/pom.xml
----------------------------------------------------------------------
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index 8bd3f42..448e7fe 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<name>State Machine</name>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/timestamp-storage/pom.xml
----------------------------------------------------------------------
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 04cb58a..fee6ee7 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>timestamp-storage</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/transaction-client/pom.xml
----------------------------------------------------------------------
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 04c1532..2dfcb9b 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>transaction-client</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5eb385bc/tso-server/pom.xml
----------------------------------------------------------------------
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index 0953ea5..bdd0527 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>0.8.2.1</version>
+ <version>0.8.2.2-SNAPSHOT</version>
</parent>
<artifactId>tso-server</artifactId>
[20/23] incubator-omid git commit: [OMID-37] Improve creation of
Disruptor components
Posted by fp...@apache.org.
[OMID-37] Improve creation of Disruptor components
Use the Disruptor API to create Omid processor components
Change-Id: I5d164bead9de6536495f08578cf6a02171b5d69f
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/9722e401
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/9722e401
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/9722e401
Branch: refs/heads/master
Commit: 9722e4013cd2139395dea5b6315dfaac59e6b84b
Parents: 3236900
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Wed May 25 21:58:38 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Wed May 25 21:59:26 2016 -0700
----------------------------------------------------------------------
.../omid/tso/PersistenceProcessorImpl.java | 37 ++++++++---------
.../org/apache/omid/tso/ReplyProcessorImpl.java | 32 ++++++++-------
.../apache/omid/tso/RequestProcessorImpl.java | 42 +++++++++++---------
.../org/apache/omid/tso/RetryProcessorImpl.java | 36 +++++++++--------
4 files changed, 80 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/9722e401/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorImpl.java
index 4fe21d2..5204332 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/PersistenceProcessorImpl.java
@@ -24,6 +24,7 @@ import com.lmax.disruptor.BusySpinWaitStrategy;
import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.WorkerPool;
+import com.lmax.disruptor.dsl.Disruptor;
import org.apache.commons.pool2.ObjectPool;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.metrics.MetricsRegistry;
@@ -39,6 +40,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import static com.lmax.disruptor.dsl.ProducerType.SINGLE;
import static org.apache.omid.metrics.MetricsUtils.name;
import static org.apache.omid.tso.PersistenceProcessorImpl.PersistBatchEvent.EVENT_FACTORY;
import static org.apache.omid.tso.PersistenceProcessorImpl.PersistBatchEvent.makePersistBatch;
@@ -47,8 +49,6 @@ class PersistenceProcessorImpl implements PersistenceProcessor {
private static final Logger LOG = LoggerFactory.getLogger(PersistenceProcessorImpl.class);
- private static final long INITIAL_LWM_VALUE = -1L;
-
private final RingBuffer<PersistBatchEvent> persistRing;
private final ObjectPool<Batch> batchPool;
@@ -73,29 +73,30 @@ class PersistenceProcessorImpl implements PersistenceProcessor {
MetricsRegistry metrics)
throws Exception {
+ // ------------------------------------------------------------------------------------------------------------
+ // Disruptor initialization
+ // ------------------------------------------------------------------------------------------------------------
+
+ ThreadFactoryBuilder threadFactory = new ThreadFactoryBuilder().setNameFormat("persist-%d");
+ ExecutorService requestExec = Executors.newFixedThreadPool(config.getNumConcurrentCTWriters(), threadFactory.build());
+
+ Disruptor<PersistBatchEvent> disruptor = new Disruptor<>(EVENT_FACTORY, 1 << 20, requestExec , SINGLE, new BusySpinWaitStrategy());
+ disruptor.handleExceptionsWith(new FatalExceptionHandler(panicker));
+ disruptor.handleEventsWithWorkerPool(handlers);
+ this.persistRing = disruptor.start();
+
+ // ------------------------------------------------------------------------------------------------------------
+ // Attribute initialization
+ // ------------------------------------------------------------------------------------------------------------
+
this.metrics = metrics;
this.lowWatermarkWriter = commitTable.getWriter();
this.batchSequence = 0L;
this.batchPool = batchPool;
this.currentBatch = batchPool.borrowObject();
-
// Low Watermark writer
ThreadFactoryBuilder lwmThreadFactory = new ThreadFactoryBuilder().setNameFormat("lwm-writer-%d");
- lowWatermarkWriterExecutor = Executors.newSingleThreadExecutor(lwmThreadFactory.build());
-
- // Disruptor configuration
- this.persistRing = RingBuffer.createSingleProducer(EVENT_FACTORY, 1 << 20, new BusySpinWaitStrategy());
-
- ThreadFactoryBuilder threadFactory = new ThreadFactoryBuilder().setNameFormat("persist-%d");
- ExecutorService requestExec = Executors.newFixedThreadPool(config.getNumConcurrentCTWriters(),
- threadFactory.build());
-
- WorkerPool<PersistBatchEvent> persistProcessor = new WorkerPool<>(persistRing,
- persistRing.newBarrier(),
- new FatalExceptionHandler(panicker),
- handlers);
- this.persistRing.addGatingSequences(persistProcessor.getWorkerSequences());
- persistProcessor.start(requestExec);
+ this.lowWatermarkWriterExecutor = Executors.newSingleThreadExecutor(lwmThreadFactory.build());
// Metrics config
this.lwmWriteTimer = metrics.timer(name("tso", "lwmWriter", "latency"));
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/9722e401/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
index ab257d6..d5e4c00 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/ReplyProcessorImpl.java
@@ -20,12 +20,11 @@ package org.apache.omid.tso;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.Inject;
-import com.lmax.disruptor.BatchEventProcessor;
import com.lmax.disruptor.BusySpinWaitStrategy;
import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer;
-import com.lmax.disruptor.SequenceBarrier;
+import com.lmax.disruptor.dsl.Disruptor;
import org.apache.commons.pool2.ObjectPool;
import org.apache.omid.metrics.Meter;
import org.apache.omid.metrics.MetricsRegistry;
@@ -38,10 +37,10 @@ import java.util.Comparator;
import java.util.PriorityQueue;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicLong;
import static com.codahale.metrics.MetricRegistry.name;
+import static com.lmax.disruptor.dsl.ProducerType.MULTI;
class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEvent>, ReplyProcessor {
@@ -65,28 +64,31 @@ class ReplyProcessorImpl implements EventHandler<ReplyProcessorImpl.ReplyBatchEv
@Inject
ReplyProcessorImpl(MetricsRegistry metrics, Panicker panicker, ObjectPool<Batch> batchPool) {
- this.batchPool = batchPool;
-
- this.nextIDToHandle.set(0);
+ // ------------------------------------------------------------------------------------------------------------
+ // Disruptor initialization
+ // ------------------------------------------------------------------------------------------------------------
- this.replyRing = RingBuffer.createMultiProducer(ReplyBatchEvent.EVENT_FACTORY, 1 << 12, new BusySpinWaitStrategy());
+ ThreadFactoryBuilder threadFactory = new ThreadFactoryBuilder().setNameFormat("reply-%d");
+ ExecutorService requestExec = Executors.newSingleThreadExecutor(threadFactory.build());
- SequenceBarrier replySequenceBarrier = replyRing.newBarrier();
- BatchEventProcessor<ReplyBatchEvent> replyProcessor = new BatchEventProcessor<>(replyRing, replySequenceBarrier, this);
- replyProcessor.setExceptionHandler(new FatalExceptionHandler(panicker));
+ Disruptor<ReplyProcessorImpl.ReplyBatchEvent> disruptor = new Disruptor<>(ReplyBatchEvent.EVENT_FACTORY, 1 << 12, requestExec, MULTI, new BusySpinWaitStrategy());
+ disruptor.handleExceptionsWith(new FatalExceptionHandler(panicker));
+ disruptor.handleEventsWith(this);
+ this.replyRing = disruptor.start();
- replyRing.addGatingSequences(replyProcessor.getSequence());
-
- ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("reply-%d").build();
- ExecutorService replyExec = Executors.newSingleThreadExecutor(threadFactory);
- replyExec.submit(replyProcessor);
+ // ------------------------------------------------------------------------------------------------------------
+ // Attribute initialization
+ // ------------------------------------------------------------------------------------------------------------
+ this.batchPool = batchPool;
+ this.nextIDToHandle.set(0);
this.futureEvents = new PriorityQueue<>(10, new Comparator<ReplyBatchEvent>() {
public int compare(ReplyBatchEvent replyBatchEvent1, ReplyBatchEvent replyBatchEvent2) {
return Long.compare(replyBatchEvent1.getBatchSequence(), replyBatchEvent2.getBatchSequence());
}
});
+ // Metrics config
this.abortMeter = metrics.meter(name("tso", "aborts"));
this.commitMeter = metrics.meter(name("tso", "commits"));
this.timestampMeter = metrics.meter(name("tso", "timestampAllocation"));
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/9722e401/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
index 94a3df5..b945eaf 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/RequestProcessorImpl.java
@@ -25,6 +25,7 @@ import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.SequenceBarrier;
import com.lmax.disruptor.TimeoutBlockingWaitStrategy;
import com.lmax.disruptor.TimeoutHandler;
+import com.lmax.disruptor.dsl.Disruptor;
import org.apache.omid.metrics.MetricsRegistry;
import org.apache.omid.tso.TSOStateManager.TSOState;
import org.jboss.netty.channel.Channel;
@@ -38,8 +39,13 @@ import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
+import static com.lmax.disruptor.dsl.ProducerType.MULTI;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.omid.tso.RequestProcessorImpl.RequestEvent.EVENT_FACTORY;
+
class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestEvent>, RequestProcessor, TimeoutHandler {
private static final Logger LOG = LoggerFactory.getLogger(RequestProcessorImpl.class);
@@ -59,29 +65,29 @@ class RequestProcessorImpl implements EventHandler<RequestProcessorImpl.RequestE
TSOServerConfig config)
throws IOException {
- this.metrics = metrics;
+ // ------------------------------------------------------------------------------------------------------------
+ // Disruptor initialization
+ // ------------------------------------------------------------------------------------------------------------
+
+ TimeoutBlockingWaitStrategy timeoutStrategy = new TimeoutBlockingWaitStrategy(config.getBatchPersistTimeoutInMs(), MILLISECONDS);
+
+ ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("request-%d").build();
+ ExecutorService requestExec = Executors.newSingleThreadExecutor(threadFactory);
+
+ Disruptor<RequestEvent> disruptor = new Disruptor<>(EVENT_FACTORY, 1 << 12, requestExec, MULTI, timeoutStrategy);
+ disruptor.handleExceptionsWith(new FatalExceptionHandler(panicker)); // This should be before the event handler
+ disruptor.handleEventsWith(this);
+ this.requestRing = disruptor.start();
+ // ------------------------------------------------------------------------------------------------------------
+ // Attribute initialization
+ // ------------------------------------------------------------------------------------------------------------
+
+ this.metrics = metrics;
this.persistProc = persistProc;
this.timestampOracle = timestampOracle;
-
this.hashmap = new CommitHashMap(config.getMaxItems());
- final TimeoutBlockingWaitStrategy timeoutStrategy
- = new TimeoutBlockingWaitStrategy(config.getBatchPersistTimeoutInMs(), TimeUnit.MILLISECONDS);
-
- // Set up the disruptor thread
- requestRing = RingBuffer.createMultiProducer(RequestEvent.EVENT_FACTORY, 1 << 12, timeoutStrategy);
- SequenceBarrier requestSequenceBarrier = requestRing.newBarrier();
- BatchEventProcessor<RequestEvent> requestProcessor =
- new BatchEventProcessor<>(requestRing, requestSequenceBarrier, this);
- requestRing.addGatingSequences(requestProcessor.getSequence());
- requestProcessor.setExceptionHandler(new FatalExceptionHandler(panicker));
-
- ExecutorService requestExec = Executors.newSingleThreadExecutor(
- new ThreadFactoryBuilder().setNameFormat("request-%d").build());
- // Each processor runs on a separate thread
- requestExec.submit(requestProcessor);
-
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/9722e401/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
----------------------------------------------------------------------
diff --git a/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java b/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
index a23a913..776f0ed 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/RetryProcessorImpl.java
@@ -19,25 +19,21 @@ package org.apache.omid.tso;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.lmax.disruptor.BatchEventProcessor;
import com.lmax.disruptor.EventFactory;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer;
-import com.lmax.disruptor.SequenceBarrier;
import com.lmax.disruptor.YieldingWaitStrategy;
+import com.lmax.disruptor.dsl.Disruptor;
import org.apache.commons.pool2.ObjectPool;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.committable.CommitTable.CommitTimestamp;
import org.apache.omid.metrics.Meter;
import org.apache.omid.metrics.MetricsRegistry;
-
import org.jboss.netty.channel.Channel;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
-
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -45,6 +41,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import static com.codahale.metrics.MetricRegistry.name;
+import static com.lmax.disruptor.dsl.ProducerType.SINGLE;
+import static org.apache.omid.tso.RetryProcessorImpl.RetryEvent.EVENT_FACTORY;
/**
* Manages the disambiguation of the retry requests that clients send when they did not received a response in the
@@ -74,20 +72,26 @@ class RetryProcessorImpl implements EventHandler<RetryProcessorImpl.RetryEvent>,
ObjectPool<Batch> batchPool)
throws InterruptedException, ExecutionException, IOException {
+ // ------------------------------------------------------------------------------------------------------------
+ // Disruptor initialization
+ // ------------------------------------------------------------------------------------------------------------
+
+ ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("retry-%d").build();
+ ExecutorService requestExec = Executors.newSingleThreadExecutor(threadFactory);
+
+ Disruptor<RetryProcessorImpl.RetryEvent> disruptor = new Disruptor<>(EVENT_FACTORY, 1 << 12, requestExec, SINGLE, new YieldingWaitStrategy());
+ disruptor.handleExceptionsWith(new FatalExceptionHandler(panicker)); // This should be before the event handler
+ disruptor.handleEventsWith(this);
+ this.retryRing = disruptor.start();
+
+ // ------------------------------------------------------------------------------------------------------------
+ // Attribute initialization
+ // ------------------------------------------------------------------------------------------------------------
+
this.commitTableClient = commitTable.getClient();
this.replyProc = replyProc;
this.batchPool = batchPool;
- retryRing = RingBuffer.createSingleProducer(RetryEvent.EVENT_FACTORY, 1 << 12, new YieldingWaitStrategy());
- SequenceBarrier retrySequenceBarrier = retryRing.newBarrier();
- BatchEventProcessor<RetryEvent> retryProcessor = new BatchEventProcessor<>(retryRing, retrySequenceBarrier, this);
- retryProcessor.setExceptionHandler(new FatalExceptionHandler(panicker));
- retryRing.addGatingSequences(retryProcessor.getSequence());
-
- ThreadFactory threadFactory = new ThreadFactoryBuilder().setNameFormat("retry-%d").build();
- ExecutorService retryExec = Executors.newSingleThreadExecutor(threadFactory);
- retryExec.submit(retryProcessor);
-
// Metrics configuration
this.txAlreadyCommittedMeter = metrics.meter(name("tso", "retries", "commits", "tx-already-committed"));
this.invalidTxMeter = metrics.meter(name("tso", "retries", "aborts", "tx-invalid"));
@@ -116,7 +120,7 @@ class RetryProcessorImpl implements EventHandler<RetryProcessorImpl.RetryEvent>,
long startTimestamp = event.getStartTimestamp();
try {
Optional<CommitTimestamp> commitTimestamp = commitTableClient.getCommitTimestamp(startTimestamp).get();
- if(commitTimestamp.isPresent()) {
+ if (commitTimestamp.isPresent()) {
if (commitTimestamp.get().isValid()) {
LOG.trace("Tx {}: Valid commit TS found in Commit Table. Sending Commit to client.", startTimestamp);
replyProc.sendCommitResponse(startTimestamp, commitTimestamp.get().getValue(), event.getChannel());
[19/23] incubator-omid git commit: Merge pull request #110 from
yahoo/omid-35
Posted by fp...@apache.org.
Merge pull request #110 from yahoo/omid-35
[OMID-35] Fix and improve TSO metrics
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/32369005
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/32369005
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/32369005
Branch: refs/heads/master
Commit: 323690052f1c8909e6e398264df40f068d879f4a
Parents: 1f989f8 c4c65ac
Author: ikatkov <ik...@gmail.com>
Authored: Wed May 25 13:15:17 2016 -0700
Committer: ikatkov <ik...@gmail.com>
Committed: Wed May 25 13:15:17 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/omid/tso/Batch.java | 25 ++++++----
.../org/apache/omid/tso/MonitoringContext.java | 2 +-
.../omid/tso/PersistenceProcessorHandler.java | 48 ++++++++++++++------
.../org/apache/omid/tso/ReplyProcessorImpl.java | 46 ++++++++-----------
.../apache/omid/tso/RequestProcessorImpl.java | 25 +++++-----
.../org/apache/omid/tso/RetryProcessorImpl.java | 27 +++++++----
.../java/org/apache/omid/tso/TestBatch.java | 7 +++
.../org/apache/omid/tso/TestReplyProcessor.java | 26 ++++-------
8 files changed, 117 insertions(+), 89 deletions(-)
----------------------------------------------------------------------