Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1FE1A8A51 for ; Tue, 30 Aug 2011 14:26:20 +0000 (UTC) Received: (qmail 94285 invoked by uid 500); 30 Aug 2011 14:26:19 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94215 invoked by uid 500); 30 Aug 2011 14:26:19 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 94207 invoked by uid 99); 30 Aug 2011 14:26:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2011 14:26:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Aug 2011 14:26:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 91D2E238897D for ; Tue, 30 Aug 2011 14:25:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1163228 [1/4] - in /cassandra/trunk: ./ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/avro/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/cql/ src/java/org/ap... Date: Tue, 30 Aug 2011 14:25:54 -0000 To: commits@cassandra.apache.org From: jake@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110830142557.91D2E238897D@eris.apache.org> Author: jake Date: Tue Aug 30 14:25:53 2011 New Revision: 1163228 URL: http://svn.apache.org/viewvc?rev=1163228&view=rev Log: Pluggable Secondary Index Implementations patch by tjake; reviewed by jbellis for CASSANDRA-3078 Modified: cassandra/trunk/CHANGES.txt cassandra/trunk/interface/cassandra.thrift cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexType.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java cassandra/trunk/src/avro/internode.genavro cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java cassandra/trunk/src/java/org/apache/cassandra/config/ColumnDefinition.java cassandra/trunk/src/java/org/apache/cassandra/cql/AlterTableStatement.java cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndex.java cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java cassandra/trunk/src/resources/org/apache/cassandra/cli/CliHelp.yaml cassandra/trunk/test/unit/org/apache/cassandra/SchemaLoader.java cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java cassandra/trunk/test/unit/org/apache/cassandra/config/ColumnDefinitionTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java Modified: cassandra/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1163228&r1=1163227&r2=1163228&view=diff ============================================================================== --- cassandra/trunk/CHANGES.txt (original) +++ cassandra/trunk/CHANGES.txt Tue Aug 30 14:25:53 2011 @@ -49,6 +49,7 @@ * reduce window where dropped CF sstables may not be deleted (CASSANDRA-2942) * Expose gossip/FD info to JMX (CASSANDRA-2806) * Fix streaming over SSL when compressed SSTable involved (CASSANDRA-3051) + * Add support for pluggable secondary index implementations (CASSANDRA-3078) 0.8.5 * fix NPE when encryption_options is unspecified (CASSANDRA-3007) Modified: cassandra/trunk/interface/cassandra.thrift URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=1163228&r1=1163227&r2=1163228&view=diff ============================================================================== --- cassandra/trunk/interface/cassandra.thrift (original) +++ cassandra/trunk/interface/cassandra.thrift Tue Aug 30 14:25:53 2011 @@ -357,6 +357,7 @@ struct AuthenticationRequest { enum IndexType { KEYS, + CUSTOM } /* describes a column in a column family. */ @@ -364,7 +365,8 @@ struct ColumnDef { 1: required binary name, 2: required string validation_class, 3: optional IndexType index_type, - 4: optional string index_name + 4: optional string index_name, + 5: optional map index_options } Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java?rev=1163228&r1=1163227&r2=1163228&view=diff ============================================================================== --- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java (original) +++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java Tue Aug 30 14:25:53 2011 @@ -334,21 +334,5 @@ public class AuthenticationException ext } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { - try { - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - } Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java?rev=1163228&r1=1163227&r2=1163228&view=diff ============================================================================== --- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java (original) +++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java Tue Aug 30 14:25:53 2011 @@ -379,21 +379,5 @@ public class AuthenticationRequest imple } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { - try { - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - } Modified: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java?rev=1163228&r1=1163227&r2=1163228&view=diff ============================================================================== --- cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java (original) +++ cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java Tue Aug 30 14:25:53 2011 @@ -334,21 +334,5 @@ public class AuthorizationException exte } } - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { - try { - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - }