You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2007/03/31 19:07:27 UTC
svn commit: r524452 - in /lucene/solr/trunk/src:
java/org/apache/solr/handler/CSVRequestHandler.java
test/org/apache/solr/handler/TestCSVLoader.java
Author: yonik
Date: Sat Mar 31 10:07:26 2007
New Revision: 524452
URL: http://svn.apache.org/viewvc?view=rev&rev=524452
Log:
CSV: default commit to false, add tests for skip, skipLines
Modified:
lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/solr/trunk/src/test/org/apache/solr/handler/TestCSVLoader.java
Modified: lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java?view=diff&rev=524452&r1=524451&r2=524452
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/handler/CSVRequestHandler.java Sat Mar 31 10:07:26 2007
@@ -88,6 +88,7 @@
static String FIELDNAMES="fieldnames";
static String HEADER="header";
static String SKIP="skip";
+ static String SKIPLINES="skipLines";
static String MAP="map";
static String TRIM="trim";
static String EMPTY="keepEmpty";
@@ -229,7 +230,7 @@
Boolean hasHeader = params.getBool(HEADER);
- skipLines = params.getInt(SKIP,0);
+ skipLines = params.getInt(SKIPLINES,0);
if (fieldnames==null) {
if (null == hasHeader) {
@@ -345,7 +346,7 @@
addDoc(line,vals);
}
- if (params.getBool(COMMIT,true)) {
+ if (params.getBool(COMMIT,false)) {
handler.commit(new CommitUpdateCommand(false));
}
}
Modified: lucene/solr/trunk/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/test/org/apache/solr/handler/TestCSVLoader.java?view=diff&rev=524452&r1=524451&r2=524452
==============================================================================
--- lucene/solr/trunk/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/solr/trunk/src/test/org/apache/solr/handler/TestCSVLoader.java Sat Mar 31 10:07:26 2007
@@ -86,8 +86,9 @@
public void testCSVLoad() throws Exception {
makeFile("id\n100\n101\n102");
loadLocal("stream.file",filename);
- // csv loader currently defaults to committing
- // assertU(commit());
+ // check default commit of false
+ assertQ(req("id:[100 TO 110]"),"//*[@numFound='0']");
+ assertU(commit());
assertQ(req("id:[100 TO 110]"),"//*[@numFound='3']");
}
@@ -185,12 +186,28 @@
// test that header in file was skipped
assertQ(req("id:id"),"//*[@numFound='0']");
+ // test skipping a field via the "skip" parameter
+ loadLocal("stream.file",filename,"commit","true","keepEmpty","true","skip","str_s");
+ assertQ(req("id:[100 TO 110]"),"//*[@numFound='4']");
+ assertQ(req("id:[100 TO 110]"),"count(//str[@name='str_s'])=0");
+
+ // test skipping a field by specifying an empty name
+ loadLocal("stream.file",filename,"commit","true","keepEmpty","true","fieldnames","id,");
+ assertQ(req("id:[100 TO 110]"),"//*[@numFound='4']");
+ assertQ(req("id:[100 TO 110]"),"count(//str[@name='str_s'])=0");
+
// test loading file as if it didn't have a header
loadLocal("stream.file",filename, "commit","true",
"fieldnames","id,my_s", "header","false");
assertQ(req("id:id"),"//*[@numFound='1']");
assertQ(req("id:100"),"//str[@name='my_s'][.='quoted']");
+ // test skipLines
+ loadLocal("stream.file",filename, "commit","true",
+ "fieldnames","id,my_s", "header","false", "skipLines","1");
+ assertQ(req("id:id"),"//*[@numFound='1']");
+ assertQ(req("id:100"),"//str[@name='my_s'][.='quoted']");
+
// test multi-valued fields via field splitting w/ mapping of subvalues
makeFile("id,str_s\n"
@@ -232,6 +249,8 @@
assertQ(req("id:101"),"//arr[@name='str_s']/str[3][.='c']");
assertQ(req("id:102"),"//arr[@name='str_s']/str[2][.='EMPTY']");
assertQ(req("id:103"),"//str[@name='str_s'][.='EMPTY']");
+
+
}