You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2016/07/30 09:34:26 UTC
[1/6] cassandra git commit: Include table name in "Cannot get
comparator" exception
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 8868b744c -> 1823c84b8
refs/heads/cassandra-3.9 8e775eaaf -> 5fb6f9585
refs/heads/trunk a123e984c -> 4ad335348
Include table name in "Cannot get comparator" exception
patch by sankalp kohli; reviewed by Robert Stupp for CASSANDRA-12181
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1823c84b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1823c84b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1823c84b
Branch: refs/heads/cassandra-3.0
Commit: 1823c84b827ff5f38862757db58001105f1d753f
Parents: 8868b74
Author: sankalp kohli <sa...@apple.com>
Authored: Sat Jul 30 11:30:01 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:30:01 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1823c84b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1e52b13..400fd36 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1225,13 +1225,23 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
long start = System.nanoTime();
Memtable mt = data.getMemtableFor(opGroup, replayPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- maybeUpdateRowCache(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ try
+ {
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
+ maybeUpdateRowCache(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
+ + " for ks: "
+ + keyspace.getName() + ", table: " + name, e);
+ }
+
}
/**
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fb6f958
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fb6f958
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fb6f958
Branch: refs/heads/trunk
Commit: 5fb6f95859f3b08e1037439ce1fe1475434af1dd
Parents: 8e775ea 1823c84
Author: Robert Stupp <sn...@snazy.de>
Authored: Sat Jul 30 11:32:45 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:32:45 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb6f958/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 62914a2,400fd36..9d31b60
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1337,15 -1224,24 +1337,24 @@@ public class ColumnFamilyStore implemen
{
long start = System.nanoTime();
- Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- invalidateCachedPartition(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- StorageHook.instance.reportWrite(metadata.cfId, update);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
- Memtable mt = data.getMemtableFor(opGroup, replayPosition);
+ try
+ {
++ Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
- maybeUpdateRowCache(key);
++ invalidateCachedPartition(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
++ StorageHook.instance.reportWrite(metadata.cfId, update);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
- + " for ks: "
- + keyspace.getName() + ", table: " + name, e);
++ + " for ks: "
++ + keyspace.getName() + ", table: " + name, e);
+ }
-
}
/**
[3/6] cassandra git commit: Include table name in "Cannot get
comparator" exception
Posted by sn...@apache.org.
Include table name in "Cannot get comparator" exception
patch by sankalp kohli; reviewed by Robert Stupp for CASSANDRA-12181
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1823c84b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1823c84b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1823c84b
Branch: refs/heads/trunk
Commit: 1823c84b827ff5f38862757db58001105f1d753f
Parents: 8868b74
Author: sankalp kohli <sa...@apple.com>
Authored: Sat Jul 30 11:30:01 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:30:01 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1823c84b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1e52b13..400fd36 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1225,13 +1225,23 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
long start = System.nanoTime();
Memtable mt = data.getMemtableFor(opGroup, replayPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- maybeUpdateRowCache(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ try
+ {
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
+ maybeUpdateRowCache(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
+ + " for ks: "
+ + keyspace.getName() + ", table: " + name, e);
+ }
+
}
/**
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fb6f958
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fb6f958
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fb6f958
Branch: refs/heads/cassandra-3.9
Commit: 5fb6f95859f3b08e1037439ce1fe1475434af1dd
Parents: 8e775ea 1823c84
Author: Robert Stupp <sn...@snazy.de>
Authored: Sat Jul 30 11:32:45 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:32:45 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fb6f958/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 62914a2,400fd36..9d31b60
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1337,15 -1224,24 +1337,24 @@@ public class ColumnFamilyStore implemen
{
long start = System.nanoTime();
- Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- invalidateCachedPartition(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- StorageHook.instance.reportWrite(metadata.cfId, update);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
- Memtable mt = data.getMemtableFor(opGroup, replayPosition);
+ try
+ {
++ Memtable mt = data.getMemtableFor(opGroup, commitLogPosition);
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
- maybeUpdateRowCache(key);
++ invalidateCachedPartition(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
++ StorageHook.instance.reportWrite(metadata.cfId, update);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
- + " for ks: "
- + keyspace.getName() + ", table: " + name, e);
++ + " for ks: "
++ + keyspace.getName() + ", table: " + name, e);
+ }
-
}
/**
[6/6] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ad33534
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ad33534
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ad33534
Branch: refs/heads/trunk
Commit: 4ad335348677c2ff3c80cf58bcd21715abbf4a2b
Parents: a123e98 5fb6f95
Author: Robert Stupp <sn...@snazy.de>
Authored: Sat Jul 30 11:32:49 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:32:49 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 27 +++++++++++++-------
1 file changed, 18 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ad33534/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Include table name in "Cannot get
comparator" exception
Posted by sn...@apache.org.
Include table name in "Cannot get comparator" exception
patch by sankalp kohli; reviewed by Robert Stupp for CASSANDRA-12181
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1823c84b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1823c84b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1823c84b
Branch: refs/heads/cassandra-3.9
Commit: 1823c84b827ff5f38862757db58001105f1d753f
Parents: 8868b74
Author: sankalp kohli <sa...@apple.com>
Authored: Sat Jul 30 11:30:01 2016 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Sat Jul 30 11:30:01 2016 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/ColumnFamilyStore.java | 24 ++++++++++++++------
1 file changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1823c84b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1e52b13..400fd36 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -1225,13 +1225,23 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
long start = System.nanoTime();
Memtable mt = data.getMemtableFor(opGroup, replayPosition);
- long timeDelta = mt.put(update, indexer, opGroup);
- DecoratedKey key = update.partitionKey();
- maybeUpdateRowCache(key);
- metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
- metric.writeLatency.addNano(System.nanoTime() - start);
- if(timeDelta < Long.MAX_VALUE)
- metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ try
+ {
+ long timeDelta = mt.put(update, indexer, opGroup);
+ DecoratedKey key = update.partitionKey();
+ maybeUpdateRowCache(key);
+ metric.samplers.get(Sampler.WRITES).addSample(key.getKey(), key.hashCode(), 1);
+ metric.writeLatency.addNano(System.nanoTime() - start);
+ if(timeDelta < Long.MAX_VALUE)
+ metric.colUpdateTimeDeltaHistogram.update(timeDelta);
+ }
+ catch (RuntimeException e)
+ {
+ throw new RuntimeException(e.getMessage()
+ + " for ks: "
+ + keyspace.getName() + ", table: " + name, e);
+ }
+
}
/**