Modified: accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/test/iterator/RegExTest.java Sat Sep 29 05:42:59 2012 @@ -23,6 +23,7 @@ import java.util.Map.Entry; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchScanner; import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; import org.apache.accumulo.core.client.IteratorSetting; @@ -46,7 +47,7 @@ public class RegExTest { public void runTest() throws Exception { conn = inst.getConnector("user", "pass"); conn.tableOperations().create("ret"); - BatchWriter bw = conn.createBatchWriter("ret", 100000l, 60l, 1); + BatchWriter bw = conn.createBatchWriter("ret", new BatchWriterConfig()); ArrayList<Character> chars = new ArrayList<Character>(); for (char c = 'a'; c <= 'z'; c++)
Modified: accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java Sat Sep 29 05:42:59 2012 @@ -23,6 +23,7 @@ import junit.framework.TestCase; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.mock.MockInstance; @@ -30,9 +31,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.KeyExtent; import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; -import org.apache.accumulo.server.util.MetadataTable; -import org.apache.accumulo.server.util.TabletIterator; import org.apache.hadoop.io.Text; public class CloneTest extends TestCase { @@ -44,16 +42,16 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value("/default_tablet".getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value("/default_tablet".getBytes())); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(mut); bw1.close(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -72,17 +70,17 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text("0"), null, null); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value("/default_tablet".getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value("/default_tablet".getBytes())); mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), "/default_tablet/0_0.rf", "1,200"); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(mut); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -121,13 +119,13 @@ public class CloneTest extends TestCase MockInstance mi = new MockInstance(); Connector conn = mi.getConnector("", ""); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(createTablet("0", null, null, "/default_tablet", "/default_tablet/0_0.rf")); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -163,13 +161,13 @@ public class CloneTest extends TestCase MockInstance mi = new MockInstance(); Connector conn = mi.getConnector("", ""); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(createTablet("0", null, null, "/default_tablet", "/default_tablet/0_0.rf")); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -210,9 +208,9 @@ public class CloneTest extends TestCase private static Mutation deleteTablet(String tid, String endRow, String prevRow, String dir, String file) throws Exception { KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); Mutation mut = new Mutation(ke.getMetadataEntry()); - ColumnFQ.putDelete(mut, Constants.METADATA_PREV_ROW_COLUMN); - ColumnFQ.putDelete(mut, Constants.METADATA_TIME_COLUMN); - ColumnFQ.putDelete(mut, Constants.METADATA_DIRECTORY_COLUMN); + Constants.METADATA_PREV_ROW_COLUMN.putDelete(mut); + Constants.METADATA_TIME_COLUMN.putDelete(mut); + Constants.METADATA_DIRECTORY_COLUMN.putDelete(mut); mut.putDelete(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), file); return mut; @@ -222,8 +220,8 @@ public class CloneTest extends TestCase KeyExtent ke = new KeyExtent(new Text(tid), endRow == null ? null : new Text(endRow), prevRow == null ? null : new Text(prevRow)); Mutation mut = ke.getPrevRowUpdateMutation(); - ColumnFQ.put(mut, Constants.METADATA_TIME_COLUMN, new Value("M0".getBytes())); - ColumnFQ.put(mut, Constants.METADATA_DIRECTORY_COLUMN, new Value(dir.getBytes())); + Constants.METADATA_TIME_COLUMN.put(mut, new Value("M0".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut, new Value(dir.getBytes())); mut.put(Constants.METADATA_DATAFILE_COLUMN_FAMILY.toString(), file, "10,200"); return mut; @@ -234,14 +232,14 @@ public class CloneTest extends TestCase MockInstance mi = new MockInstance(); Connector conn = mi.getConnector("", ""); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(createTablet("0", "m", null, "/d1", "/d1/file1")); bw1.addMutation(createTablet("0", null, "m", "/d2", "/d2/file2")); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -281,14 +279,14 @@ public class CloneTest extends TestCase MockInstance mi = new MockInstance(); Connector conn = mi.getConnector("", ""); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(createTablet("0", "m", null, "/d1", "/d1/file1")); bw1.addMutation(createTablet("0", null, "m", "/d2", "/d2/file2")); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); @@ -345,14 +343,14 @@ public class CloneTest extends TestCase MockInstance mi = new MockInstance(); Connector conn = mi.getConnector("", ""); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(createTablet("0", "m", null, "/d1", "/d1/file1")); bw1.addMutation(createTablet("0", null, "m", "/d2", "/d2/file2")); bw1.flush(); - BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw2 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); MetadataTable.initializeClone("0", "1", conn, bw2); Modified: accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java (original) +++ accumulo/branches/ACCUMULO-259/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java Sat Sep 29 05:42:59 2012 @@ -22,6 +22,7 @@ import junit.framework.TestCase; import org.apache.accumulo.core.Constants; import org.apache.accumulo.core.client.BatchWriter; +import org.apache.accumulo.core.client.BatchWriterConfig; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.mock.MockInstance; @@ -30,8 +31,6 @@ import org.apache.accumulo.core.data.Key import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.Value; -import org.apache.accumulo.core.util.ColumnFQ; -import org.apache.accumulo.server.util.TabletIterator; import org.apache.accumulo.server.util.TabletIterator.TabletDeletedException; import org.apache.hadoop.io.Text; @@ -54,7 +53,7 @@ public class TabletIteratorTest extends Mutation m = new Mutation(tablet); - BatchWriter bw = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); for (Entry<Key,Value> entry : ds) { Key k = entry.getKey(); m.putDelete(k.getColumnFamily(), k.getColumnQualifier(), k.getTimestamp()); @@ -80,13 +79,13 @@ public class TabletIteratorTest extends KeyExtent ke1 = new KeyExtent(new Text("0"), new Text("m"), null); Mutation mut1 = ke1.getPrevRowUpdateMutation(); - ColumnFQ.put(mut1, Constants.METADATA_DIRECTORY_COLUMN, new Value("/d1".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut1, new Value("/d1".getBytes())); KeyExtent ke2 = new KeyExtent(new Text("0"), null, null); Mutation mut2 = ke2.getPrevRowUpdateMutation(); - ColumnFQ.put(mut2, Constants.METADATA_DIRECTORY_COLUMN, new Value("/d2".getBytes())); + Constants.METADATA_DIRECTORY_COLUMN.put(mut2, new Value("/d2".getBytes())); - BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, 10000000, 60000l, 1); + BatchWriter bw1 = conn.createBatchWriter(Constants.METADATA_TABLE_NAME, new BatchWriterConfig()); bw1.addMutation(mut1); bw1.addMutation(mut2); bw1.close(); Propchange: accumulo/branches/ACCUMULO-259/src/ ------------------------------------------------------------------------------ Merged /accumulo/branches/ACCUMULO-672:r1359163 Merged /accumulo/trunk/src:r1363474-1391624 Merged /accumulo/branches/1.4/src:r1356924-1358205,1358207-1382577,1382613,1388120,1388629 Merged /accumulo/trunk:r1359620,1359721 Merged /accumulo/branches/1.4/src/src:r1364778,1365213,1382566,1382923,1388120 Modified: accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java (original) +++ accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/Main.java Sat Sep 29 05:42:59 2012 @@ -61,6 +61,8 @@ public class Main { runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.core.Constants"); System.out.println(runTMP.getField("VERSION").get(null)); return; + } else if (args[0].equals("rfile-info") ) { + runTMP = AccumuloClassLoader.loadClass("org.apache.accumulo.core.file.rfile.PrintInfo"); } else { try { runTMP = AccumuloClassLoader.loadClass(args[0]); @@ -103,6 +105,6 @@ public class Main { } private static void printUsage() { - System.out.println("accumulo init | master | tserver | logger | monitor | shell | admin | gc | classpath | <accumulo class> args"); + System.out.println("accumulo init | master | tserver | logger | monitor | shell | admin | gc | classpath | rfile-info | <accumulo class> args"); } } Modified: accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/TestMain.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/TestMain.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/TestMain.java (original) +++ accumulo/branches/ACCUMULO-259/start/src/main/java/org/apache/accumulo/start/TestMain.java Sat Sep 29 05:42:59 2012 @@ -16,6 +16,14 @@ */ package org.apache.accumulo.start; +/** This program tests that the proper exit code is propogated to the shell. + * + * $ ./bin/accumulo org.apache.accumulo.start.TestMain + * $ ./bin/accumulo org.apache.accumulo.start.TestMain badExit + * $ ./bin/accumulo org.apache.accumulo.start.TestMain throw + * + * The last case tests the proper logging of an exception. + */ public class TestMain { public static void main(String[] args) { if (args.length > 0) { Modified: accumulo/branches/ACCUMULO-259/test/compat/diffAPI.pl URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/compat/diffAPI.pl?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/compat/diffAPI.pl (original) +++ accumulo/branches/ACCUMULO-259/test/compat/diffAPI.pl Sat Sep 29 05:42:59 2012 @@ -15,6 +15,60 @@ # See the License for the specific language governing permissions and # limitations under the License. +sub trim($) +{ + my $string = shift; + $string =~ s/^\s+//; + $string =~ s/\s+$//; + return $string; +} + +sub getDeprecated { + my($jar, $class) = @_; + + open(JAVAP, "javap -verbose -public -classpath '$jar' '$class'|"); + + my $lastMethod = ""; + my %deprecated; + + while(<JAVAP>){ + chomp(); + if(/^public\s/){ + $lastMethod = $_; + } + if(/Deprecated\:\strue/){ + $lastMethod =~ s/\s+/ /g; + $deprecated{$lastMethod}="true"; + } + } + + close(JAVAP); + + return %deprecated; +} + +sub annotateDeprecated { + my($jar, $class, $deprecated, $outFile) = @_; + open(JAVAP, "javap -public -classpath '$jar' '$class'|"); + open(OUT, ">$outFile"); + my @javapOut = <JAVAP>; + @javapOut = sort(@javapOut); + + for my $line (@javapOut){ + my $trimLine = trim($line); + chomp($line); + $trimLine =~ s/\s+/ /g; + if($deprecated->{$trimLine}){ + print OUT "$line DEPRECATED\n"; + }else{ + print OUT "$line\n"; + } + } + + close(JAVAP); + close(OUT); + +} if(scalar(@ARGV) != 2){ print "Usage : diffAPI.pl <core jar 1> <core jar 2>\n"; @@ -24,7 +78,7 @@ if(scalar(@ARGV) != 2){ $jar1 = $ARGV[0]; $jar2 = $ARGV[1]; -$gtCmd = 'egrep "accumulo/core/client/.*class|accumulo/core/data/.*class" | grep -v accumulo/core/client/impl | grep -v accumulo/core/data/thrift | tr / .'; +$gtCmd = 'egrep "accumulo/core/client/.*class|accumulo/core/data/.*class" | grep -v accumulo/core/client/impl | grep -v accumulo/core/data/thrift | egrep -v "Impl.*class$" | tr / .'; @classes1 = `jar tf $jar1 | $gtCmd`; @classes2 = `jar tf $jar2 | $gtCmd`; @@ -35,12 +89,14 @@ mkdir("diffWorkDir/jar2"); for $class (@classes1){ $class = substr($class, 0, length($class) - 7); - system("javap -classpath $jar1 $class | sort > diffWorkDir/jar1/$class"); + %deprecated = getDeprecated($jar1, $class); + annotateDeprecated($jar1, $class, \%deprecated, "diffWorkDir/jar1/$class"); } for $class (@classes2){ $class = substr($class, 0, length($class) - 7); - system("javap -classpath $jar2 $class | sort > diffWorkDir/jar2/$class"); + %deprecated = getDeprecated($jar2, $class); + annotateDeprecated($jar2, $class, \%deprecated, "diffWorkDir/jar2/$class"); } system("diff -u diffWorkDir/jar1 diffWorkDir/jar2"); Propchange: accumulo/branches/ACCUMULO-259/test/system/continuous/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat Sep 29 05:42:59 2012 @@ -1,5 +1,5 @@ continuous-env.sh - walkers.txt - ingesters.txt +batch_walkers.txt +scanners.txt Modified: accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Shard.xml URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Shard.xml?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Shard.xml (original) +++ accumulo/branches/ACCUMULO-259/test/system/randomwalk/conf/modules/Shard.xml Sat Sep 29 05:42:59 2012 @@ -45,6 +45,10 @@ <edge id="Verify" weight="1"/> </node> +<node id="shard.ExportIndex"> + <edge id="Verify" weight="1"/> +</node> + <node id="Verify" src="shard.VerifyIndex"> <edge id="dummy.ToAll" weight="1"/> </node> @@ -103,6 +107,7 @@ <edge id="shard.Reindex" weight="3"/> <edge id="shard.Flush" weight="3"/> <edge id="shard.CloneIndex" weight="3"/> + <edge id="shard.ExportIndex" weight="3"/> <edge id="shard.Grep" weight="20"/> <edge id="shard.Split" weight="40"/> <edge id="shard.Merge" weight="20"/> @@ -111,7 +116,7 @@ <edge id="shard.DeleteSomeDocs" weight="20"/> <edge id="shard.BulkInsert" weight="3"/> <edge id="shard.Delete" weight="486"/> - <edge id="shard.Insert" weight="4693"/> + <edge id="shard.Insert" weight="4690"/> <edge id="shard.Search" weight="4691"/> </node> Modified: accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java (original) +++ accumulo/branches/ACCUMULO-259/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java Sat Sep 29 05:42:59 2012 @@ -25,7 +25,6 @@ import org.apache.accumulo.cloudtrace.in import org.apache.accumulo.cloudtrace.instrument.Trace; import org.apache.accumulo.cloudtrace.instrument.Tracer; import org.apache.accumulo.cloudtrace.thrift.TInfo; -import org.apache.log4j.Logger; /** Modified: accumulo/branches/ACCUMULO-259/trace/thrift.sh URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/trace/thrift.sh?rev=1391754&r1=1391753&r2=1391754&view=diff ============================================================================== --- accumulo/branches/ACCUMULO-259/trace/thrift.sh (original) +++ accumulo/branches/ACCUMULO-259/trace/thrift.sh Sat Sep 29 05:42:59 2012 @@ -24,6 +24,7 @@ thrift -o target -gen java src/main/thri # For all generated thrift code, suppress all warnings find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all") public class /' +find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public enum /@SuppressWarnings("all") public enum /' # Make a directory for said thrift code if does not already exist mkdir -p src/main/java/org/apache/accumulo/cloudtrace/thrift
