[Carbon-commits] [Carbon] svn commit r115210 - trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt
deep at wso2.com
deep at wso2.com
Tue Nov 1 05:37:51 EDT 2011
Author: deep
Date: Tue Nov 1 02:37:51 2011
New Revision: 115210
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=115210
Log:
added UUID in imports
Modified:
trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java
Modified: trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java?rev=115210&r1=115209&r2=115210&view=diff
==============================================================================
--- trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java (original)
+++ trunk/carbon/components/cassandra/org.wso2.carbon.cassandra.mgt/src/main/java/org/wso2/carbon/cassandra/mgt/CassandraKeyspaceAdmin.java Tue Nov 1 02:37:51 2011
@@ -18,6 +18,7 @@
*/
package org.wso2.carbon.cassandra.mgt;
+
import me.prettyprint.cassandra.model.BasicColumnDefinition;
import me.prettyprint.cassandra.model.BasicColumnFamilyDefinition;
import me.prettyprint.cassandra.serializers.StringSerializer;
@@ -68,6 +69,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import java.util.UUID;
/**
* Cassandra Management(Admin) Service
@@ -84,6 +86,7 @@
+ File.separator + "advanced" + File.separator
+ "cassandra-auth.xml";
+
private static final Log log = LogFactory.getLog(CassandraKeyspaceAdmin.class);
/**
@@ -105,7 +108,8 @@
* @throws CassandraServerManagementException
* for any errors during locating keyspaces
*/
- public String[] listKeyspaces(String clusterName, String username, String password) throws CassandraServerManagementException {
+ public String[] listKeyspaces(String clusterName, String username, String password)
+ throws CassandraServerManagementException {
if (username == null || "".equals(username.trim())) {
throw new CassandraServerManagementException("The username is empty or null", log);
@@ -139,7 +143,8 @@
* @throws CassandraServerManagementException
* For any errors
*/
- public String[] listColumnFamiliesOfCurrentUser(String keyspaceName) throws CassandraServerManagementException {
+ public String[] listColumnFamiliesOfCurrentUser(String keyspaceName)
+ throws CassandraServerManagementException {
KeyspaceDefinition keyspaceDefinition = getKeyspaceDefinition(keyspaceName);
@@ -161,7 +166,8 @@
* @throws CassandraServerManagementException
* For any errors during accessing a keyspace
*/
- public KeyspaceInformation getKeyspaceofCurrentUser(String keyspaceName) throws CassandraServerManagementException {
+ public KeyspaceInformation getKeyspaceofCurrentUser(String keyspaceName)
+ throws CassandraServerManagementException {
KeyspaceDefinition keyspaceDefinition = getKeyspaceDefinition(keyspaceName);
KeyspaceInformation keyspaceInformation = new KeyspaceInformation(keyspaceDefinition.getName());
@@ -188,7 +194,8 @@
* for errors in removing operation
*/
public ColumnFamilyInformation getColumnFamilyOfCurrentUser(String keyspaceName,
- String columnFamilyName) throws CassandraServerManagementException {
+ String columnFamilyName)
+ throws CassandraServerManagementException {
try {
KeyspaceDefinition keyspaceDefinition = getKeyspaceDefinition(keyspaceName);
@@ -200,10 +207,10 @@
}
}
throw new CassandraServerManagementException("There is no column family with the name :" + columnFamilyName,
- log);
+ log);
} catch (HectorException e) {
throw new CassandraServerManagementException("Error accessing a column family with the name :" +
- columnFamilyName, e, log);
+ columnFamilyName, e, log);
}
}
@@ -216,7 +223,8 @@
* @throws CassandraServerManagementException
* For any errors
*/
- public boolean shareResource(String role, String path) throws CassandraServerManagementException {
+ public boolean shareResource(String role, String path)
+ throws CassandraServerManagementException {
if (role == null || "".equals(role.trim())) {
throw new CassandraServerManagementException("Username is null or empty", log);
@@ -240,7 +248,7 @@
return true;
} catch (UserStoreException e) {
throw new CassandraServerManagementException("Error during sharing a resource at path :" + path + " and" +
- " for role :" + role, e, log);
+ " for role :" + role, e, log);
}
}
@@ -253,7 +261,8 @@
* @throws CassandraServerManagementException
* For any errors
*/
- public boolean clearResource(String role, String path) throws CassandraServerManagementException {
+ public boolean clearResource(String role, String path)
+ throws CassandraServerManagementException {
if (role == null || "".equals(role.trim())) {
throw new CassandraServerManagementException("Username is null or empty", log);
@@ -275,7 +284,7 @@
return true;
} catch (UserStoreException e) {
throw new CassandraServerManagementException("Error during clear sharing a resource at path :" + path + " and" +
- " for role :" + role, e, log);
+ " for role :" + role, e, log);
}
}
@@ -286,11 +295,12 @@
* @throws CassandraServerManagementException
* For any error
*/
- public void addKeyspace(KeyspaceInformation keyspaceInformation) throws CassandraServerManagementException {
+ public void addKeyspace(KeyspaceInformation keyspaceInformation)
+ throws CassandraServerManagementException {
validateKeyspaceInformation(keyspaceInformation);
addOrUpdateKeyspace(true, keyspaceInformation.getName(), keyspaceInformation.getReplicationFactor(),
- keyspaceInformation.getStrategyClass());
+ keyspaceInformation.getStrategyClass());
}
/**
@@ -300,11 +310,12 @@
* @throws CassandraServerManagementException
* For any error during update operation
*/
- public void updatedKeyspace(KeyspaceInformation keyspaceInformation) throws CassandraServerManagementException {
+ public void updatedKeyspace(KeyspaceInformation keyspaceInformation)
+ throws CassandraServerManagementException {
validateKeyspaceInformation(keyspaceInformation);
addOrUpdateKeyspace(false, keyspaceInformation.getName(), keyspaceInformation.getReplicationFactor(),
- keyspaceInformation.getStrategyClass());
+ keyspaceInformation.getStrategyClass());
}
/**
@@ -349,7 +360,8 @@
* @throws CassandraServerManagementException
* For errors during adding a CF
*/
- public void addColumnFamily(ColumnFamilyInformation columnFamilyInformation) throws CassandraServerManagementException {
+ public void addColumnFamily(ColumnFamilyInformation columnFamilyInformation)
+ throws CassandraServerManagementException {
addOrUpdateCF(true, columnFamilyInformation);
}
@@ -360,7 +372,8 @@
* @throws CassandraServerManagementException
* For errors during updating a CF
*/
- public void updateColumnFamily(ColumnFamilyInformation columnFamilyInformation) throws CassandraServerManagementException {
+ public void updateColumnFamily(ColumnFamilyInformation columnFamilyInformation)
+ throws CassandraServerManagementException {
addOrUpdateCF(false, columnFamilyInformation);
}
@@ -373,7 +386,8 @@
* @throws CassandraServerManagementException
* for errors in removing operation
*/
- public boolean deleteColumnFamily(String keyspaceName, String columnFamilyName) throws CassandraServerManagementException {
+ public boolean deleteColumnFamily(String keyspaceName, String columnFamilyName)
+ throws CassandraServerManagementException {
validateKeyspace(keyspaceName);
validateCF(columnFamilyName);
@@ -382,7 +396,7 @@
cluster.dropColumnFamily(keyspaceName.trim(), columnFamilyName.trim());
} catch (HectorException e) {
throw new CassandraServerManagementException("Error removing a column family with the name :" +
- columnFamilyName, e, log);
+ columnFamilyName, e, log);
}
return true;
}
@@ -395,7 +409,8 @@
* @throws CassandraServerManagementException
* for errors during getting the token ring
*/
- public TokenRangeInformation[] getTokenRange(String keyspace) throws CassandraServerManagementException {
+ public TokenRangeInformation[] getTokenRange(String keyspace)
+ throws CassandraServerManagementException {
validateKeyspace(keyspace);
ThriftCluster thriftCluster = (ThriftCluster) getCluster(null); // TODO hector limitation
Set<CassandraHost> cassandraHosts = thriftCluster.getKnownPoolHosts(true); // This returns all endpoints if only auto discovery is set.
@@ -448,7 +463,8 @@
* @throws CassandraServerManagementException
* for errors during accessing keyspaces
*/
- private String[] getKeyspaces(ClusterInformation clusterInformation) throws CassandraServerManagementException {
+ private String[] getKeyspaces(ClusterInformation clusterInformation)
+ throws CassandraServerManagementException {
Cluster cluster = getCluster(clusterInformation);
List<String> keyspaceNames = new ArrayList<String>();
for (KeyspaceDefinition keyspaceDefinition : cluster.describeKeyspaces()) {
@@ -468,7 +484,8 @@
* @throws CassandraServerManagementException
* for errors during accessing a hector cluster
*/
- private Cluster getCluster(ClusterInformation clusterInformation) throws CassandraServerManagementException {
+ private Cluster getCluster(ClusterInformation clusterInformation)
+ throws CassandraServerManagementException {
DataAccessService dataAccessService =
CassandraAdminComponentManager.getInstance().getDataAccessService();
Cluster cluster;
@@ -486,7 +503,6 @@
String message = "Error getting cluster";
throw new CassandraServerManagementException(message, log);
}
- return cluster;
}
/* Helper method for adding or updating a keyspace */
@@ -494,7 +510,8 @@
private void addOrUpdateKeyspace(boolean isAdd,
String keyspaceName,
int replicationFactor,
- String replicationStrategy) throws CassandraServerManagementException {
+ String replicationStrategy)
+ throws CassandraServerManagementException {
Cluster cluster = getCluster(null);
try {
@@ -507,13 +524,14 @@
}
} catch (HectorException e) {
throw new CassandraServerManagementException("Error " + (isAdd ? "adding" : "updating") + " a keyspace" +
- " with name :" + keyspaceName, e, log);
+ " with name :" + keyspaceName, e, log);
}
}
/* Helper method for adding or updating a CF */
- private void addOrUpdateCF(boolean isAdd, ColumnFamilyInformation columnFamilyInformation) throws CassandraServerManagementException {
+ private void addOrUpdateCF(boolean isAdd, ColumnFamilyInformation columnFamilyInformation)
+ throws CassandraServerManagementException {
String keyspaceName = columnFamilyInformation.getKeyspace();
String columnFamilyName = columnFamilyInformation.getName();
@@ -587,18 +605,20 @@
}
} catch (HectorException e) {
throw new CassandraServerManagementException("Error " + (isAdd ? "adding" : "updating ") + " a column family with" +
- " the name :" + columnFamilyName, e, log);
+ " the name :" + columnFamilyName, e, log);
}
}
- private void validateKeyspaceInformation(KeyspaceInformation information) throws CassandraServerManagementException {
+ private void validateKeyspaceInformation(KeyspaceInformation information)
+ throws CassandraServerManagementException {
if (information == null) {
throw new CassandraServerManagementException("The keyspace information is null", log);
}
validateKeyspace(information.getName());
}
- private void validateColumnInformation(ColumnInformation information) throws CassandraServerManagementException {
+ private void validateColumnInformation(ColumnInformation information)
+ throws CassandraServerManagementException {
if (information == null) {
throw new CassandraServerManagementException("The column information is null", log);
}
@@ -620,7 +640,8 @@
}
}
- private KeyspaceDefinition getKeyspaceDefinition(String keyspace) throws CassandraServerManagementException {
+ private KeyspaceDefinition getKeyspaceDefinition(String keyspace)
+ throws CassandraServerManagementException {
validateKeyspace(keyspace);
Cluster cluster = getCluster(null);
KeyspaceDefinition keyspaceDefinition = cluster.describeKeyspace(keyspace.trim());
@@ -630,7 +651,8 @@
return keyspaceDefinition;
}
- private ColumnFamilyInformation createColumnFamilyInformation(ColumnFamilyDefinition definition) throws CassandraServerManagementException {
+ private ColumnFamilyInformation createColumnFamilyInformation(ColumnFamilyDefinition definition)
+ throws CassandraServerManagementException {
ColumnFamilyInformation information =
new ColumnFamilyInformation(definition.getKeyspaceName(), definition.getName());
information.setId(definition.getId());
More information about the Carbon-commits
mailing list