using data selector as wrapper over raw data #815
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package zingg.common.core.data.df; | ||
|
|
||
| import org.apache.commons.logging.Log; | ||
| import org.apache.commons.logging.LogFactory; | ||
|
|
||
| import zingg.common.client.IArguments; | ||
| import zingg.common.client.ZFrame; | ||
| import zingg.common.client.ZinggClientException; | ||
| import zingg.common.client.cols.ZidAndFieldDefSelector; | ||
| import zingg.common.client.util.ColName; | ||
| import zingg.common.core.block.Canopy; | ||
| import zingg.common.core.block.Tree; | ||
| import zingg.common.core.context.Context; | ||
| import zingg.common.core.preprocess.StopWordsRemover; | ||
| import zingg.common.core.util.Analytics; | ||
| import zingg.common.core.util.Metric; | ||
|
|
||
| public class ZFrameDataSelector<S, D, R, C, T> { | ||
|
|
||
| protected ZFrame<D,R,C> rawData; | ||
| protected ZFrame<D,R,C> fieldDefColumnsDS; | ||
| protected ZFrame<D,R,C> blockedData; | ||
| protected IArguments args; | ||
| protected Context<S,D,R,C,T> context; | ||
| protected StopWordsRemover<S, D, R, C, T> stopWordsRemover; | ||
| protected ZFrame<D, R, C> preprocessedRepartitionedData; | ||
|
|
||
| public static final Log LOG = LogFactory.getLog(ZFrameDataSelector.class); | ||
|
|
||
| public ZFrameDataSelector(ZFrame<D, R, C> rawData, IArguments args, Context<S,D,R,C,T> context,StopWordsRemover<S, D, R, C, T> stopWordsRemover) { | ||
|
There was a problem hiding this comment. this class shuld not be aware of the blocking tree loading and context etc. it should get the blocking tree and have a method to apply it. |
||
| super(); | ||
| this.rawData = rawData; | ||
| this.args = args; | ||
| this.context = context; | ||
| this.stopWordsRemover = stopWordsRemover; | ||
| } | ||
|
|
||
| public ZFrame<D, R, C> getRawData() { | ||
| return rawData; | ||
| } | ||
|
|
||
| public ZFrame<D, R, C> getFieldDefColumnsDS() { | ||
| if (fieldDefColumnsDS==null) { | ||
| ZidAndFieldDefSelector zidAndFieldDefSelector = new ZidAndFieldDefSelector(args.getFieldDefinition()); | ||
| fieldDefColumnsDS = getRawData().select(zidAndFieldDefSelector.getCols()); | ||
| } | ||
| return fieldDefColumnsDS; | ||
| // return getDSUtil().getFieldDefColumnsDS(testDataOriginal, args, true); | ||
| } | ||
|
|
||
| public ZFrame<D, R, C> getPreprocessedRepartitionedData() { | ||
| return preprocessedRepartitionedData; | ||
| } | ||
|
|
||
| public ZFrame<D,R,C> getBlocked() throws Exception, ZinggClientException{ | ||
| if (blockedData==null) { | ||
| preprocessedRepartitionedData = stopWordsRemover.preprocessForStopWords(getFieldDefColumnsDS()); | ||
|
|
||
| preprocessedRepartitionedData = preprocessedRepartitionedData.repartition(args.getNumPartitions(), preprocessedRepartitionedData.col(ColName.ID_COL)); | ||
| //testData = dropDuplicates(testData); | ||
| long count = preprocessedRepartitionedData.count(); | ||
| LOG.info("Read " + count); | ||
| Analytics.track(Metric.DATA_COUNT, count, args.getCollectMetrics()); | ||
|
There was a problem hiding this comment. count should be a method on this and Analytics should not be a part of this object - it should be driven from the executor |
||
| LOG.debug("Blocking model file location is " + args.getBlockFile()); | ||
| ZFrame<D, R, C> blocked1; //.cache(); | ||
| Tree<Canopy<R>> tree = context.getBlockingTreeUtil().readBlockingTree(args); | ||
| ZFrame<D, R, C> blocked = context.getBlockingTreeUtil().getBlockHashes(preprocessedRepartitionedData, tree); | ||
| blocked1 = blocked.repartition(args.getNumPartitions(), blocked.col(ColName.HASH_COL)); | ||
| this.blockedData = blocked1; | ||
| } | ||
| return blockedData; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rename to ZData