[jira] [Commented] (CASSANDRA-4832) AssertionError: keys must not be empty

2012-11-18 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4832?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499652#comment-13499652
 ] 

Jonathan Ellis commented on CASSANDRA-4832:
---

The patch to fix this is git commit 72dcc298d335721c053444249c157e9a6431ebea.

 AssertionError: keys must not be empty
 --

 Key: CASSANDRA-4832
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4832
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.1.6
 Environment: Debian 6.0.5
Reporter: Tristan Seligmann
Assignee: Tristan Seligmann
Priority: Minor
  Labels: indexing
 Fix For: 1.1.7

 Attachments: FlushWriterKeyAssertionBlock.txt


 I'm getting errors like this logged:
  INFO 07:08:32,104 Compacting 
 [SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-114-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-113-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-110-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hd-108-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hd-106-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hd-107-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-112-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-109-Data.db'),
  
 SSTableReader(path='/var/lib/cassandra/data/Fusion/quoteinfo/Fusion-quoteinfo.quoteinfo_search_value_idx-hf-111-Data.db')]
 ERROR 07:08:32,108 Exception in thread Thread[CompactionExecutor:5,1,main]
 java.lang.AssertionError: Keys must not be empty
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:133)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:154)
 at 
 org.apache.cassandra.db.compaction.CompactionTask.execute(CompactionTask.java:159)
 at 
 org.apache.cassandra.db.compaction.CompactionManager$1.runMayThrow(CompactionManager.java:154)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at 
 java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:441)
 at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:303)
 at java.util.concurrent.FutureTask.run(FutureTask.java:138)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 I'm not really sure when this started happening; they tend to be logged 
 during a repair but I can't reproduce the error 100% reliably.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4648) Unable to start Cassandra with simple authentication enabled

2012-11-18 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4648?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499786#comment-13499786
 ] 

Sylvain Lebresne commented on CASSANDRA-4648:
-

Yes, authentication was only one small problem, the big one this ticket solvers 
is that it's not a good idea to use the normal path (basically everythign 
related to replication) to write to the System tables (that are not replicated 
anyway).

If there is a need to do normal queries but without authentication checks, I 
would look into subclassing ClientState with no-op authentication methods.

 Unable to start Cassandra with simple authentication enabled
 

 Key: CASSANDRA-4648
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4648
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.2.0 beta 1
 Environment: Mac OS X
Reporter: John Sanda
Assignee: Sylvain Lebresne
  Labels: security
 Fix For: 1.2.0 beta 2

 Attachments: 4648.txt


 I followed the steps for enabling simple authentication as described here, 
 http://www.datastax.com/docs/1.1/configuration/authentication. I tried 
 starting Cassandra with, 
 cassandra -f -Dpasswd.properties=conf/passwd.properties 
 -Daccess.properties=conf/access.properties
 Start up failed with this exception in my log:
 ERROR [main] 2012-09-11 15:03:04,642 CassandraDaemon.java (line 403) 
 Exception encountered during startup
 java.lang.AssertionError: 
 org.apache.cassandra.exceptions.InvalidRequestException: You have not logged 
 in
 at 
 org.apache.cassandra.cql3.QueryProcessor.processInternal(QueryProcessor.java:136)
 at 
 org.apache.cassandra.db.SystemTable.checkHealth(SystemTable.java:298)
 at 
 org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:203)
 at 
 org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:386)
 at 
 org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:429)
 Caused by: org.apache.cassandra.exceptions.InvalidRequestException: You have 
 not logged in
 at 
 org.apache.cassandra.service.ClientState.validateLogin(ClientState.java:254)
 at 
 org.apache.cassandra.service.ClientState.hasColumnFamilyAccess(ClientState.java:235)
 at 
 org.apache.cassandra.cql3.statements.SelectStatement.checkAccess(SelectStatement.java:105)
 at 
 org.apache.cassandra.cql3.QueryProcessor.processStatement(QueryProcessor.java:106)
 at 
 org.apache.cassandra.cql3.QueryProcessor.processInternal(QueryProcessor.java:124)
 ... 4 more

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


