Repository: incubator-fluo-recipes Updated Branches: refs/heads/master b79c6fb89 -> d7347ee15
updates for Fluo API changes Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/commit/d7347ee1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/tree/d7347ee1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/diff/d7347ee1 Branch: refs/heads/master Commit: d7347ee15555abcc01881d04af1b375eca4018a3 Parents: b79c6fb Author: Keith Turner <ktur...@apache.org> Authored: Fri Sep 16 18:03:14 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Fri Sep 16 18:03:14 2016 -0400 ---------------------------------------------------------------------- .../recipes/core/export/ExportObserver.java | 2 +- .../fluo/recipes/core/export/ExportQueue.java | 6 +- .../fluo/recipes/core/map/CollisionFreeMap.java | 6 +- .../core/map/CollisionFreeMapObserver.java | 2 +- .../transaction/RecordingTransactionBase.java | 65 +------------------- .../recipes/core/types/TypedSnapshotBase.java | 3 +- .../recipes/core/export/ExportTestBase.java | 4 +- .../recipes/core/map/CollisionFreeMapIT.java | 4 +- .../recipes/core/types/MockSnapshotBase.java | 26 +------- .../recipes/core/types/MockTransactionBase.java | 9 +-- 10 files changed, 23 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserver.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserver.java index 2c41313..b3070e0 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserver.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportObserver.java @@ -83,7 +83,7 @@ public class ExportObserver<K, V> extends AbstractObserver { @SuppressWarnings("unchecked") @Override public void init(Context context) throws Exception { - queueId = context.getParameters().get("queueId"); + queueId = context.getObserverConfiguration().getString("queueId"); ExportQueue.Options opts = new ExportQueue.Options(queueId, context.getAppConfiguration()); // TODO defer loading classes... so that not done during fluo init http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportQueue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportQueue.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportQueue.java index e53e17c..81d277b 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportQueue.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/export/ExportQueue.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.hash.Hashing; import org.apache.fluo.api.client.TransactionBase; import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.config.SimpleConfiguration; import org.apache.fluo.api.data.Bytes; import org.apache.fluo.recipes.core.common.TableOptimizations; @@ -105,8 +105,8 @@ public class ExportQueue<K, V> { SimpleConfiguration appConfig = fluoConfig.getAppConfiguration(); opts.save(appConfig); - fluoConfig.addObserver(new ObserverConfiguration(ExportObserver.class.getName()) - .setParameters(Collections.singletonMap("queueId", opts.queueId))); + fluoConfig.addObserver(new ObserverSpecification(ExportObserver.class.getName(), Collections + .singletonMap("queueId", opts.queueId))); Bytes exportRangeStart = Bytes.of(opts.queueId + RANGE_BEGIN); Bytes exportRangeStop = Bytes.of(opts.queueId + RANGE_END); http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java index 8747c87..6e74c3c 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java @@ -36,7 +36,7 @@ import com.google.common.hash.Hashing; import org.apache.fluo.api.client.SnapshotBase; import org.apache.fluo.api.client.TransactionBase; import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.config.SimpleConfiguration; import org.apache.fluo.api.data.Bytes; import org.apache.fluo.api.data.Bytes.BytesBuilder; @@ -573,8 +573,8 @@ public class CollisionFreeMap<K, V> { */ public static void configure(FluoConfiguration fluoConfig, Options opts) { opts.save(fluoConfig.getAppConfiguration()); - fluoConfig.addObserver(new ObserverConfiguration(CollisionFreeMapObserver.class.getName()) - .setParameters(ImmutableMap.of("mapId", opts.mapId))); + fluoConfig.addObserver(new ObserverSpecification(CollisionFreeMapObserver.class.getName(), + ImmutableMap.of("mapId", opts.mapId))); Bytes dataRangeEnd = Bytes.of(opts.mapId + DATA_RANGE_END); Bytes updateRangeEnd = Bytes.of(opts.mapId + UPDATE_RANGE_END); http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMapObserver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMapObserver.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMapObserver.java index 581bb10..a8e333d 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMapObserver.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMapObserver.java @@ -36,7 +36,7 @@ public class CollisionFreeMapObserver extends AbstractObserver { @Override public void init(Context context) throws Exception { - this.mapId = context.getParameters().get("mapId"); + this.mapId = context.getObserverConfiguration().getString("mapId"); cfm = CollisionFreeMap.getInstance(mapId, context.getAppConfiguration()); cfm.updateObserver.init(mapId, context); } http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionBase.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionBase.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionBase.java index 13e2b78..6d72d49 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionBase.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionBase.java @@ -22,6 +22,7 @@ import java.util.Set; import java.util.function.Predicate; import com.google.common.collect.Iterators; +import org.apache.fluo.api.client.AbstractTransactionBase; import org.apache.fluo.api.client.TransactionBase; import org.apache.fluo.api.client.scanner.CellScanner; import org.apache.fluo.api.client.scanner.ColumnScanner; @@ -42,7 +43,7 @@ import org.apache.fluo.api.exceptions.AlreadySetException; * * @since 1.0.0 */ -public class RecordingTransactionBase implements TransactionBase { +public class RecordingTransactionBase extends AbstractTransactionBase implements TransactionBase { private final TransactionBase txb; private final TxLog txLog = new TxLog(); @@ -63,34 +64,17 @@ public class RecordingTransactionBase implements TransactionBase { } @Override - public void setWeakNotification(CharSequence row, Column col) { - txb.setWeakNotification(row, col); - } - - @Override public void set(Bytes row, Column col, Bytes value) throws AlreadySetException { txLog.filteredAdd(LogEntry.newSet(row, col, value), filter); txb.set(row, col, value); } @Override - public void set(CharSequence row, Column col, CharSequence value) throws AlreadySetException { - txLog.filteredAdd(LogEntry.newSet(row, col, value), filter); - txb.set(row, col, value); - } - - @Override public void delete(Bytes row, Column col) { txLog.filteredAdd(LogEntry.newDelete(row, col), filter); txb.delete(row, col); } - @Override - public void delete(CharSequence row, Column col) { - txLog.filteredAdd(LogEntry.newDelete(row, col), filter); - txb.delete(row, col); - } - /** * Logs GETs for returned Row/Columns. Requests that return no data will not be logged. */ @@ -326,49 +310,4 @@ public class RecordingTransactionBase implements TransactionBase { public static RecordingTransactionBase wrap(TransactionBase txb, Predicate<LogEntry> filter) { return new RecordingTransactionBase(txb, filter); } - - @Override - public Map<RowColumn, String> gets(Collection<RowColumn> rowColumns) { - Map<RowColumn, String> rowColVal = txb.gets(rowColumns); - for (Map.Entry<RowColumn, String> rce : rowColVal.entrySet()) { - txLog - .filteredAdd( - LogEntry.newGet(rce.getKey().getsRow(), rce.getKey().getColumn(), rce.getValue()), - filter); - } - return rowColVal; - } - - // TODO alot of these String methods may be more efficient if called the Byte version in this - // class... this would avoid conversion from Byte->String->Byte - @Override - public Map<String, Map<Column, String>> gets(Collection<? extends CharSequence> rows, - Set<Column> columns) { - Map<String, Map<Column, String>> rowColVal = txb.gets(rows, columns); - for (Map.Entry<String, Map<Column, String>> rowEntry : rowColVal.entrySet()) { - for (Map.Entry<Column, String> colEntry : rowEntry.getValue().entrySet()) { - txLog.filteredAdd( - LogEntry.newGet(rowEntry.getKey(), colEntry.getKey(), colEntry.getValue()), filter); - } - } - return rowColVal; - } - - @Override - public String gets(CharSequence row, Column col) { - String val = txb.gets(row, col); - if (val != null) { - txLog.filteredAdd(LogEntry.newGet(row, col, val), filter); - } - return val; - } - - @Override - public Map<Column, String> gets(CharSequence row, Set<Column> columns) { - Map<Column, String> colVal = txb.gets(row, columns); - for (Map.Entry<Column, String> entry : colVal.entrySet()) { - txLog.filteredAdd(LogEntry.newGet(row, entry.getKey(), entry.getValue()), filter); - } - return colVal; - } } http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/main/java/org/apache/fluo/recipes/core/types/TypedSnapshotBase.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/types/TypedSnapshotBase.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/types/TypedSnapshotBase.java index c8fc105..5a2c9c6 100644 --- a/modules/core/src/main/java/org/apache/fluo/recipes/core/types/TypedSnapshotBase.java +++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/types/TypedSnapshotBase.java @@ -28,6 +28,7 @@ import java.util.Set; import com.google.common.collect.Maps; import org.apache.commons.collections.map.DefaultedMap; +import org.apache.fluo.api.client.AbstractSnapshotBase; import org.apache.fluo.api.client.SnapshotBase; import org.apache.fluo.api.client.scanner.ScannerBuilder; import org.apache.fluo.api.data.Bytes; @@ -45,7 +46,7 @@ import org.apache.fluo.recipes.core.types.TypeLayer.RowMethods; * * @since 1.0.0 */ -public class TypedSnapshotBase implements SnapshotBase { +public class TypedSnapshotBase extends AbstractSnapshotBase implements SnapshotBase { private SnapshotBase snapshot; private Encoder encoder; http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/test/java/org/apache/fluo/recipes/core/export/ExportTestBase.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/export/ExportTestBase.java b/modules/core/src/test/java/org/apache/fluo/recipes/core/export/ExportTestBase.java index d9e9034..fd3ece1 100644 --- a/modules/core/src/test/java/org/apache/fluo/recipes/core/export/ExportTestBase.java +++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/export/ExportTestBase.java @@ -36,7 +36,7 @@ import org.apache.fluo.api.client.scanner.CellScanner; import org.apache.fluo.api.client.scanner.ColumnScanner; import org.apache.fluo.api.client.scanner.RowScanner; import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.data.Column; import org.apache.fluo.api.data.ColumnValue; import org.apache.fluo.api.data.Span; @@ -141,7 +141,7 @@ public class ExportTestBase { props.setWorkerThreads(20); props.setMiniDataDir("target/mini"); - ObserverConfiguration doc = new ObserverConfiguration(DocumentObserver.class.getName()); + ObserverSpecification doc = new ObserverSpecification(DocumentObserver.class.getName()); props.addObserver(doc); SimpleSerializer.setSerializer(props, GsonSerializer.class); http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/test/java/org/apache/fluo/recipes/core/map/CollisionFreeMapIT.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/map/CollisionFreeMapIT.java b/modules/core/src/test/java/org/apache/fluo/recipes/core/map/CollisionFreeMapIT.java index 7e1ac21..f5c832a 100644 --- a/modules/core/src/test/java/org/apache/fluo/recipes/core/map/CollisionFreeMapIT.java +++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/map/CollisionFreeMapIT.java @@ -29,7 +29,7 @@ import org.apache.fluo.api.client.Snapshot; import org.apache.fluo.api.client.Transaction; import org.apache.fluo.api.client.scanner.CellScanner; import org.apache.fluo.api.config.FluoConfiguration; -import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.data.Column; import org.apache.fluo.api.data.RowColumnValue; import org.apache.fluo.api.data.Span; @@ -57,7 +57,7 @@ public class CollisionFreeMapIT { props.setWorkerThreads(20); props.setMiniDataDir("target/mini"); - props.addObserver(new ObserverConfiguration(DocumentObserver.class.getName())); + props.addObserver(new ObserverSpecification(DocumentObserver.class.getName())); SimpleSerializer.setSerializer(props, TestSerializer.class); http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockSnapshotBase.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockSnapshotBase.java b/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockSnapshotBase.java index cf9bb31..793baa0 100644 --- a/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockSnapshotBase.java +++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockSnapshotBase.java @@ -21,14 +21,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.fluo.api.client.AbstractSnapshotBase; import org.apache.fluo.api.client.SnapshotBase; import org.apache.fluo.api.client.scanner.ScannerBuilder; import org.apache.fluo.api.data.Bytes; import org.apache.fluo.api.data.Column; import org.apache.fluo.api.data.RowColumn; -import org.apache.fluo.core.impl.TxStringUtil; -public class MockSnapshotBase implements SnapshotBase { +public class MockSnapshotBase extends AbstractSnapshotBase implements SnapshotBase { final Map<Bytes, Map<Column, Bytes>> getData; @@ -173,28 +173,6 @@ public class MockSnapshotBase implements SnapshotBase { throw new UnsupportedOperationException(); } - - @Override - public String gets(CharSequence row, Column column) { - return TxStringUtil.gets(this, row, column); - } - - @Override - public Map<Column, String> gets(CharSequence row, Set<Column> columns) { - return TxStringUtil.gets(this, row, columns); - } - - @Override - public Map<String, Map<Column, String>> gets(Collection<? extends CharSequence> rows, - Set<Column> columns) { - return TxStringUtil.gets(this, rows, columns); - } - - @Override - public Map<RowColumn, String> gets(Collection<RowColumn> rowColumns) { - return TxStringUtil.gets(this, rowColumns); - } - @Override public Map<RowColumn, Bytes> get(Collection<RowColumn> rowColumns) { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/d7347ee1/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockTransactionBase.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockTransactionBase.java b/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockTransactionBase.java index 3532848..1daf4d8 100644 --- a/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockTransactionBase.java +++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/types/MockTransactionBase.java @@ -74,8 +74,9 @@ public class MockTransactionBase extends MockSnapshotBase implements Transaction } @Override - public void setWeakNotification(CharSequence row, Column col) { - setWeakNotification(Bytes.of(row), col); + public void delete(CharSequence row, Column col) { + delete(Bytes.of(row), col); + } @Override @@ -84,7 +85,7 @@ public class MockTransactionBase extends MockSnapshotBase implements Transaction } @Override - public void delete(CharSequence row, Column col) { - delete(Bytes.of(row), col); + public void setWeakNotification(CharSequence row, Column col) { + setWeakNotification(Bytes.of(row), col); } }
