You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by ka...@apache.org on 2013/02/01 00:49:52 UTC
svn commit: r1441267 - in /gora/trunk:
gora-cassandra/src/main/java/org/apache/gora/cassandra/store/
gora-tutorial/conf/
Author: kazk
Date: Thu Jan 31 23:49:51 2013
New Revision: 1441267
URL: http://svn.apache.org/viewvc?rev=1441267&view=rev
Log:
gora-tutorial does not work with Cassandra
Modified:
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java
gora/trunk/gora-tutorial/conf/gora-cassandra-mapping.xml
Modified: gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java?rev=1441267&r1=1441266&r2=1441267&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java (original)
+++ gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java Thu Jan 31 23:49:51 2013
@@ -84,6 +84,7 @@ public class CassandraClient<K, T extend
// get cassandra mapping with persistent class
this.persistentClass = persistentClass;
this.cassandraMapping = CassandraMappingManager.getManager().get(persistentClass);
+ // LOG.info("persistentClass=" + persistentClass.getName() + " -> cassandraMapping=" + cassandraMapping);
this.cluster = HFactory.getOrCreateCluster(this.cassandraMapping.getClusterName(), new CassandraHostConfigurator(this.cassandraMapping.getHostName()));
@@ -184,9 +185,9 @@ public class CassandraClient<K, T extend
}
ByteBuffer byteBuffer = toByteBuffer(value);
-
String columnFamily = this.cassandraMapping.getFamily(fieldName);
String columnName = this.cassandraMapping.getColumn(fieldName);
+
if (columnName == null) {
LOG.warn("Column name is null for field=" + fieldName + " with value=" + value.toString());
return;
Modified: gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java?rev=1441267&r1=1441266&r2=1441267&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java (original)
+++ gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java Thu Jan 31 23:49:51 2013
@@ -110,27 +110,28 @@ public class CassandraMapping {
*/
public CassandraMapping(Element keyspace, Element mapping) {
if (keyspace == null) {
- LOG.warn("Error locating Cassandra Keyspace element!");
+ LOG.error("Keyspace element should not be null!");
+ return;
} else {
// LOG.info("Located Cassandra Keyspace: '" + KEYSPACE_ELEMENT + "'");
}
this.keyspaceName = keyspace.getAttributeValue(NAME_ATTRIBUTE);
if (this.keyspaceName == null) {
- LOG.warn("Error locating Cassandra Keyspace name attribute!");
+ LOG.error("Error locating Cassandra Keyspace name attribute!");
} else {
- // LOG.info("Located Cassandra Keyspace name: '" + NAME_ATTRIBUTE + "'");
+ // LOG.info("Located Cassandra Keyspace name: '" + NAME_ATTRIBUTE + "' -> " + keyspaceName);
}
this.clusterName = keyspace.getAttributeValue(CLUSTER_ATTRIBUTE);
if (this.clusterName == null) {
- LOG.warn("Error locating Cassandra Keyspace cluster attribute!");
+ LOG.error("Error locating Cassandra Keyspace cluster attribute!");
} else {
- // LOG.info("Located Cassandra Keyspace cluster: '" + CLUSTER_ATTRIBUTE + "'");
+ // LOG.info("Located Cassandra Keyspace cluster: '" + CLUSTER_ATTRIBUTE + "' -> " + clusterName);
}
this.hostName = keyspace.getAttributeValue(HOST_ATTRIBUTE);
if (this.hostName == null) {
- LOG.warn("Error locating Cassandra Keyspace host attribute!");
+ LOG.error("Error locating Cassandra Keyspace host attribute!");
} else {
- // LOG.info("Located Cassandra Keyspace host: '" + HOST_ATTRIBUTE + "'");
+ // LOG.info("Located Cassandra Keyspace host: '" + HOST_ATTRIBUTE + "' -> " + hostName);
}
// load column family definitions
@@ -140,9 +141,10 @@ public class CassandraMapping {
String familyName = element.getAttributeValue(NAME_ATTRIBUTE);
if (familyName == null) {
- LOG.warn("Error locating column family name attribute!");
+ LOG.error("Error locating column family name attribute!");
+ continue;
} else {
- // LOG.info("Located column family name: '" + NAME_ATTRIBUTE + "'");
+ // LOG.info("Located column family name: '" + NAME_ATTRIBUTE + "' -> " + familyName);
}
String superAttribute = element.getAttributeValue(SUPER_ATTRIBUTE);
if (superAttribute != null) {
Modified: gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java?rev=1441267&r1=1441266&r2=1441267&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java (original)
+++ gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingManager.java Thu Jan 31 23:49:51 2013
@@ -79,8 +79,17 @@ public class CassandraMappingManager {
public CassandraMapping get(Class persistentClass) {
String className = persistentClass.getName();
Element mappingElement = mappingMap.get(className);
+ if (mappingElement == null) {
+ LOG.error("Mapping element does not exist for className=" + className);
+ return null;
+ }
String keyspaceName = mappingElement.getAttributeValue(KEYSPACE_ELEMENT);
+ // LOG.info("className=" + className + " -> keyspaceName=" + keyspaceName);
Element keyspaceElement = keyspaceMap.get(keyspaceName);
+ if (keyspaceElement == null) {
+ LOG.error("Keyspace element does not exist for keyspaceName=" + keyspaceName);
+ return null;
+ }
return new CassandraMapping(keyspaceElement, mappingElement);
}
@@ -101,16 +110,19 @@ public class CassandraMappingManager {
List<Element> keyspaces = root.getChildren(KEYSPACE_ELEMENT);
if (keyspaces == null || keyspaces.size() == 0) {
- LOG.warn("Error locating Cassandra Keyspace element!");
+ LOG.error("Error locating Cassandra Keyspace element!");
}
else {
- LOG.info("Located Cassandra Keyspace: '" + KEYSPACE_ELEMENT + "'");
+ // LOG.info("Located Cassandra Keyspace: '" + KEYSPACE_ELEMENT + "'");
for (Element keyspace : keyspaces) {
String keyspaceName = keyspace.getAttributeValue(NAME_ATTRIBUTE);
if (keyspaceName == null) {
- LOG.warn("Error locating Cassandra Keyspace name attribute!");
+ LOG.error("Error locating Cassandra Keyspace name attribute!");
+ continue;
+ }
+ else {
+ // LOG.info("Located Cassandra Keyspace name: '" + NAME_ATTRIBUTE + "' -> " + keyspaceName);
}
- LOG.info("Located Cassandra Keyspace name: '" + NAME_ATTRIBUTE + "'");
keyspaceMap.put(keyspaceName, keyspace);
}
}
@@ -118,17 +130,19 @@ public class CassandraMappingManager {
// load column definitions
List<Element> mappings = root.getChildren(MAPPING_ELEMENT);
if (mappings == null || mappings.size() == 0) {
- LOG.warn("Error locating Cassandra Mapping element!");
+ LOG.error("Error locating Cassandra Mapping class element!");
}
else {
- LOG.info("Located Cassandra Mapping: '" + MAPPING_ELEMENT + "'");
+ // LOG.info("Located Cassandra Mapping: '" + MAPPING_ELEMENT + "'");
for (Element mapping : mappings) {
String className = mapping.getAttributeValue(NAME_ATTRIBUTE);
if (className == null) {
- LOG.warn("Error locating Cassandra Mapping class name attribute!");
+ LOG.error("Error locating Cassandra Mapping class name attribute!");
continue;
}
- LOG.info("Located Cassandra Mapping class name: '" + NAME_ATTRIBUTE + "'");
+ else {
+ // LOG.info("Located Cassandra Mapping class name: '" + NAME_ATTRIBUTE + "' -> " + className);
+ }
mappingMap.put(className, mapping);
}
}
Modified: gora/trunk/gora-tutorial/conf/gora-cassandra-mapping.xml
URL: http://svn.apache.org/viewvc/gora/trunk/gora-tutorial/conf/gora-cassandra-mapping.xml?rev=1441267&r1=1441266&r2=1441267&view=diff
==============================================================================
--- gora/trunk/gora-tutorial/conf/gora-cassandra-mapping.xml (original)
+++ gora/trunk/gora-tutorial/conf/gora-cassandra-mapping.xml Thu Jan 31 23:49:51 2013
@@ -27,7 +27,7 @@
<family name="misc"/>
</keyspace>
- <class name="org.apache.gora.tutorial.log.generated.Pageview" keyClass="java.lang.Long" table="AccessLog">
+ <class name="org.apache.gora.tutorial.log.generated.Pageview" keyClass="java.lang.Long" keyspace="Pageview">
<field name="url" family="common" qualifier="url"/>
<field name="timestamp" family="common" qualifier="timestamp"/>
<field name="ip" family="common" qualifier="ip" />
@@ -38,7 +38,7 @@
<field name="userAgent" family="misc" qualifier="userAgent"/>
</class>
- <class name="org.apache.gora.tutorial.log.generated.MetricDatum" keyClass="java.lang.String" table="Metrics">
+ <class name="org.apache.gora.tutorial.log.generated.MetricDatum" keyClass="java.lang.String" keyspace="Pageview">
<field name="metricDimension" family="common" qualifier="metricDimension"/>
<field name="timestamp" family="common" qualifier="ts"/>
<field name="metric" family="common" qualifier="metric"/>