You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by yo...@apache.org on 2019/03/20 13:42:32 UTC
[incubator-omid] branch 1.0.1 updated (1610d2c -> 4fcba08)
This is an automated email from the ASF dual-hosted git repository.
yonigo pushed a change to branch 1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-omid.git.
discard 1610d2c Prepare for omid 1.0.1 release
new 4fcba08 Prepare for omid 1.0.1 release
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1610d2c)
\
N -- N -- N refs/heads/1.0.1 (4fcba08)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/omid/transaction/CellUtils.java | 12 +++++-------
hbase-shims/hbase-2/pom.xml | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
[incubator-omid] 01/01: Prepare for omid 1.0.1 release
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yonigo pushed a commit to branch 1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-omid.git
commit 4fcba0840f2c58e013f300efe5d9aa6893e771de
Author: Yonatan Gottesman <yo...@gmail.com>
AuthorDate: Sun Mar 17 11:52:55 2019 +0200
Prepare for omid 1.0.1 release
---
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 +-
.../src/main/java/org/apache/omid/transaction/CellUtils.java | 12 +++++-------
hbase-coprocessor/pom.xml | 2 +-
hbase-shims/hbase-1/pom.xml | 2 +-
hbase-shims/hbase-2/pom.xml | 2 +-
hbase-shims/pom.xml | 2 +-
hbase-tools/pom.xml | 2 +-
metrics/pom.xml | 2 +-
packaging/pom.xml | 4 ++--
pom.xml | 2 +-
statemachine/pom.xml | 2 +-
timestamp-storage/pom.xml | 2 +-
transaction-client/pom.xml | 2 +-
tso-server/pom.xml | 2 +-
21 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index c128b15..4525f45 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-benchmarks</artifactId>
diff --git a/codahale-metrics/pom.xml b/codahale-metrics/pom.xml
index c5c4160..65ac5b3 100644
--- a/codahale-metrics/pom.xml
+++ b/codahale-metrics/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/commit-table/pom.xml b/commit-table/pom.xml
index d802cd0..353eca0 100644
--- a/commit-table/pom.xml
+++ b/commit-table/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-commit-table</artifactId>
diff --git a/common/pom.xml b/common/pom.xml
index a70ca18..936b51a 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-common</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index 2d1830b..4d1b507 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-examples</artifactId>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 2d268c8..06f0b4a 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-client-${hbase.artifactId.suffix}</artifactId>
diff --git a/hbase-commit-table/pom.xml b/hbase-commit-table/pom.xml
index 699ec6b..15eafe3 100644
--- a/hbase-commit-table/pom.xml
+++ b/hbase-commit-table/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-commit-table-${hbase.artifactId.suffix}</artifactId>
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index 26e6063..d3292c4 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-common-${hbase.artifactId.suffix}</artifactId>
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 672659b..575c3be 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
@@ -338,10 +338,9 @@ public final class CellUtils {
} else {
if (cell.getSequenceId() > storedCell.getSequenceId()) { // Swap values
Optional<Cell> previousValue = cellToShadowCellMap.remove(storedCell);
+ Preconditions.checkNotNull(previousValue, "Should contain an Optional<Cell> value");
cellIdToCellMap.put(key, cell);
- if (previousValue != null) {
- cellToShadowCellMap.put(cell, previousValue);
- }
+ cellToShadowCellMap.put(cell, previousValue);
} else {
LOG.warn("Cell {} with an earlier MVCC found. Ignoring...", cell);
}
@@ -359,7 +358,7 @@ public final class CellUtils {
CellId key = new CellId(cell, true);
Cell savedCell = cellIdToCellMap.get(key);
if (savedCell != null) {
- Cell originalCell = cellIdToCellMap.get(key);
+ Cell originalCell = savedCell;
cellToShadowCellMap.put(originalCell, Optional.of(cell));
} else {
cellIdToSCCellMap.put(key, cell);
@@ -458,7 +457,6 @@ public final class CellUtils {
qualifierOffset = qualifierOffset + SHADOW_CELL_PREFIX.length;
}
}
- String a = Bytes.toString(cell.getQualifierArray(), qualifierOffset, qualifierLength);
hasher.putBytes(cell.getQualifierArray(),qualifierOffset , qualifierLength);
hasher.putLong(cell.getTimestamp());
@@ -477,8 +475,8 @@ public final class CellUtils {
int qualifierLength = qualifierLengthFromShadowCellQualifier(cell.getQualifierArray(),
cell.getQualifierOffset(),
cell.getQualifierLength());
- byte[] b = removeShadowCellSuffixPrefix(cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength());
- helper.add("qualifier whithout shadow cell suffix", Bytes.toString(b));
+ byte[] cellWithoutSc = removeShadowCellSuffixPrefix(cell.getQualifierArray(), cell.getQualifierOffset(), cell.getQualifierLength());
+ helper.add("qualifier whithout shadow cell suffix", Bytes.toString(cellWithoutSc));
}
helper.add("ts", cell.getTimestamp());
return helper.toString();
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 48ab6b1..ba7d4bc 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-coprocessor-${hbase.artifactId.suffix}</artifactId>
diff --git a/hbase-shims/hbase-1/pom.xml b/hbase-shims/hbase-1/pom.xml
index 771ac74..ceb7fa7 100644
--- a/hbase-shims/hbase-1/pom.xml
+++ b/hbase-shims/hbase-1/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>${shims1.artifactId}</artifactId>
diff --git a/hbase-shims/hbase-2/pom.xml b/hbase-shims/hbase-2/pom.xml
index 2f60a9e..4261a65 100644
--- a/hbase-shims/hbase-2/pom.xml
+++ b/hbase-shims/hbase-2/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid-shims-aggregator</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>${shims2.artifactId}</artifactId>
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index 5e161b5..530d241 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-shims-aggregator</artifactId>
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
index f97e0d8..b97ecd9 100644
--- a/hbase-tools/pom.xml
+++ b/hbase-tools/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-hbase-tools-${hbase.artifactId.suffix}</artifactId>
diff --git a/metrics/pom.xml b/metrics/pom.xml
index 456f02e..0ffb98b 100644
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>omid</artifactId>
<groupId>org.apache.omid</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-metrics</artifactId>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 37754f7..8c7a1a3 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-packaging</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Omid Packaging</name>
diff --git a/pom.xml b/pom.xml
index 5038cd1..7b06faa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<artifactId>omid</artifactId>
<packaging>pom</packaging>
<!-- WARNING: do not update version manually, use mvn versions:set -->
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<organization>
<name>Apache Software Foundation</name>
diff --git a/statemachine/pom.xml b/statemachine/pom.xml
index f78e994..3a097d0 100644
--- a/statemachine/pom.xml
+++ b/statemachine/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<name>State Machine</name>
diff --git a/timestamp-storage/pom.xml b/timestamp-storage/pom.xml
index 40b0472..73bfe31 100644
--- a/timestamp-storage/pom.xml
+++ b/timestamp-storage/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-timestamp-storage-${hbase.artifactId.suffix}</artifactId>
diff --git a/transaction-client/pom.xml b/transaction-client/pom.xml
index 1d95199..00ff0ce 100644
--- a/transaction-client/pom.xml
+++ b/transaction-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-transaction-client</artifactId>
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index a45cdde..9b3e32d 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.omid</groupId>
<artifactId>omid</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>omid-tso-server-${hbase.artifactId.suffix}</artifactId>