You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/13 02:16:02 UTC
[2/8] lucene-solr:jira/SOLR-10834: some scripted conversion of
xpaths: int|float -> str when dealing with @name=id
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
index 026c594..c773aa8 100644
--- a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
+++ b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
@@ -80,69 +80,69 @@ public class SimpleMLTQParserTest extends SolrTestCaseJ4 {
ModifiableSolrParams params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt}17");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='13']",
- "//result/doc[2]/int[@name='id'][.='14']",
- "//result/doc[3]/int[@name='id'][.='15']",
- "//result/doc[4]/int[@name='id'][.='16']",
- "//result/doc[5]/int[@name='id'][.='18']",
- "//result/doc[6]/int[@name='id'][.='19']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='21']",
- "//result/doc[9]/int[@name='id'][.='22']",
- "//result/doc[10]/int[@name='id'][.='23']"
+ "//result/doc[1]/str[@name='id'][.='13']",
+ "//result/doc[2]/str[@name='id'][.='14']",
+ "//result/doc[3]/str[@name='id'][.='15']",
+ "//result/doc[4]/str[@name='id'][.='16']",
+ "//result/doc[5]/str[@name='id'][.='18']",
+ "//result/doc[6]/str[@name='id'][.='19']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='21']",
+ "//result/doc[9]/str[@name='id'][.='22']",
+ "//result/doc[10]/str[@name='id'][.='23']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt boost=true}17");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='13']",
- "//result/doc[2]/int[@name='id'][.='14']",
- "//result/doc[3]/int[@name='id'][.='15']",
- "//result/doc[4]/int[@name='id'][.='16']",
- "//result/doc[5]/int[@name='id'][.='18']",
- "//result/doc[6]/int[@name='id'][.='19']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='21']",
- "//result/doc[9]/int[@name='id'][.='22']",
- "//result/doc[10]/int[@name='id'][.='23']"
+ "//result/doc[1]/str[@name='id'][.='13']",
+ "//result/doc[2]/str[@name='id'][.='14']",
+ "//result/doc[3]/str[@name='id'][.='15']",
+ "//result/doc[4]/str[@name='id'][.='16']",
+ "//result/doc[5]/str[@name='id'][.='18']",
+ "//result/doc[6]/str[@name='id'][.='19']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='21']",
+ "//result/doc[9]/str[@name='id'][.='22']",
+ "//result/doc[10]/str[@name='id'][.='23']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt,lowerfilt1^1000 boost=false mintf=0 mindf=0}30");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='31']",
- "//result/doc[2]/int[@name='id'][.='13']",
- "//result/doc[3]/int[@name='id'][.='14']",
- "//result/doc[4]/int[@name='id'][.='18']",
- "//result/doc[5]/int[@name='id'][.='20']",
- "//result/doc[6]/int[@name='id'][.='22']",
- "//result/doc[7]/int[@name='id'][.='23']",
- "//result/doc[8]/int[@name='id'][.='32']",
- "//result/doc[9]/int[@name='id'][.='15']",
- "//result/doc[10]/int[@name='id'][.='16']"
+ "//result/doc[1]/str[@name='id'][.='31']",
+ "//result/doc[2]/str[@name='id'][.='13']",
+ "//result/doc[3]/str[@name='id'][.='14']",
+ "//result/doc[4]/str[@name='id'][.='18']",
+ "//result/doc[5]/str[@name='id'][.='20']",
+ "//result/doc[6]/str[@name='id'][.='22']",
+ "//result/doc[7]/str[@name='id'][.='23']",
+ "//result/doc[8]/str[@name='id'][.='32']",
+ "//result/doc[9]/str[@name='id'][.='15']",
+ "//result/doc[10]/str[@name='id'][.='16']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt,lowerfilt1^1000 boost=true mintf=0 mindf=0}30");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='29']",
- "//result/doc[2]/int[@name='id'][.='31']",
- "//result/doc[3]/int[@name='id'][.='32']",
- "//result/doc[4]/int[@name='id'][.='13']",
- "//result/doc[5]/int[@name='id'][.='14']",
- "//result/doc[6]/int[@name='id'][.='18']",
- "//result/doc[7]/int[@name='id'][.='20']",
- "//result/doc[8]/int[@name='id'][.='22']",
- "//result/doc[9]/int[@name='id'][.='23']",
- "//result/doc[10]/int[@name='id'][.='15']"
+ "//result/doc[1]/str[@name='id'][.='29']",
+ "//result/doc[2]/str[@name='id'][.='31']",
+ "//result/doc[3]/str[@name='id'][.='32']",
+ "//result/doc[4]/str[@name='id'][.='13']",
+ "//result/doc[5]/str[@name='id'][.='14']",
+ "//result/doc[6]/str[@name='id'][.='18']",
+ "//result/doc[7]/str[@name='id'][.='20']",
+ "//result/doc[8]/str[@name='id'][.='22']",
+ "//result/doc[9]/str[@name='id'][.='23']",
+ "//result/doc[10]/str[@name='id'][.='15']"
);
params = new ModifiableSolrParams();
params.set(CommonParams.Q, "{!mlt qf=lowerfilt mindf=0 mintf=1}26");
assertQ(req(params),
- "//result/doc[1]/int[@name='id'][.='29']",
- "//result/doc[2]/int[@name='id'][.='27']",
- "//result/doc[3]/int[@name='id'][.='28']"
+ "//result/doc[1]/str[@name='id'][.='29']",
+ "//result/doc[2]/str[@name='id'][.='27']",
+ "//result/doc[3]/str[@name='id'][.='28']"
);
params = new ModifiableSolrParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
index 1cbe849..17091ab 100644
--- a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java
@@ -61,4 +61,4 @@ public class MockAuthorizationPlugin implements AuthorizationPlugin {
public void close() throws IOException {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
index 7f2fe73..d886f17 100644
--- a/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
+++ b/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
@@ -172,4 +172,4 @@ public class NoCacheHeaderTest extends CacheHeaderTestBase {
head = response.getFirstHeader("Expires");
assertNull("We got an Expires header in response", head);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
index ed8e812..321e9ad 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java
@@ -114,4 +114,4 @@ public class TestAnalyzeInfixSuggestions extends SolrTestCaseJ4 {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
index a091235..f304f8e 100644
--- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
+++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java
@@ -54,4 +54,4 @@ public class TestFreeTextSuggestions extends SolrTestCaseJ4 {
);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
index bfcf015..46282fa 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java
@@ -1162,7 +1162,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='666']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1177,7 +1177,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG after atomic update"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1191,7 +1191,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": post commit RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
, "//doc/int[@name='intDefault'][.='42']"
, "//doc/int[@name='intDvoDefault'][.='42']"
@@ -1214,7 +1214,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG#7"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='708']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1228,7 +1228,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG#7 after atomic update"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='153']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1243,7 +1243,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": initial RTG#8"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='666']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1257,7 +1257,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": RTG after atomic update"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1272,7 +1272,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": doc7 post commit RTG"
, req("qt", "/get", "id", "7")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='7']"
+ , "//doc/str[@name='id'][.='7']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='153']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
@@ -1284,7 +1284,7 @@ public class AtomicUpdatesTest extends SolrTestCaseJ4 {
assertQ(fieldToUpdate + ": doc8 post commit RTG"
, req("qt", "/get", "id", "8")
, "count(//doc)=1"
- , "//doc/int[@name='id'][.='8']"
+ , "//doc/str[@name='id'][.='8']"
, "//doc/int[@name='"+fieldToUpdate+"'][.='111']"
// whichever field we did *NOT* update
, "//doc/int[@name!='"+fieldToUpdate+"'][.='42']"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
index aa536a7..df2e7aa 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/ClassificationUpdateProcessorTest.java
@@ -503,4 +503,4 @@ public class ClassificationUpdateProcessorTest extends SolrTestCaseJ4 {
writer.addDocument(doc);
return writer.numDocs() - 1;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
index b9121c3..3514fb8 100644
--- a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
+++ b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java
@@ -89,4 +89,4 @@ public class PrimUtilsTest extends LuceneTestCase {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java b/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
index 0ca65ed..4272ad7 100644
--- a/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
+++ b/solr/core/src/test/org/apache/solr/util/UtilsToolTest.java
@@ -186,4 +186,4 @@ public class UtilsToolTest extends SolrTestCaseJ4 {
CommandLine cli = parseCmdLine(args, tool.getOptions());
return tool.runTool(cli);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
index c21e5ca..0107af1 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java
@@ -165,4 +165,4 @@ public class BitVectorTest extends LuceneTestCase {
assertEquals(vector.getRegister(i), 17/*arbitrary*/);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
index 7e98771..02f9a46 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java
@@ -231,4 +231,4 @@ public class ExplicitHLLTest extends LuceneTestCase {
private static HLL newHLL(final int explicitThreshold) {
return new HLL(11/*log2m, unused*/, 5/*regwidth, unused*/, explicitThreshold, 256/*sparseThreshold, arbitrary, unused*/, HLLType.EXPLICIT);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d430057/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
index 95cc6eb..aef4838 100644
--- a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
+++ b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java
@@ -337,4 +337,4 @@ public class FullHLLTest extends LuceneTestCase {
assertFalse(iterA.hasNext());
assertFalse(iterB.hasNext());
}
-}
\ No newline at end of file
+}