[metcat] r191 committed - Indexed property retrieval methods updated

[metcat.apach...@codespot.com]

Revision: 191
Author: tobha...@gmail.com
Date: Wed Aug 29 00:08:01 2012
Log: Indexed property retrieval methods updated
http://code.google.com/a/apache-extras.org/p/metcat/source/detail?r=191

Modified:

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/index/WorkflowIndex.java

=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/index/WorkflowIndex.java
Sat Aug 25 09:36:53 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/index/WorkflowIndex.java
Wed Aug 29 00:08:01 2012
@@ -31,6 +31,9 @@
import java.util.UUID;

public class WorkflowIndex extends WorkflowDataModel{
+
+ public final String EVENT_PROPERTY_NAME_PREFIX = "Event.";
+ public final String LOG_PROPERTY_NAME_PREFIX = "Log.";

public WorkflowIndex(DataModelImpl dbImpl) {
super(dbImpl);
@@ -43,12 +46,12 @@

public void insertEventPropertyIndex(String eventPropertyName, String
eventPropertyValue, String eventID) throws Exception {
this.datamodelImpl.insertItem(ModelConfig.KEYSPACE,
ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY,
- ("Event." + eventPropertyName), (eventPropertyValue +
PART_DELIMETER + UUID.randomUUID()), eventID );
+ (EVENT_PROPERTY_NAME_PREFIX + eventPropertyName),
(eventPropertyValue + PART_DELIMETER + UUID.randomUUID()), eventID );
}

public void insertLogPropertyIndex(String logPropertyName, String
logPropertyValue, String eventID) throws Exception {
this.datamodelImpl.insertItem(ModelConfig.KEYSPACE,
ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY,
- ("Log." + logPropertyName), (logPropertyValue + PART_DELIMETER +
UUID.randomUUID()), eventID );
+ (LOG_PROPERTY_NAME_PREFIX + logPropertyName), (logPropertyValue +
PART_DELIMETER + UUID.randomUUID()), eventID );
}

public void insertBulkIndexOnce(List<String> items) throws Exception {
@@ -62,12 +65,11 @@
resultList =
this.datamodelImpl.getAllRowsOfAGivenCF(ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY);
for (String rowID : resultList)
{
- if (!rowID.startsWith("Event.") && !rowID.startsWith("Log."))
+ if (!rowID.startsWith(EVENT_PROPERTY_NAME_PREFIX)
&& !rowID.startsWith(LOG_PROPERTY_NAME_PREFIX))
newResultList.add(rowID);

}
return newResultList;
-
}

public List<String> getEventProperties () throws Exception
@@ -77,22 +79,23 @@
resultList =
this.datamodelImpl.getAllRowsOfAGivenCF(ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY);
for (String rowID : resultList)
{
- if (rowID.startsWith("Event."))
+ if (rowID.startsWith(EVENT_PROPERTY_NAME_PREFIX))
newResultList.add(rowID);

}
return newResultList;
-
}

- public List<String> getIDsOfAGivenPropertyValue(String propertyName,
String propertyValue) throws Exception
+ public List<String>
getWorkflowIDsOfGivenWorkflowPropertyAndValue(String propertyName, String
propertyValue) throws Exception
{
return
this.datamodelImpl.getValuesInCellRange(ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY,propertyName,
- ( propertyValue + DataModel.PART_DELIMETER ),(
propertyValue + DataModel.PART_DELIMETER +
- DataModel.PART_DELIMETER ));
-
+ ( propertyValue + DataModel.PART_DELIMETER ),(
propertyValue + DataModel.PART_DELIMETER + "|"));
}
-
-
+
+ public List<String> getEventIDsOfGivenEventPropertyAndValue(String
propertyName, String propertyValue) throws Exception
+ {
+ return
this.datamodelImpl.getValuesInCellRange(ModelConfig.WORKFLOW_INDEX_COLUMN_FAMILY,EVENT_PROPERTY_NAME_PREFIX
+ propertyName,
+ ( propertyValue + DataModel.PART_DELIMETER ),(
propertyValue + DataModel.PART_DELIMETER + "|"));
+ }

}