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 2018/10/10 12:28:11 UTC
incubator-omid git commit: Fix java versions
Repository: incubator-omid
Updated Branches:
refs/heads/phoenix-integration c1948a59f -> 0bc97bea0
Fix java versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/0bc97bea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/0bc97bea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/0bc97bea
Branch: refs/heads/phoenix-integration
Commit: 0bc97bea082d59982767762e4c5cd929328c74f9
Parents: c1948a5
Author: Yonatan Gottesman <yo...@gmail.com>
Authored: Wed Oct 10 14:13:19 2018 +0300
Committer: Yonatan Gottesman <yo...@gmail.com>
Committed: Wed Oct 10 15:26:08 2018 +0300
----------------------------------------------------------------------
.../apache/omid/transaction/OmidCompactor.java | 5 ----
.../omid/transaction/OmidSnapshotFilter.java | 8 +-----
.../apache/omid/transaction/TestCompaction.java | 1 +
.../main/java/org/apache/omid/HBaseShims.java | 2 --
.../hbase/coprocessor/BaseRegionObserver.java | 7 ++++-
hbase-shims/pom.xml | 27 +++++++++++++++++---
pom.xml | 5 ++--
7 files changed, 34 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
index 97dbea3..901f819 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java
@@ -40,7 +40,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.Optional;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -79,10 +78,6 @@ public class OmidCompactor extends BaseRegionObserver {
this(false);
}
- public Optional getRegionObserver() {
- return Optional.of(this);
- }
-
public OmidCompactor(boolean enableCompactorForAllFamilies) {
LOG.info("Compactor coprocessor initialized");
this.enableCompactorForAllFamilies = enableCompactorForAllFamilies;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
index 3c5f3c6..c2ed187 100644
--- a/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
+++ b/hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java
@@ -49,7 +49,6 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -78,11 +77,6 @@ public class OmidSnapshotFilter extends BaseRegionObserver {
LOG.info("Compactor coprocessor initialized via empty constructor");
}
-
- public Optional getRegionObserver() {
- return Optional.of(this);
- }
-
@Override
public void start(CoprocessorEnvironment env) {
LOG.info("Starting snapshot filter coprocessor");
@@ -208,7 +202,7 @@ public class OmidSnapshotFilter extends BaseRegionObserver {
long epoch = transaction.getEpoch();
VisibilityLevel visibilityLevel = VisibilityLevel.fromInteger(transaction.getVisibilityLevel());
- return new HBaseTransaction(id, readTs, visibilityLevel, epoch, new HashSet<>(), new HashSet<>(), null);
+ return new HBaseTransaction(id, readTs, visibilityLevel, epoch, new HashSet<HBaseCellId>(), new HashSet<HBaseCellId>(), null);
}
private CommitTable.Client initAndGetCommitTableClient() throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
index 4d20458..a4bf65e 100644
--- a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
+++ b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
@@ -114,6 +114,7 @@ public class TestCompaction {
TSOServerConfig tsoConfig = new TSOServerConfig();
tsoConfig.setPort(1234);
tsoConfig.setConflictMapSize(1);
+ tsoConfig.setWaitStrategy("LOW_CPU");
injector = Guice.createInjector(new TSOForHBaseCompactorTestModule(tsoConfig));
hbaseConf = injector.getInstance(Configuration.class);
HBaseCommitTableConfig hBaseCommitTableConfig = injector.getInstance(HBaseCommitTableConfig.class);
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java b/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
index 85cb58e..c0aab90 100644
--- a/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
+++ b/hbase-shims/hbase-1/src/main/java/org/apache/omid/HBaseShims.java
@@ -18,7 +18,6 @@
package org.apache.omid;
import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
@@ -27,7 +26,6 @@ import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.regionserver.Store;
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
----------------------------------------------------------------------
diff --git a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
index 961a11c..59d0759 100644
--- a/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
+++ b/hbase-shims/hbase-2/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.hbase.regionserver.Store;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionLifeCycleTracker;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
import java.io.IOException;
-
+import java.util.Optional;
public abstract class BaseRegionObserver implements RegionObserver, RegionCoprocessor {
@@ -44,4 +44,9 @@ public abstract class BaseRegionObserver implements RegionObserver, RegionCoproc
return scanner;
}
+ @Override
+ public Optional getRegionObserver() {
+ return Optional.of(this);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/hbase-shims/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-shims/pom.xml b/hbase-shims/pom.xml
index d4f9963..118b7fe 100644
--- a/hbase-shims/pom.xml
+++ b/hbase-shims/pom.xml
@@ -12,10 +12,7 @@
<packaging>pom</packaging>
<name>Shims Aggregator for HBase</name>
- <modules>
- <module>hbase-1</module>
- <module>hbase-2</module>
- </modules>
+
<dependencies>
@@ -90,4 +87,26 @@
</build>
+ <profiles>
+
+ <profile>
+ <id>hbase-1</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>hbase-1</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>hbase-2</id>
+ <modules>
+ <module>hbase-2</module>
+ </modules>
+ </profile>
+
+ </profiles>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/0bc97bea/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72d7b5b..499d5a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,8 +123,7 @@
<!-- Basic properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- Java Version -->
- <java.version>1.8</java.version>
+
<!-- 3rd-Party Library Versioning -->
<hbase0.version>0.98.10.1-hadoop1</hbase0.version>
@@ -552,6 +551,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
+ <java.version>1.7</java.version>
<hadoop.version>${hadoop1.version}</hadoop.version>
<hbase.version>${hbase1.version}</hbase.version>
</properties>
@@ -560,6 +560,7 @@
<profile>
<id>hbase-2</id>
<properties>
+ <java.version>1.8</java.version>
<hadoop.version>${hadoop2.version}</hadoop.version>
<hbase.version>${hbase2.version}</hbase.version>
</properties>