You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/09/24 23:49:45 UTC
[01/12] cassandra git commit: Simplify MultiCBuilder implementation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 0c1432ac7 -> 6039d0ef7
refs/heads/cassandra-2.2 4a849efeb -> 5fe40a117
refs/heads/cassandra-3.0 32d761684 -> 5d918b8fc
refs/heads/trunk 52a10696a -> 4a0d1caa2
Simplify MultiCBuilder implementation
We had 2 implementations of MultiCBuilder but one was now unused. The
patch thus simplify the implementation by getting rid of the unused
wrap method and making the whole class not abstract.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/53dc42d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53dc42d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53dc42d4
Branch: refs/heads/trunk
Commit: 53dc42d4243766f0a828dc167175c7036c1b3942
Parents: 2e87c43
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 24 09:41:57 2015 -0700
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 24 10:08:13 2015 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/db/MultiCBuilder.java | 507 ++++++++-----------
1 file changed, 199 insertions(+), 308 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/53dc42d4/src/java/org/apache/cassandra/db/MultiCBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/MultiCBuilder.java b/src/java/org/apache/cassandra/db/MultiCBuilder.java
index ab1c94d..be654fa 100644
--- a/src/java/org/apache/cassandra/db/MultiCBuilder.java
+++ b/src/java/org/apache/cassandra/db/MultiCBuilder.java
@@ -26,101 +26,64 @@ import org.apache.cassandra.utils.btree.BTreeSet;
/**
* Builder that allow to build multiple Clustering/Slice.Bound at the same time.
*/
-public abstract class MultiCBuilder
+public class MultiCBuilder
{
/**
- * Creates a new empty {@code MultiCBuilder}.
+ * The table comparator.
*/
- public static MultiCBuilder create(ClusteringComparator comparator)
- {
- return new ConcreteMultiCBuilder(comparator);
- }
+ private final ClusteringComparator comparator;
/**
- * Wraps an existing {@code CBuilder} to provide him with a MultiCBuilder interface
- * for the sake of passing it to {@link Restriction.appendTo}. The resulting
- * {@code MultiCBuilder} will still only be able to create a single clustering/bound
- * and an {@code IllegalArgumentException} will be thrown if elements that added that
- * would correspond to building multiple clusterings.
+ * The elements of the clusterings
*/
- public static MultiCBuilder wrap(final CBuilder builder)
- {
- return new MultiCBuilder()
- {
- private boolean containsNull;
- private boolean containsUnset;
- private boolean hasMissingElements;
-
- public MultiCBuilder addElementToAll(ByteBuffer value)
- {
- builder.add(value);
-
- if (value == null)
- containsNull = true;
- if (value == ByteBufferUtil.UNSET_BYTE_BUFFER)
- containsUnset = true;
-
- return this;
- }
-
- public MultiCBuilder addEachElementToAll(List<ByteBuffer> values)
- {
- if (values.isEmpty())
- {
- hasMissingElements = true;
- return this;
- }
+ private final List<List<ByteBuffer>> elementsList = new ArrayList<>();
- if (values.size() > 1)
- throw new IllegalArgumentException();
-
- return addElementToAll(values.get(0));
- }
-
- public MultiCBuilder addAllElementsToAll(List<List<ByteBuffer>> values)
- {
- if (values.isEmpty())
- {
- hasMissingElements = true;
- return this;
- }
-
- if (values.size() > 1)
- throw new IllegalArgumentException();
+ /**
+ * The number of elements that have been added.
+ */
+ private int size;
- return addEachElementToAll(values.get(0));
- }
+ /**
+ * <code>true</code> if the clusterings have been build, <code>false</code> otherwise.
+ */
+ private boolean built;
- public int remainingCount()
- {
- return builder.remainingCount();
- }
+ /**
+ * <code>true</code> if the clusterings contains some <code>null</code> elements.
+ */
+ private boolean containsNull;
- public boolean containsNull()
- {
- return containsNull;
- }
+ /**
+ * <code>true</code> if the composites contains some <code>unset</code> elements.
+ */
+ private boolean containsUnset;
- public boolean containsUnset()
- {
- return containsUnset;
- }
+ /**
+ * <code>true</code> if some empty collection have been added.
+ */
+ private boolean hasMissingElements;
- public boolean hasMissingElements()
- {
- return hasMissingElements;
- }
+ private MultiCBuilder(ClusteringComparator comparator)
+ {
+ this.comparator = comparator;
+ }
- public NavigableSet<Clustering> build()
- {
- return BTreeSet.of(builder.comparator(), builder.build());
- }
+ /**
+ * Creates a new empty {@code MultiCBuilder}.
+ */
+ public static MultiCBuilder create(ClusteringComparator comparator)
+ {
+ return new MultiCBuilder(comparator);
+ }
- public NavigableSet<Slice.Bound> buildBound(boolean isStart, boolean isInclusive)
- {
- return BTreeSet.of(builder.comparator(), builder.buildBound(isStart, isInclusive));
- }
- };
+ /**
+ * Checks if this builder is empty.
+ *
+ * @return <code>true</code> if this builder is empty, <code>false</code> otherwise.
+ */
+ private boolean isEmpty()
+ {
+ return elementsList.isEmpty();
}
/**
@@ -133,7 +96,25 @@ public abstract class MultiCBuilder
* @param value the value of the next element
* @return this <code>MulitCBuilder</code>
*/
- public abstract MultiCBuilder addElementToAll(ByteBuffer value);
+ public MultiCBuilder addElementToAll(ByteBuffer value)
+ {
+ checkUpdateable();
+
+ if (isEmpty())
+ elementsList.add(new ArrayList<ByteBuffer>());
+
+ for (int i = 0, m = elementsList.size(); i < m; i++)
+ {
+ if (value == null)
+ containsNull = true;
+ if (value == ByteBufferUtil.UNSET_BYTE_BUFFER)
+ containsUnset = true;
+
+ elementsList.get(i).add(value);
+ }
+ size++;
+ return this;
+ }
/**
* Adds individually each of the specified elements to the end of all of the existing clusterings.
@@ -145,7 +126,42 @@ public abstract class MultiCBuilder
* @param values the elements to add
* @return this <code>CompositeBuilder</code>
*/
- public abstract MultiCBuilder addEachElementToAll(List<ByteBuffer> values);
+ public MultiCBuilder addEachElementToAll(List<ByteBuffer> values)
+ {
+ checkUpdateable();
+
+ if (isEmpty())
+ elementsList.add(new ArrayList<ByteBuffer>());
+
+ if (values.isEmpty())
+ {
+ hasMissingElements = true;
+ }
+ else
+ {
+ for (int i = 0, m = elementsList.size(); i < m; i++)
+ {
+ List<ByteBuffer> oldComposite = elementsList.remove(0);
+
+ for (int j = 0, n = values.size(); j < n; j++)
+ {
+ List<ByteBuffer> newComposite = new ArrayList<>(oldComposite);
+ elementsList.add(newComposite);
+
+ ByteBuffer value = values.get(j);
+
+ if (value == null)
+ containsNull = true;
+ if (value == ByteBufferUtil.UNSET_BYTE_BUFFER)
+ containsUnset = true;
+
+ newComposite.add(values.get(j));
+ }
+ }
+ }
+ size++;
+ return this;
+ }
/**
* Adds individually each of the specified list of elements to the end of all of the existing composites.
@@ -157,48 +173,138 @@ public abstract class MultiCBuilder
* @param values the elements to add
* @return this <code>CompositeBuilder</code>
*/
- public abstract MultiCBuilder addAllElementsToAll(List<List<ByteBuffer>> values);
+ public MultiCBuilder addAllElementsToAll(List<List<ByteBuffer>> values)
+ {
+ checkUpdateable();
+
+ if (isEmpty())
+ elementsList.add(new ArrayList<ByteBuffer>());
+
+ if (values.isEmpty())
+ {
+ hasMissingElements = true;
+ }
+ else
+ {
+ for (int i = 0, m = elementsList.size(); i < m; i++)
+ {
+ List<ByteBuffer> oldComposite = elementsList.remove(0);
+
+ for (int j = 0, n = values.size(); j < n; j++)
+ {
+ List<ByteBuffer> newComposite = new ArrayList<>(oldComposite);
+ elementsList.add(newComposite);
+
+ List<ByteBuffer> value = values.get(j);
+
+ if (value.isEmpty())
+ hasMissingElements = true;
+
+ if (value.contains(null))
+ containsNull = true;
+ if (value.contains(ByteBufferUtil.UNSET_BYTE_BUFFER))
+ containsUnset = true;
+
+ newComposite.addAll(value);
+ }
+ }
+ size += values.get(0).size();
+ }
+ return this;
+ }
/**
* Returns the number of elements that can be added to the clusterings.
*
* @return the number of elements that can be added to the clusterings.
*/
- public abstract int remainingCount();
+ public int remainingCount()
+ {
+ return comparator.size() - size;
+ }
/**
* Checks if the clusterings contains null elements.
*
* @return <code>true</code> if the clusterings contains <code>null</code> elements, <code>false</code> otherwise.
*/
- public abstract boolean containsNull();
+ public boolean containsNull()
+ {
+ return containsNull;
+ }
/**
* Checks if the clusterings contains unset elements.
*
* @return <code>true</code> if the clusterings contains <code>unset</code> elements, <code>false</code> otherwise.
*/
- public abstract boolean containsUnset();
+ public boolean containsUnset()
+ {
+ return containsUnset;
+ }
/**
* Checks if some empty list of values have been added
* @return <code>true</code> if the clusterings have some missing elements, <code>false</code> otherwise.
*/
- public abstract boolean hasMissingElements();
+ public boolean hasMissingElements()
+ {
+ return hasMissingElements;
+ }
/**
* Builds the <code>clusterings</code>.
*
* @return the clusterings
*/
- public abstract NavigableSet<Clustering> build();
+ public NavigableSet<Clustering> build()
+ {
+ built = true;
+
+ if (hasMissingElements)
+ return BTreeSet.empty(comparator);
+
+ CBuilder builder = CBuilder.create(comparator);
+
+ if (elementsList.isEmpty())
+ return BTreeSet.of(builder.comparator(), builder.build());
+
+ BTreeSet.Builder<Clustering> set = BTreeSet.builder(builder.comparator());
+ for (int i = 0, m = elementsList.size(); i < m; i++)
+ {
+ List<ByteBuffer> elements = elementsList.get(i);
+ set.add(builder.buildWith(elements));
+ }
+ return set.build();
+ }
/**
* Builds the <code>clusterings</code> with the specified EOC.
*
* @return the clusterings
*/
- public abstract NavigableSet<Slice.Bound> buildBound(boolean isStart, boolean isInclusive);
+ public NavigableSet<Slice.Bound> buildBound(boolean isStart, boolean isInclusive)
+ {
+ built = true;
+
+ if (hasMissingElements)
+ return BTreeSet.empty(comparator);
+
+ CBuilder builder = CBuilder.create(comparator);
+
+ if (elementsList.isEmpty())
+ return BTreeSet.of(comparator, builder.buildBound(isStart, isInclusive));
+
+ // Use a TreeSet to sort and eliminate duplicates
+ BTreeSet.Builder<Slice.Bound> set = BTreeSet.builder(comparator);
+
+ for (int i = 0, m = elementsList.size(); i < m; i++)
+ {
+ List<ByteBuffer> elements = elementsList.get(i);
+ set.add(builder.buildBoundWith(elements, isStart, isInclusive));
+ }
+ return set.build();
+ }
/**
* Checks if some elements can still be added to the clusterings.
@@ -210,224 +316,9 @@ public abstract class MultiCBuilder
return remainingCount() > 0;
}
-
- private static class ConcreteMultiCBuilder extends MultiCBuilder
+ private void checkUpdateable()
{
- /**
- * The table comparator.
- */
- private final ClusteringComparator comparator;
-
- /**
- * The elements of the clusterings
- */
- private final List<List<ByteBuffer>> elementsList = new ArrayList<>();
-
- /**
- * The number of elements that have been added.
- */
- private int size;
-
- /**
- * <code>true</code> if the clusterings have been build, <code>false</code> otherwise.
- */
- private boolean built;
-
- /**
- * <code>true</code> if the clusterings contains some <code>null</code> elements.
- */
- private boolean containsNull;
-
- /**
- * <code>true</code> if the composites contains some <code>unset</code> elements.
- */
- private boolean containsUnset;
-
- /**
- * <code>true</code> if some empty collection have been added.
- */
- private boolean hasMissingElements;
-
- public ConcreteMultiCBuilder(ClusteringComparator comparator)
- {
- this.comparator = comparator;
- }
-
- public MultiCBuilder addElementToAll(ByteBuffer value)
- {
- checkUpdateable();
-
- if (isEmpty())
- elementsList.add(new ArrayList<ByteBuffer>());
-
- for (int i = 0, m = elementsList.size(); i < m; i++)
- {
- if (value == null)
- containsNull = true;
- if (value == ByteBufferUtil.UNSET_BYTE_BUFFER)
- containsUnset = true;
-
- elementsList.get(i).add(value);
- }
- size++;
- return this;
- }
-
- public MultiCBuilder addEachElementToAll(List<ByteBuffer> values)
- {
- checkUpdateable();
-
- if (isEmpty())
- elementsList.add(new ArrayList<ByteBuffer>());
-
- if (values.isEmpty())
- {
- hasMissingElements = true;
- }
- else
- {
- for (int i = 0, m = elementsList.size(); i < m; i++)
- {
- List<ByteBuffer> oldComposite = elementsList.remove(0);
-
- for (int j = 0, n = values.size(); j < n; j++)
- {
- List<ByteBuffer> newComposite = new ArrayList<>(oldComposite);
- elementsList.add(newComposite);
-
- ByteBuffer value = values.get(j);
-
- if (value == null)
- containsNull = true;
- if (value == ByteBufferUtil.UNSET_BYTE_BUFFER)
- containsUnset = true;
-
- newComposite.add(values.get(j));
- }
- }
- }
- size++;
- return this;
- }
-
- public MultiCBuilder addAllElementsToAll(List<List<ByteBuffer>> values)
- {
- checkUpdateable();
-
- if (isEmpty())
- elementsList.add(new ArrayList<ByteBuffer>());
-
- if (values.isEmpty())
- {
- hasMissingElements = true;
- }
- else
- {
- for (int i = 0, m = elementsList.size(); i < m; i++)
- {
- List<ByteBuffer> oldComposite = elementsList.remove(0);
-
- for (int j = 0, n = values.size(); j < n; j++)
- {
- List<ByteBuffer> newComposite = new ArrayList<>(oldComposite);
- elementsList.add(newComposite);
-
- List<ByteBuffer> value = values.get(j);
-
- if (value.isEmpty())
- hasMissingElements = true;
-
- if (value.contains(null))
- containsNull = true;
- if (value.contains(ByteBufferUtil.UNSET_BYTE_BUFFER))
- containsUnset = true;
-
- newComposite.addAll(value);
- }
- }
- size += values.get(0).size();
- }
- return this;
- }
-
- public int remainingCount()
- {
- return comparator.size() - size;
- }
-
- /**
- * Checks if this builder is empty.
- *
- * @return <code>true</code> if this builder is empty, <code>false</code> otherwise.
- */
- public boolean isEmpty()
- {
- return elementsList.isEmpty();
- }
-
- public boolean containsNull()
- {
- return containsNull;
- }
-
- public boolean containsUnset()
- {
- return containsUnset;
- }
-
- public boolean hasMissingElements()
- {
- return hasMissingElements;
- }
-
- public NavigableSet<Clustering> build()
- {
- built = true;
-
- if (hasMissingElements)
- return BTreeSet.empty(comparator);
-
- CBuilder builder = CBuilder.create(comparator);
-
- if (elementsList.isEmpty())
- return BTreeSet.of(builder.comparator(), builder.build());
-
- BTreeSet.Builder<Clustering> set = BTreeSet.builder(builder.comparator());
- for (int i = 0, m = elementsList.size(); i < m; i++)
- {
- List<ByteBuffer> elements = elementsList.get(i);
- set.add(builder.buildWith(elements));
- }
- return set.build();
- }
-
- public NavigableSet<Slice.Bound> buildBound(boolean isStart, boolean isInclusive)
- {
- built = true;
-
- if (hasMissingElements)
- return BTreeSet.empty(comparator);
-
- CBuilder builder = CBuilder.create(comparator);
-
- if (elementsList.isEmpty())
- return BTreeSet.of(comparator, builder.buildBound(isStart, isInclusive));
-
- // Use a TreeSet to sort and eliminate duplicates
- BTreeSet.Builder<Slice.Bound> set = BTreeSet.builder(comparator);
-
- for (int i = 0, m = elementsList.size(); i < m; i++)
- {
- List<ByteBuffer> elements = elementsList.get(i);
- set.add(builder.buildBoundWith(elements, isStart, isInclusive));
- }
- return set.build();
- }
-
- private void checkUpdateable()
- {
- if (!hasRemaining() || built)
- throw new IllegalStateException("this builder cannot be updated anymore");
- }
+ if (!hasRemaining() || built)
+ throw new IllegalStateException("this builder cannot be updated anymore");
}
}
[09/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe40a11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe40a11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe40a11
Branch: refs/heads/trunk
Commit: 5fe40a1178c2896822a51adc28c1ee6c95efc2ff
Parents: 4a849ef 6039d0e
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:45:43 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:45:43 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2bbc999,7e74947..6dc5a9f
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -159,8 -159,18 +159,11 @@@ public interface StorageServiceMBean ex
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
- /**
- * Numeric load value.
- * @see org.apache.cassandra.metrics.StorageMetrics#load
- */
- @Deprecated
- public double getLoad();
-
/** Human-readable load value */
public String getLoadString();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
[04/12] cassandra git commit: Fix DC and Rack in nodetool info
Posted by jm...@apache.org.
Fix DC and Rack in nodetool info
Patch by Carl Yeksigian; reviewed by stefania for CASSANDRA-10382
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6039d0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6039d0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6039d0ef
Branch: refs/heads/cassandra-3.0
Commit: 6039d0ef74a1d4c3333a699626302596d621ab04
Parents: 0c1432a
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Sep 24 14:43:44 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:43:44 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ffe219e..8a2e71e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,7 +1416,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
@@ -1424,6 +1424,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return mapOut;
}
+ public Map<String, String> getHostIdToEndpoint()
+ {
+ Map<String, String> mapOut = new HashMap<>();
+ for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
+ mapOut.put(entry.getValue().toString(), entry.getKey().getHostAddress());
+ return mapOut;
+ }
+
/**
* Construct the range to endpoint mapping based on the true view
* of the world.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 1f86d82..7e74947 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -159,7 +159,10 @@ public interface StorageServiceMBean extends NotificationEmitter
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
/**
* Numeric load value.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index caa12c3..6f2b6fb 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -502,7 +502,7 @@ public class NodeProbe implements AutoCloseable
public Map<String, String> getHostIdMap()
{
- return ssProxy.getHostIdMap();
+ return ssProxy.getEndpointToHostId();
}
public String getLoadString()
@@ -807,7 +807,7 @@ public class NodeProbe implements AutoCloseable
public String getEndpoint()
{
- Map<String, String> hostIdToEndpoint = ssProxy.getHostIdMap();
+ Map<String, String> hostIdToEndpoint = ssProxy.getHostIdToEndpoint();
return hostIdToEndpoint.get(ssProxy.getLocalHostId());
}
[03/12] cassandra git commit: Fix DC and Rack in nodetool info
Posted by jm...@apache.org.
Fix DC and Rack in nodetool info
Patch by Carl Yeksigian; reviewed by stefania for CASSANDRA-10382
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6039d0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6039d0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6039d0ef
Branch: refs/heads/cassandra-2.2
Commit: 6039d0ef74a1d4c3333a699626302596d621ab04
Parents: 0c1432a
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Sep 24 14:43:44 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:43:44 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ffe219e..8a2e71e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,7 +1416,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
@@ -1424,6 +1424,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return mapOut;
}
+ public Map<String, String> getHostIdToEndpoint()
+ {
+ Map<String, String> mapOut = new HashMap<>();
+ for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
+ mapOut.put(entry.getValue().toString(), entry.getKey().getHostAddress());
+ return mapOut;
+ }
+
/**
* Construct the range to endpoint mapping based on the true view
* of the world.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 1f86d82..7e74947 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -159,7 +159,10 @@ public interface StorageServiceMBean extends NotificationEmitter
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
/**
* Numeric load value.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index caa12c3..6f2b6fb 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -502,7 +502,7 @@ public class NodeProbe implements AutoCloseable
public Map<String, String> getHostIdMap()
{
- return ssProxy.getHostIdMap();
+ return ssProxy.getEndpointToHostId();
}
public String getLoadString()
@@ -807,7 +807,7 @@ public class NodeProbe implements AutoCloseable
public String getEndpoint()
{
- Map<String, String> hostIdToEndpoint = ssProxy.getHostIdMap();
+ Map<String, String> hostIdToEndpoint = ssProxy.getHostIdToEndpoint();
return hostIdToEndpoint.get(ssProxy.getLocalHostId());
}
[06/12] cassandra git commit: Fix DC and Rack in nodetool info
Posted by jm...@apache.org.
Fix DC and Rack in nodetool info
Patch by Carl Yeksigian; reviewed by stefania for CASSANDRA-10382
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6039d0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6039d0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6039d0ef
Branch: refs/heads/trunk
Commit: 6039d0ef74a1d4c3333a699626302596d621ab04
Parents: 0c1432a
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Sep 24 14:43:44 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:43:44 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ffe219e..8a2e71e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,7 +1416,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
@@ -1424,6 +1424,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return mapOut;
}
+ public Map<String, String> getHostIdToEndpoint()
+ {
+ Map<String, String> mapOut = new HashMap<>();
+ for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
+ mapOut.put(entry.getValue().toString(), entry.getKey().getHostAddress());
+ return mapOut;
+ }
+
/**
* Construct the range to endpoint mapping based on the true view
* of the world.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 1f86d82..7e74947 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -159,7 +159,10 @@ public interface StorageServiceMBean extends NotificationEmitter
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
/**
* Numeric load value.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index caa12c3..6f2b6fb 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -502,7 +502,7 @@ public class NodeProbe implements AutoCloseable
public Map<String, String> getHostIdMap()
{
- return ssProxy.getHostIdMap();
+ return ssProxy.getEndpointToHostId();
}
public String getLoadString()
@@ -807,7 +807,7 @@ public class NodeProbe implements AutoCloseable
public String getEndpoint()
{
- Map<String, String> hostIdToEndpoint = ssProxy.getHostIdMap();
+ Map<String, String> hostIdToEndpoint = ssProxy.getHostIdToEndpoint();
return hostIdToEndpoint.get(ssProxy.getLocalHostId());
}
[12/12] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a0d1caa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a0d1caa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a0d1caa
Branch: refs/heads/trunk
Commit: 4a0d1caa262af3b6f2b6d329e45766b4df845a88
Parents: 52a1069 5d918b8
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:47:28 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:47:28 2015 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/db/MultiCBuilder.java | 507 ++++++++-----------
.../db/rows/UnfilteredRowIterators.java | 4 +-
.../cassandra/service/StorageService.java | 10 +-
.../cassandra/service/StorageServiceMBean.java | 5 +-
.../org/apache/cassandra/tools/NodeProbe.java | 4 +-
5 files changed, 216 insertions(+), 314 deletions(-)
----------------------------------------------------------------------
[02/12] cassandra git commit: Properly test for empty static row
Posted by jm...@apache.org.
Properly test for empty static row
UnfilteredRowIterators.noRowsIterator() was testing the staticRow
against null to avoid allocating an empty Columns object, but we never
use null for empty static rows, we use Rows.EMPTY_STATIC_ROW so the
branch was never taken. This is a trivial fix to avoid that allocation.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32d76168
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32d76168
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32d76168
Branch: refs/heads/trunk
Commit: 32d7616846cb02b89fdecd087e6fbdf53e50fcb2
Parents: 53dc42d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 24 10:02:53 2015 -0700
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 24 10:08:17 2015 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/db/rows/UnfilteredRowIterators.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/32d76168/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java
index e251670..22628e2 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java
@@ -99,8 +99,8 @@ public abstract class UnfilteredRowIterators
*/
public static UnfilteredRowIterator noRowsIterator(final CFMetaData cfm, final DecoratedKey partitionKey, final Row staticRow, final DeletionTime partitionDeletion, final boolean isReverseOrder)
{
- PartitionColumns columns = staticRow == null ? PartitionColumns.NONE
- : new PartitionColumns(Columns.from(staticRow.columns()), Columns.NONE);
+ PartitionColumns columns = staticRow == Rows.EMPTY_STATIC_ROW ? PartitionColumns.NONE
+ : new PartitionColumns(Columns.from(staticRow.columns()), Columns.NONE);
return new UnfilteredRowIterator()
{
public CFMetaData metadata()
[08/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe40a11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe40a11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe40a11
Branch: refs/heads/cassandra-3.0
Commit: 5fe40a1178c2896822a51adc28c1ee6c95efc2ff
Parents: 4a849ef 6039d0e
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:45:43 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:45:43 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2bbc999,7e74947..6dc5a9f
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -159,8 -159,18 +159,11 @@@ public interface StorageServiceMBean ex
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
- /**
- * Numeric load value.
- * @see org.apache.cassandra.metrics.StorageMetrics#load
- */
- @Deprecated
- public double getLoad();
-
/** Human-readable load value */
public String getLoadString();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
[05/12] cassandra git commit: Fix DC and Rack in nodetool info
Posted by jm...@apache.org.
Fix DC and Rack in nodetool info
Patch by Carl Yeksigian; reviewed by stefania for CASSANDRA-10382
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6039d0ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6039d0ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6039d0ef
Branch: refs/heads/cassandra-2.1
Commit: 6039d0ef74a1d4c3333a699626302596d621ab04
Parents: 0c1432a
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Sep 24 14:43:44 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:43:44 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ffe219e..8a2e71e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,7 +1416,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
@@ -1424,6 +1424,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return mapOut;
}
+ public Map<String, String> getHostIdToEndpoint()
+ {
+ Map<String, String> mapOut = new HashMap<>();
+ for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
+ mapOut.put(entry.getValue().toString(), entry.getKey().getHostAddress());
+ return mapOut;
+ }
+
/**
* Construct the range to endpoint mapping based on the true view
* of the world.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 1f86d82..7e74947 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -159,7 +159,10 @@ public interface StorageServiceMBean extends NotificationEmitter
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
/**
* Numeric load value.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6039d0ef/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index caa12c3..6f2b6fb 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -502,7 +502,7 @@ public class NodeProbe implements AutoCloseable
public Map<String, String> getHostIdMap()
{
- return ssProxy.getHostIdMap();
+ return ssProxy.getEndpointToHostId();
}
public String getLoadString()
@@ -807,7 +807,7 @@ public class NodeProbe implements AutoCloseable
public String getEndpoint()
{
- Map<String, String> hostIdToEndpoint = ssProxy.getHostIdMap();
+ Map<String, String> hostIdToEndpoint = ssProxy.getHostIdToEndpoint();
return hostIdToEndpoint.get(ssProxy.getLocalHostId());
}
[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fe40a11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fe40a11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fe40a11
Branch: refs/heads/cassandra-2.2
Commit: 5fe40a1178c2896822a51adc28c1ee6c95efc2ff
Parents: 4a849ef 6039d0e
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:45:43 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:45:43 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 2bbc999,7e74947..6dc5a9f
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@@ -159,8 -159,18 +159,11 @@@ public interface StorageServiceMBean ex
public String getLocalHostId();
/** Retrieve the mapping of endpoint to host ID */
- public Map<String, String> getHostIdMap();
+ public Map<String, String> getEndpointToHostId();
+
+ /** Retrieve the mapping of host ID to endpoint */
+ public Map<String, String> getHostIdToEndpoint();
- /**
- * Numeric load value.
- * @see org.apache.cassandra.metrics.StorageMetrics#load
- */
- @Deprecated
- public double getLoad();
-
/** Human-readable load value */
public String getLoadString();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fe40a11/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
[10/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d918b8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d918b8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d918b8f
Branch: refs/heads/trunk
Commit: 5d918b8fc0b90771caef586ce3b268c10b0d645a
Parents: 32d7616 5fe40a1
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:47:18 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:47:18 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 0a8717f,1527eb1..76299b7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1571,12 -1555,7 +1571,12 @@@ public class StorageService extends Not
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
+ public UUID getLocalHostUUID()
+ {
+ return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress());
+ }
+
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
[11/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d918b8f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d918b8f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d918b8f
Branch: refs/heads/cassandra-3.0
Commit: 5d918b8fc0b90771caef586ce3b268c10b0d645a
Parents: 32d7616 5fe40a1
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 24 14:47:18 2015 -0700
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 24 14:47:18 2015 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 10 +++++++++-
.../org/apache/cassandra/service/StorageServiceMBean.java | 5 ++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 0a8717f,1527eb1..76299b7
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1571,12 -1555,7 +1571,12 @@@ public class StorageService extends Not
return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
}
+ public UUID getLocalHostUUID()
+ {
+ return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress());
+ }
+
- public Map<String, String> getHostIdMap()
+ public Map<String, String> getEndpointToHostId()
{
Map<String, String> mapOut = new HashMap<>();
for (Map.Entry<InetAddress, UUID> entry : getTokenMetadata().getEndpointToHostIdMapForReading().entrySet())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d918b8f/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------