Skip to content

Commit 1e5ee3f

Browse files
yonigottesmanyonigottesman
committed
Merge master rebase issues
1 parent 7207046 commit 1e5ee3f

21 files changed

Lines changed: 45 additions & 223 deletions

File tree

‎benchmarks/maven/assembly/bin.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,4 @@
7777

7878
</dependencySets>
7979

80-
</assembly>
80+
</assembly>

‎hbase-client/src/main/java/org/apache/omid/transaction/HBaseOmidClientConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import com.google.common.annotations.VisibleForTesting;
2121
import com.google.inject.Inject;
2222
import com.google.inject.name.Named;
23+
import org.apache.commons.beanutils.BeanUtils;
2324
import org.apache.omid.YAMLUtils;
2425
import org.apache.omid.metrics.MetricsRegistry;
2526
import org.apache.omid.tools.hbase.SecureHBaseConfig;
2627
import org.apache.omid.tso.client.OmidClientConfiguration.ConflictDetectionLevel;
2728
import org.apache.omid.tso.client.OmidClientConfiguration.PostCommitMode;
2829
import org.apache.omid.tso.client.OmidClientConfiguration;
29-
import org.apache.omid.tso.client.OmidClientConfiguration.PostCommitMode;
30+
import org.apache.hadoop.conf.Configuration;
31+
import org.apache.hadoop.hbase.HBaseConfiguration;
3032

3133
import java.lang.reflect.InvocationTargetException;
3234
import java.util.Map;

‎hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.apache.omid.tso.client.CellId;
3535
import org.apache.omid.tso.client.OmidClientConfiguration.ConflictDetectionLevel;
3636
import org.apache.omid.tso.client.TSOClient;
37-
37+
import org.apache.omid.tso.client.TSOProtocol;
3838
import org.slf4j.Logger;
3939
import org.slf4j.LoggerFactory;
4040

@@ -74,7 +74,6 @@ public static TransactionManager newInstance(HBaseOmidClientConfiguration config
7474
return builder(configuration).build();
7575
}
7676

