[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
test/unit/org/apache/cassandra/db/KeyCacheTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813577e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813577e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813577e3
Branch: refs/heads/trunk
Commit: 813577e32b7e9a40ff1e71875d019eda44c84586
Parents: 371e7bf 422d223
Author: Yuki Morishita yu...@apache.org
Authored: Wed Jul 24 11:07:31 2013 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Jul 24 11:07:31 2013 -0500
--
CHANGES.txt | 1 +
.../apache/cassandra/cql3/AbstractMarker.java | 5 ++
src/java/org/apache/cassandra/cql3/Lists.java | 76 ++
src/java/org/apache/cassandra/cql3/Maps.java| 84 +++-
src/java/org/apache/cassandra/cql3/Sets.java| 73 +
src/java/org/apache/cassandra/cql3/Term.java| 28 ++-
.../cassandra/cql3/functions/FunctionCall.java | 10 +++
.../org/apache/cassandra/db/KeyCacheTest.java | 70 ++--
8 files changed, 266 insertions(+), 81 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/813577e3/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/813577e3/src/java/org/apache/cassandra/cql3/Lists.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/813577e3/src/java/org/apache/cassandra/cql3/Maps.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/813577e3/src/java/org/apache/cassandra/cql3/Sets.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/813577e3/test/unit/org/apache/cassandra/db/KeyCacheTest.java
--
diff --cc test/unit/org/apache/cassandra/db/KeyCacheTest.java
index e8e524d,3458961..10bcedd
--- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
@@@ -35,8 -27,14 +27,12 @@@ import org.junit.Test
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
+ import org.apache.cassandra.cache.KeyCacheKey;
import org.apache.cassandra.db.compaction.CompactionManager;
+ import org.apache.cassandra.db.filter.QueryFilter;
-import org.apache.cassandra.db.filter.QueryPath;
+ import org.apache.cassandra.service.CacheService;
-import org.apache.cassandra.thrift.ColumnParent;
import org.apache.cassandra.utils.ByteBufferUtil;
+
import static junit.framework.Assert.assertEquals;
public class KeyCacheTest extends SchemaLoader
@@@ -60,28 -58,45 +56,45 @@@
// empty the cache
CacheService.instance.invalidateKeyCache();
- assert CacheService.instance.keyCache.size() == 0;
-assertKeyCacheSize(0, TABLE1, COLUMN_FAMILY2);
++assertKeyCacheSize(0, KEYSPACE1, COLUMN_FAMILY2);
// insert data and force to disk
-insertData(TABLE1, COLUMN_FAMILY2, 0, 100);
+insertData(KEYSPACE1, COLUMN_FAMILY2, 0, 100);
store.forceBlockingFlush();
// populate the cache
-readData(TABLE1, COLUMN_FAMILY2, 0, 100);
-assertKeyCacheSize(100, TABLE1, COLUMN_FAMILY2);
+readData(KEYSPACE1, COLUMN_FAMILY2, 0, 100);
- assertEquals(100, CacheService.instance.keyCache.size());
++assertKeyCacheSize(100, KEYSPACE1, COLUMN_FAMILY2);
// really? our caches don't implement the map interface? (hence no
.addAll)
MapKeyCacheKey, RowIndexEntry savedMap = new HashMapKeyCacheKey,
RowIndexEntry();
for (KeyCacheKey k : CacheService.instance.keyCache.getKeySet())
{
- savedMap.put(k, CacheService.instance.keyCache.get(k));
-if (k.desc.ksname.equals(TABLE1)
k.desc.cfname.equals(COLUMN_FAMILY2))
++if (k.desc.ksname.equals(KEYSPACE1)
k.desc.cfname.equals(COLUMN_FAMILY2))
+ savedMap.put(k, CacheService.instance.keyCache.get(k));
}
// force the cache to disk
CacheService.instance.keyCache.submitWrite(Integer.MAX_VALUE).get();
CacheService.instance.invalidateKeyCache();
- assert CacheService.instance.keyCache.size() == 0;
-assertKeyCacheSize(0, TABLE1, COLUMN_FAMILY2);
++assertKeyCacheSize(0, KEYSPACE1, COLUMN_FAMILY2);
+
+ CacheService.instance.keyCache.loadSaved(store);
-assertKeyCacheSize(savedMap.size(), TABLE1, COLUMN_FAMILY2);
++
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b0dbeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b0dbeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78b0dbeb
Branch: refs/heads/trunk
Commit: 78b0dbeb25f2327fc2c417bb07bebac15f99e785
Parents: 86081fa fc5044f
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Jun 19 12:21:52 2013 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Jun 19 12:21:52 2013 -0700
--
src/java/org/apache/cassandra/gms/Gossiper.java | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b0dbeb/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c32cc41,efa9865..d8918f3
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -1077,10 -1074,22 +1077,22 @@@ public class Gossiper implements IFailu
logger.debug(Attempt to add self as saved endpoint);
return;
}
- EndpointState epState = new EndpointState(new HeartBeatState(0));
+
+ //preserve any previously known, in-memory data about the endpoint
(such as DC, RACK, and so on)
+ EndpointState epState = endpointStateMap.get(ep);
+ if (epState != null)
+ {
+ logger.debug(not replacing a previous epState for {}, but
reusing it: {}, ep, epState);
+ epState.setHeartBeatState(new HeartBeatState(0));
+ }
+ else
+ {
+ epState = new EndpointState(new HeartBeatState(0));
+ }
+
epState.markDead();
endpointStateMap.put(ep, epState);
-unreachableEndpoints.put(ep, System.currentTimeMillis());
+unreachableEndpoints.put(ep, System.nanoTime());
if (logger.isTraceEnabled())
logger.trace(Adding saved endpoint + ep + +
epState.getHeartBeatState().getGeneration());
}
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3de31572 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3de31572 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3de31572 Branch: refs/heads/trunk Commit: 3de315723624d80769b9a803a695b803117a51da Parents: 47d5f12 473713f Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jun 14 11:44:29 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jun 14 11:44:29 2013 -0500 -- pylib/cqlshlib/helptopics.py | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3de31572/pylib/cqlshlib/helptopics.py --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/deac4cc1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/deac4cc1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/deac4cc1 Branch: refs/heads/trunk Commit: deac4cc17bed2df56b2d0b452dc52b693a65e9cf Parents: 72ca5e6 6850cdc Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jun 6 13:59:41 2013 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jun 6 13:59:41 2013 -0500 -- --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b410078 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b410078 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b410078 Branch: refs/heads/trunk Commit: 8b410078a4d2c779930ee0228d263b926beda00c Parents: 94d42a9 b69c1aa Author: Yuki Morishita yu...@apache.org Authored: Fri May 17 10:29:10 2013 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Fri May 17 10:29:10 2013 -0500 -- build.xml |2 +- lib/snappy-java-1.0.4.1.jar| Bin 995967 - 0 bytes lib/snappy-java-1.0.5.jar | Bin 0 - 1251514 bytes .../transport/RequestThreadPoolExecutor.java |4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b410078/build.xml --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e2b4b96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e2b4b96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e2b4b96 Branch: refs/heads/trunk Commit: 3e2b4b96120a9b301cdfb8ac1eb8b86487adfa80 Parents: 49a7311 f91d320 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon May 13 16:35:12 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon May 13 16:35:12 2013 +0200 -- CHANGES.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e2b4b96/CHANGES.txt --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Conflicts: test/unit/org/apache/cassandra/service/CassandraServerTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72231959 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72231959 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72231959 Branch: refs/heads/trunk Commit: 72231959a622f51ee2030a9da5a56aa027328970 Parents: 738b127 2699533 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat May 11 01:52:12 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat May 11 01:52:12 2013 +0300 -- test/system/test_thrift_server.py | 29 + .../cassandra/service/CassandraServerTest.java | 88 --- 2 files changed, 29 insertions(+), 88 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/72231959/test/system/test_thrift_server.py --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/029c2f34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/029c2f34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/029c2f34 Branch: refs/heads/trunk Commit: 029c2f34829b28c0acffd91dc5d23c4c4d28aa19 Parents: 3f729d3 95ff3bb Author: Dave Brosius dbros...@apache.org Authored: Sat Apr 13 00:11:45 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Sat Apr 13 00:11:45 2013 -0400 -- .../db/compaction/LeveledCompactionStrategy.java |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/029c2f34/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39cf55a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39cf55a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39cf55a5 Branch: refs/heads/trunk Commit: 39cf55a543efc0ef9d3cc83ea225a8d068d3d537 Parents: 4902bdc c5820ed Author: Dave Brosius dbros...@apache.org Authored: Mon Apr 8 23:31:30 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Mon Apr 8 23:31:30 2013 -0400 -- CHANGES.txt|1 + debian/changelog |6 ++ .../apache/cassandra/tools/AbstractJmxClient.java | 11 ++- src/java/org/apache/cassandra/tools/Shuffle.java | 11 +++ 4 files changed, 20 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39cf55a5/src/java/org/apache/cassandra/tools/Shuffle.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk cfbcd98e0 - fd1f5fd08 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd1f5fd0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd1f5fd0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd1f5fd0 Branch: refs/heads/trunk Commit: fd1f5fd081e47612ea42305a4e9cdb94957a4c8c Parents: cfbcd98 bb63238 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Mar 14 02:02:13 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Mar 14 02:02:13 2013 +0300 -- --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.1 aba9a1774 - 2b87bfe55 refs/heads/trunk 62ff2942a - adfc94a3b Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adfc94a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adfc94a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adfc94a3 Branch: refs/heads/trunk Commit: adfc94a3bef0a94b6905f827e4ba27e03953f237 Parents: 62ff294 268e5b1 Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Mar 6 16:06:08 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Mar 6 16:06:08 2013 -0600 -- .../cassandra/gms/GossipDigestAck2VerbHandler.java |6 ++ src/java/org/apache/cassandra/gms/Gossiper.java|2 +- 2 files changed, 7 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/adfc94a3/src/java/org/apache/cassandra/gms/Gossiper.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 b7e10828f - 6415d6bee refs/heads/trunk 6d5e0831a - 881429ff8 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/881429ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/881429ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/881429ff Branch: refs/heads/trunk Commit: 881429ff8927a0ed6009542d6d03f07b19b76318 Parents: 6d5e083 6415d6b Author: Yuki Morishita yu...@apache.org Authored: Mon Mar 4 13:36:08 2013 -0600 Committer: Yuki Morishita yu...@apache.org Committed: Mon Mar 4 13:36:08 2013 -0600 -- CHANGES.txt|2 ++ .../db/compaction/CompactionController.java| 12 ++-- .../transport/messages/ResultMessage.java |2 +- 3 files changed, 13 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/881429ff/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/881429ff/src/java/org/apache/cassandra/db/compaction/CompactionController.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk b6062a5ca - acf2fd47f Merge branch 'cassandra-1.2' into trunk Conflicts: test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acf2fd47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acf2fd47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acf2fd47 Branch: refs/heads/trunk Commit: acf2fd47f6f1a7f6a9f301ac14f601dd09b98225 Parents: b6062a5 068b53d Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Feb 20 23:58:58 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Feb 20 23:58:58 2013 +0100 -- debian/changelog |6 ++ pylib/cqlshlib/helptopics.py | 126 + 2 files changed, 132 insertions(+), 0 deletions(-) --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 1d67b64f2 - e692c1b04 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e692c1b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e692c1b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e692c1b0 Branch: refs/heads/trunk Commit: e692c1b04f3bcf4efa5150e9b47e9806ee894f85 Parents: 1d67b64 858dfef Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Feb 12 14:02:04 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Feb 12 14:02:04 2013 +0100 -- CHANGES.txt|3 +++ build.xml |2 +- .../cassandra/transport/FrameCompressor.java | 13 + 3 files changed, 17 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e692c1b0/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e692c1b0/build.xml --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 27ccc433f - 1423fb110 refs/heads/trunk 63cc6b0c7 - d9f6cb8a6 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9f6cb8a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f6cb8a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f6cb8a Branch: refs/heads/trunk Commit: d9f6cb8a6f2582fb34f13f184cb86c7d9ff06768 Parents: 63cc6b0 1423fb1 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Feb 8 10:57:00 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Feb 8 10:57:00 2013 -0600 -- CHANGES.txt|3 +- conf/cassandra-env.sh |4 +++ .../org/apache/cassandra/transport/Server.java | 16 ++- 3 files changed, 21 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f6cb8a/conf/cassandra-env.sh --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk de0743fd0 - d66630d3f
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/marshal/CollectionType.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d66630d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d66630d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d66630d3
Branch: refs/heads/trunk
Commit: d66630d3f17659aa8134689280b61aa2c76817a9
Parents: de0743f a67f779
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Jan 31 12:21:29 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Jan 31 12:21:29 2013 +0100
--
NEWS.txt | 11 +
doc/cql3/CQL.textile | 98 ++--
src/java/org/apache/cassandra/cql3/CQL3Type.java | 185 +++
src/java/org/apache/cassandra/cql3/Cql.g | 82 ---
src/java/org/apache/cassandra/cql3/ParsedType.java | 152
src/java/org/apache/cassandra/cql3/Term.java | 55 -
.../cassandra/cql3/operations/ColumnOperation.java |7 +-
.../cassandra/cql3/operations/ListOperation.java | 15 +-
.../cassandra/cql3/operations/MapOperation.java|9 +-
.../cassandra/cql3/operations/Operation.java |2 +-
.../cql3/operations/PreparedOperation.java | 46 +++-
.../cassandra/cql3/operations/SetOperation.java| 49 +++--
.../cql3/statements/AlterTableStatement.java |4 +-
.../statements/CreateColumnFamilyStatement.java|8 +-
.../cassandra/cql3/statements/DeleteStatement.java |6 +-
.../cassandra/cql3/statements/SelectStatement.java | 15 +-
.../cassandra/cql3/statements/UpdateStatement.java | 27 +--
src/java/org/apache/cassandra/db/SystemTable.java |6 +-
.../apache/cassandra/db/marshal/AbstractType.java | 15 ++
.../org/apache/cassandra/db/marshal/AsciiType.java | 16 ++
.../apache/cassandra/db/marshal/BooleanType.java | 16 ++
.../org/apache/cassandra/db/marshal/BytesType.java | 16 ++
.../cassandra/db/marshal/CollectionType.java |7 +
.../cassandra/db/marshal/CounterColumnType.java| 16 ++
.../org/apache/cassandra/db/marshal/DateType.java | 17 ++-
.../apache/cassandra/db/marshal/DecimalType.java | 16 ++
.../apache/cassandra/db/marshal/DoubleType.java| 16 ++
.../org/apache/cassandra/db/marshal/FloatType.java | 16 ++
.../cassandra/db/marshal/InetAddressType.java | 16 ++
.../org/apache/cassandra/db/marshal/Int32Type.java | 15 ++
.../apache/cassandra/db/marshal/IntegerType.java | 16 ++
.../cassandra/db/marshal/LexicalUUIDType.java | 10 +
.../org/apache/cassandra/db/marshal/LongType.java | 16 ++
.../apache/cassandra/db/marshal/TimeUUIDType.java | 16 ++
.../org/apache/cassandra/db/marshal/UTF8Type.java | 16 ++
.../org/apache/cassandra/db/marshal/UUIDType.java | 16 ++
.../dht/AbstractByteOrderedPartitioner.java|7 +
.../org/apache/cassandra/dht/IPartitioner.java |3 +
.../org/apache/cassandra/dht/LocalPartitioner.java |5 +
.../apache/cassandra/dht/Murmur3Partitioner.java |7 +
.../cassandra/dht/OrderPreservingPartitioner.java |7 +
.../apache/cassandra/dht/RandomPartitioner.java|7 +
.../apache/cassandra/service/StorageService.java | 13 +-
43 files changed, 799 insertions(+), 299 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d66630d3/src/java/org/apache/cassandra/cql3/operations/ColumnOperation.java
--
diff --cc src/java/org/apache/cassandra/cql3/operations/ColumnOperation.java
index c5f5b44,d53a6b0..47abc76
--- a/src/java/org/apache/cassandra/cql3/operations/ColumnOperation.java
+++ b/src/java/org/apache/cassandra/cql3/operations/ColumnOperation.java
@@@ -108,13 -109,17 +108,17 @@@ public class ColumnOperation implement
val = -val;
}
-cf.addCounter(new QueryPath(cf.metadata().cfName, null,
builder.build()), val);
+cf.addCounter(builder.build(), val);
}
- public void addBoundNames(ColumnSpecification column,
ColumnSpecification[] boundNames) throws InvalidRequestException
+ public Operation validateAndAddBoundNames(ColumnSpecification column,
ColumnSpecification[] boundNames) throws InvalidRequestException
{
+ value.validateType(column.name.toString(), column.type);
+
if (value.isBindMarker())
boundNames[value.bindIndex] = column;
+
+ return this;
}
public ListTerm getValues()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d66630d3/src/java/org/apache/cassandra/cql3/operations/ListOperation.java
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk c25a6a14c - de0743fd0 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de0743fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de0743fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de0743fd Branch: refs/heads/trunk Commit: de0743fd00e469ea42524f1a258a81eced51d0e4 Parents: c25a6a1 be36736 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Jan 29 19:09:52 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Jan 29 19:09:52 2013 +0100 -- CHANGES.txt|2 + .../statements/CreateColumnFamilyStatement.java| 14 +++--- .../cassandra/hadoop/ColumnFamilyOutputFormat.java |4 +- .../cassandra/hadoop/ColumnFamilyRecordReader.java |4 +- .../org/apache/cassandra/hadoop/ConfigHelper.java | 34 ++- .../apache/cassandra/thrift/ITransportFactory.java |3 +- .../apache/cassandra/thrift/TBinaryProtocol.java |8 +++ .../cassandra/thrift/TFramedTransportFactory.java |7 ++- 8 files changed, 61 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de0743fd/CHANGES.txt -- diff --cc CHANGES.txt index 5ae58fe,e1af9ee..7ab72d1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,7 +1,15 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + 1.2.2 * fix symlinks under data dir not working (CASSANDRA-5185) + * fix bug in compact storage metadata handling (CASSANDRA-5189) + 1.2.1 * stream undelivered hints on decommission (CASSANDRA-5128) * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) http://git-wip-us.apache.org/repos/asf/cassandra/blob/de0743fd/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 689410b89 - eaedd259c Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eaedd259 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaedd259 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaedd259 Branch: refs/heads/trunk Commit: eaedd259c8b5ec584a964d1f4659f9fcf7133661 Parents: 689410b a71e526 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Fri Jan 18 10:58:13 2013 -0800 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Fri Jan 18 10:58:13 2013 -0800 -- .../org/apache/cassandra/locator/Ec2Snitch.java| 15 .../apache/cassandra/db/marshal/RoundTripTest.java | 26 --- 2 files changed, 15 insertions(+), 26 deletions(-) --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 2dc444851 - 551da4cfa refs/heads/trunk 1cc0f1f30 - ead7312cf Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ead7312c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ead7312c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ead7312c Branch: refs/heads/trunk Commit: ead7312cf8baa249de74ad4f7ab0c6760c505fc3 Parents: 1cc0f1f 551da4c Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jan 16 14:45:38 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jan 16 14:45:38 2013 -0600 -- .../locator/GossipingPropertyFileSnitch.java |2 ++ .../cassandra/locator/PropertyFileSnitch.java |7 +-- 2 files changed, 7 insertions(+), 2 deletions(-) --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk c3b40df72 - 118cd0d99 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/118cd0d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/118cd0d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/118cd0d9 Branch: refs/heads/trunk Commit: 118cd0d99e379f08f75e553e0bbc0d3cd2df240d Parents: c3b40df cc0c9f3 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Jan 9 12:08:15 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Jan 9 12:08:15 2013 +0100 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/Cql.g | 12 .../locator/AbstractReplicationStrategy.java | 13 + .../apache/cassandra/locator/LocalStrategy.java|2 +- .../cassandra/locator/NetworkTopologyStrategy.java |1 - .../apache/cassandra/locator/SimpleStrategy.java |9 - .../apache/cassandra/thrift/CassandraServer.java |8 7 files changed, 31 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/118cd0d9/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/118cd0d9/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 3ff0c81f6 - 1c2a69c35 refs/heads/trunk 049352f9b - c7366c508 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7366c50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7366c50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7366c50 Branch: refs/heads/trunk Commit: c7366c5086dea0c66a235b1a7023ec6a634cecfc Parents: 049352f 1c2a69c Author: Jonathan Ellis jbel...@apache.org Authored: Wed Jan 9 15:58:25 2013 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Jan 9 15:58:25 2013 -0600 -- CHANGES.txt|1 + NEWS.txt |3 ++- .../cassandra/db/compaction/CompactionManager.java | 11 ++- 3 files changed, 9 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7366c50/CHANGES.txt -- diff --cc CHANGES.txt index dd3826c,a4d7963..4553340 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +1.3 + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_tim_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237) + + 1.2.1 + * fix validation compaction of empty rows (CASSADRA-5136) * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750) * disallow bloom filter false positive chance of 0 (CASSANDRA-5013) * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7366c50/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/cassandra-1.2 6108a34bb - 794623441 refs/heads/trunk 534101959 - c3b40df72 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3b40df7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3b40df7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3b40df7 Branch: refs/heads/trunk Commit: c3b40df7262e02043ec839744d4d528cdf885eb6 Parents: 5341019 7946234 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Jan 8 20:09:52 2013 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Jan 8 20:09:52 2013 -0600 -- NEWS.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) --
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches:
refs/heads/trunk 51947d9ea - 125a8c9c7
Merge branch 'cassandra-1.2' into trunk
Conflicts:
pylib/cqlshlib/cql3handling.py
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/125a8c9c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/125a8c9c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/125a8c9c
Branch: refs/heads/trunk
Commit: 125a8c9c79f605c1dcfe45e772441cdd0438dc74
Parents: 51947d9 6b093b4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 28 02:45:32 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 28 02:45:32 2012 +0300
--
CHANGES.txt |1 +
bin/cqlsh| 86 ++-
pylib/cqlshlib/cql3handling.py | 36 +-
pylib/cqlshlib/displaying.py |8 +-
pylib/cqlshlib/formatting.py | 27 +-
pylib/cqlshlib/test/__init__.py | 20 +
pylib/cqlshlib/test/ansi_colors.py | 191
pylib/cqlshlib/test/basecase.py | 71 ++
pylib/cqlshlib/test/cassconnect.py | 159
pylib/cqlshlib/test/run_cqlsh.py | 271 ++
pylib/cqlshlib/test/table_arrangements.cql | 114 +++
pylib/cqlshlib/test/test_cql_parsing.py | 87 ++
pylib/cqlshlib/test/test_cqlsh_commands.py | 42 +
pylib/cqlshlib/test/test_cqlsh_completion.py | 243 ++
pylib/cqlshlib/test/test_cqlsh_invocation.py | 78 ++
pylib/cqlshlib/test/test_cqlsh_output.py | 965 +
pylib/cqlshlib/test/test_keyspace_init2.cql | 180
pylib/cqlshlib/test/test_keyspace_init3.cql | 36 +
18 files changed, 2562 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/125a8c9c/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/125a8c9c/pylib/cqlshlib/cql3handling.py
--
diff --cc pylib/cqlshlib/cql3handling.py
index 5b4d8fe,5293857..36e34e8
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@@ -38,7 -38,7 +38,7 @@@ class UnexpectedTableStructure(UserWarn
def __str__(self):
return 'Unexpected table structure; may not translate correctly to
CQL. ' + self.msg
--SYSTEM_KEYSPACES = ('system', 'system_traces')
++SYSTEM_KEYSPACES = ('system', 'system_auth', 'system_traces')
class Cql3ParsingRuleSet(CqlParsingRuleSet):
keywords = set((
@@@ -58,39 -58,34 +58,37 @@@
columnfamily_options = (
# (CQL option name, Thrift option name (or None if same))
('comment', None),
+ ('compaction_strategy_class', 'compaction_strategy'),
('comparator', 'comparator_type'),
- ('read_repair_chance', None),
- ('gc_grace_seconds', None),
('default_validation', 'default_validation_class'),
- ('replicate_on_write', None),
- ('compaction_strategy_class', 'compaction_strategy'),
+ ('gc_grace_seconds', None),
+('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
old_columnfamily_layout_options = (
# (CQL3 option name, schema_columnfamilies column name (or None if
same))
- ('comment', None),
('bloom_filter_fp_chance', None),
('caching', None),
- ('read_repair_chance', None),
+ ('comment', None),
+ ('compaction_strategy_class', None),
('dclocal_read_repair_chance', 'local_read_repair_chance'),
('gc_grace_seconds', None),
- ('replicate_on_write', None),
- ('compaction_strategy_class', None),
+('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
new_columnfamily_layout_options = (
- ('comment', None),
('bloom_filter_fp_chance', None),
('caching', None),
- ('read_repair_chance', None),
+ ('comment', None),
('dclocal_read_repair_chance', 'local_read_repair_chance'),
('gc_grace_seconds', None),
- ('replicate_on_write', None),
- ('default_read_consistency', None),
- ('default_write_consistency', None),
+('index_interval', None),
+ ('read_repair_chance', None),
+ ('replicate_on_write', None),
)
old_columnfamily_layout_map_options = (
