natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Benedict Elliott Smith 2014-08-01 21:39:56 +01:00
parent 1e7962cf39 a182ea00ba
commit 63393eb248
1 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java
View File

@ -21,7 +21,10 @@ package org.apache.cassandra.stress.settings;
*/ */
import java.io.IOException;
import java.io.Serializable; import java.io.Serializable;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException; import java.nio.charset.CharacterCodingException;
import java.util.ArrayList; import java.util.ArrayList;
@ -41,7 +44,7 @@ public class SettingsColumn implements Serializable
{ {
public final int maxColumnsPerKey; public final int maxColumnsPerKey;
public transient final List<ByteBuffer> names; public transient List<ByteBuffer> names;
public final List<String> namestrs; public final List<String> namestrs;
public final String comparator; public final String comparator;
public final String timestamp; public final String timestamp;
@ -132,7 +135,6 @@ public class SettingsColumn implements Serializable
{ {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
this.names = Arrays.asList(names); this.names = Arrays.asList(names);
this.namestrs = Arrays.asList(namestrs); this.namestrs = Arrays.asList(namestrs);
} }
@ -208,4 +210,29 @@ public class SettingsColumn implements Serializable
} }
}; };
} }
/* Custom serializaiton invoked here to make legacy thrift based table creation work with StressD. This code requires
* the names attribute to be populated. Since the names attribute is set as a List[ByteBuffer] we switch it
* to an array on the way out and back to a buffer when it's being read in.
*/
private void writeObject(ObjectOutputStream oos) throws IOException
{
oos.defaultWriteObject();
ArrayList<byte[]> namesBytes = new ArrayList<>();
for (ByteBuffer buffer : this.names)
namesBytes.add(ByteBufferUtil.getArray(buffer));
oos.writeObject(namesBytes);
}
private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException
{
ois.defaultReadObject();
List<ByteBuffer> namesBuffer = new ArrayList<>();
List<byte[]> namesBytes = (List<byte[]>) ois.readObject();
for (byte[] bytes : namesBytes)
namesBuffer.add(ByteBuffer.wrap(bytes));
this.names = new ArrayList<>(namesBuffer);
}
} }