You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by zz...@apache.org on 2013/07/31 02:18:07 UTC
git commit: HELIX-155: PropertyKey.instances() is wrongly wired to
CONFIG type instead of INSTANCES type
Updated Branches:
refs/heads/master 1a8216848 -> 86f63b9e4
HELIX-155: PropertyKey.instances() is wrongly wired to CONFIG type instead of INSTANCES type
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/86f63b9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/86f63b9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/86f63b9e
Branch: refs/heads/master
Commit: 86f63b9e4da35069a33c1eaadbe61340aa904599
Parents: 1a82168
Author: zzhang <zz...@apache.org>
Authored: Tue Jul 30 17:17:09 2013 -0700
Committer: zzhang <zz...@apache.org>
Committed: Tue Jul 30 17:17:09 2013 -0700
----------------------------------------------------------------------
.../main/java/org/apache/helix/PropertyKey.java | 24 ++++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/86f63b9e/helix-core/src/main/java/org/apache/helix/PropertyKey.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/PropertyKey.java b/helix-core/src/main/java/org/apache/helix/PropertyKey.java
index 80aeaf1..50dbc60 100644
--- a/helix-core/src/main/java/org/apache/helix/PropertyKey.java
+++ b/helix-core/src/main/java/org/apache/helix/PropertyKey.java
@@ -74,12 +74,12 @@ public class PropertyKey
//if type is CONFIGS, set configScope; otherwise null
ConfigScopeProperty _configScope;
- public PropertyKey(PropertyType type, Class<? extends HelixProperty> typeClazz,
+ public PropertyKey(PropertyType type, Class<? extends HelixProperty> typeClazz,
String... params)
{
this(type, null, typeClazz, params);
}
-
+
public PropertyKey(PropertyType type,
ConfigScopeProperty configScope,
Class<? extends HelixProperty> typeClazz,
@@ -93,7 +93,7 @@ public class PropertyKey
_params = params;
_typeClazz = typeClazz;
-
+
_configScope = configScope;
}
@@ -107,7 +107,7 @@ public class PropertyKey
public String toString() {
return getPath();
}
-
+
public String getPath()
{
String clusterName = _params[0];
@@ -161,7 +161,7 @@ public class PropertyKey
_clusterName,
ConfigScopeProperty.CLUSTER.toString());
}
-
+
public PropertyKey clusterConfig()
{
return new PropertyKey(CONFIGS,
@@ -169,7 +169,7 @@ public class PropertyKey
HelixProperty.class,
_clusterName,
ConfigScopeProperty.CLUSTER.toString(),
- _clusterName);
+ _clusterName);
}
public PropertyKey instanceConfigs()
@@ -178,7 +178,7 @@ public class PropertyKey
ConfigScopeProperty.PARTICIPANT,
InstanceConfig.class,
_clusterName,
- ConfigScopeProperty.PARTICIPANT.toString());
+ ConfigScopeProperty.PARTICIPANT.toString());
}
public PropertyKey instanceConfig(String instanceName)
@@ -199,7 +199,7 @@ public class PropertyKey
_clusterName,
ConfigScopeProperty.RESOURCE.toString());
}
-
+
public PropertyKey resourceConfig(String resourceName)
{
return new PropertyKey(CONFIGS,
@@ -264,7 +264,7 @@ public class PropertyKey
public PropertyKey instances()
{
- return new PropertyKey(CONFIGS, null, _clusterName);
+ return new PropertyKey(PropertyType.INSTANCES, null, _clusterName);
}
public PropertyKey messages(String instanceName)
@@ -374,7 +374,7 @@ public class PropertyKey
/**
* Used to get status update for a NON STATE TRANSITION type
- *
+ *
* @param instanceName
* @param sessionId
* @param msgType
@@ -423,7 +423,7 @@ public class PropertyKey
/**
* Used to get status update for a NON STATE TRANSITION type
- *
+ *
* @param instanceName
* @param sessionId
* @param msgType
@@ -566,5 +566,5 @@ public class PropertyKey
{
return _configScope;
}
-
+
}