You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by pr...@apache.org on 2012/03/13 05:09:53 UTC
svn commit: r1299971 - in /oodt/trunk/filemgr/src:
main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java
Author: pramirez
Date: Tue Mar 13 04:09:52 2012
New Revision: 1299971
URL: http://svn.apache.org/viewvc?rev=1299971&view=rev
Log:
OODT-404 Fix for LuceneCatalog.getReducedMetadata()
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java
Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java?rev=1299971&r1=1299970&r2=1299971&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java (original)
+++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LuceneCatalog.java Tue Mar 13 04:09:52 2012
@@ -621,7 +621,7 @@ public class LuceneCatalog implements Ca
for (int i = 0; i < elements.size(); i++) {
String element = elements.get(i);
reducedMetadata.addMetadata(element, fullMetadata
- .getMetadata(element));
+ .getAllMetadata(element));
}
return reducedMetadata;
}
Modified: oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java?rev=1299971&r1=1299970&r2=1299971&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java (original)
+++ oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestLuceneCatalog.java Tue Mar 13 04:09:52 2012
@@ -37,6 +37,8 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import org.apache.oodt.cas.metadata.Metadata;
+import com.google.common.collect.Lists;
+
//Junit imports
import junit.framework.TestCase;
@@ -170,6 +172,37 @@ public class TestLuceneCatalog extends T
}
}
+ public void testGetMetadata() throws CatalogException {
+ Product product = getTestProduct();
+ myCat.addProduct(product);
+ myCat.addProductReferences(product);
+ Metadata m = new Metadata();
+ m.addMetadata(CoreMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
+ myCat.addMetadata(m, product);
+ Metadata rndTripMet = myCat.getMetadata(product);
+
+ assertNotNull(rndTripMet);
+ assertEquals(2, rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
+ assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/1"));
+ assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/2"));
+ }
+
+ public void testGetReducedMetadata() throws CatalogException {
+ Product product = getTestProduct();
+ myCat.addProduct(product);
+ myCat.addProductReferences(product);
+ Metadata m = new Metadata();
+ m.addMetadata(CoreMetKeys.FILE_LOCATION, Lists.newArrayList("/loc/1", "/loc/2"));
+ myCat.addMetadata(m, product);
+ Metadata rndTripMet = myCat.getReducedMetadata(product,
+ Lists.newArrayList(CoreMetKeys.FILE_LOCATION));
+
+ assertNotNull(rndTripMet);
+ assertEquals(2, rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).size());
+ assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/1"));
+ assertTrue(rndTripMet.getAllMetadata(CoreMetKeys.FILE_LOCATION).contains("/loc/2"));
+ }
+
public void testRemoveProduct() {
Product productToRemove = getTestProduct();
Modified: oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java?rev=1299971&r1=1299970&r2=1299971&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java (original)
+++ oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/cli/action/TestSqlQueryCliAction.java Tue Mar 13 04:09:52 2012
@@ -113,6 +113,32 @@ public class TestSqlQueryCliAction exten
assertEquals(VERSION_CONV, clientSetComplexQuery.getQueryFilter().getConverter());
}
+ public void testClientTransTrueAndFlatProductAndNoOutputFormat() throws CmdLineActionException, IOException {
+ ActionMessagePrinter printer = new ActionMessagePrinter();
+ MockSqlQueryCliAction cliAction = new MockSqlQueryCliAction();
+ cliAction.setQuery(QUERY);
+ cliAction.setSortBy(SORT_BY);
+ cliAction.setDelimiter(DELIMITER);
+ cliAction.setFilterAlgor(FILTER_ALGOR);
+ cliAction.setStartDateTimeMetKey(START_DATE_TIME_MET_KEY);
+ cliAction.setEndDateTimeMetKey(END_DATE_TIME_MET_KEY);
+ cliAction.setPriorityMetKey(PRIORITY_DATE_TIME_MET_KEY);
+ cliAction.setVersionConverter(VERSION_CONV);
+ cliAction.execute(printer);
+ assertEquals(2, printer.getPrintedMessages().size());
+ assertEquals("data.dat,Bob,Billy", printer.getPrintedMessages().get(0));
+ assertEquals("\n", printer.getPrintedMessages().get(1));
+ assertEquals(SORT_BY, clientSetComplexQuery.getSortByMetKey());
+ assertNull(clientSetComplexQuery.getToStringResultFormat());
+ assertNull(clientSetComplexQuery.getReducedProductTypeNames());
+ assertNull(clientSetComplexQuery.getReducedMetadata());
+ assertEquals(FILTER_ALGOR, clientSetComplexQuery.getQueryFilter().getFilterAlgor());
+ assertEquals(START_DATE_TIME_MET_KEY, clientSetComplexQuery.getQueryFilter().getStartDateTimeMetKey());
+ assertEquals(END_DATE_TIME_MET_KEY, clientSetComplexQuery.getQueryFilter().getEndDateTimeMetKey());
+ assertEquals(PRIORITY_DATE_TIME_MET_KEY, clientSetComplexQuery.getQueryFilter().getPriorityMetKey());
+ assertEquals(VERSION_CONV, clientSetComplexQuery.getQueryFilter().getConverter());
+ }
+
public class MockSqlQueryCliAction extends SqlQueryCliAction {
@Override
public XmlRpcFileManagerClient getClient() throws MalformedURLException,
@@ -126,6 +152,7 @@ public class TestSqlQueryCliAction exten
p.setProductId("TestProductId");
Metadata m = new Metadata();
m.addMetadata("Filename", TEST_FILENAME);
+ m.addMetadata("Owners", Lists.newArrayList("Bob", "Billy"));
QueryResult qr = new QueryResult(p, m);
qr.setToStringFormat(complexQuery.getToStringResultFormat());
return Lists.newArrayList(qr);