You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2012/03/19 15:58:43 UTC
svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Author: mattmann
Date: Mon Mar 19 14:58:43 2012
New Revision: 1302489
URL: http://svn.apache.org/viewvc?rev=1302489&view=rev
Log:
- fix for OODT-410 DataSourceCatalog compatible with HypersonicSQL
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1302489&r1=1302488&r2=1302489&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Mon Mar 19 14:58:43 2012
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.4: Current Development
--------------------------------------------
+* OODT-410 DataSourceCatalog compatible with HypersonicSQL
+ (mattmann,rickdn,bfoster,pramirez)
+
* OODT-413 filemgr query throws NPE when some products have undefined metadata values (rickdn)
* OODT-420 CAS-PGE should fail when product ingests fail (bfoster)
Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java?rev=1302489&r1=1302488&r2=1302489&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java (original)
+++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java Mon Mar 19 14:58:43 2012
@@ -1790,7 +1790,6 @@ public class DataSourceCatalog implement
getProductSql += whereClause.toString();
}
- getProductSql += "ORDER BY p.product_id DESC ";
LOG.log(Level.FINE, "catalog get num results: executing: "
+ getProductSql);
Modified: oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java?rev=1302489&r1=1302488&r2=1302489&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java (original)
+++ oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java Mon Mar 19 14:58:43 2012
@@ -21,15 +21,7 @@ package org.apache.oodt.cas.filemgr.cata
//JDK imports
import java.io.File;
import java.io.FileInputStream;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.sql.DataSource;
//OODT imports
@@ -38,15 +30,10 @@ import org.apache.oodt.cas.filemgr.struc
import org.apache.oodt.cas.filemgr.structs.ProductPage;
import org.apache.oodt.cas.filemgr.structs.ProductType;
import org.apache.oodt.cas.filemgr.structs.Query;
-import org.apache.oodt.cas.filemgr.structs.QueryCriteria;
-import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
-import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
-import org.apache.oodt.commons.pagination.PaginationUtils;
import org.apache.oodt.commons.database.SqlScript;
import org.apache.oodt.cas.filemgr.util.SqlParser;
-import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
import org.apache.oodt.cas.metadata.Metadata;
//Junit imports
@@ -242,7 +229,7 @@ public class TestDataSourceCatalog exten
public void testFirstProductOnlyOnFirstPage() {
// add catPageSize of the test Product
// then add a product called "ShouldBeFirstForPage.txt"
- // make sure it's the first one on the 2nd page
+ // make sure it's the first one on the 1st page
Product testProd = getTestProduct();
Metadata met = getTestMetadata("test");
@@ -281,6 +268,8 @@ public class TestDataSourceCatalog exten
assertNotNull(myCat.getFirstPage(type).getPageProducts());
assertEquals(catPageSize, myCat.getFirstPage(type).getPageProducts()
.size());
+ assertNotNull(myCat.getFirstPage(type).getPageProducts().get(0));
+ assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
ProductPage page = myCat.getNextPage(type, myCat.getFirstPage(type));
assertNotNull(page);
assertNotNull(page.getPageProducts());
@@ -288,7 +277,7 @@ public class TestDataSourceCatalog exten
assertEquals(2, page.getTotalPages());
assertNotNull(page.getPageProducts().get(0));
Product retProd = ((Product) page.getPageProducts().get(0));
- assertEquals("ShouldBeFirstForPage.txt", retProd.getProductName());
+ assertEquals("test", retProd.getProductName());
}
@@ -444,8 +433,7 @@ public class TestDataSourceCatalog exten
}
private Catalog getCatalog() {
- return (HsqlDbFriendlyDataSourceCatalog) new HsqlDbFriendlyDataSourceCatalogFatory()
- .createCatalog();
+ return new DataSourceCatalogFactory().createCatalog();
}
private void createSchema() {
@@ -485,591 +473,4 @@ public class TestDataSourceCatalog exten
return met;
}
- class HsqlDbFriendlyDataSourceCatalogFatory extends
- DataSourceCatalogFactory {
-
- public HsqlDbFriendlyDataSourceCatalogFatory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
- */
- public Catalog createCatalog() {
- return new HsqlDbFriendlyDataSourceCatalog(dataSource,
- validationLayer, fieldIdStr, pageSize, cacheUpdateMinutes);
- }
- }
-
- class HsqlDbFriendlyDataSourceCatalog extends DataSourceCatalog {
-
- public HsqlDbFriendlyDataSourceCatalog(DataSource ds,
- ValidationLayer valLayer, boolean fieldId, int pageSize,
- long cacheUpdateMin) {
- super(ds, valLayer, fieldId, pageSize, cacheUpdateMin);
- }
-
- private final Logger LOG = Logger
- .getLogger(HsqlDbFriendlyDataSourceCatalog.class.getName());
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#pagedQuery(org.apache.oodt.cas.filemgr.structs.Query,
- * org.apache.oodt.cas.filemgr.structs.ProductType, int)
- */
- public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
- throws CatalogException {
- int totalPages = PaginationUtils.getTotalPage(getResultListSize(
- query, type), this.pageSize);
-
- /*
- * if there are 0 total pages in the result list size then don't
- * bother returning a valid product page instead, return blank
- * ProductPage
- */
- if (totalPages == 0) {
- return ProductPage.blankPage();
- }
-
- ProductPage retPage = new ProductPage();
- retPage.setPageNum(pageNum);
- retPage.setPageSize(this.pageSize);
- retPage.setTotalPages(totalPages);
-
- List productIds = paginateQuery(query, type, pageNum);
-
- if (productIds != null && productIds.size() > 0) {
- List products = new Vector(productIds.size());
-
- for (Iterator i = productIds.iterator(); i.hasNext();) {
- String productId = (String) i.next();
- Product p = getProductById(productId);
- products.add(p);
- }
-
- retPage.setPageProducts(products);
- }
-
- return retPage;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getFirstPage(org.apache.oodt.cas.filemgr.structs.ProductType)
- */
- public ProductPage getFirstPage(ProductType type) {
- Query query = new Query();
- ProductPage firstPage = null;
-
- try {
- firstPage = pagedQuery(query, type, 1);
- } catch (CatalogException e) {
- LOG.log(Level.WARNING,
- "Exception getting first page: Message: "
- + e.getMessage());
- }
- return firstPage;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getNextPage(org.apache.oodt.cas.filemgr.structs.ProductType,
- * org.apache.oodt.cas.filemgr.structs.ProductPage)
- */
- public ProductPage getNextPage(ProductType type, ProductPage currentPage) {
- if (currentPage == null) {
- return getFirstPage(type);
- }
-
- if (currentPage.isLastPage()) {
- return currentPage;
- }
-
- ProductPage nextPage = null;
- Query query = new Query();
-
- try {
- nextPage = pagedQuery(query, type, currentPage.getPageNum() + 1);
- } catch (CatalogException e) {
- LOG.log(Level.WARNING, "Exception getting next page: Message: "
- + e.getMessage());
- }
-
- return nextPage;
- }
-
- private List paginateQuery(Query query, ProductType type, int pageNum)
- throws CatalogException {
- Connection conn = null;
- Statement statement = null;
- ResultSet rs = null;
-
- List productIds = null;
- boolean doSkip = true;
- int numResults = -1;
-
- if (pageNum == -1) {
- doSkip = false;
- } else {
- numResults = getResultListSize(query, type);
- }
-
- try {
- conn = dataSource.getConnection();
- statement = conn.createStatement(
- ResultSet.TYPE_SCROLL_INSENSITIVE,
- ResultSet.CONCUR_READ_ONLY);
-
- String getProductSql = "";
- String tableName = type.getName() + "_metadata";
- String subSelectQueryBase = "SELECT product_id FROM "
- + tableName + " ";
- StringBuffer selectClause = new StringBuffer(
- "SELECT DISTINCT p.product_id ");
- StringBuffer fromClause = new StringBuffer("FROM " + tableName
- + " p ");
- StringBuffer whereClause = new StringBuffer("WHERE ");
-
- boolean gotFirstClause = false;
- int clauseNum = 0;
-
- if (query.getCriteria() != null
- && query.getCriteria().size() > 0) {
- for (Iterator i = query.getCriteria().iterator(); i
- .hasNext();) {
- QueryCriteria criteria = (QueryCriteria) i.next();
- clauseNum++;
-
- String elementIdStr = null;
-
- if (fieldIdStringFlag) {
- elementIdStr = "'"
- + this.getValidationLayer()
- .getElementByName(
- criteria.getElementName())
- .getElementId() + "'";
- } else {
- elementIdStr = this
- .getValidationLayer()
- .getElementByName(criteria.getElementName())
- .getElementId();
- }
-
- String clause = null;
-
- if (!gotFirstClause) {
- clause = "(p.element_id = " + elementIdStr
- + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- clause += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%') ";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
- boolean inclusive = ((RangeQueryCriteria) criteria)
- .getInclusive();
-
- if ((startVal != null && !startVal.equals(""))
- || (endVal != null && !endVal
- .equals(""))) {
- clause += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null
- && !startVal.equals("")) {
- if (inclusive)
- clause += ">= '" + startVal + "'";
- else
- clause += "> '" + startVal + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- if (inclusive)
- clause += " AND metadata_value <= '"
- + endVal + "'";
- else
- clause += " AND metadata_value < '"
- + endVal + "'";
- } else if (inclusive)
- clause += "<= '" + endVal + "'";
- else
- clause += "< '" + endVal + "'";
- }
-
- clause += ") ";
- }
- }
-
- whereClause.append(clause);
- gotFirstClause = true;
- } else {
- String subSelectTblName = "p" + clauseNum;
- String subSelectQuery = subSelectQueryBase
- + "WHERE (element_id = " + elementIdStr
- + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- subSelectQuery += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%')";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
-
- if (startVal != null || endVal != null) {
- subSelectQuery += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null
- && !startVal.equals("")) {
- subSelectQuery += ">= '" + startVal
- + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- subSelectQuery += " AND metadata_value <= '"
- + endVal + "'";
- } else
- subSelectQuery += "<= '" + endVal
- + "'";
- }
-
- subSelectQuery += ") ";
-
- }
- }
- fromClause.append("INNER JOIN (" + subSelectQuery
- + ") " + subSelectTblName + " ON "
- + subSelectTblName
- + ".product_id = p.product_id ");
-
- }
- }
- }
- getProductSql = selectClause.toString() + fromClause.toString();
- if (gotFirstClause) {
- getProductSql += whereClause.toString();
- }
-
- LOG.log(Level.FINE, "catalog query: executing: "
- + getProductSql);
-
- rs = statement.executeQuery(getProductSql);
- productIds = new Vector();
-
- if (doSkip) {
- int startNum = (pageNum - 1) * pageSize;
-
- if (startNum > numResults) {
- startNum = 0;
- }
-
- // must call next first, or else no relative cursor
- if (rs.next()) {
- // grab the first one
- int numGrabbed = -1;
-
- if (pageNum == 1) {
- numGrabbed = 1;
- productIds.add(rs.getString("product_id"));
- } else {
- numGrabbed = 0;
- }
-
- // now move the cursor to the correct position
- if (pageNum != 1) {
- rs.relative(startNum - 1);
- }
-
- // grab the rest
- while (rs.next() && numGrabbed < pageSize) {
- String productId = rs.getString("product_id");
- productIds.add(productId);
- numGrabbed++;
- }
- }
-
- } else {
- while (rs.next()) {
- String productId = rs.getString("product_id");
- productIds.add(productId);
- }
- }
-
- if (productIds.size() == 0) {
- productIds = null;
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- LOG.log(Level.WARNING, "Exception performing query. Message: "
- + e.getMessage());
- try {
- conn.rollback();
- } catch (SQLException e2) {
- LOG.log(Level.SEVERE,
- "Unable to rollback query transaction. Message: "
- + e2.getMessage());
- }
- throw new CatalogException(e.getMessage());
- } finally {
-
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException ignore) {
- }
-
- rs = null;
- }
-
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException ignore) {
- }
-
- statement = null;
- }
-
- if (conn != null) {
- try {
- conn.close();
-
- } catch (SQLException ignore) {
- }
-
- conn = null;
- }
- }
-
- return productIds;
- }
-
- private int getResultListSize(Query query, ProductType type)
- throws CatalogException {
- Connection conn = null;
- Statement statement = null;
- ResultSet rs = null;
-
- int resultCount = 0;
-
- try {
- conn = dataSource.getConnection();
- statement = conn.createStatement();
-
- String getProductSql = "";
- String tableName = type.getName() + "_metadata";
- String subSelectQueryBase = "SELECT product_id FROM "
- + tableName + " ";
- StringBuffer selectClause = new StringBuffer(
- "SELECT COUNT(DISTINCT p.product_id) AS numResults ");
- StringBuffer fromClause = new StringBuffer("FROM " + tableName
- + " p ");
- StringBuffer whereClause = new StringBuffer("WHERE ");
-
- boolean gotFirstClause = false;
- int clauseNum = 0;
-
- if (query.getCriteria() != null
- && query.getCriteria().size() > 0) {
- for (Iterator i = query.getCriteria().iterator(); i
- .hasNext();) {
- QueryCriteria criteria = (QueryCriteria) i.next();
- clauseNum++;
-
- String elementIdStr = null;
-
- if (fieldIdStringFlag) {
- elementIdStr = "'"
- + this.getValidationLayer()
- .getElementByName(
- criteria.getElementName())
- .getElementId() + "'";
- } else {
- elementIdStr = this
- .getValidationLayer()
- .getElementByName(criteria.getElementName())
- .getElementId();
- }
-
- String clause = null;
-
- if (!gotFirstClause) {
- clause = "(p.element_id = " + elementIdStr
- + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- clause += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%') ";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
- boolean inclusive = ((RangeQueryCriteria) criteria)
- .getInclusive();
-
- if ((startVal != null && !startVal.equals(""))
- || (endVal != null && !endVal
- .equals(""))) {
- clause += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null
- && !startVal.equals("")) {
- if (inclusive)
- clause += ">= '" + startVal + "'";
- else
- clause += "> '" + startVal + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- if (inclusive)
- clause += " AND metadata_value <= '"
- + endVal + "'";
- else
- clause += " AND metadata_value < '"
- + endVal + "'";
- } else if (inclusive)
- clause += "<= '" + endVal + "'";
- else
- clause += "< '" + endVal + "'";
- }
-
- clause += ") ";
- }
- }
- whereClause.append(clause);
- gotFirstClause = true;
- } else {
- String subSelectTblName = "p" + clauseNum;
- String subSelectQuery = subSelectQueryBase
- + "WHERE (element_id = " + elementIdStr
- + " AND ";
- if (criteria instanceof TermQueryCriteria) {
- subSelectQuery += " metadata_value LIKE '%"
- + ((TermQueryCriteria) criteria)
- .getValue() + "%')";
- } else if (criteria instanceof RangeQueryCriteria) {
- String startVal = ((RangeQueryCriteria) criteria)
- .getStartValue();
- String endVal = ((RangeQueryCriteria) criteria)
- .getEndValue();
-
- if (startVal != null || endVal != null) {
- subSelectQuery += " metadata_value ";
-
- boolean gotStart = false;
-
- if (startVal != null
- && !startVal.equals("")) {
- subSelectQuery += ">= '" + startVal
- + "'";
- gotStart = true;
- }
-
- if (endVal != null && !endVal.equals("")) {
- if (gotStart) {
- subSelectQuery += " AND metadata_value <= '"
- + endVal + "'";
- } else
- subSelectQuery += "<= '" + endVal
- + "'";
- }
-
- subSelectQuery += ") ";
-
- }
- }
-
- fromClause.append("INNER JOIN (" + subSelectQuery
- + ") " + subSelectTblName + " ON "
- + subSelectTblName
- + ".product_id = p.product_id ");
-
- }
- }
- }
-
- getProductSql = selectClause.toString() + fromClause.toString();
- if (gotFirstClause) {
- getProductSql += whereClause.toString();
- }
-
- LOG.log(Level.FINE, "catalog get num results: executing: "
- + getProductSql);
-
- rs = statement.executeQuery(getProductSql);
-
- while (rs.next()) {
- resultCount = rs.getInt("numResults");
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- LOG.log(Level.WARNING,
- "Exception performing get num results. Message: "
- + e.getMessage());
- try {
- conn.rollback();
- } catch (SQLException e2) {
- LOG.log(Level.SEVERE,
- "Unable to rollback get num results transaction. Message: "
- + e2.getMessage());
- }
- throw new CatalogException(e.getMessage());
- } finally {
-
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException ignore) {
- }
-
- rs = null;
- }
-
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException ignore) {
- }
-
- statement = null;
- }
-
- if (conn != null) {
- try {
- conn.close();
-
- } catch (SQLException ignore) {
- }
-
- conn = null;
- }
- }
-
- return resultCount;
- }
- }
-
}
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Mattmann, Chris A (388J)" <ch...@jpl.nasa.gov>.
You rock thanks Ricky!
Sent from my iPhone
On Mar 23, 2012, at 3:08 PM, "Nguyen, Ricky" <rn...@chla.usc.edu> wrote:
> filed subtask OODT-431 under OODT-410.
> simple fix, didn't think i needed review board since all discussion happened for OODT-410 already.
> committed and seems like jenkins build succeeds.
>
> On Mar 22, 2012, at 8:13 AM, Ramirez, Paul M (388J) wrote:
>
>> Hey Chris,
>>
>> Yep, you're right so I'll look into this further. I know that commit broke the build as Jenkins keeps telling the list. I wonder if the bug was there before. If I recall you just expanded the unit test. Anyhow when I have more time I'll try to track this down if someone doesn't get to it first. Essentially, the unit test is failing right now.
>>
>> --Paul
>>
>> On Mar 21, 2012, at 1:18 PM, Mattmann, Chris A (388J) wrote:
>>
>>> Hi Paul,
>>>
>>> On Mar 21, 2012, at 3:41 PM, Ramirez, Paul M (388J) wrote:
>>>
>>>> Hey Guys,
>>>>
>>>> This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
>>>>
>>>> assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
>>>
>>> Hmmm, that commit was from me. Read on below.
>>>
>>>>
>>>> The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
>>>>
>>>
>>> Sorting in the DataSourceCatalog by product ID should be equivalent to sorting in the Lucene Catalog by ProductReceivedTime, right?
>>>
>>> Cheers,
>>> Chris
>>>
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> Chris Mattmann, Ph.D.
>>> Senior Computer Scientist
>>> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
>>> Office: 171-266B, Mailstop: 171-246
>>> Email: chris.a.mattmann@nasa.gov
>>> WWW: http://sunset.usc.edu/~mattmann/
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> Adjunct Assistant Professor, Computer Science Department
>>> University of Southern California, Los Angeles, CA 90089 USA
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>
>>
>
>
>
>
> ---------------------------------------------------------------------
> CONFIDENTIALITY NOTICE: This e-mail message, including any attachments,
> is for the sole use of the intended recipient(s) and may contain confidential
> or legally privileged information. Any unauthorized review, use, disclosure
> or distribution is prohibited. If you are not the intended recipient, please
> contact the sender by reply e-mail and destroy all copies of this original message.
>
> ---------------------------------------------------------------------
>
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Mattmann, Chris A (388J)" <ch...@jpl.nasa.gov>.
Hey Ricky,
+1, sounds fine and thanks for fixing them!
Cheers,
Chris
On Mar 23, 2012, at 3:07 PM, Nguyen, Ricky wrote:
> filed subtask OODT-431 under OODT-410.
> simple fix, didn't think i needed review board since all discussion happened for OODT-410 already.
> committed and seems like jenkins build succeeds.
>
> On Mar 22, 2012, at 8:13 AM, Ramirez, Paul M (388J) wrote:
>
>> Hey Chris,
>>
>> Yep, you're right so I'll look into this further. I know that commit broke the build as Jenkins keeps telling the list. I wonder if the bug was there before. If I recall you just expanded the unit test. Anyhow when I have more time I'll try to track this down if someone doesn't get to it first. Essentially, the unit test is failing right now.
>>
>> --Paul
>>
>> On Mar 21, 2012, at 1:18 PM, Mattmann, Chris A (388J) wrote:
>>
>>> Hi Paul,
>>>
>>> On Mar 21, 2012, at 3:41 PM, Ramirez, Paul M (388J) wrote:
>>>
>>>> Hey Guys,
>>>>
>>>> This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
>>>>
>>>> assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
>>>
>>> Hmmm, that commit was from me. Read on below.
>>>
>>>>
>>>> The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
>>>>
>>>
>>> Sorting in the DataSourceCatalog by product ID should be equivalent to sorting in the Lucene Catalog by ProductReceivedTime, right?
>>>
>>> Cheers,
>>> Chris
>>>
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> Chris Mattmann, Ph.D.
>>> Senior Computer Scientist
>>> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
>>> Office: 171-266B, Mailstop: 171-246
>>> Email: chris.a.mattmann@nasa.gov
>>> WWW: http://sunset.usc.edu/~mattmann/
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>> Adjunct Assistant Professor, Computer Science Department
>>> University of Southern California, Los Angeles, CA 90089 USA
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>
>>
>
>
>
>
> ---------------------------------------------------------------------
> CONFIDENTIALITY NOTICE: This e-mail message, including any attachments,
> is for the sole use of the intended recipient(s) and may contain confidential
> or legally privileged information. Any unauthorized review, use, disclosure
> or distribution is prohibited. If you are not the intended recipient, please
> contact the sender by reply e-mail and destroy all copies of this original message.
>
> ---------------------------------------------------------------------
>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Senior Computer Scientist
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 171-266B, Mailstop: 171-246
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Assistant Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Nguyen, Ricky" <rn...@chla.usc.edu>.
filed subtask OODT-431 under OODT-410.
simple fix, didn't think i needed review board since all discussion happened for OODT-410 already.
committed and seems like jenkins build succeeds.
On Mar 22, 2012, at 8:13 AM, Ramirez, Paul M (388J) wrote:
> Hey Chris,
>
> Yep, you're right so I'll look into this further. I know that commit broke the build as Jenkins keeps telling the list. I wonder if the bug was there before. If I recall you just expanded the unit test. Anyhow when I have more time I'll try to track this down if someone doesn't get to it first. Essentially, the unit test is failing right now.
>
> --Paul
>
> On Mar 21, 2012, at 1:18 PM, Mattmann, Chris A (388J) wrote:
>
>> Hi Paul,
>>
>> On Mar 21, 2012, at 3:41 PM, Ramirez, Paul M (388J) wrote:
>>
>>> Hey Guys,
>>>
>>> This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
>>>
>>> assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
>>
>> Hmmm, that commit was from me. Read on below.
>>
>>>
>>> The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
>>>
>>
>> Sorting in the DataSourceCatalog by product ID should be equivalent to sorting in the Lucene Catalog by ProductReceivedTime, right?
>>
>> Cheers,
>> Chris
>>
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> Chris Mattmann, Ph.D.
>> Senior Computer Scientist
>> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
>> Office: 171-266B, Mailstop: 171-246
>> Email: chris.a.mattmann@nasa.gov
>> WWW: http://sunset.usc.edu/~mattmann/
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> Adjunct Assistant Professor, Computer Science Department
>> University of Southern California, Los Angeles, CA 90089 USA
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>
>
---------------------------------------------------------------------
CONFIDENTIALITY NOTICE: This e-mail message, including any attachments,
is for the sole use of the intended recipient(s) and may contain confidential
or legally privileged information. Any unauthorized review, use, disclosure
or distribution is prohibited. If you are not the intended recipient, please
contact the sender by reply e-mail and destroy all copies of this original message.
---------------------------------------------------------------------
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Ramirez, Paul M (388J)" <pa...@jpl.nasa.gov>.
Hey Chris,
Yep, you're right so I'll look into this further. I know that commit broke the build as Jenkins keeps telling the list. I wonder if the bug was there before. If I recall you just expanded the unit test. Anyhow when I have more time I'll try to track this down if someone doesn't get to it first. Essentially, the unit test is failing right now.
--Paul
On Mar 21, 2012, at 1:18 PM, Mattmann, Chris A (388J) wrote:
> Hi Paul,
>
> On Mar 21, 2012, at 3:41 PM, Ramirez, Paul M (388J) wrote:
>
>> Hey Guys,
>>
>> This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
>>
>> assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
>
> Hmmm, that commit was from me. Read on below.
>
>>
>> The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
>>
>
> Sorting in the DataSourceCatalog by product ID should be equivalent to sorting in the Lucene Catalog by ProductReceivedTime, right?
>
> Cheers,
> Chris
>
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> Chris Mattmann, Ph.D.
> Senior Computer Scientist
> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
> Office: 171-266B, Mailstop: 171-246
> Email: chris.a.mattmann@nasa.gov
> WWW: http://sunset.usc.edu/~mattmann/
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> Adjunct Assistant Professor, Computer Science Department
> University of Southern California, Los Angeles, CA 90089 USA
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Mattmann, Chris A (388J)" <ch...@jpl.nasa.gov>.
Hi Paul,
On Mar 21, 2012, at 3:41 PM, Ramirez, Paul M (388J) wrote:
> Hey Guys,
>
> This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
>
> assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
Hmmm, that commit was from me. Read on below.
>
> The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
>
Sorting in the DataSourceCatalog by product ID should be equivalent to sorting in the Lucene Catalog by ProductReceivedTime, right?
Cheers,
Chris
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Chris Mattmann, Ph.D.
Senior Computer Scientist
NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
Office: 171-266B, Mailstop: 171-246
Email: chris.a.mattmann@nasa.gov
WWW: http://sunset.usc.edu/~mattmann/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Adjunct Assistant Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Re: svn commit: r1302489 - in /oodt/trunk: CHANGES.txt
filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
Posted by "Ramirez, Paul M (388J)" <pa...@jpl.nasa.gov>.
Hey Guys,
This commit broke the unit test (org.apache.oodt.cas.filemgr.catalog.TestMappedDataSourceCatalog) with the addition of:
assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
The data source catalog is sorted by product id so this test does not succeed (since 20 products were added before it) as it would with the lucene catalog which is naturally sorted by CAS.ProductReceivedTime. I can fix the test to look at the second page but wanted to make sure the intent was captured. Also this is sort of an oddity with our catalogs having one set sorted by default with product id and the other with time.
Thoughts?
--Paul
On Mar 19, 2012, at 7:58 AM, <ma...@apache.org> <ma...@apache.org> wrote:
> Author: mattmann
> Date: Mon Mar 19 14:58:43 2012
> New Revision: 1302489
>
> URL: http://svn.apache.org/viewvc?rev=1302489&view=rev
> Log:
> - fix for OODT-410 DataSourceCatalog compatible with HypersonicSQL
>
> Modified:
> oodt/trunk/CHANGES.txt
> oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
> oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
>
> Modified: oodt/trunk/CHANGES.txt
> URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1302489&r1=1302488&r2=1302489&view=diff
> ==============================================================================
> --- oodt/trunk/CHANGES.txt (original)
> +++ oodt/trunk/CHANGES.txt Mon Mar 19 14:58:43 2012
> @@ -4,6 +4,9 @@ Apache OODT Change Log
> Release 0.4: Current Development
> --------------------------------------------
>
> +* OODT-410 DataSourceCatalog compatible with HypersonicSQL
> + (mattmann,rickdn,bfoster,pramirez)
> +
> * OODT-413 filemgr query throws NPE when some products have undefined metadata values (rickdn)
>
> * OODT-420 CAS-PGE should fail when product ingests fail (bfoster)
>
> Modified: oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
> URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java?rev=1302489&r1=1302488&r2=1302489&view=diff
> ==============================================================================
> --- oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java (original)
> +++ oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java Mon Mar 19 14:58:43 2012
> @@ -1790,7 +1790,6 @@ public class DataSourceCatalog implement
> getProductSql += whereClause.toString();
> }
>
> - getProductSql += "ORDER BY p.product_id DESC ";
>
> LOG.log(Level.FINE, "catalog get num results: executing: "
> + getProductSql);
>
> Modified: oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java
> URL: http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java?rev=1302489&r1=1302488&r2=1302489&view=diff
> ==============================================================================
> --- oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java (original)
> +++ oodt/trunk/filemgr/src/test/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java Mon Mar 19 14:58:43 2012
> @@ -21,15 +21,7 @@ package org.apache.oodt.cas.filemgr.cata
> //JDK imports
> import java.io.File;
> import java.io.FileInputStream;
> -import java.sql.Connection;
> -import java.sql.ResultSet;
> -import java.sql.SQLException;
> -import java.sql.Statement;
> -import java.util.Iterator;
> import java.util.List;
> -import java.util.Vector;
> -import java.util.logging.Level;
> -import java.util.logging.Logger;
> import javax.sql.DataSource;
>
> //OODT imports
> @@ -38,15 +30,10 @@ import org.apache.oodt.cas.filemgr.struc
> import org.apache.oodt.cas.filemgr.structs.ProductPage;
> import org.apache.oodt.cas.filemgr.structs.ProductType;
> import org.apache.oodt.cas.filemgr.structs.Query;
> -import org.apache.oodt.cas.filemgr.structs.QueryCriteria;
> -import org.apache.oodt.cas.filemgr.structs.RangeQueryCriteria;
> -import org.apache.oodt.cas.filemgr.structs.TermQueryCriteria;
> import org.apache.oodt.cas.filemgr.structs.exceptions.CatalogException;
> import org.apache.oodt.commons.database.DatabaseConnectionBuilder;
> -import org.apache.oodt.commons.pagination.PaginationUtils;
> import org.apache.oodt.commons.database.SqlScript;
> import org.apache.oodt.cas.filemgr.util.SqlParser;
> -import org.apache.oodt.cas.filemgr.validation.ValidationLayer;
> import org.apache.oodt.cas.metadata.Metadata;
>
> //Junit imports
> @@ -242,7 +229,7 @@ public class TestDataSourceCatalog exten
> public void testFirstProductOnlyOnFirstPage() {
> // add catPageSize of the test Product
> // then add a product called "ShouldBeFirstForPage.txt"
> - // make sure it's the first one on the 2nd page
> + // make sure it's the first one on the 1st page
>
> Product testProd = getTestProduct();
> Metadata met = getTestMetadata("test");
> @@ -281,6 +268,8 @@ public class TestDataSourceCatalog exten
> assertNotNull(myCat.getFirstPage(type).getPageProducts());
> assertEquals(catPageSize, myCat.getFirstPage(type).getPageProducts()
> .size());
> + assertNotNull(myCat.getFirstPage(type).getPageProducts().get(0));
> + assertEquals("ShouldBeFirstForPage.txt", ((Product)myCat.getFirstPage(type).getPageProducts().get(0)).getProductName());
> ProductPage page = myCat.getNextPage(type, myCat.getFirstPage(type));
> assertNotNull(page);
> assertNotNull(page.getPageProducts());
> @@ -288,7 +277,7 @@ public class TestDataSourceCatalog exten
> assertEquals(2, page.getTotalPages());
> assertNotNull(page.getPageProducts().get(0));
> Product retProd = ((Product) page.getPageProducts().get(0));
> - assertEquals("ShouldBeFirstForPage.txt", retProd.getProductName());
> + assertEquals("test", retProd.getProductName());
>
> }
>
> @@ -444,8 +433,7 @@ public class TestDataSourceCatalog exten
> }
>
> private Catalog getCatalog() {
> - return (HsqlDbFriendlyDataSourceCatalog) new HsqlDbFriendlyDataSourceCatalogFatory()
> - .createCatalog();
> + return new DataSourceCatalogFactory().createCatalog();
> }
>
> private void createSchema() {
> @@ -485,591 +473,4 @@ public class TestDataSourceCatalog exten
> return met;
> }
>
> - class HsqlDbFriendlyDataSourceCatalogFatory extends
> - DataSourceCatalogFactory {
> -
> - public HsqlDbFriendlyDataSourceCatalogFatory() {
> - super();
> - }
> -
> - /*
> - * (non-Javadoc)
> - *
> - * @see org.apache.oodt.cas.filemgr.catalog.CatalogFactory#createCatalog()
> - */
> - public Catalog createCatalog() {
> - return new HsqlDbFriendlyDataSourceCatalog(dataSource,
> - validationLayer, fieldIdStr, pageSize, cacheUpdateMinutes);
> - }
> - }
> -
> - class HsqlDbFriendlyDataSourceCatalog extends DataSourceCatalog {
> -
> - public HsqlDbFriendlyDataSourceCatalog(DataSource ds,
> - ValidationLayer valLayer, boolean fieldId, int pageSize,
> - long cacheUpdateMin) {
> - super(ds, valLayer, fieldId, pageSize, cacheUpdateMin);
> - }
> -
> - private final Logger LOG = Logger
> - .getLogger(HsqlDbFriendlyDataSourceCatalog.class.getName());
> -
> - /*
> - * (non-Javadoc)
> - *
> - * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#pagedQuery(org.apache.oodt.cas.filemgr.structs.Query,
> - * org.apache.oodt.cas.filemgr.structs.ProductType, int)
> - */
> - public ProductPage pagedQuery(Query query, ProductType type, int pageNum)
> - throws CatalogException {
> - int totalPages = PaginationUtils.getTotalPage(getResultListSize(
> - query, type), this.pageSize);
> -
> - /*
> - * if there are 0 total pages in the result list size then don't
> - * bother returning a valid product page instead, return blank
> - * ProductPage
> - */
> - if (totalPages == 0) {
> - return ProductPage.blankPage();
> - }
> -
> - ProductPage retPage = new ProductPage();
> - retPage.setPageNum(pageNum);
> - retPage.setPageSize(this.pageSize);
> - retPage.setTotalPages(totalPages);
> -
> - List productIds = paginateQuery(query, type, pageNum);
> -
> - if (productIds != null && productIds.size() > 0) {
> - List products = new Vector(productIds.size());
> -
> - for (Iterator i = productIds.iterator(); i.hasNext();) {
> - String productId = (String) i.next();
> - Product p = getProductById(productId);
> - products.add(p);
> - }
> -
> - retPage.setPageProducts(products);
> - }
> -
> - return retPage;
> - }
> -
> - /*
> - * (non-Javadoc)
> - *
> - * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getFirstPage(org.apache.oodt.cas.filemgr.structs.ProductType)
> - */
> - public ProductPage getFirstPage(ProductType type) {
> - Query query = new Query();
> - ProductPage firstPage = null;
> -
> - try {
> - firstPage = pagedQuery(query, type, 1);
> - } catch (CatalogException e) {
> - LOG.log(Level.WARNING,
> - "Exception getting first page: Message: "
> - + e.getMessage());
> - }
> - return firstPage;
> - }
> -
> - /*
> - * (non-Javadoc)
> - *
> - * @see org.apache.oodt.cas.filemgr.catalog.DataSourceCatalog#getNextPage(org.apache.oodt.cas.filemgr.structs.ProductType,
> - * org.apache.oodt.cas.filemgr.structs.ProductPage)
> - */
> - public ProductPage getNextPage(ProductType type, ProductPage currentPage) {
> - if (currentPage == null) {
> - return getFirstPage(type);
> - }
> -
> - if (currentPage.isLastPage()) {
> - return currentPage;
> - }
> -
> - ProductPage nextPage = null;
> - Query query = new Query();
> -
> - try {
> - nextPage = pagedQuery(query, type, currentPage.getPageNum() + 1);
> - } catch (CatalogException e) {
> - LOG.log(Level.WARNING, "Exception getting next page: Message: "
> - + e.getMessage());
> - }
> -
> - return nextPage;
> - }
> -
> - private List paginateQuery(Query query, ProductType type, int pageNum)
> - throws CatalogException {
> - Connection conn = null;
> - Statement statement = null;
> - ResultSet rs = null;
> -
> - List productIds = null;
> - boolean doSkip = true;
> - int numResults = -1;
> -
> - if (pageNum == -1) {
> - doSkip = false;
> - } else {
> - numResults = getResultListSize(query, type);
> - }
> -
> - try {
> - conn = dataSource.getConnection();
> - statement = conn.createStatement(
> - ResultSet.TYPE_SCROLL_INSENSITIVE,
> - ResultSet.CONCUR_READ_ONLY);
> -
> - String getProductSql = "";
> - String tableName = type.getName() + "_metadata";
> - String subSelectQueryBase = "SELECT product_id FROM "
> - + tableName + " ";
> - StringBuffer selectClause = new StringBuffer(
> - "SELECT DISTINCT p.product_id ");
> - StringBuffer fromClause = new StringBuffer("FROM " + tableName
> - + " p ");
> - StringBuffer whereClause = new StringBuffer("WHERE ");
> -
> - boolean gotFirstClause = false;
> - int clauseNum = 0;
> -
> - if (query.getCriteria() != null
> - && query.getCriteria().size() > 0) {
> - for (Iterator i = query.getCriteria().iterator(); i
> - .hasNext();) {
> - QueryCriteria criteria = (QueryCriteria) i.next();
> - clauseNum++;
> -
> - String elementIdStr = null;
> -
> - if (fieldIdStringFlag) {
> - elementIdStr = "'"
> - + this.getValidationLayer()
> - .getElementByName(
> - criteria.getElementName())
> - .getElementId() + "'";
> - } else {
> - elementIdStr = this
> - .getValidationLayer()
> - .getElementByName(criteria.getElementName())
> - .getElementId();
> - }
> -
> - String clause = null;
> -
> - if (!gotFirstClause) {
> - clause = "(p.element_id = " + elementIdStr
> - + " AND ";
> - if (criteria instanceof TermQueryCriteria) {
> - clause += " metadata_value LIKE '%"
> - + ((TermQueryCriteria) criteria)
> - .getValue() + "%') ";
> - } else if (criteria instanceof RangeQueryCriteria) {
> - String startVal = ((RangeQueryCriteria) criteria)
> - .getStartValue();
> - String endVal = ((RangeQueryCriteria) criteria)
> - .getEndValue();
> - boolean inclusive = ((RangeQueryCriteria) criteria)
> - .getInclusive();
> -
> - if ((startVal != null && !startVal.equals(""))
> - || (endVal != null && !endVal
> - .equals(""))) {
> - clause += " metadata_value ";
> -
> - boolean gotStart = false;
> -
> - if (startVal != null
> - && !startVal.equals("")) {
> - if (inclusive)
> - clause += ">= '" + startVal + "'";
> - else
> - clause += "> '" + startVal + "'";
> - gotStart = true;
> - }
> -
> - if (endVal != null && !endVal.equals("")) {
> - if (gotStart) {
> - if (inclusive)
> - clause += " AND metadata_value <= '"
> - + endVal + "'";
> - else
> - clause += " AND metadata_value < '"
> - + endVal + "'";
> - } else if (inclusive)
> - clause += "<= '" + endVal + "'";
> - else
> - clause += "< '" + endVal + "'";
> - }
> -
> - clause += ") ";
> - }
> - }
> -
> - whereClause.append(clause);
> - gotFirstClause = true;
> - } else {
> - String subSelectTblName = "p" + clauseNum;
> - String subSelectQuery = subSelectQueryBase
> - + "WHERE (element_id = " + elementIdStr
> - + " AND ";
> - if (criteria instanceof TermQueryCriteria) {
> - subSelectQuery += " metadata_value LIKE '%"
> - + ((TermQueryCriteria) criteria)
> - .getValue() + "%')";
> - } else if (criteria instanceof RangeQueryCriteria) {
> - String startVal = ((RangeQueryCriteria) criteria)
> - .getStartValue();
> - String endVal = ((RangeQueryCriteria) criteria)
> - .getEndValue();
> -
> - if (startVal != null || endVal != null) {
> - subSelectQuery += " metadata_value ";
> -
> - boolean gotStart = false;
> -
> - if (startVal != null
> - && !startVal.equals("")) {
> - subSelectQuery += ">= '" + startVal
> - + "'";
> - gotStart = true;
> - }
> -
> - if (endVal != null && !endVal.equals("")) {
> - if (gotStart) {
> - subSelectQuery += " AND metadata_value <= '"
> - + endVal + "'";
> - } else
> - subSelectQuery += "<= '" + endVal
> - + "'";
> - }
> -
> - subSelectQuery += ") ";
> -
> - }
> - }
> - fromClause.append("INNER JOIN (" + subSelectQuery
> - + ") " + subSelectTblName + " ON "
> - + subSelectTblName
> - + ".product_id = p.product_id ");
> -
> - }
> - }
> - }
> - getProductSql = selectClause.toString() + fromClause.toString();
> - if (gotFirstClause) {
> - getProductSql += whereClause.toString();
> - }
> -
> - LOG.log(Level.FINE, "catalog query: executing: "
> - + getProductSql);
> -
> - rs = statement.executeQuery(getProductSql);
> - productIds = new Vector();
> -
> - if (doSkip) {
> - int startNum = (pageNum - 1) * pageSize;
> -
> - if (startNum > numResults) {
> - startNum = 0;
> - }
> -
> - // must call next first, or else no relative cursor
> - if (rs.next()) {
> - // grab the first one
> - int numGrabbed = -1;
> -
> - if (pageNum == 1) {
> - numGrabbed = 1;
> - productIds.add(rs.getString("product_id"));
> - } else {
> - numGrabbed = 0;
> - }
> -
> - // now move the cursor to the correct position
> - if (pageNum != 1) {
> - rs.relative(startNum - 1);
> - }
> -
> - // grab the rest
> - while (rs.next() && numGrabbed < pageSize) {
> - String productId = rs.getString("product_id");
> - productIds.add(productId);
> - numGrabbed++;
> - }
> - }
> -
> - } else {
> - while (rs.next()) {
> - String productId = rs.getString("product_id");
> - productIds.add(productId);
> - }
> - }
> -
> - if (productIds.size() == 0) {
> - productIds = null;
> - }
> -
> - } catch (Exception e) {
> - e.printStackTrace();
> - LOG.log(Level.WARNING, "Exception performing query. Message: "
> - + e.getMessage());
> - try {
> - conn.rollback();
> - } catch (SQLException e2) {
> - LOG.log(Level.SEVERE,
> - "Unable to rollback query transaction. Message: "
> - + e2.getMessage());
> - }
> - throw new CatalogException(e.getMessage());
> - } finally {
> -
> - if (rs != null) {
> - try {
> - rs.close();
> - } catch (SQLException ignore) {
> - }
> -
> - rs = null;
> - }
> -
> - if (statement != null) {
> - try {
> - statement.close();
> - } catch (SQLException ignore) {
> - }
> -
> - statement = null;
> - }
> -
> - if (conn != null) {
> - try {
> - conn.close();
> -
> - } catch (SQLException ignore) {
> - }
> -
> - conn = null;
> - }
> - }
> -
> - return productIds;
> - }
> -
> - private int getResultListSize(Query query, ProductType type)
> - throws CatalogException {
> - Connection conn = null;
> - Statement statement = null;
> - ResultSet rs = null;
> -
> - int resultCount = 0;
> -
> - try {
> - conn = dataSource.getConnection();
> - statement = conn.createStatement();
> -
> - String getProductSql = "";
> - String tableName = type.getName() + "_metadata";
> - String subSelectQueryBase = "SELECT product_id FROM "
> - + tableName + " ";
> - StringBuffer selectClause = new StringBuffer(
> - "SELECT COUNT(DISTINCT p.product_id) AS numResults ");
> - StringBuffer fromClause = new StringBuffer("FROM " + tableName
> - + " p ");
> - StringBuffer whereClause = new StringBuffer("WHERE ");
> -
> - boolean gotFirstClause = false;
> - int clauseNum = 0;
> -
> - if (query.getCriteria() != null
> - && query.getCriteria().size() > 0) {
> - for (Iterator i = query.getCriteria().iterator(); i
> - .hasNext();) {
> - QueryCriteria criteria = (QueryCriteria) i.next();
> - clauseNum++;
> -
> - String elementIdStr = null;
> -
> - if (fieldIdStringFlag) {
> - elementIdStr = "'"
> - + this.getValidationLayer()
> - .getElementByName(
> - criteria.getElementName())
> - .getElementId() + "'";
> - } else {
> - elementIdStr = this
> - .getValidationLayer()
> - .getElementByName(criteria.getElementName())
> - .getElementId();
> - }
> -
> - String clause = null;
> -
> - if (!gotFirstClause) {
> - clause = "(p.element_id = " + elementIdStr
> - + " AND ";
> - if (criteria instanceof TermQueryCriteria) {
> - clause += " metadata_value LIKE '%"
> - + ((TermQueryCriteria) criteria)
> - .getValue() + "%') ";
> - } else if (criteria instanceof RangeQueryCriteria) {
> - String startVal = ((RangeQueryCriteria) criteria)
> - .getStartValue();
> - String endVal = ((RangeQueryCriteria) criteria)
> - .getEndValue();
> - boolean inclusive = ((RangeQueryCriteria) criteria)
> - .getInclusive();
> -
> - if ((startVal != null && !startVal.equals(""))
> - || (endVal != null && !endVal
> - .equals(""))) {
> - clause += " metadata_value ";
> -
> - boolean gotStart = false;
> -
> - if (startVal != null
> - && !startVal.equals("")) {
> - if (inclusive)
> - clause += ">= '" + startVal + "'";
> - else
> - clause += "> '" + startVal + "'";
> - gotStart = true;
> - }
> -
> - if (endVal != null && !endVal.equals("")) {
> - if (gotStart) {
> - if (inclusive)
> - clause += " AND metadata_value <= '"
> - + endVal + "'";
> - else
> - clause += " AND metadata_value < '"
> - + endVal + "'";
> - } else if (inclusive)
> - clause += "<= '" + endVal + "'";
> - else
> - clause += "< '" + endVal + "'";
> - }
> -
> - clause += ") ";
> - }
> - }
> - whereClause.append(clause);
> - gotFirstClause = true;
> - } else {
> - String subSelectTblName = "p" + clauseNum;
> - String subSelectQuery = subSelectQueryBase
> - + "WHERE (element_id = " + elementIdStr
> - + " AND ";
> - if (criteria instanceof TermQueryCriteria) {
> - subSelectQuery += " metadata_value LIKE '%"
> - + ((TermQueryCriteria) criteria)
> - .getValue() + "%')";
> - } else if (criteria instanceof RangeQueryCriteria) {
> - String startVal = ((RangeQueryCriteria) criteria)
> - .getStartValue();
> - String endVal = ((RangeQueryCriteria) criteria)
> - .getEndValue();
> -
> - if (startVal != null || endVal != null) {
> - subSelectQuery += " metadata_value ";
> -
> - boolean gotStart = false;
> -
> - if (startVal != null
> - && !startVal.equals("")) {
> - subSelectQuery += ">= '" + startVal
> - + "'";
> - gotStart = true;
> - }
> -
> - if (endVal != null && !endVal.equals("")) {
> - if (gotStart) {
> - subSelectQuery += " AND metadata_value <= '"
> - + endVal + "'";
> - } else
> - subSelectQuery += "<= '" + endVal
> - + "'";
> - }
> -
> - subSelectQuery += ") ";
> -
> - }
> - }
> -
> - fromClause.append("INNER JOIN (" + subSelectQuery
> - + ") " + subSelectTblName + " ON "
> - + subSelectTblName
> - + ".product_id = p.product_id ");
> -
> - }
> - }
> - }
> -
> - getProductSql = selectClause.toString() + fromClause.toString();
> - if (gotFirstClause) {
> - getProductSql += whereClause.toString();
> - }
> -
> - LOG.log(Level.FINE, "catalog get num results: executing: "
> - + getProductSql);
> -
> - rs = statement.executeQuery(getProductSql);
> -
> - while (rs.next()) {
> - resultCount = rs.getInt("numResults");
> - }
> -
> - } catch (Exception e) {
> - e.printStackTrace();
> - LOG.log(Level.WARNING,
> - "Exception performing get num results. Message: "
> - + e.getMessage());
> - try {
> - conn.rollback();
> - } catch (SQLException e2) {
> - LOG.log(Level.SEVERE,
> - "Unable to rollback get num results transaction. Message: "
> - + e2.getMessage());
> - }
> - throw new CatalogException(e.getMessage());
> - } finally {
> -
> - if (rs != null) {
> - try {
> - rs.close();
> - } catch (SQLException ignore) {
> - }
> -
> - rs = null;
> - }
> -
> - if (statement != null) {
> - try {
> - statement.close();
> - } catch (SQLException ignore) {
> - }
> -
> - statement = null;
> - }
> -
> - if (conn != null) {
> - try {
> - conn.close();
> -
> - } catch (SQLException ignore) {
> - }
> -
> - conn = null;
> - }
> - }
> -
> - return resultCount;
> - }
> - }
> -
> }
>
>