You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/12 20:46:25 UTC
git commit: Load user types at the right place
Updated Branches:
refs/heads/trunk ed1fabb39 -> c20dd2992
Load user types at the right place
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c20dd299
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c20dd299
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c20dd299
Branch: refs/heads/trunk
Commit: c20dd29923ea9e99122d75cb8f3b1d91e199fc15
Parents: ed1fabb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 12 20:28:23 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 12 20:46:02 2013 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c20dd299/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 6abbd0c..d412032 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -468,7 +468,6 @@ public class DatabaseDescriptor
assert systemKeyspaces.size() == Schema.systemKeyspaceNames.size();
for (KSMetaData ksmd : systemKeyspaces)
Schema.instance.load(ksmd);
- Schema.instance.loadUserTypes();
/* Load the seeds for node contact points */
if (conf.seed_provider == null)
@@ -502,6 +501,8 @@ public class DatabaseDescriptor
/** load keyspace (keyspace) definitions, but do not initialize the keyspace instances. */
public static void loadSchemas()
{
+ Schema.instance.loadUserTypes();
+
ColumnFamilyStore schemaCFS = SystemKeyspace.schemaCFS(SystemKeyspace.SCHEMA_KEYSPACES_CF);
// if keyspace with definitions is empty try loading the old way