Author: mattmann
Date: Thu Jan 17 03:00:34 2013
New Revision: 1434542
URL: http://svn.apache.org/viewvc?rev=1434542&view=rev
Log:
Revert r1434369 and discuss in https://reviews.apache.org/r/8989/
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/DataSourceCatalog.java
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
oodt/trunk/filemgr/src/main/resources/cas-filemgr-dyn-catalog-schema.sql
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=1434542&r1=1434541&r2=1434542&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
Thu Jan 17 03:00:34 2013
@@ -17,7 +17,7 @@
package org.apache.oodt.cas.filemgr.catalog;
-//OODT imports
+// OODT imports
import org.apache.oodt.cas.filemgr.structs.BooleanQueryCriteria;
import org.apache.oodt.cas.filemgr.structs.Element;
import org.apache.oodt.cas.filemgr.structs.Product;
@@ -824,7 +824,7 @@ public class DataSourceCatalog implement
String getProductRefSql = "SELECT * FROM "
+ product.getProductType().getName() + "_reference"
- + " WHERE product_id = " + quoteIt(product.getProductId())
+ " ORDER BY pkey";
+ + " WHERE product_id = " + quoteIt(product.getProductId());
LOG.log(Level.FINE, "getProductReferences: Executing: "
+ getProductRefSql);
@@ -1060,8 +1060,8 @@ public class DataSourceCatalog implement
statement = conn.createStatement();
String metadataSql = "SELECT * FROM "
- + product.getProductType().getName() + "_metadata"
- + " WHERE product_id = " +
quoteIt(product.getProductId())+" ORDER BY pkey";
+ + product.getProductType().getName() + "_metadata "
+ + " WHERE product_id = " + quoteIt(product.getProductId());
LOG.log(Level.FINE, "getMetadata: Executing: " + metadataSql);
rs = statement.executeQuery(metadataSql);
@@ -1152,8 +1152,7 @@ public class DataSourceCatalog implement
}
String metadataSql = "SELECT element_id,metadata_value FROM "
+ product.getProductType().getName() + "_metadata"
- + " WHERE product_id = " + quoteIt(product.getProductId())
+ elementIds
- + " ORDER BY pkey";
+ + " WHERE product_id = " + quoteIt(product.getProductId())
+ elementIds;
LOG.log(Level.FINE, "getMetadata: Executing: " + metadataSql);
rs = statement.executeQuery(metadataSql);
Modified:
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java?rev=1434542&r1=1434541&r2=1434542&view=diff
==============================================================================
---
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
(original)
+++
oodt/trunk/filemgr/src/main/java/org/apache/oodt/cas/filemgr/catalog/LenientDataSourceCatalog.java
Thu Jan 17 03:00:34 2013
@@ -226,7 +226,7 @@ public class LenientDataSourceCatalog ex
String metadataSql = "SELECT * FROM "
+ product.getProductType().getName() + "_metadata "
- + "WHERE product_id = '" + product.getProductId()+"' ORDER
BY pkey" ;
+ + " WHERE product_id = '" + product.getProductId()+"'";
LOG.log(Level.FINE, "getMetadata: Executing: " + metadataSql);
rs = statement.executeQuery(metadataSql);
@@ -358,7 +358,7 @@ public class LenientDataSourceCatalog ex
}
String metadataSql = "SELECT element_id,metadata_value FROM "
+ product.getProductType().getName() + "_metadata"
- + " WHERE product_id = " + quoteIt(product.getProductId())
+ elementIds + " ORDER BY pkey";
+ + " WHERE product_id = " + quoteIt(product.getProductId())
+ elementIds;
LOG.log(Level.FINE, "getMetadata: Executing: " + metadataSql);
rs = statement.executeQuery(metadataSql);
Modified:
oodt/trunk/filemgr/src/main/resources/cas-filemgr-dyn-catalog-schema.sql
URL:
http://svn.apache.org/viewvc/oodt/trunk/filemgr/src/main/resources/cas-filemgr-dyn-catalog-schema.sql?rev=1434542&r1=1434541&r2=1434542&view=diff
==============================================================================
--- oodt/trunk/filemgr/src/main/resources/cas-filemgr-dyn-catalog-schema.sql
(original)
+++ oodt/trunk/filemgr/src/main/resources/cas-filemgr-dyn-catalog-schema.sql
Thu Jan 17 03:00:34 2013
@@ -16,7 +16,6 @@
CREATE TABLE YourProductTypeName_metadata
(
- pkey int(10) unsigned primary KEY AUTO_INCREMENT,
product_id int NOT NULL,
element_id varchar(1000) NOT NULL,
metadata_value varchar(2500) NOT NULL