git commit: Make SerializingCache Memory Pluggable Patch by vijay, reviewed by jbellis for CASSANDRA-3997

2012-11-18 Thread vijay
Updated Branches:
  refs/heads/trunk 567928f5f - a8e848241


Make SerializingCache Memory Pluggable
Patch by vijay, reviewed by jbellis for CASSANDRA-3997

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8e84824
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8e84824
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8e84824

Branch: refs/heads/trunk
Commit: a8e848241a5eab8947cb521dd631da91deaa1d5d
Parents: 567928f
Author: Vijay Parthasarathy vijay2...@gmail.com
Authored: Sun Nov 18 07:59:18 2012 -0800
Committer: Vijay Parthasarathy vijay2...@gmail.com
Committed: Sun Nov 18 07:59:18 2012 -0800

--
 conf/cassandra-env.sh  |5 ++
 conf/cassandra.yaml|   11 +++
 src/java/org/apache/cassandra/config/Config.java   |2 +
 .../cassandra/config/DatabaseDescriptor.java   |9 ++-
 .../org/apache/cassandra/io/util/IAllocator.java   |   24 +++
 .../cassandra/io/util/JEMallocAllocator.java   |   43 
 src/java/org/apache/cassandra/io/util/Memory.java  |   23 ++-
 .../apache/cassandra/io/util/NativeAllocator.java  |   51 +++
 .../org/apache/cassandra/utils/FBUtilities.java|8 ++
 9 files changed, 157 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8e84824/conf/cassandra-env.sh
--
diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh
index 95760dd..8df11ea 100644
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@ -208,6 +208,11 @@ JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
 # JVM_OPTS=$JVM_OPTS -XX:PrintFLSStatistics=1
 # JVM_OPTS=$JVM_OPTS -Xloggc:/var/log/cassandra/gc-`date +%s`.log
 
+# Configure the following for JEMallocAllocator and if jemalloc is not 
available in the system 
+# library path (Example: /usr/local/lib/). Usually make install will do the 
right thing. 
+# export LD_LIBRARY_PATH=JEMALLOC_HOME/lib/
+# JVM_OPTS=-Djava.library.path=JEMALLOC_HOME/lib/
+
 # uncomment to have Cassandra JVM listen for remote debuggers/profilers on 
port 1414
 # JVM_OPTS=$JVM_OPTS -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1414
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8e84824/conf/cassandra.yaml
--
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index a79e150..9c74475 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -164,6 +164,17 @@ row_cache_save_period: 0
 # Defaults to SerializingCacheProvider
 row_cache_provider: SerializingCacheProvider
 
+# The pluggable Memory allocation for Off heap row cache, Experiments show 
that JEMAlloc
+# saves some memory than the native GCC allocator.
+# 
+# Supported values are: NativeAllocator, JEMallocAllocator
+#
+# If you intend to use JEMallocAllocator you have to install JEMalloc as 
library and
+# modify cassandra-env.sh as directed in the file.
+#
+# Defaults to NativeAllocator
+# memory_allocator: NativeAllocator
+
 # saved caches
 saved_caches_directory: /var/lib/cassandra/saved_caches
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8e84824/src/java/org/apache/cassandra/config/Config.java
--
diff --git a/src/java/org/apache/cassandra/config/Config.java 
b/src/java/org/apache/cassandra/config/Config.java
index c605a3a..d2f268a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -18,6 +18,7 @@
 package org.apache.cassandra.config;
 
 import org.apache.cassandra.cache.SerializingCacheProvider;
