Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 57496 invoked from network); 22 Oct 2010 03:24:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Oct 2010 03:24:33 -0000 Received: (qmail 80673 invoked by uid 500); 22 Oct 2010 03:24:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 80657 invoked by uid 500); 22 Oct 2010 03:24:33 -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 80649 invoked by uid 99); 22 Oct 2010 03:24:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Oct 2010 03:24:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 22 Oct 2010 03:24:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 661CD23888E4; Fri, 22 Oct 2010 03:23:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1026200 [1/11] - in /cassandra/trunk: ./ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/auth/ src/java/org/apache/cassandra/avro/ src/java/org/apache/cassandra/cli/ src/java/org/apache/cassa... Date: Fri, 22 Oct 2010 03:23:31 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101022032334.661CD23888E4@eris.apache.org> Author: jbellis Date: Fri Oct 22 03:23:26 2010 New Revision: 1026200 URL: http://svn.apache.org/viewvc?rev=1026200&view=rev Log: tjake Added: cassandra/trunk/src/java/org/apache/cassandra/utils/ByteBufferUtil.java - copied, changed from r1026177, cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java Modified: cassandra/trunk/build.xml 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/Constants.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/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/RowPredicate.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/java/org/apache/cassandra/auth/Resources.java cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.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/config/DatabaseDescriptor.java cassandra/trunk/src/java/org/apache/cassandra/db/BinaryMemtable.java cassandra/trunk/src/java/org/apache/cassandra/db/Column.java cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java cassandra/trunk/src/java/org/apache/cassandra/db/ColumnSerializer.java cassandra/trunk/src/java/org/apache/cassandra/db/DecoratedKey.java cassandra/trunk/src/java/org/apache/cassandra/db/DefsTable.java cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java cassandra/trunk/src/java/org/apache/cassandra/db/IColumn.java cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java cassandra/trunk/src/java/org/apache/cassandra/db/RangeSliceCommand.java cassandra/trunk/src/java/org/apache/cassandra/db/ReadCommand.java cassandra/trunk/src/java/org/apache/cassandra/db/ReadResponse.java cassandra/trunk/src/java/org/apache/cassandra/db/ReadVerbHandler.java cassandra/trunk/src/java/org/apache/cassandra/db/RowMutation.java cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java cassandra/trunk/src/java/org/apache/cassandra/db/Table.java cassandra/trunk/src/java/org/apache/cassandra/db/WriteResponse.java cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java cassandra/trunk/src/java/org/apache/cassandra/db/filter/NamesQueryFilter.java cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryFilter.java cassandra/trunk/src/java/org/apache/cassandra/db/filter/QueryPath.java cassandra/trunk/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AsciiType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/BytesType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/IntegerType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LexicalUUIDType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LocalByPartionerType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/LongType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java cassandra/trunk/src/java/org/apache/cassandra/db/marshal/UTF8Type.java cassandra/trunk/src/java/org/apache/cassandra/db/migration/Migration.java cassandra/trunk/src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java cassandra/trunk/src/java/org/apache/cassandra/dht/AbstractByteOrderedPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/BytesToken.java cassandra/trunk/src/java/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/IPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/LocalPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/LocalToken.java cassandra/trunk/src/java/org/apache/cassandra/dht/OrderPreservingPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/RandomPartitioner.java cassandra/trunk/src/java/org/apache/cassandra/dht/Range.java cassandra/trunk/src/java/org/apache/cassandra/dht/StringToken.java cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java cassandra/trunk/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java cassandra/trunk/src/java/org/apache/cassandra/hadoop/ConfigHelper.java cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java cassandra/trunk/src/java/org/apache/cassandra/io/SerDeUtils.java cassandra/trunk/src/java/org/apache/cassandra/io/sstable/IndexHelper.java cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableTracker.java cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyChecker.java cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java cassandra/trunk/src/java/org/apache/cassandra/service/StorageServiceMBean.java cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java cassandra/trunk/src/java/org/apache/cassandra/thrift/ThriftValidation.java cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableImport.java cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java cassandra/trunk/src/java/org/apache/cassandra/utils/Filter.java cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java cassandra/trunk/src/java/org/apache/cassandra/utils/MerkleTree.java cassandra/trunk/src/java/org/apache/cassandra/utils/MurmurHash.java cassandra/trunk/src/java/org/apache/cassandra/utils/UUIDGen.java cassandra/trunk/test/system/test_thrift_server.py cassandra/trunk/test/unit/org/apache/cassandra/Util.java cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.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/ColumnFamilyTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsPurgeTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/DefsTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/NameSortTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/ReadMessageTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveColumnTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RowIterationTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RowTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/SuperColumnTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/TimeSortTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/IntegerTypeTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/marshal/TypeCompareTest.java cassandra/trunk/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java cassandra/trunk/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java cassandra/trunk/test/unit/org/apache/cassandra/hadoop/ColumnFamilyInputFormatTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java cassandra/trunk/test/unit/org/apache/cassandra/locator/SimpleStrategyTest.java cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java cassandra/trunk/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableExportTest.java cassandra/trunk/test/unit/org/apache/cassandra/tools/SSTableImportTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/BloomFilterTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/FilterTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/KeyGenerator.java cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/UUIDTests.java Modified: cassandra/trunk/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1026200&r1=1026199&r2=1026200&view=diff ============================================================================== --- cassandra/trunk/build.xml (original) +++ cassandra/trunk/build.xml Fri Oct 22 03:23:26 2010 @@ -74,8 +74,8 @@ - @@ -99,7 +99,7 @@ - - + Building Grammar ${build.src.java}/org/apache/cassandra/cli/Cli.g .... - + @@ -254,21 +254,21 @@ - + - + - + @@ -277,7 +277,7 @@ - + @@ -290,7 +290,7 @@ @@ -309,7 +309,7 @@ - + @@ -326,20 +326,20 @@ - + - + - + @@ -356,9 +356,9 @@ - + - + @@ -392,7 +392,7 @@ - + - + @@ -459,7 +459,7 @@ - + @@ -470,12 +470,12 @@ - + - + - + @@ -483,9 +483,9 @@ - + - + @@ -528,7 +528,7 @@ - + Modified: cassandra/trunk/interface/cassandra.thrift URL: http://svn.apache.org/viewvc/cassandra/trunk/interface/cassandra.thrift?rev=1026200&r1=1026199&r2=1026200&view=diff ============================================================================== --- cassandra/trunk/interface/cassandra.thrift (original) +++ cassandra/trunk/interface/cassandra.thrift Fri Oct 22 03:23:26 2010 @@ -373,7 +373,7 @@ service Cassandra { */ ColumnOrSuperColumn get(1:required binary key, 2:required ColumnPath column_path, - 3:required ConsistencyLevel consistency_level=ONE) + 3:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:NotFoundException nfe, 3:UnavailableException ue, 4:TimedOutException te), /** @@ -383,7 +383,7 @@ service Cassandra { list get_slice(1:required binary key, 2:required ColumnParent column_parent, 3:required SlicePredicate predicate, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -393,7 +393,7 @@ service Cassandra { i32 get_count(1:required binary key, 2:required ColumnParent column_parent, 3:required SlicePredicate predicate, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -402,7 +402,7 @@ service Cassandra { map> multiget_slice(1:required list keys, 2:required ColumnParent column_parent, 3:required SlicePredicate predicate, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -411,7 +411,7 @@ service Cassandra { map multiget_count(1:required list keys, 2:required ColumnParent column_parent, 3:required SlicePredicate predicate, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -420,14 +420,14 @@ service Cassandra { list get_range_slices(1:required ColumnParent column_parent, 2:required SlicePredicate predicate, 3:required KeyRange range, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** Returns the subset of columns specified in SlicePredicate for the rows matching the IndexClause */ list get_indexed_slices(1:required ColumnParent column_parent, 2:required IndexClause index_clause, 3:required SlicePredicate column_predicate, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), # modification methods @@ -438,7 +438,7 @@ service Cassandra { void insert(1:required binary key, 2:required ColumnParent column_parent, 3:required Column column, - 4:required ConsistencyLevel consistency_level=ONE) + 4:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -449,7 +449,7 @@ service Cassandra { void remove(1:required binary key, 2:required ColumnPath column_path, 3:required i64 timestamp, - 4:ConsistencyLevel consistency_level=ONE) + 4:ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** @@ -458,7 +458,7 @@ service Cassandra { mutation_map maps key to column family to a list of Mutation objects to take place at that scope. **/ void batch_mutate(1:required map>> mutation_map, - 2:required ConsistencyLevel consistency_level=ONE) + 2:required ConsistencyLevel consistency_level=ConsistencyLevel.ONE) throws (1:InvalidRequestException ire, 2:UnavailableException ue, 3:TimedOutException te), /** 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=1026200&r1=1026199&r2=1026200&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 Fri Oct 22 03:23:26 2010 @@ -37,6 +37,7 @@ import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,9 +150,9 @@ public class AuthenticationException ext return new AuthenticationException(this); } - @Deprecated - public AuthenticationException clone() { - return new AuthenticationException(this); + @Override + public void clear() { + this.why = null; } public String getWhy() { @@ -191,10 +192,6 @@ public class AuthenticationException ext } } - public void setFieldValue(int fieldID, Object value) { - setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); - } - public Object getFieldValue(_Fields field) { switch (field) { case WHY: @@ -204,12 +201,12 @@ public class AuthenticationException ext throw new IllegalStateException(); } - public Object getFieldValue(int fieldId) { - return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); - } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + switch (field) { case WHY: return isSetWhy(); @@ -217,10 +214,6 @@ public class AuthenticationException ext throw new IllegalStateException(); } - public boolean isSet(int fieldID) { - return isSet(_Fields.findByThriftIdOrThrow(fieldID)); - } - @Override public boolean equals(Object that) { if (that == null) @@ -270,7 +263,8 @@ public class AuthenticationException ext if (lastComparison != 0) { return lastComparison; } - if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(this.why, typedOther.why); + if (isSetWhy()) { + lastComparison = TBaseHelper.compareTo(this.why, typedOther.why); if (lastComparison != 0) { return lastComparison; } @@ -278,6 +272,10 @@ public class AuthenticationException ext return 0; } + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); 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=1026200&r1=1026199&r2=1026200&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 Fri Oct 22 03:23:26 2010 @@ -37,6 +37,7 @@ import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -163,9 +164,9 @@ public class AuthenticationRequest imple return new AuthenticationRequest(this); } - @Deprecated - public AuthenticationRequest clone() { - return new AuthenticationRequest(this); + @Override + public void clear() { + this.credentials = null; } public int getCredentialsSize() { @@ -216,10 +217,6 @@ public class AuthenticationRequest imple } } - public void setFieldValue(int fieldID, Object value) { - setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); - } - public Object getFieldValue(_Fields field) { switch (field) { case CREDENTIALS: @@ -229,12 +226,12 @@ public class AuthenticationRequest imple throw new IllegalStateException(); } - public Object getFieldValue(int fieldId) { - return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); - } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + switch (field) { case CREDENTIALS: return isSetCredentials(); @@ -242,10 +239,6 @@ public class AuthenticationRequest imple throw new IllegalStateException(); } - public boolean isSet(int fieldID) { - return isSet(_Fields.findByThriftIdOrThrow(fieldID)); - } - @Override public boolean equals(Object that) { if (that == null) @@ -295,7 +288,8 @@ public class AuthenticationRequest imple if (lastComparison != 0) { return lastComparison; } - if (isSetCredentials()) { lastComparison = TBaseHelper.compareTo(this.credentials, typedOther.credentials); + if (isSetCredentials()) { + lastComparison = TBaseHelper.compareTo(this.credentials, typedOther.credentials); if (lastComparison != 0) { return lastComparison; } @@ -303,6 +297,10 @@ public class AuthenticationRequest imple return 0; } + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); 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=1026200&r1=1026199&r2=1026200&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 Fri Oct 22 03:23:26 2010 @@ -37,6 +37,7 @@ import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -149,9 +150,9 @@ public class AuthorizationException exte return new AuthorizationException(this); } - @Deprecated - public AuthorizationException clone() { - return new AuthorizationException(this); + @Override + public void clear() { + this.why = null; } public String getWhy() { @@ -191,10 +192,6 @@ public class AuthorizationException exte } } - public void setFieldValue(int fieldID, Object value) { - setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); - } - public Object getFieldValue(_Fields field) { switch (field) { case WHY: @@ -204,12 +201,12 @@ public class AuthorizationException exte throw new IllegalStateException(); } - public Object getFieldValue(int fieldId) { - return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); - } - /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + switch (field) { case WHY: return isSetWhy(); @@ -217,10 +214,6 @@ public class AuthorizationException exte throw new IllegalStateException(); } - public boolean isSet(int fieldID) { - return isSet(_Fields.findByThriftIdOrThrow(fieldID)); - } - @Override public boolean equals(Object that) { if (that == null) @@ -270,7 +263,8 @@ public class AuthorizationException exte if (lastComparison != 0) { return lastComparison; } - if (isSetWhy()) { lastComparison = TBaseHelper.compareTo(this.why, typedOther.why); + if (isSetWhy()) { + lastComparison = TBaseHelper.compareTo(this.why, typedOther.why); if (lastComparison != 0) { return lastComparison; } @@ -278,6 +272,10 @@ public class AuthorizationException exte return 0; } + public _Fields fieldForId(int fieldId) { + return _Fields.findByThriftId(fieldId); + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin();