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

Check schema before trying to export sstable 

patch by Jason Brown; reviewed by jbellis for CASSANDRA-2760
This commit is contained in:
Jonathan Ellis 2012-06-26 19:51:30 -05:00
parent 80d7d43e29
commit 98dc41393f
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -1,4 +1,5 @@
1.1.2
* Check schema before trying to export sstable (CASSANDRA-2760)
* Raise a meaningful exception instead of NPE when PFS encounters
an unconfigured node + no default (CASSANDRA-4349)
* fix bug in sstable blacklisting with LCS (CASSANDRA-4343)
@ -7,8 +8,8 @@
* fix NPE in compactionstats (CASSANDRA-4318)
* enforce 1m min keycache for auto (CASSANDRA-4306)
* Have DeletedColumn.isMFD always return true (CASSANDRA-4307)
* ex msg for cql3 order by constraints says primary filter can be an IN clause
which is misleading (CASSANDRA-4319)
* (cql3) exeption message for ORDER BY constraints said primary filter can be
an IN clause, which is misleading (CASSANDRA-4319)
* (cql3) Reject (not yet supported) creation of 2ndardy indexes on tables with
composite primary keys (CASSANDRA-4328)
* Set JVM stack size to 160k for java 7 (CASSANDRA-4275)

36
src/java/org/apache/cassandra/tools/SSTableExport.java
View File

@ -204,14 +204,13 @@ public class SSTableExport
/**
* Enumerate row keys from an SSTableReader and write the result to a PrintStream.
*
* @param ssTableFile the file to export the rows from
* @param desc the descriptor of the file to export the rows from
* @param outs PrintStream to write the output to
* @throws IOException on failure to read/write input/output
*/
public static void enumeratekeys(String ssTableFile, PrintStream outs)
public static void enumeratekeys(Descriptor desc, PrintStream outs)
throws IOException
{
Descriptor desc = Descriptor.fromFilename(ssTableFile);
KeyIterator iter = new KeyIterator(desc);
DecoratedKey lastKey = null;
while (iter.hasNext())
@ -232,15 +231,15 @@ public class SSTableExport
/**
* Export specific rows from an SSTable and write the resulting JSON to a PrintStream.
*
* @param ssTableFile the SSTableScanner to export the rows from
* @param desc the descriptor of the sstable table to read from
* @param outs PrintStream to write the output to
* @param toExport the keys corresponding to the rows to export
* @param excludes keys to exclude from export
* @throws IOException on failure to read/write input/output
*/
public static void export(String ssTableFile, PrintStream outs, Collection<String> toExport, String[] excludes) throws IOException
public static void export(Descriptor desc, PrintStream outs, Collection<String> toExport, String[] excludes) throws IOException
{
SSTableReader reader = SSTableReader.open(Descriptor.fromFilename(ssTableFile));
SSTableReader reader = SSTableReader.open(desc);
SSTableScanner scanner = reader.getDirectScanner();
IPartitioner<?> partitioner = reader.partitioner;
@ -330,28 +329,28 @@ public class SSTableExport
/**
* Export an SSTable and write the resulting JSON to a PrintStream.
*
* @param ssTableFile the SSTable to export
* @param desc the descriptor of the sstable table to read from
* @param outs PrintStream to write the output to
* @param excludes keys to exclude from export
*
* @throws IOException on failure to read/write input/output
*/
public static void export(String ssTableFile, PrintStream outs, String[] excludes) throws IOException
public static void export(Descriptor desc, PrintStream outs, String[] excludes) throws IOException
{
export(SSTableReader.open(Descriptor.fromFilename(ssTableFile)), outs, excludes);
export(SSTableReader.open(desc), outs, excludes);
}
/**
* Export an SSTable and write the resulting JSON to standard out.
*
* @param ssTableFile SSTable to export
* @param desc the descriptor of the sstable table to read from
* @param excludes keys to exclude from export
*
* @throws IOException on failure to read/write SSTable/standard out
*/
public static void export(String ssTableFile, String[] excludes) throws IOException
public static void export(Descriptor desc, String[] excludes) throws IOException
{
export(ssTableFile, System.out, excludes);
export(desc, System.out, excludes);
}
/**
@ -399,17 +398,24 @@ public class SSTableExport
System.err.println(msg);
throw new ConfigurationException(msg);
}
Descriptor descriptor = Descriptor.fromFilename(ssTableFileName);
if (Schema.instance.getCFMetaData(descriptor) == null)
{
System.err.println(String.format("The provided column family is not part of this cassandra database: keysapce = %s, column family = %s",
descriptor.ksname, descriptor.cfname));
System.exit(1);
}
if (cmd.hasOption(ENUMERATEKEYS_OPTION))
{
enumeratekeys(ssTableFileName, System.out);
enumeratekeys(descriptor, System.out);
}
else
{
if ((keys != null) && (keys.length > 0))
export(ssTableFileName, System.out, Arrays.asList(keys), excludes);
export(descriptor, System.out, Arrays.asList(keys), excludes);
else
export(ssTableFileName, excludes);
export(descriptor, excludes);
}
System.exit(0);

2
test/unit/org/apache/cassandra/tools/SSTableExportTest.java
View File

@ -77,7 +77,7 @@ public class SSTableExportTest extends SchemaLoader
// Enumerate and verify
File temp = File.createTempFile("Standard1", ".txt");
SSTableExport.enumeratekeys(writer.getFilename(), new PrintStream(temp.getPath()));
SSTableExport.enumeratekeys(Descriptor.fromFilename(writer.getFilename()), new PrintStream(temp.getPath()));
FileReader file = new FileReader(temp);