+import org.apache.cassandra.io.util.NativeAllocator;
 
 /**
  * A class that contains configuration properties for the cassandra node it 
runs within.
@@ -155,6 +156,7 @@ public class Config
 public volatile int row_cache_save_period = 0;
 public int row_cache_keys_to_save = Integer.MAX_VALUE;
 public String row_cache_provider = 
SerializingCacheProvider.class.getSimpleName();
+public String memory_allocator = NativeAllocator.class.getSimpleName();
 public boolean populate_io_cache_on_flush = false;
 
 private static boolean loadYaml = true;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8e84824/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java 
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index e615887..e14e589 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ 

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-18 Thread jbellis
Updated Branches:
  refs/heads/cassandra-1.2 1a93de3b3 - 33ae0908a
  refs/heads/cassandra-1.2.0 b226ae593 - 6cdbb2d7b
  refs/heads/trunk a8e848241 - 58daf


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/58da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58da

Branch: refs/heads/trunk
Commit: 58daf9b29627dd2f6413cdb966c295c3c25c
Parents: a8e8482 33ae090
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:20:35 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:20:35 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58da/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 61cefff,5b29a2a..65309d6
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -42,9 -46,8 +42,9 @@@ public class CFPropDefs extends Propert
  public static final String KW_REPLICATEONWRITE = replicate_on_write;
  public static final String KW_CACHING = caching;
  public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 +public static final String KW_MEMTABLE_FLUSH_PERIOD = 
memtable_flush_period_in_ms;
  
- public static final String KW_COMPACTION = compaction;
+ public static final String KW_COMPACTION = compaction_strategy;
  public static final String KW_COMPRESSION = compression;
  
  public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[3/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33ae0908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ae0908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ae0908

Branch: refs/heads/trunk
Commit: 33ae0908a36221a862ae4b66a93271222abefda8
Parents: 1a93de3 6cdbb2d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:20:13 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:20:13 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--




[4/6] git commit: fix WITH compaction_strategy - WITH compaction patch by jbellis for CASSANDRA-4968

2012-11-18 Thread jbellis
fix WITH compaction_strategy - WITH compaction
patch by jbellis for CASSANDRA-4968


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cdbb2d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cdbb2d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cdbb2d7

Branch: refs/heads/trunk
Commit: 6cdbb2d7b16fdd783c7bb93b9b40b79d526f342d
Parents: b226ae5
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Nov 17 18:24:36 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:19:46 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index bf2746e..931aa18 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -227,7 +227,7 @@ CREATE TABLE timeline (
 body text,
 posted_by text,
 PRIMARY KEY (userid, posted_month, posted_time)
-) WITH compaction_strategy = { 'class' : 'LeveledCompactionStrategy' };
+) WITH compaction = { 'class' : 'LeveledCompactionStrategy' };
 p. 
 The @CREATE TABLE@ statement creates a new table. Each such table is a set of 
_rows_ (usually representing related entities) for which it defines a number of 
properties. A table is defined by a name:#createTableName, it defines the a 
href=#createTableColumnitcolumns/it/a composing rows of the table and 
have a number of options:#createTableOptions. Note that the @CREATE 
COLUMNFAMILY@ syntax is supported as an alias for @CREATE TABLE@ (for 
historical reasons).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java 
b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 0b563cc..5b29a2a 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
 public static final String KW_CACHING = caching;
 public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 
-public static final String KW_COMPACTION = compaction;
+public static final String KW_COMPACTION = compaction_strategy;
 public static final String KW_COMPRESSION = compression;
 
 public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[5/6] git commit: fix WITH compaction_strategy - WITH compaction patch by jbellis for CASSANDRA-4968

2012-11-18 Thread jbellis
fix WITH compaction_strategy - WITH compaction
patch by jbellis for CASSANDRA-4968


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cdbb2d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cdbb2d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cdbb2d7

Branch: refs/heads/cassandra-1.2.0
Commit: 6cdbb2d7b16fdd783c7bb93b9b40b79d526f342d
Parents: b226ae5
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Nov 17 18:24:36 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:19:46 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index bf2746e..931aa18 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -227,7 +227,7 @@ CREATE TABLE timeline (
 body text,
 posted_by text,
 PRIMARY KEY (userid, posted_month, posted_time)
-) WITH compaction_strategy = { 'class' : 'LeveledCompactionStrategy' };
+) WITH compaction = { 'class' : 'LeveledCompactionStrategy' };
 p. 
 The @CREATE TABLE@ statement creates a new table. Each such table is a set of 
_rows_ (usually representing related entities) for which it defines a number of 
properties. A table is defined by a name:#createTableName, it defines the a 
href=#createTableColumnitcolumns/it/a composing rows of the table and 
have a number of options:#createTableOptions. Note that the @CREATE 
COLUMNFAMILY@ syntax is supported as an alias for @CREATE TABLE@ (for 
historical reasons).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java 
b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 0b563cc..5b29a2a 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
 public static final String KW_CACHING = caching;
 public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 
-public static final String KW_COMPACTION = compaction;
+public static final String KW_COMPACTION = compaction_strategy;
 public static final String KW_COMPRESSION = compression;
 
 public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/33ae0908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/33ae0908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/33ae0908

Branch: refs/heads/cassandra-1.2
Commit: 33ae0908a36221a862ae4b66a93271222abefda8
Parents: 1a93de3 6cdbb2d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:20:13 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:20:13 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--




[6/6] git commit: fix WITH compaction_strategy - WITH compaction patch by jbellis for CASSANDRA-4968

2012-11-18 Thread jbellis
fix WITH compaction_strategy - WITH compaction
patch by jbellis for CASSANDRA-4968


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cdbb2d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cdbb2d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cdbb2d7

Branch: refs/heads/cassandra-1.2
Commit: 6cdbb2d7b16fdd783c7bb93b9b40b79d526f342d
Parents: b226ae5
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Nov 17 18:24:36 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:19:46 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/doc/cql3/CQL.textile
--
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index bf2746e..931aa18 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -227,7 +227,7 @@ CREATE TABLE timeline (
 body text,
 posted_by text,
 PRIMARY KEY (userid, posted_month, posted_time)
-) WITH compaction_strategy = { 'class' : 'LeveledCompactionStrategy' };
+) WITH compaction = { 'class' : 'LeveledCompactionStrategy' };
 p. 
 The @CREATE TABLE@ statement creates a new table. Each such table is a set of 
_rows_ (usually representing related entities) for which it defines a number of 
properties. A table is defined by a name:#createTableName, it defines the a 
href=#createTableColumnitcolumns/it/a composing rows of the table and 
have a number of options:#createTableOptions. Note that the @CREATE 
COLUMNFAMILY@ syntax is supported as an alias for @CREATE TABLE@ (for 
historical reasons).
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cdbb2d7/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java 
b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 0b563cc..5b29a2a 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
 public static final String KW_CACHING = caching;
 public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 
-public static final String KW_COMPACTION = compaction;
+public static final String KW_COMPACTION = compaction_strategy;
 public static final String KW_COMPRESSION = compression;
 
 public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-18 Thread jbellis
Updated Branches:
  refs/heads/cassandra-1.2 33ae0908a - 2a41dcd00
  refs/heads/cassandra-1.2.0 6cdbb2d7b - 6e332e340
  refs/heads/trunk 58daf - 192b20875


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/192b2087
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/192b2087
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/192b2087

Branch: refs/heads/trunk
Commit: 192b20875df5399e9b26f1ceb499e04e3a40b507
Parents: 58d 2a41dcd
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:47 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:47 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/192b2087/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 65309d6,0b563cc..61cefff
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -42,9 -46,8 +42,9 @@@ public class CFPropDefs extends Propert
  public static final String KW_REPLICATEONWRITE = replicate_on_write;
  public static final String KW_CACHING = caching;
  public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 +public static final String KW_MEMTABLE_FLUSH_PERIOD = 
memtable_flush_period_in_ms;
  
- public static final String KW_COMPACTION = compaction_strategy;
+ public static final String KW_COMPACTION = compaction;
  public static final String KW_COMPRESSION = compression;
  
  public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a41dcd0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a41dcd0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a41dcd0

Branch: refs/heads/cassandra-1.2
Commit: 2a41dcd007cfcf7048b8f7aa2599211e4c71b1bc
Parents: 33ae090 6e332e3
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:42 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:42 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[3/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread jbellis
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a41dcd0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a41dcd0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a41dcd0

Branch: refs/heads/trunk
Commit: 2a41dcd007cfcf7048b8f7aa2599211e4c71b1bc
Parents: 33ae090 6e332e3
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:42 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:42 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[4/6] git commit: set KW_COMPACTION back to compaction

2012-11-18 Thread jbellis
set KW_COMPACTION back to compaction


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e332e34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e332e34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e332e34

Branch: refs/heads/trunk
Commit: 6e332e34077cee60cce9fa00c47cd7f89f8e865f
Parents: 6cdbb2d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:35 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:35 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e332e34/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java 
b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 5b29a2a..0b563cc 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
 public static final String KW_CACHING = caching;
 public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 
-public static final String KW_COMPACTION = compaction_strategy;
+public static final String KW_COMPACTION = compaction;
 public static final String KW_COMPRESSION = compression;
 
 public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[6/6] git commit: set KW_COMPACTION back to compaction

2012-11-18 Thread jbellis
set KW_COMPACTION back to compaction


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e332e34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e332e34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e332e34

Branch: refs/heads/cassandra-1.2
Commit: 6e332e34077cee60cce9fa00c47cd7f89f8e865f
Parents: 6cdbb2d
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:35 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:35 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e332e34/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java 
b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 5b29a2a..0b563cc 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -47,7 +47,7 @@ public class CFPropDefs extends PropertyDefinitions
 public static final String KW_CACHING = caching;
 public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 
-public static final String KW_COMPACTION = compaction_strategy;
+public static final String KW_COMPACTION = compaction;
 public static final String KW_COMPRESSION = compression;
 
 public static final String COMPACTION_STRATEGY_CLASS_KEY = class;



[jira] [Updated] (CASSANDRA-4295) Implement caching of authorization results

2012-11-18 Thread Aleksey Yeschenko (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-4295?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aleksey Yeschenko updated CASSANDRA-4295:
-

Fix Version/s: (was: 1.2.0 rc1)
   1.2.0

 Implement caching of authorization results
 --

 Key: CASSANDRA-4295
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4295
 Project: Cassandra
  Issue Type: Improvement
  Components: API
Affects Versions: 1.1.0
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.2.0

 Attachments: CASSANDRA-4295.patch


 1.2 will come with default IAuthority implementation that stores permissions 
 in Cassandra, and each permission check will involve at least 1 Cassandra 
 read. Some form of authorization result caching is very important for this 
 scenario.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499916#comment-13499916
 ] 

Aleksey Yeschenko commented on CASSANDRA-4921:
--

I don't know what it was in recent cassandra-dbapi2 versions, but it seems like 
there is no longer an issue.
I'll do some more testing, but in half an hour of poking I found no problems 
with 1.1 cqlsh + 1.4.0 python-cql combo.

 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499921#comment-13499921
 ] 

Aleksey Yeschenko commented on CASSANDRA-4921:
--

I remember now. It's CQL query must be bytes, not unicode error when 
attempting COPY TO and COPY FROM in CQL3 mode.
Nothing else seems to be affected (DESCRIBE * command work fine and all field 
types are properly deserialized/formatted in both CQL2 and CQL3 mode).

 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Comment Edited] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499921#comment-13499921
 ] 

Aleksey Yeschenko edited comment on CASSANDRA-4921 at 11/18/12 10:00 PM:
-

I remember now. It's CQL query must be bytes, not unicode error when 
attempting COPY TO and COPY FROM in CQL3 mode.
Nothing else seems to be affected (DESCRIBE * commands work fine and all field 
types are properly deserialized/formatted in both CQL2 and CQL3 mode).

  was (Author: iamaleksey):
I remember now. It's CQL query must be bytes, not unicode error when 
attempting COPY TO and COPY FROM in CQL3 mode.
Nothing else seems to be affected (DESCRIBE * command work fine and all field 
types are properly deserialized/formatted in both CQL2 and CQL3 mode).
  
 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aleksey Yeschenko updated CASSANDRA-4921:
-

Attachment: 4921.txt

 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7

 Attachments: 4921.txt


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499935#comment-13499935
 ] 

Aleksey Yeschenko commented on CASSANDRA-4921:
--

Back ported cql_protect_name function from 1.2 (two line diff). Everything 
seems to be working in both CQL2 and CQL3 modes.

 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7

 Attachments: 4921.txt


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4921) improve cqlsh COPY FROM performance

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4921?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499937#comment-13499937
 ] 

Aleksey Yeschenko commented on CASSANDRA-4921:
--

For completeness: this is the cql-python commit that broke the compatibility: 
https://code.google.com/a/apache-extras.org/p/cassandra-dbapi2/source/detail?r=620f813baae3b568349d3fc8886f9e29280f3164
 (resolving this issue: 
https://code.google.com/a/apache-extras.org/p/cassandra-dbapi2/issues/detail?id=19).

 improve cqlsh COPY FROM performance
 ---

 Key: CASSANDRA-4921
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4921
 Project: Cassandra
  Issue Type: Improvement
  Components: Tools
Affects Versions: 1.1.2
Reporter: Jonathan Ellis
Assignee: Aleksey Yeschenko
Priority: Minor
 Fix For: 1.1.7

 Attachments: 4921.txt


 Profiling shows that prepare_inline takes the vast majority of cqlsh COPY 
 FROM time, particularly on csv rows with many columns.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Updated] (CASSANDRA-4965) in cqlsh, alter table with compaction_strategy_class does nothing

2012-11-18 Thread Aleksey Yeschenko (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-4965?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aleksey Yeschenko updated CASSANDRA-4965:
-

 Reviewer: jbellis
  Component/s: (was: Tools)
Affects Version/s: 1.2.0 beta 2
Fix Version/s: 1.2.0 rc1
   1.1.7

 in cqlsh, alter table with compaction_strategy_class does nothing
 -

 Key: CASSANDRA-4965
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4965
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.6, 1.2.0 beta 2
Reporter: Jeremy Hanna
Assignee: Aleksey Yeschenko
 Fix For: 1.1.7, 1.2.0 rc1

 Attachments: 4965.txt


 The following cqlsh code appears to do nothing.
 {code}
 alter table blah with compaction_strategy_class = ‘LeveledCompactionStrategy’;
 {code}
 It completes as though it worked but when you describe the table, it's still 
 STCS.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4965) in cqlsh, alter table with compaction_strategy_class does nothing

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4965?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499986#comment-13499986
 ] 

Aleksey Yeschenko commented on CASSANDRA-4965:
--

It's not a cqlsh issue. It's CQL2 AlterTableStatement bug. Affects CQL2 1.1 and 
1.2. Doesn't affect CQL3 in either C* version.

 in cqlsh, alter table with compaction_strategy_class does nothing
 -

 Key: CASSANDRA-4965
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4965
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.6, 1.2.0 beta 2
Reporter: Jeremy Hanna
Assignee: Aleksey Yeschenko
 Fix For: 1.1.7, 1.2.0 rc1

 Attachments: 4965.txt


 The following cqlsh code appears to do nothing.
 {code}
 alter table blah with compaction_strategy_class = ‘LeveledCompactionStrategy’;
 {code}
 It completes as though it worked but when you describe the table, it's still 
 STCS.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Comment Edited] (CASSANDRA-4965) in cqlsh, alter table with compaction_strategy_class does nothing

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4965?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13499986#comment-13499986
 ] 

Aleksey Yeschenko edited comment on CASSANDRA-4965 at 11/19/12 1:55 AM:


It's not a cqlsh issue. It's a CQL2 AlterTableStatement bug. Affects CQL2 1.1 
and 1.2. Doesn't affect CQL3 in either C* version.

  was (Author: iamaleksey):
It's not a cqlsh issue. It's CQL2 AlterTableStatement bug. Affects CQL2 1.1 
and 1.2. Doesn't affect CQL3 in either C* version.
  
 in cqlsh, alter table with compaction_strategy_class does nothing
 -

 Key: CASSANDRA-4965
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4965
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.1.6, 1.2.0 beta 2
Reporter: Jeremy Hanna
Assignee: Aleksey Yeschenko
 Fix For: 1.1.7, 1.2.0 rc1

 Attachments: 4965.txt


 The following cqlsh code appears to do nothing.
 {code}
 alter table blah with compaction_strategy_class = ‘LeveledCompactionStrategy’;
 {code}
 It completes as though it worked but when you describe the table, it's still 
 STCS.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


git commit: ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names

2012-11-18 Thread aleksey
Updated Branches:
  refs/heads/cassandra-1.2.0 6e332e340 - c3173d475


ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3173d47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3173d47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3173d47

Branch: refs/heads/cassandra-1.2.0
Commit: c3173d475f05a5025369a361dc3a4a94a35319c5
Parents: 6e332e3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:50:36 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:50:36 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3173d47/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 53eef8a..142b036 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
 else:
 cf_q = select columnfamily from system.schema_columnfamilies
where keyspace=:ks
-self.cursor.execute(cf_q, {'ks': ksname})
+self.cursor.execute(cf_q, {'ks': self.cql_unprotect_name(ksname)})
 return [str(row[0]) for row in self.cursor.fetchall()]
 
 def get_columnfamily_layout(self, ksname, cfname):



[1/2] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread aleksey
Updated Branches:
  refs/heads/cassandra-1.2 2a41dcd00 - 6acbc86dd


Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbc86d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbc86d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbc86d

Branch: refs/heads/cassandra-1.2
Commit: 6acbc86ddfea2c781aba84f2b8dfd7f8f842fdc2
Parents: 2a41dcd c3173d4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:52:10 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:52:10 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[2/2] git commit: ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names

2012-11-18 Thread aleksey
ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3173d47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3173d47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3173d47

Branch: refs/heads/cassandra-1.2
Commit: c3173d475f05a5025369a361dc3a4a94a35319c5
Parents: 6e332e3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:50:36 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:50:36 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3173d47/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 53eef8a..142b036 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
 else:
 cf_q = select columnfamily from system.schema_columnfamilies
where keyspace=:ks
-self.cursor.execute(cf_q, {'ks': ksname})
+self.cursor.execute(cf_q, {'ks': self.cql_unprotect_name(ksname)})
 return [str(row[0]) for row in self.cursor.fetchall()]
 
 def get_columnfamily_layout(self, ksname, cfname):



[3/3] git commit: ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names

2012-11-18 Thread aleksey
ninja-fix cqlsh get_columnfamily_names_cql3 for case-sensitive keyspace names


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3173d47
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3173d47
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3173d47

Branch: refs/heads/trunk
Commit: c3173d475f05a5025369a361dc3a4a94a35319c5
Parents: 6e332e3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:50:36 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:50:36 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3173d47/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index 53eef8a..142b036 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -726,7 +726,7 @@ class Shell(cmd.Cmd):
 else:
 cf_q = select columnfamily from system.schema_columnfamilies
where keyspace=:ks
-self.cursor.execute(cf_q, {'ks': ksname})
+self.cursor.execute(cf_q, {'ks': self.cql_unprotect_name(ksname)})
 return [str(row[0]) for row in self.cursor.fetchall()]
 
 def get_columnfamily_layout(self, ksname, cfname):



[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2

2012-11-18 Thread aleksey
Merge branch 'cassandra-1.2.0' into cassandra-1.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbc86d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbc86d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbc86d

Branch: refs/heads/trunk
Commit: 6acbc86ddfea2c781aba84f2b8dfd7f8f842fdc2
Parents: 2a41dcd c3173d4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:52:10 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:52:10 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[1/3] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-18 Thread aleksey
Updated Branches:
  refs/heads/trunk 192b20875 - 408b468fa


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/408b468f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/408b468f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/408b468f

Branch: refs/heads/trunk
Commit: 408b468fac1d0af047f0b9ef011b8a33b1c67d28
Parents: 192b208 6acbc86
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Nov 19 05:53:09 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Nov 19 05:53:09 2012 +0300

--
 bin/cqlsh |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--




[jira] [Updated] (CASSANDRA-4753) Timeout reporter writes hints for the local node

2012-11-18 Thread Aleksey Yeschenko (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-4753?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Aleksey Yeschenko updated CASSANDRA-4753:
-

Attachment: 4753.txt

 Timeout reporter writes hints for the local node
 

 Key: CASSANDRA-4753
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4753
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.2.0 beta 1
Reporter: Aleksey Yeschenko
Assignee: Aleksey Yeschenko
 Fix For: 1.2.0

 Attachments: 4753.txt


 MessagingService.java:330 calls StorageProxy.scheduleLocalHint() without 
 checking if the local node is the target. This causes 
 StorageProxy.scheduleLocalHint to throw AssertionError sometimes.
 Got this error when some batches are timed out. This can happen because even 
 local batches now go through StorageProxy.sendMessages and aren't just 
 rm.apply()'d.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4753) Timeout reporter writes hints for the local node

2012-11-18 Thread Aleksey Yeschenko (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4753?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=1349#comment-1349
 ] 

Aleksey Yeschenko commented on CASSANDRA-4753:
--

That particular error has been fixed some time ago (same issue that was causing 
batchlog timeouts in beta1). So there is really no need to special-case 
timeout-reporter for local node - such cases just should not happen.

However, I added a check for local node to StorageProxy.shouldHint so that no 
issue like this one pops in the future.

 Timeout reporter writes hints for the local node
 

 Key: CASSANDRA-4753
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4753
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.2.0 beta 1
Reporter: Aleksey Yeschenko
Assignee: Aleksey Yeschenko
 Fix For: 1.2.0

 Attachments: 4753.txt


 MessagingService.java:330 calls StorageProxy.scheduleLocalHint() without 
 checking if the local node is the target. This causes 
 StorageProxy.scheduleLocalHint to throw AssertionError sometimes.
 Got this error when some batches are timed out. This can happen because even 
 local batches now go through StorageProxy.sendMessages and aren't just 
 rm.apply()'d.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira


[jira] [Commented] (CASSANDRA-4417) invalid counter shard detected

2012-11-18 Thread Michael Kjellman (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-4417?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13500026#comment-13500026
 ] 

Michael Kjellman commented on CASSANDRA-4417:
-

unfortunately, hitting this as well. We increment by different values as well. 
RF=3 on 1.1.6. Happened to me after i did a nodetool drain and restarted a 
node. When it came back up started seeing it being logged.

 invalid counter shard detected 
 ---

 Key: CASSANDRA-4417
 URL: https://issues.apache.org/jira/browse/CASSANDRA-4417
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.1.1
 Environment: Amazon Linux
Reporter: Senthilvel Rangaswamy
 Attachments: cassandra-mck.log.bz2, err.txt


 Seeing errors like these:
 2012-07-06_07:00:27.22662 ERROR 07:00:27,226 invalid counter shard detected; 
 (17bfd850-ac52-11e1--6ecd0b5b61e7, 1, 13) and 
 (17bfd850-ac52-11e1--6ecd0b5b61e7, 1, 1) differ only in count; will pick 
 highest to self-heal; this indicates a bug or corruption generated a bad 
 counter shard
 What does it mean ?

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira