Skip to content

Commit 8ca571b

Browse files
Nitish1814Nitish1814
authored
Merge pull request #1 from sania-16/pr-1061
Fixes in PR1061
2 parents 0c2dcae + f31b954 commit 8ca571b

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

‎common/client/src/main/java/zingg/common/client/FieldDefinition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void setMatchType(List<? extends IMatchType> type) {
8181
}
8282

8383

84-
public void setMatchTypeInternal(MatchType... type) {
84+
public void setMatchTypeInternal(IMatchType... type) {
8585
this.matchType = Arrays.asList(type);
8686
}
8787

‎common/client/src/test/java/zingg/common/client/util/TestStopWordUtility.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ public void testGetFieldDefinitionWithStopwords(){
2222
FieldDefinition def1 = new FieldDefinition();
2323
def1.setFieldName("field1");
2424
def1.setDataType("string");
25-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
25+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
2626
def1.setFields("field1");
2727

2828
FieldDefinition def2 = new FieldDefinition();
2929
def2.setFieldName("field2");
3030
def2.setDataType("string");
31-
def2.setMatchTypeInternal((MatchType) MatchTypes.EXACT);
31+
def2.setMatchTypeInternal(MatchTypes.EXACT);
3232
def2.setStopWords("stopWordsFileName2");
3333
def2.setFields("field2");
3434

3535
FieldDefinition def3 = new FieldDefinition();
3636
def3.setFieldName("field3");
3737
def3.setDataType("string");
38-
def3.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
38+
def3.setMatchTypeInternal(MatchTypes.FUZZY);
3939
def3.setStopWords(null);
4040
def3.setFields("field3");
4141

@@ -60,20 +60,20 @@ public void testGetFieldDefinitionNamesWithStopwords() throws ZinggClientExcepti
6060
FieldDefinition def1 = new FieldDefinition();
6161
def1.setFieldName("field1");
6262
def1.setDataType("string");
63-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
63+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
6464
def1.setFields("field1");
6565

6666
FieldDefinition def2 = new FieldDefinition();
6767
def2.setFieldName("field2");
6868
def2.setDataType("string");
69-
def2.setMatchTypeInternal((MatchType) MatchTypes.EXACT);
69+
def2.setMatchTypeInternal(MatchTypes.EXACT);
7070
def2.setStopWords("stopWordsFileName2");
7171
def2.setFields("field2");
7272

7373
FieldDefinition def3 = new FieldDefinition();
7474
def3.setFieldName("field3");
7575
def3.setDataType("string");
76-
def3.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
76+
def3.setMatchTypeInternal(MatchTypes.FUZZY);
7777
def3.setStopWords("stopWordsFileName3");
7878
def3.setFields("field3");
7979

‎common/core/src/main/java/zingg/common/core/preprocess/stopwords/StopWordsRemover.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected String getPattern(List<String> wordList) {
100100
}
101101

102102
// implementation specific as may require UDF
103-
public abstract ZFrame<D,R,C> removeStopWordsFromDF(ZFrame<D,R,C> ds,String fieldName, String pattern);
103+
protected abstract ZFrame<D,R,C> removeStopWordsFromDF(ZFrame<D,R,C> ds,String fieldName, String pattern);
104104

105105
@Override
106106
public IContext<S, D, R, C, T> getContext() {

‎common/core/src/test/java/zingg/common/core/executor/validate/BlockerValidator.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ public BlockerValidator(VerifyBlocking<S, D, R, C, T> executor, IVerifyBlockingP
2626
public void validateResults() throws ZinggClientException {
2727

2828
ZFrame<D, R, C> df = executor.getContext().getPipeUtil().read(false,false,verifyBlockingPipes.getCountsPipe(executor.getArgs()));
29-
ZFrame<D, R, C> topDf = df.select(ColName.HASH_COL,ColName.HASH_COUNTS_COL).limit(3);
29+
ZFrame<D, R, C> topDf = df.select(ColName.HASH_COL,ColName.HASH_COUNTS_COL).sortDescending(ColName.HASH_COUNTS_COL).limit(3);
3030
long blockCount = topDf.count();
31-
LOG.info("blockCount : " + blockCount);
3231
assertTrue(blockCount == 3);
3332
List<R> countsDf = topDf.collectAsList();
3433
int sumHash = 0;
@@ -46,8 +45,8 @@ public void validateResults() throws ZinggClientException {
4645
//to assert on different dataset
4746
//TODO need to check if this is a valid assertion and required
4847
protected void performAssertions(int sumHash, long sumCount) {
49-
assertTrue(sumHash == 11846 | sumHash == 11855);
50-
assertTrue(sumCount == 20 | sumCount == 16);
48+
assertTrue(sumHash == 11843 | sumHash == 11855);
49+
assertTrue(sumCount == 24 | sumCount == 16);
5150
}
5251

5352
}

‎common/core/src/test/java/zingg/common/core/util/TestDSUtil.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ public void testGetFieldDefColumnsWhenShowConciseIsTrue() throws ZinggClientExce
5555
FieldDefinition def1 = new FieldDefinition();
5656
def1.setFieldName("field_fuzzy");
5757
def1.setDataType("string");
58-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
58+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
5959
def1.setFields("field_fuzzy");
6060

6161
FieldDefinition def2 = new FieldDefinition();
6262
def2.setFieldName("field_match_type_DONT_USE");
6363
def2.setDataType("string");
64-
def2.setMatchTypeInternal((MatchType) MatchTypes.DONT_USE);
64+
def2.setMatchTypeInternal(MatchTypes.DONT_USE);
6565
def2.setFields("field_match_type_DONT_USE");
6666

6767
FieldDefinition def3 = new FieldDefinition();
6868
def3.setFieldName("field_str_DONTspaceUSE");
6969
def3.setDataType("string");
70-
def3.setMatchTypeInternal((MatchType) MatchTypes.DONT_USE);
70+
def3.setMatchTypeInternal(MatchTypes.DONT_USE);
7171
def3.setFields("field_str_DONTspaceUSE");
7272

7373
List<FieldDefinition> fieldDef = new ArrayList<FieldDefinition>();
@@ -97,19 +97,19 @@ public void testGetFieldDefColumnsWhenShowConciseIsFalse() throws ZinggClientExc
9797
FieldDefinition def1 = new FieldDefinition();
9898
def1.setFieldName("field_fuzzy");
9999
def1.setDataType("string");
100-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
100+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
101101
def1.setFields("field_fuzzy");
102102

103103
FieldDefinition def2 = new FieldDefinition();
104104
def2.setFieldName("field_match_type_DONT_USE");
105105
def2.setDataType("string");
106-
def2.setMatchTypeInternal((MatchType) MatchTypes.DONT_USE);
106+
def2.setMatchTypeInternal(MatchTypes.DONT_USE);
107107
def2.setFields("field_match_type_DONT_USE");
108108

109109
FieldDefinition def3 = new FieldDefinition();
110110
def3.setFieldName("field_str_DONTspaceUSE");
111111
def3.setDataType("string");
112-
def3.setMatchTypeInternal((MatchType) MatchTypes.DONT_USE);
112+
def3.setMatchTypeInternal(MatchTypes.DONT_USE);
113113
def3.setFields("field_str_DONTspaceUSE");
114114

115115
List<FieldDefinition> fieldDef = new ArrayList<FieldDefinition>();
@@ -143,7 +143,7 @@ public void testGetTrainingDataWhenTrainingSamplesIsNull() throws Exception, Zin
143143
FieldDefinition def1 = new FieldDefinition();
144144
def1.setFieldName("field1");
145145
def1.setDataType("string");
146-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
146+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
147147
def1.setFields("field1");
148148

149149
List<FieldDefinition> fieldDef = new ArrayList<FieldDefinition>();
@@ -180,7 +180,7 @@ public void testGetTrainingDataWhenTrainingSamplesIsNotNull() throws Exception,
180180
FieldDefinition def1 = new FieldDefinition();
181181
def1.setFieldName("field1");
182182
def1.setDataType("string");
183-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
183+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
184184
def1.setFields("field1");
185185

186186
List<FieldDefinition> fieldDef = new ArrayList<FieldDefinition>();
@@ -223,7 +223,7 @@ public void testGetTrainingDataWhenTrainingDataIsNull() throws Exception, ZinggC
223223
FieldDefinition def1 = new FieldDefinition();
224224
def1.setFieldName("field1");
225225
def1.setDataType("string");
226-
def1.setMatchTypeInternal((MatchType) MatchTypes.FUZZY);
226+
def1.setMatchTypeInternal(MatchTypes.FUZZY);
227227
def1.setFields("field1");
228228

229229
List<FieldDefinition> fieldDef = new ArrayList<FieldDefinition>();

‎spark/core/src/main/java/zingg/spark/core/model/SparkModel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public ZFrame<Dataset<Row>,Row,Column> predict(ZFrame<Dataset<Row>,Row,Column> d
143143

144144

145145
@Override
146-
public ZFrame<Dataset<Row>,Row,Column> predictCore(ZFrame<Dataset<Row>,Row,Column> data) {
146+
protected ZFrame<Dataset<Row>,Row,Column> predictCore(ZFrame<Dataset<Row>,Row,Column> data) {
147147
//create features
148148
LOG.info("threshold while predicting is " + lr.getThreshold());
149149
//lr.setThreshold(0.95);

0 commit comments

Comments
 (0)