77-
7877
public static class Builder {
7978

8079
// Required parameters
@@ -90,9 +89,7 @@ public Builder(HBaseOmidClientConfiguration hbaseOmidClientConf) {
9089
this.hbaseOmidClientConf = hbaseOmidClientConf;
9190
}
9291

93-
94-
public Builder tsoClient(TSOClient tsoClient) {
95-
92+
public Builder tsoClient(TSOProtocol tsoClient) {
9693
this.tsoClient = Optional.of(tsoClient);
9794
return this;
9895
}
@@ -102,7 +99,6 @@ public Builder commitTableClient(CommitTable.Client client) {
10299
return this;
103100
}
104101

105-
106102
public Builder commitTableWriter(CommitTable.Writer writer) {
107103
this.commitTableWriter = Optional.of(writer);
108104
return this;
@@ -170,7 +166,6 @@ private Optional<PostCommitActions> buildPostCommitter(CommitTable.Client commit
170166

171167
}
172168

173-
174169
public static Builder builder(HBaseOmidClientConfiguration hbaseOmidClientConf) {
175170
return new Builder(hbaseOmidClientConf);
176171
}

‎hbase-client/src/main/java/org/apache/omid/transaction/TableAccessWrapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
//This interface is used to wrap the HTableInterface and Region object when doing client and server side filtering accordingly.
3232
public interface TableAccessWrapper {
3333

34-
public Result[] get(List<Get> get) throws IOException;
35-
public Result get(Get get) throws IOException;
36-
public void put(Put put) throws IOException;
37-
public ResultScanner getScanner(Scan scan) throws IOException;
34+
Result[] get(List<Get> get) throws IOException;
35+
Result get(Get get) throws IOException;
36+
void put(Put put) throws IOException;
37+
ResultScanner getScanner(Scan scan) throws IOException;
3838
}

‎hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/RegionConnectionFactory.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import org.apache.hadoop.hbase.HConstants;
2828
import org.apache.hadoop.hbase.client.Connection;
2929
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
30-
import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
31-
import org.apache.hadoop.hbase.ipc.controller.InterRegionServerRpcControllerFactory;
3230
import org.apache.omid.HBaseShims;
3331
import org.slf4j.Logger;
3432
import org.slf4j.LoggerFactory;

‎hbase-coprocessor/src/main/java/org/apache/omid/transaction/CompactorScanner.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,18 @@
1515
* See the License for the specific language governing permissions and
1616
* limitations under the License.
1717
*/
18-
package org.apache.omid.transaction;
18+
package org.apache.hadoop.hbase.regionserver;
1919

2020
import com.google.common.annotations.VisibleForTesting;
2121
import com.google.common.base.Optional;
2222
import com.google.common.collect.Iterators;
2323
import com.google.common.collect.PeekingIterator;
24-
import org.apache.hadoop.hbase.regionserver.InternalScanner;
25-
import org.apache.omid.RegionWrapper;
26-
import org.apache.hadoop.hbase.regionserver.ScannerContext;
2724
import org.apache.omid.HBaseShims;
2825
import org.apache.omid.committable.CommitTable;
2926
import org.apache.omid.committable.CommitTable.Client;
3027
import org.apache.omid.committable.CommitTable.CommitTimestamp;
28+
import org.apache.omid.transaction.CellUtils;
29+
import org.apache.omid.transaction.CellInfo;
3130
import org.apache.hadoop.hbase.Cell;
3231
import org.apache.hadoop.hbase.CellUtil;
3332
import org.apache.hadoop.hbase.KeyValue;
@@ -60,7 +59,7 @@ public class CompactorScanner implements InternalScanner {
6059
private final boolean retainNonTransactionallyDeletedCells;
6160
private final long lowWatermark;
6261

63-
private final RegionWrapper regionWrapper;
62+
private final Region hRegion;
6463

6564
private boolean hasMoreRows = false;
6665
private List<Cell> currentRowWorthValues = new ArrayList<Cell>();
@@ -78,19 +77,18 @@ public CompactorScanner(ObserverContext<RegionCoprocessorEnvironment> e,
7877
this.retainNonTransactionallyDeletedCells = preserveNonTransactionallyDeletedCells;
7978
this.lowWatermark = getLowWatermarkFromCommitTable();
8079
// Obtain the table in which the scanner is going to operate
81-
this.regionWrapper = HBaseShims.getRegionCoprocessorRegion(e.getEnvironment());
80+
this.hRegion = HBaseShims.getRegionCoprocessorRegion(e.getEnvironment());
8281
LOG.info("Scanner cleaning up uncommitted txs older than LW [{}] in region [{}]",
83-
lowWatermark, regionWrapper.getRegionInfo());
82+
lowWatermark, hRegion.getRegionInfo());
8483
}
8584

8685
@Override
8786
public boolean next(List<Cell> results) throws IOException {
8887
return next(results, -1);
8988
}
9089

91-
// This method is invoked only in HBase 1.x versions
9290
public boolean next(List<Cell> result, ScannerContext scannerContext) throws IOException {
93-
int limit = HBaseShims.getBatchLimit(scannerContext);
91+
int limit = scannerContext.getBatchLimit();
9492
return next(result, limit);
9593
}
9694

@@ -242,7 +240,7 @@ private Optional<CommitTimestamp> queryCommitTimestamp(Cell cell) throws IOExcep
242240
cell.getQualifierLength());
243241
g.addColumn(family, qualifier);
244242
g.setTimeStamp(cell.getTimestamp());
245-
Result r = regionWrapper.get(g);
243+
Result r = hRegion.get(g);
246244
if (r.containsColumn(family, qualifier)) {
247245
return Optional.of(new CommitTimestamp(SHADOW_CELL,
248246
Bytes.toLong(r.getValue(family, qualifier)), true));

‎hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
3030
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
3131
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
32+
import org.apache.hadoop.hbase.regionserver.CompactorScanner;
3233
import org.apache.hadoop.hbase.regionserver.InternalScanner;
3334
import org.apache.hadoop.hbase.regionserver.RegionConnectionFactory;
3435
import org.apache.hadoop.hbase.regionserver.ScanType;
@@ -53,8 +54,8 @@ public class OmidCompactor extends BaseRegionObserver {
5354

5455
private static final Logger LOG = LoggerFactory.getLogger(OmidCompactor.class);
5556

56-
private static final String HBASE_RETAIN_NON_TRANSACTIONALLY_DELETED_CELLS_KEY =
57-
"omid.hbase.compactor.retain.tombstones";
57+
private static final String HBASE_RETAIN_NON_TRANSACTIONALLY_DELETED_CELLS_KEY
58+
= "omid.hbase.compactor.retain.tombstones";
5859
private static final boolean HBASE_RETAIN_NON_TRANSACTIONALLY_DELETED_CELLS_DEFAULT = true;
5960

6061
final static String OMID_COMPACTABLE_CF_FLAG = "OMID_ENABLED";
@@ -92,7 +93,6 @@ public void start(CoprocessorEnvironment env) throws IOException {
9293
commitTableConf.setTableName(commitTableName);
9394
}
9495
retainNonTransactionallyDeletedCells =
95-
9696
env.getConfiguration().getBoolean(HBASE_RETAIN_NON_TRANSACTIONALLY_DELETED_CELLS_KEY,
9797
HBASE_RETAIN_NON_TRANSACTIONALLY_DELETED_CELLS_DEFAULT);
9898
LOG.info("Compactor coprocessor started");
@@ -117,7 +117,6 @@ public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment>
117117
InternalScanner scanner,
118118
ScanType scanType,
119119
CompactionRequest request) throws IOException {
120-
121120
boolean omidCompactable;
122121
try {
123122
if (enableCompactorForAllFamilies) {
@@ -144,14 +143,11 @@ public InternalScanner preCompact(ObserverContext<RegionCoprocessorEnvironment>
144143
isMajorCompaction,
145144
retainNonTransactionallyDeletedCells);
146145
}
147-
148146
} catch (IOException e) {
149147
throw e;
150148
} catch (Exception e) {
151149
throw new DoNotRetryIOException(e);
152-
153150
}
154-
155151
}
156152

157153
private CommitTable.Client initAndGetCommitTableClient() throws IOException {

‎hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompactorScanner.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.hadoop.hbase.KeyValue.Type;
2424
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
2525
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
26+
import org.apache.hadoop.hbase.regionserver.CompactorScanner;
2627
import org.apache.hadoop.hbase.regionserver.HRegion;
2728
import org.apache.hadoop.hbase.regionserver.InternalScanner;
2829
import org.apache.hadoop.hbase.util.Bytes;

‎hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilterLL.java‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,10 @@
1717
*/
1818
package org.apache.omid.transaction;
1919

20-
import static org.mockito.Matchers.any;
21-
import static org.mockito.Mockito.doAnswer;
2220
import static org.mockito.Mockito.spy;
23-
import static org.testng.Assert.assertEquals;
24-
import static org.testng.Assert.assertFalse;
2521
import static org.testng.Assert.assertTrue;
2622

2723
import java.io.IOException;
28-
import java.util.concurrent.CountDownLatch;
29-
import java.util.concurrent.atomic.AtomicBoolean;
3024

3125
import org.apache.hadoop.conf.Configuration;
3226
import org.apache.hadoop.hbase.Coprocessor;
@@ -38,19 +32,11 @@
3832
import org.apache.hadoop.hbase.client.Admin;
3933
import org.apache.hadoop.hbase.client.Connection;
4034
import org.apache.hadoop.hbase.client.ConnectionFactory;
41-
import org.apache.hadoop.hbase.client.Delete;
4235
import org.apache.hadoop.hbase.client.Get;
4336
import org.apache.hadoop.hbase.client.Put;
4437
import org.apache.hadoop.hbase.client.Result;
4538
import org.apache.hadoop.hbase.client.ResultScanner;
4639
import org.apache.hadoop.hbase.client.Scan;
47-
import org.apache.hadoop.hbase.filter.BinaryComparator;
48-
import org.apache.hadoop.hbase.filter.CompareFilter;
49-
import org.apache.hadoop.hbase.filter.FamilyFilter;
50-
import org.apache.hadoop.hbase.filter.Filter;
51-
import org.apache.hadoop.hbase.filter.FilterList;
52-
import org.apache.hadoop.hbase.filter.SingleColumnValueFilter;
53-
import org.apache.hadoop.hbase.filter.SubstringComparator;
5440
import org.apache.hadoop.hbase.util.Bytes;
5541
import org.apache.omid.TestUtils;
5642
import org.apache.omid.committable.CommitTable;
@@ -59,16 +45,13 @@
5945
import org.apache.omid.timestamp.storage.HBaseTimestampStorageConfig;
6046
import org.apache.omid.tso.TSOServer;
6147
import org.apache.omid.tso.TSOServerConfig;
62-
import org.mockito.invocation.InvocationOnMock;
63-
import org.mockito.stubbing.Answer;
6448
import org.slf4j.Logger;
6549
import org.slf4j.LoggerFactory;
6650
import org.testng.annotations.AfterClass;
6751
import org.testng.annotations.BeforeClass;
6852
import org.testng.annotations.BeforeMethod;
6953
import org.testng.annotations.Test;
7054

71-
import com.google.common.util.concurrent.ListenableFuture;
7255
import com.google.inject.Guice;
7356
import com.google.inject.Injector;
7457

‎hbase-shims/hbase-0/pom.xml‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)