[metcat] r211 committed - comments updated

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

Revision: 211
Author: tanyamadu...@gmail.com
Date: Wed Aug 29 22:50:40 2012
Log: comments updated
http://code.google.com/a/apache-extras.org/p/metcat/source/detail?r=211

Modified:

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

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

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductConsumed.java

/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductInfo.java

=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/CassandraDataModelImpl.java
Wed Aug 29 04:22:23 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/CassandraDataModelImpl.java
Wed Aug 29 22:50:40 2012
@@ -25,10 +25,7 @@

import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.cassandra.service.ColumnSliceIterator;
-import me.prettyprint.cassandra.service.OperationType;
import me.prettyprint.hector.api.Cluster;
-import me.prettyprint.hector.api.ConsistencyLevelPolicy;
-import me.prettyprint.hector.api.HConsistencyLevel;
import me.prettyprint.hector.api.Keyspace;
import me.prettyprint.hector.api.beans.ColumnSlice;
import me.prettyprint.hector.api.beans.HColumn;
@@ -43,7 +40,6 @@
import me.prettyprint.hector.api.query.QueryResult;
import me.prettyprint.hector.api.query.RangeSlicesQuery;
import me.prettyprint.hector.api.query.SliceQuery;
-import org.apache.cassandra.thrift.ConsistencyLevel;

/**
* Concrete implementation for supporting Apache Cassandra database
activities.
@@ -55,7 +51,10 @@
public Keyspace keyspace = null;

public CassandraDataModelImpl() {
+ // Connect to the Cluster
cluster = HFactory.getOrCreateCluster(ModelConfig.CASSANDRA_CLUSTER,
ModelConfig.CLUSTER_PORT);
+
+ // Define the (existing) Keyspace
keyspace = HFactory.createKeyspace(ModelConfig.KEYSPACE, cluster);
}

@@ -333,7 +332,8 @@
public Map<String, String> getValuesInSingleRowWithRange(String tableName,
String rowID, String rangeValue1,
String rangeValue2) throws Exception {
- return this.getValuesInSingleRowWithRange(ModelConfig.KEYSPACE,
tableName, rowID, rangeValue1, rangeValue2);
+ return this.getValuesInSingleRowWithRange(ModelConfig.KEYSPACE,
tableName,
+ rowID, rangeValue1, rangeValue2);
}

@Override
@@ -352,7 +352,6 @@

for (HColumn<String, String> column : result.get().getColumns()) {
resultList.add(column.getName());
- // System.out.println(column.getName() +"::"+ column.getValue());
}
return resultList;
}
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/ModelConfig.java
Thu Aug 16 06:31:05 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/ModelConfig.java
Wed Aug 29 22:50:40 2012
@@ -55,8 +55,8 @@
public static void loadProperties() {
props = ModelProperties.getInstance();

- logger.debug("Cassandra properties: [cluster: " +
props.getCassandraCluster() + ", port: " + props.getClusterPort()
- + ", keyspace: " + props.getKeyspace());
+ logger.debug("Cassandra properties: [cluster: " +
props.getCassandraCluster() + ", port: " +
+ props.getClusterPort() + ", keyspace: " +
props.getKeyspace());

CASSANDRA_CLUSTER = props.getCassandraCluster();
CLUSTER_PORT = props.getClusterPort();
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductConsumed.java
Thu Aug 23 17:55:36 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductConsumed.java
Wed Aug 29 22:50:40 2012
@@ -94,10 +94,9 @@
* Get set of workflow ids which the given data product has been used
* within specified time window.
*
- * @param dpId identifier of the data product.
- * @param startTime start time of the time window.
- * @param endTime end time of the time window.
- * @return List list of workflow ids.
+ *
+ * @param dpId identifier of the data product.
+ * @return List list of workflow ids.
* @throws Exception Hector exception
*/
public List<String> getWorkflowsConsumedIn(String dpId, String startTime,
String endTime) throws Exception {
=======================================
---
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductInfo.java
Wed Aug 29 01:52:17 2012
+++
/trunk/metcatserver/src/main/java/org/apache/airavata/metcat/db/model/DataProductInfo.java
Wed Aug 29 22:50:40 2012
@@ -133,6 +133,7 @@
+ " meta-data(s) for data product [" + dataID + "]");
this.addNewDataProductInfo(mdatarows);
}
+

/**
* Returns data product properties