Author: gdusbabek Date: Mon Jan 24 20:48:05 2011 New Revision: 1062966 URL: http://svn.apache.org/viewvc?rev=1062966&view=rev Log: merge from 0.7 (CASSANDRA-1923)
Added: cassandra/trunk/test/data/serialization/ - copied from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/ cassandra/trunk/test/data/serialization/0.7/ - copied from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/ cassandra/trunk/test/data/serialization/0.7/db.RangeSliceCommand.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.RangeSliceCommand.bin cassandra/trunk/test/data/serialization/0.7/db.Row.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.Row.bin cassandra/trunk/test/data/serialization/0.7/db.RowMutation.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.RowMutation.bin cassandra/trunk/test/data/serialization/0.7/db.SliceByNamesReadCommand.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.SliceByNamesReadCommand.bin cassandra/trunk/test/data/serialization/0.7/db.SliceFromReadCommand.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.SliceFromReadCommand.bin cassandra/trunk/test/data/serialization/0.7/db.Truncation.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.Truncation.bin cassandra/trunk/test/data/serialization/0.7/db.WriteResponse.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.WriteResponse.bin cassandra/trunk/test/data/serialization/0.7/db.migration.Keyspace1.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.migration.Keyspace1.bin cassandra/trunk/test/data/serialization/0.7/db.migration.Keyspace2.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.migration.Keyspace2.bin cassandra/trunk/test/data/serialization/0.7/db.migration.Keyspace3.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.migration.Keyspace3.bin cassandra/trunk/test/data/serialization/0.7/db.migration.Keyspace4.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.migration.Keyspace4.bin cassandra/trunk/test/data/serialization/0.7/db.migration.Keyspace5.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/db.migration.Keyspace5.bin cassandra/trunk/test/data/serialization/0.7/gms.EndpointState.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/gms.EndpointState.bin cassandra/trunk/test/data/serialization/0.7/gms.Gossip.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/gms.Gossip.bin cassandra/trunk/test/data/serialization/0.7/service.TreeRequest.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/service.TreeRequest.bin cassandra/trunk/test/data/serialization/0.7/service.TreeResponse.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/service.TreeResponse.bin cassandra/trunk/test/data/serialization/0.7/streaming.PendingFile.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/streaming.PendingFile.bin cassandra/trunk/test/data/serialization/0.7/streaming.StreamHeader.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/streaming.StreamHeader.bin cassandra/trunk/test/data/serialization/0.7/streaming.StreamReply.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/streaming.StreamReply.bin cassandra/trunk/test/data/serialization/0.7/streaming.StreamRequestMessage.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/streaming.StreamRequestMessage.bin cassandra/trunk/test/data/serialization/0.7/utils.BloomFilter.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/utils.BloomFilter.bin cassandra/trunk/test/data/serialization/0.7/utils.EstimatedHistogram.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/utils.EstimatedHistogram.bin cassandra/trunk/test/data/serialization/0.7/utils.LegacyBloomFilter.bin - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/data/serialization/0.7/utils.LegacyBloomFilter.bin cassandra/trunk/test/unit/org/apache/cassandra/AbstractSerializationsTester.java - copied, changed from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/AbstractSerializationsTester.java cassandra/trunk/test/unit/org/apache/cassandra/db/SerializationsTest.java - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/SerializationsTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/migration/ - copied from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/migration/ cassandra/trunk/test/unit/org/apache/cassandra/db/migration/SerializationsTest.java - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/db/migration/SerializationsTest.java cassandra/trunk/test/unit/org/apache/cassandra/gms/SerializationsTest.java - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/gms/SerializationsTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/CompactSerializerTest.java - copied, changed from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/CompactSerializerTest.java cassandra/trunk/test/unit/org/apache/cassandra/service/SerializationsTest.java - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/service/SerializationsTest.java cassandra/trunk/test/unit/org/apache/cassandra/streaming/SerializationsTest.java - copied, changed from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/SerializationsTest.java cassandra/trunk/test/unit/org/apache/cassandra/utils/SerializationsTest.java - copied unchanged from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/utils/SerializationsTest.java Modified: cassandra/trunk/ (props changed) cassandra/trunk/CHANGES.txt cassandra/trunk/build.xml cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed) cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java cassandra/trunk/src/java/org/apache/cassandra/net/Message.java cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java Propchange: cassandra/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7:1026516-1062958 /cassandra/branches/cassandra-0.7.0:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3:774578-796573 Modified: cassandra/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/CHANGES.txt (original) +++ cassandra/trunk/CHANGES.txt Mon Jan 24 20:48:05 2011 @@ -43,6 +43,9 @@ to allow "warm spare" nodes or performing JMX maintenance before joining the ring (CASSANDRA-526) * log migrations at INFO (CASSANDRA-2028) + * add CLI verbose option in file mode (CASSANDRA-2030) + * add single-line "--" comments to CLI (CASSANDRA-2032) + * message serialization tests (CASSANDRA-1923) 0.7.0-final Modified: cassandra/trunk/build.xml URL: http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/build.xml (original) +++ cassandra/trunk/build.xml Mon Jan 24 20:48:05 2011 @@ -502,6 +502,7 @@ <attribute name="timeout" /> <attribute name="forkmode" default="perTest"/> <element name="optjvmargs" implicit="true" optional="true" /> + <attribute name="filter" default="**/${test.name}.java"/> <sequential> <echo message="running @{suitename} tests"/> <mkdir dir="${build.test.dir}/cassandra"/> @@ -525,7 +526,7 @@ </fileset> </classpath> <batchtest todir="${build.test.dir}/output"> - <fileset dir="@{inputdir}" includes="**/${test.name}.java" /> + <fileset dir="@{inputdir}" includes="@{filter}" /> </batchtest> </junit> <fail if="testfailed" message="Some @{suitename} test(s) failed."/> @@ -537,6 +538,26 @@ <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/> </testmacro> </target> + + <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations"> + <testmacro suitename="unit" inputdir="${test.unit.src}" + timeout="60000" filter="**/SerializationsTest.java"> + <jvmarg value="-Dcassandra.test-serialization-writes=True"/> + </testmacro> + </target> + + <target name="msg-ser-test" depends="build-test" description="Tests message serializations"> + <testmacro suitename="unit" inputdir="${test.unit.src}" timeout="60000" + filter="**/SerializationsTest.java"/> + </target> + + <target name="msg-ser-test-7" depends="build-test" description="Generates message serializations"> + <testmacro suitename="unit" inputdir="${test.unit.src}" + timeout="60000" filter="**/SerializationsTest.java"> + <jvmarg value="-Dcassandra.version=0.7"/> + </testmacro> + </target> + <target name="long-test" depends="build-test" description="Execute functional tests"> <testmacro suitename="long" inputdir="${test.long.src}" Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1062958 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1062958 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1062958 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1062958 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jan 24 20:48:05 2011 @@ -1,5 +1,5 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1055311,1056121,1057932 -/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1062901,1062946 +/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1062958 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689 /incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198 Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliMain.java Mon Jan 24 20:48:05 2011 @@ -308,7 +308,7 @@ public class CliMain sessionState.err.printf("Unable to open %s for writing %n", historyFile); } } - else + else if (!sessionState.verbose) // if in batch mode but no verbose flag { sessionState.out.close(); } @@ -338,7 +338,8 @@ public class CliMain line = line.trim(); - if (line.isEmpty()) + // skipping empty and comment lines + if (line.isEmpty() || line.startsWith("--")) continue; currentStatement += line; @@ -364,10 +365,12 @@ public class CliMain while ((line = reader.readLine()) != null) { - if (line.isEmpty()) + line = line.trim(); + + // skipping empty and comment lines + if (line.isEmpty() || line.startsWith("--")) continue; - line = line.trim(); currentStatement += line; if (line.endsWith(";")) Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliOptions.java Mon Jan 24 20:48:05 2011 @@ -43,6 +43,7 @@ public class CliOptions private static final String HELP_OPTION = "help"; private static final String FILE_OPTION = "file"; private static final String JMX_PORT_OPTION = "jmxport"; + private static final String VERBOSE_OPTION = "verbose"; // Default values for optional command line arguments private static final int DEFAULT_THRIFT_PORT = 9160; @@ -66,6 +67,7 @@ public class CliOptions options.addOption(null, UNFRAME_OPTION, "use cassandra server's unframed transport"); options.addOption(null, DEBUG_OPTION, "display stack traces"); options.addOption("?", HELP_OPTION, "usage help."); + options.addOption("v", VERBOSE_OPTION, "verbose output when using batch mode."); } private static void printUsage() @@ -153,6 +155,11 @@ public class CliOptions System.exit(1); } + if (cmd.hasOption(VERBOSE_OPTION)) + { + css.verbose = true; + } + // Abort if there are any unrecognized arguments left if (cmd.getArgs().length > 0) { Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliSessionState.java Mon Jan 24 20:48:05 2011 @@ -39,7 +39,7 @@ public class CliSessionState public boolean batch = false; // enable/disable batch processing mode public String filename = ""; // file to read commands from public int jmxPort = 8080;// JMX service port - + public boolean verbose = false; // verbose output /* * Streams to read/write from */ Modified: cassandra/trunk/src/java/org/apache/cassandra/net/Message.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/Message.java?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/net/Message.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/net/Message.java Mon Jan 24 20:48:05 2011 @@ -30,14 +30,14 @@ import org.apache.cassandra.utils.FBUtil public class Message { - private static MessageSerializer serializer_; + private static ICompactSerializer<Message> serializer_; static { serializer_ = new MessageSerializer(); } - public static MessageSerializer serializer() + public static ICompactSerializer<Message> serializer() { return serializer_; } @@ -121,25 +121,25 @@ public class Message .append(separator); return sbuf.toString(); } -} - -class MessageSerializer implements ICompactSerializer<Message> -{ - public void serialize(Message t, DataOutputStream dos) throws IOException + + private static class MessageSerializer implements ICompactSerializer<Message> { - Header.serializer().serialize( t.header_, dos); - byte[] bytes = t.getMessageBody(); - dos.writeInt(bytes.length); - dos.write(bytes); - } - - public Message deserialize(DataInputStream dis) throws IOException - { - Header header = Header.serializer().deserialize(dis); - int size = dis.readInt(); - byte[] bytes = new byte[size]; - dis.readFully(bytes); - // return new Message(header.getMessageId(), header.getFrom(), header.getMessageType(), header.getVerb(), new Object[]{bytes}); - return new Message(header, bytes); + public void serialize(Message t, DataOutputStream dos) throws IOException + { + Header.serializer().serialize( t.header_, dos); + byte[] bytes = t.getMessageBody(); + dos.writeInt(bytes.length); + dos.write(bytes); + } + + public Message deserialize(DataInputStream dis) throws IOException + { + Header header = Header.serializer().deserialize(dis); + int size = dis.readInt(); + byte[] bytes = new byte[size]; + dis.readFully(bytes); + // return new Message(header.getMessageId(), header.getFrom(), header.getMessageType(), header.getVerb(), new Object[]{bytes}); + return new Message(header, bytes); + } } } Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java?rev=1062966&r1=1062965&r2=1062966&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java Mon Jan 24 20:48:05 2011 @@ -56,12 +56,6 @@ public class EstimatedHistogram buckets = new AtomicLongArray(numBuckets); } - public EstimatedHistogram(long[] bucketData) - { - makeOffsets(bucketData.length - 1); - buckets = new AtomicLongArray(bucketData); - } - public EstimatedHistogram(long[] offsets, long[] bucketData) { assert bucketData.length == offsets.length +1; Copied: cassandra/trunk/test/unit/org/apache/cassandra/AbstractSerializationsTester.java (from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/AbstractSerializationsTester.java) URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/AbstractSerializationsTester.java?p2=cassandra/trunk/test/unit/org/apache/cassandra/AbstractSerializationsTester.java&p1=cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/AbstractSerializationsTester.java&r1=1062958&r2=1062966&rev=1062966&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/AbstractSerializationsTester.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/AbstractSerializationsTester.java Mon Jan 24 20:48:05 2011 @@ -16,7 +16,7 @@ public class AbstractSerializationsTeste protected static DataInputStream getInput(String name) throws IOException { File f = new File("test/data/serialization/" + CUR_VER + "/" + name); - assert f.exists(); + assert f.exists() : f.getPath(); return new DataInputStream(new FileInputStream(f)); } Copied: cassandra/trunk/test/unit/org/apache/cassandra/io/CompactSerializerTest.java (from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/CompactSerializerTest.java) URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/CompactSerializerTest.java?p2=cassandra/trunk/test/unit/org/apache/cassandra/io/CompactSerializerTest.java&p1=cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/CompactSerializerTest.java&r1=1062958&r2=1062966&rev=1062966&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/io/CompactSerializerTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/io/CompactSerializerTest.java Mon Jan 24 20:48:05 2011 @@ -49,6 +49,7 @@ public class CompactSerializerTest exten expectedClassNames.add("BloomFilterSerializer"); expectedClassNames.add("EstimatedHistogramSerializer"); expectedClassNames.add("LegacyBloomFilterSerializer"); + expectedClassNames.add("CounterMutationSerializer"); discoveredClassNames = new ArrayList<String>(); String cp = System.getProperty("java.class.path"); Copied: cassandra/trunk/test/unit/org/apache/cassandra/streaming/SerializationsTest.java (from r1062958, cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/SerializationsTest.java) URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/streaming/SerializationsTest.java?p2=cassandra/trunk/test/unit/org/apache/cassandra/streaming/SerializationsTest.java&p1=cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/SerializationsTest.java&r1=1062958&r2=1062966&rev=1062966&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/test/unit/org/apache/cassandra/streaming/SerializationsTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/streaming/SerializationsTest.java Mon Jan 24 20:48:05 2011 @@ -12,6 +12,7 @@ import org.apache.cassandra.io.sstable.S import org.apache.cassandra.net.Message; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; +import org.junit.Ignore; import org.junit.Test; import java.io.DataInputStream; @@ -28,9 +29,9 @@ public class SerializationsTest extends private void testPendingFileWrite() throws IOException { // make sure to test serializing null and a pf with no sstable. - PendingFile normal = makePendingFile(true, "fake_component", 100); - PendingFile noSections = makePendingFile(true, "not_real", 0); - PendingFile noSST = makePendingFile(false, "also_fake", 100); + PendingFile normal = makePendingFile(true, "fake_component", 100, OperationType.BOOTSTRAP); + PendingFile noSections = makePendingFile(true, "not_real", 0, OperationType.AES); + PendingFile noSST = makePendingFile(false, "also_fake", 100, OperationType.RESTORE_REPLICA_COUNT); DataOutputStream out = getOutput("streaming.PendingFile.bin"); PendingFile.serializer().serialize(normal, out); @@ -40,7 +41,7 @@ public class SerializationsTest extends out.close(); } - @Test + @Test @Ignore public void testPendingFileRead() throws IOException { if (EXECUTE_WRITES) @@ -56,14 +57,14 @@ public class SerializationsTest extends private void testStreamHeaderWrite() throws IOException { - StreamHeader sh0 = new StreamHeader("Keyspace1", 123L, makePendingFile(true, "zz", 100)); - StreamHeader sh1 = new StreamHeader("Keyspace1", 124L, makePendingFile(false, "zz", 100)); + StreamHeader sh0 = new StreamHeader("Keyspace1", 123L, makePendingFile(true, "zz", 100, OperationType.BOOTSTRAP)); + StreamHeader sh1 = new StreamHeader("Keyspace1", 124L, makePendingFile(false, "zz", 100, OperationType.BOOTSTRAP)); Collection<PendingFile> files = new ArrayList<PendingFile>(); for (int i = 0; i < 50; i++) - files.add(makePendingFile(i % 2 == 0, "aa", 100)); - StreamHeader sh2 = new StreamHeader("Keyspace1", 125L, makePendingFile(true, "bb", 100), files); + files.add(makePendingFile(i % 2 == 0, "aa", 100, OperationType.BOOTSTRAP)); + StreamHeader sh2 = new StreamHeader("Keyspace1", 125L, makePendingFile(true, "bb", 100, OperationType.BOOTSTRAP), files); StreamHeader sh3 = new StreamHeader("Keyspace1", 125L, null, files); - StreamHeader sh4 = new StreamHeader("Keyspace1", 125L, makePendingFile(true, "bb", 100), new ArrayList<PendingFile>()); + StreamHeader sh4 = new StreamHeader("Keyspace1", 125L, makePendingFile(true, "bb", 100, OperationType.BOOTSTRAP), new ArrayList<PendingFile>()); DataOutputStream out = getOutput("streaming.StreamHeader.bin"); StreamHeader.serializer().serialize(sh0, out); @@ -74,7 +75,7 @@ public class SerializationsTest extends out.close(); } - @Test + @Test @Ignore public void testStreamHeaderRead() throws IOException { if (EXECUTE_WRITES) @@ -110,13 +111,13 @@ public class SerializationsTest extends in.close(); } - private static PendingFile makePendingFile(boolean sst, String comp, int numSecs) + private static PendingFile makePendingFile(boolean sst, String comp, int numSecs, OperationType op) { Descriptor desc = new Descriptor("z", new File("path/doesn't/matter"), "Keyspace1", "Standard1", 23, false); List<Pair<Long, Long>> sections = new ArrayList<Pair<Long, Long>>(); for (int i = 0; i < numSecs; i++) sections.add(new Pair<Long, Long>(new Long(i), new Long(i * i))); - return new PendingFile(sst ? makeSSTable() : null, desc, comp, sections); + return new PendingFile(sst ? makeSSTable() : null, desc, comp, sections, op); } private void testStreamRequestMessageWrite() throws IOException @@ -124,9 +125,9 @@ public class SerializationsTest extends Collection<Range> ranges = new ArrayList<Range>(); for (int i = 0; i < 5; i++) ranges.add(new Range(new BytesToken(ByteBuffer.wrap(Integer.toString(10*i).getBytes())), new BytesToken(ByteBuffer.wrap(Integer.toString(10*i+5).getBytes())))); - StreamRequestMessage msg0 = new StreamRequestMessage(FBUtilities.getLocalAddress(), ranges, "Keyspace1", 123L); - StreamRequestMessage msg1 = new StreamRequestMessage(FBUtilities.getLocalAddress(), makePendingFile(true, "aa", 100), 124L); - StreamRequestMessage msg2 = new StreamRequestMessage(FBUtilities.getLocalAddress(), makePendingFile(false, "aa", 100), 124L); + StreamRequestMessage msg0 = new StreamRequestMessage(FBUtilities.getLocalAddress(), ranges, "Keyspace1", 123L, OperationType.RESTORE_REPLICA_COUNT); + StreamRequestMessage msg1 = new StreamRequestMessage(FBUtilities.getLocalAddress(), makePendingFile(true, "aa", 100, OperationType.BOOTSTRAP), 124L); + StreamRequestMessage msg2 = new StreamRequestMessage(FBUtilities.getLocalAddress(), makePendingFile(false, "aa", 100, OperationType.BOOTSTRAP), 124L); DataOutputStream out = getOutput("streaming.StreamRequestMessage.bin"); StreamRequestMessage.serializer().serialize(msg0, out); @@ -138,7 +139,7 @@ public class SerializationsTest extends out.close(); } - @Test + @Test @Ignore public void testStreamRequestMessageRead() throws IOException { if (EXECUTE_WRITES)