svn commit: r1479924 - in /accumulo/trunk/core/src: main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamily
Author: kturner Date: Tue May 7 14:38:27 2013 New Revision: 1479924 URL: http://svn.apache.org/r1479924 Log: ACCUMULO-1337 patch from Pushpinder Heer to add WholeColumnFamilyIterator Added: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIteratorTest.java Added: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java?rev=1479924&view=auto == --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java (added) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/WholeColumnFamilyIterator.java Tue May 7 14:38:27 2013 @@ -0,0 +1,261 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.accumulo.core.iterators.user; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.apache.accumulo.core.data.ByteSequence; +import org.apache.accumulo.core.data.Key; +import org.apache.accumulo.core.data.PartialKey; +import org.apache.accumulo.core.data.Range; +import org.apache.accumulo.core.data.Value; +import org.apache.accumulo.core.iterators.IteratorEnvironment; +import org.apache.accumulo.core.iterators.OptionDescriber; +import org.apache.accumulo.core.iterators.SortedKeyValueIterator; +import org.apache.hadoop.io.Text; + +/** + * + * The WholeColumnFamilyIterator is designed to provide row/cf-isolation so that queries see mutations as atomic. It does so by grouping row/Column family (as + * key) and rest of data as Value into a single key/value pair, which is returned through the client as an atomic operation. + * + * To regain the original key/value pairs of the row, call the decodeRow function on the key/value pair that this iterator returned. + * + * @since 1.6.0 + */ +public class WholeColumnFamilyIterator implements SortedKeyValueIterator, OptionDescriber { + + private SortedKeyValueIterator sourceIter; + private Key topKey = null; + private Value topValue = null; + + public WholeColumnFamilyIterator() { + + } + + WholeColumnFamilyIterator(SortedKeyValueIterator source) { +this.sourceIter = source; + } + + /** + * Decode whole row/cf out of value. decode key value pairs that have been encoded into a single // value + * + * @param rowKey + * the row key to decode + * @param rowValue + * the value to decode + * @return the sorted map. After decoding the flattened data map + * @throws IOException + * Signals that an I/O exception has occurred. + */ + public static final SortedMap decodeColumnFamily(Key rowKey, Value rowValue) throws IOException { +SortedMap map = new TreeMap(); +ByteArrayInputStream in = new ByteArrayInputStream(rowValue.get()); +DataInputStream din = new DataInputStream(in); +int numKeys = din.readInt(); +for (int i = 0; i < numKeys; i++) { + byte[] cq; + byte[] cv; + byte[] valBytes; + // read the col qual + { +int len = din.readInt(); +cq = new byte[len]; +din.read(cq); + } + // read the col visibility + { +int len = din.readInt(); +cv = new byte[len]; +din.read(cv); + } + // read the timestamp + long timestamp = din.readLong(); + // read the value + { +int len = din.readInt(); +valBytes = new byte[len]; +din.read(valBytes); + } + map.put(new Key(rowKey.getRowData().toArray(), rowKey.getColumnFamilyData().toArray(), cq, cv, timestamp, false, false), new Value(valBytes, false)); +} +retur
svn commit: r1479932 - in /accumulo/branches/1.5/core/src: main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Author: kturner Date: Tue May 7 15:03:11 2013 New Revision: 1479932 URL: http://svn.apache.org/r1479932 Log: ACCUMULO-1358 Appled patch from Mike Drob, with modification to delete table in unit test. Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1479932&r1=1479931&r2=1479932&view=diff == --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Tue May 7 15:03:11 2013 @@ -175,14 +175,23 @@ public class SetIterCommand extends Comm clazz = classloader.loadClass(className).asSubclass(OptionDescriber.class); skvi = clazz.newInstance(); } catch (ClassNotFoundException e) { - throw new IllegalArgumentException(e.getMessage()); + StringBuilder msg = new StringBuilder("Unable to load ").append(className); + if (className.indexOf('.') < 0) { +msg.append("; did you use a fully qualified package name?"); + } else { +msg.append("; class not found."); + } + throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString()); } catch (InstantiationException e) { throw new IllegalArgumentException(e.getMessage()); } catch (IllegalAccessException e) { throw new IllegalArgumentException(e.getMessage()); } catch (ClassCastException e) { - throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Unable to load " + className + " as type " + OptionDescriber.class.getName() - + "; configure with 'config' instead"); + StringBuilder msg = new StringBuilder("Loaded "); + msg.append(className).append(" but it does not implement "); + msg.append(OptionDescriber.class.getSimpleName()); + msg.append("; use 'config -s' instead."); + throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString()); } final IteratorOptions itopts = skvi.describeOptions(); Modified: accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1479932&r1=1479931&r2=1479932&view=diff == --- accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java (original) +++ accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Tue May 7 15:03:11 2013 @@ -199,4 +199,23 @@ public class ShellTest { assertEquals(0, shell.start()); assertGoodExit("Unknown command", false); } + + @Test + public void setIterTest() throws IOException { +Shell.log.debug("Starting setiter test --"); +exec("createtable t", true); + +String cmdJustClass = "setiter -class VersioningIterator -p 1"; +exec(cmdJustClass, false, "java.lang.IllegalArgumentException", false); +exec(cmdJustClass, false, "fully qualified package name", true); + +String cmdFullPackage = "setiter -class o.a.a.foo -p 1"; +exec(cmdFullPackage, false, "java.lang.IllegalArgumentException", false); +exec(cmdFullPackage, false, "class not found", true); + +String cmdNoOption = "setiter -class java.lang.String -p 1"; +exec(cmdNoOption, false, "Loaded", true); + +exec("deletetable t -f", true, "Table: [t] has been deleted"); + } }
svn commit: r1479946 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/util/shell/commands/ core/src/test/java/org/apache/accumulo/core/util/shell/ examples/ fate/sr
Author: kturner Date: Tue May 7 15:37:58 2013 New Revision: 1479946 URL: http://svn.apache.org/r1479946 Log: ACCUMULO-1358 Appled patch from Mike Drob, with modification to delete table in unit test. Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1479932 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1479932 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1479932 Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1479946&r1=1479945&r2=1479946&view=diff == --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Tue May 7 15:37:58 2013 @@ -175,14 +175,23 @@ public class SetIterCommand extends Comm clazz = classloader.loadClass(className).asSubclass(OptionDescriber.class); skvi = clazz.newInstance(); } catch (ClassNotFoundException e) { - throw new IllegalArgumentException(e.getMessage()); + StringBuilder msg = new StringBuilder("Unable to load ").append(className); + if (className.indexOf('.') < 0) { +msg.append("; did you use a fully qualified package name?"); + } else { +msg.append("; class not found."); + } + throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString()); } catch (InstantiationException e) { throw new IllegalArgumentException(e.getMessage()); } catch (IllegalAccessException e) { throw new IllegalArgumentException(e.getMessage()); } catch (ClassCastException e) { - throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Unable to load " + className + " as type " + OptionDescriber.class.getName() - + "; configure with 'config' instead"); + StringBuilder msg = new StringBuilder("Loaded "); + msg.append(className).append(" but it does not implement "); + msg.append(OptionDescriber.class.getSimpleName()); + msg.append("; use 'config -s' instead."); + throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, msg.toString()); } final IteratorOptions itopts = skvi.describeOptions(); Modified: accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java?rev=1479946&r1=1479945&r2=1479946&view=diff == --- accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java (original) +++ accumulo/trunk/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java Tue May 7 15:37:58 2013 @@ -222,4 +222,23 @@ public class ShellTest { assertEquals(0, shell.start()); assertGoodExit("Unknown command", false); } + + @Test + public void setIterTest() throws IOException { +Shell.log.debug("Starting setiter test --"); +exec("createtable t", true); + +String cmdJustClass = "setiter -class VersioningIterator -p 1"; +exec(cmdJustClass, false, "java.lang.IllegalArgumentException", false); +exec(cmdJustClass, false, "fully qualified package name", true); + +String cmdFullPackage = "setiter -class o.a.a.foo -p 1"; +exec(cmdFullPackage, false, "java.lang.IllegalArgumentException", false); +exec(cmdFullPackage, false, "class not found", true); + +String cmdNoOption = "setiter -class java.lang.String -p 1"; +exec(cmdNoOption, false, "Loaded", true); + +exec("deletetable t -f", true, "Table: [t] has been deleted"); + } } Propchange: accumulo
svn commit: r1479959 - /accumulo/site/trunk/content/people.mdtext
Author: kturner Date: Tue May 7 16:05:48 2013 New Revision: 1479959 URL: http://svn.apache.org/r1479959 Log: CMS commit to accumulo by kturner Modified: accumulo/site/trunk/content/people.mdtext Modified: accumulo/site/trunk/content/people.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/people.mdtext?rev=1479959&r1=1479958&r2=1479959&view=diff == --- accumulo/site/trunk/content/people.mdtext (original) +++ accumulo/site/trunk/content/people.mdtext Tue May 7 16:05:48 2013 @@ -89,6 +89,7 @@ Contributors Michael Allenhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Michael Berman Michael Wall + Mike Drob Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Phil Eberhardthttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Philip Young
svn commit: r861195 - in /websites/staging/accumulo/trunk/content: ./ people.html
Author: buildbot Date: Tue May 7 16:06:02 2013 New Revision: 861195 Log: Staging update by buildbot for accumulo Modified: websites/staging/accumulo/trunk/content/ (props changed) websites/staging/accumulo/trunk/content/people.html Propchange: websites/staging/accumulo/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Tue May 7 16:06:02 2013 @@ -1 +1 @@ -1477207 +1479959 Modified: websites/staging/accumulo/trunk/content/people.html == --- websites/staging/accumulo/trunk/content/people.html (original) +++ websites/staging/accumulo/trunk/content/people.html Tue May 7 16:06:02 2013 @@ -157,6 +157,7 @@ tr:nth-child(2n+1) { Michael Allenhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Michael Berman Michael Wall + Mike Drob Oren Falkowitzhttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Phil Eberhardthttp://sqrrl.com/>sqrrlET (http://www.timeanddate.com/library/abbreviations/timezones/na/est.html>-5 / http://www.timeanddate.com/library/abbreviations/timezones/na/edt.html>-4) Philip Young
svn commit: r861196 - in /websites/production/accumulo/content: ./ 1.4/apidocs/
Author: kturner Date: Tue May 7 16:07:41 2013 New Revision: 861196 Log: Publishing svnmucc operation to accumulo site by kturner Added: websites/production/accumulo/content/ - copied from r861195, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r861195, websites/production/accumulo/content/1.4/apidocs/
svn commit: r1479973 - in /accumulo: branches/1.5/ branches/1.5/assemble/ branches/1.5/bin/ branches/1.5/core/ branches/1.5/examples/ branches/1.5/examples/simple/ branches/1.5/fate/ branches/1.5/prox
Author: ctubbsii Date: Tue May 7 16:36:19 2013 New Revision: 1479973 URL: http://svn.apache.org/r1479973 Log: ACCUMULO-970 revert 1.5.0-RC1 Removed: accumulo/tags/1.5.0-RC/ Modified: accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/bin/config.sh accumulo/branches/1.5/core/pom.xml accumulo/branches/1.5/examples/pom.xml accumulo/branches/1.5/examples/simple/pom.xml accumulo/branches/1.5/fate/pom.xml accumulo/branches/1.5/pom.xml accumulo/branches/1.5/proxy/pom.xml accumulo/branches/1.5/server/pom.xml accumulo/branches/1.5/start/pom.xml accumulo/branches/1.5/test/pom.xml accumulo/branches/1.5/trace/pom.xml accumulo/contrib/wikisearch/trunk/ (props changed) Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Tue May 7 16:36:19 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.1-SNAPSHOT +1.5.0-SNAPSHOT accumulo-assemble pom Modified: accumulo/branches/1.5/bin/config.sh URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/config.sh?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/bin/config.sh (original) +++ accumulo/branches/1.5/bin/config.sh Tue May 7 16:36:19 2013 @@ -53,7 +53,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null export ACCUMULO_LOG_DIR if [ -z "${ACCUMULO_VERSION}" ]; then - ACCUMULO_VERSION=1.5.1-SNAPSHOT + ACCUMULO_VERSION=1.5.0-SNAPSHOT fi if [ -z "$HADOOP_PREFIX" ] Modified: accumulo/branches/1.5/core/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/core/pom.xml (original) +++ accumulo/branches/1.5/core/pom.xml Tue May 7 16:36:19 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.1-SNAPSHOT +1.5.0-SNAPSHOT accumulo-core Core Modified: accumulo/branches/1.5/examples/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/examples/pom.xml (original) +++ accumulo/branches/1.5/examples/pom.xml Tue May 7 16:36:19 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.1-SNAPSHOT +1.5.0-SNAPSHOT accumulo-examples pom Modified: accumulo/branches/1.5/examples/simple/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/examples/simple/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/examples/simple/pom.xml (original) +++ accumulo/branches/1.5/examples/simple/pom.xml Tue May 7 16:36:19 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-examples -1.5.1-SNAPSHOT +1.5.0-SNAPSHOT accumulo-examples-simple Simple Examples Modified: accumulo/branches/1.5/fate/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/fate/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/fate/pom.xml (original) +++ accumulo/branches/1.5/fate/pom.xml Tue May 7 16:36:19 2013 @@ -20,7 +20,7 @@ org.apache.accumulo accumulo -1.5.1-SNAPSHOT +1.5.0-SNAPSHOT accumulo-fate Fate Modified: accumulo/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1479973&r1=1479972&r2=1479973&view=diff == --- accumulo/branches/1.5/pom.xml (original) +++ accumulo/branches/1.5/pom.xml Tue May 7 16:36:19 2013 @@ -24,7 +24,7 @@ org.apache.accumulo accumulo - 1.5.1-SNAPSHOT + 1.5.0-SNAPSHOT pom Apache Accumulo Apache Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process. @@ -502,7 +502,7 @@ - + @@ -515,7 +515,7 @@ - +
svn commit: r1480033 - in /accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile: PrintInfo.java bcfile/PrintInfo.java
Author: ecn Date: Tue May 7 19:22:48 2013 New Revision: 1480033 URL: http://svn.apache.org/r1480033 Log: ACCUMULO-1381 applying Drew Farris's patch Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1480033&r1=1480032&r2=1480033&view=diff == --- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original) +++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Tue May 7 19:22:48 2013 @@ -38,7 +38,8 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Options opts = new Options(); Option dumpKeys = new Option("d", "dump", false, "dump the key/value pairs"); @@ -57,6 +58,7 @@ public class PrintInfo { for (String arg : commandLine.getArgs()) { Path path = new Path(arg); + FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local CachableBlockFile.Reader _rdr = new CachableBlockFile.Reader(fs, path, conf, null, null); Reader iter = new RFile.Reader(_rdr); Modified: accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1480033&r1=1480032&r2=1480033&view=diff == --- accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original) +++ accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Tue May 7 19:22:48 2013 @@ -48,8 +48,10 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Path path = new Path(args[0]); +FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local printMetaBlockInfo(conf, fs, path); } }
svn commit: r1480034 - in /accumulo/branches/1.5: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/file/rfile/ core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/ examples/ fa
Author: ecn Date: Tue May 7 19:24:58 2013 New Revision: 1480034 URL: http://svn.apache.org/r1480034 Log: ACCUMULO-1381 applying Drew Farris's patch Modified: accumulo/branches/1.5/ (props changed) accumulo/branches/1.5/assemble/ (props changed) accumulo/branches/1.5/core/ (props changed) accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java accumulo/branches/1.5/examples/ (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/branches/1.5/server/ (props changed) accumulo/branches/1.5/src/ (props changed) Propchange: accumulo/branches/1.5/ -- Merged /accumulo/branches/1.4/src:r1480033 Merged /accumulo/branches/1.4:r1480033 Propchange: accumulo/branches/1.5/assemble/ -- Merged /accumulo/branches/1.4/src/assemble:r1480033 Merged /accumulo/branches/1.4/assemble:r1480033 Propchange: accumulo/branches/1.5/core/ -- Merged /accumulo/branches/1.4/core:r1480033 Merged /accumulo/branches/1.4/src/core:r1480033 Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1480034&r1=1480033&r2=1480034&view=diff == --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Tue May 7 19:24:58 2013 @@ -48,7 +48,8 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Opts opts = new Opts(); opts.parseArgs(PrintInfo.class.getName(), args); if (opts.files.isEmpty()) { @@ -63,6 +64,7 @@ public class PrintInfo { for (String arg : opts.files) { Path path = new Path(arg); + FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local CachableBlockFile.Reader _rdr = new CachableBlockFile.Reader(fs, path, conf, null, null); Reader iter = new RFile.Reader(_rdr); Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1480034&r1=1480033&r2=1480034&view=diff == --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Tue May 7 19:24:58 2013 @@ -56,8 +56,10 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Path path = new Path(args[0]); +FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local printMetaBlockInfo(conf, fs, path); } } Propchange: accumulo/branches/1.5/examples/ -- Merged /accumulo/branches/1.4/src/examples:r1480033 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033 Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033 Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -
svn commit: r1480038 - in /accumulo/trunk: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/file/rfile/ core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/ examples/ fate/src/
Author: ecn Date: Tue May 7 19:27:32 2013 New Revision: 1480038 URL: http://svn.apache.org/r1480038 Log: ACCUMULO-1381 applying Drew Farris's patch Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.4/src:r1480033 Merged /accumulo/branches/1.5:r1480034 Merged /accumulo/branches/1.4:r1480033 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.4/src/assemble:r1480033 Merged /accumulo/branches/1.4/assemble:r1480033 Merged /accumulo/branches/1.5/assemble:r1480034 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1480034 Merged /accumulo/branches/1.4/core:r1480033 Merged /accumulo/branches/1.4/src/core:r1480033 Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1480038&r1=1480037&r2=1480038&view=diff == --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Tue May 7 19:27:32 2013 @@ -48,7 +48,8 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Opts opts = new Opts(); opts.parseArgs(PrintInfo.class.getName(), args); if (opts.files.isEmpty()) { @@ -63,6 +64,7 @@ public class PrintInfo { for (String arg : opts.files) { Path path = new Path(arg); + FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local CachableBlockFile.Reader _rdr = new CachableBlockFile.Reader(fs, path, conf, null, null); Reader iter = new RFile.Reader(_rdr); Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1480038&r1=1480037&r2=1480038&view=diff == --- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original) +++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Tue May 7 19:27:32 2013 @@ -56,8 +56,10 @@ public class PrintInfo { public static void main(String[] args) throws Exception { Configuration conf = new Configuration(); @SuppressWarnings("deprecation") -FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem hadoopFs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration()); +FileSystem localFs = FileSystem.getLocal(conf); Path path = new Path(args[0]); +FileSystem fs = hadoopFs.exists(path) ? hadoopFs : localFs; // fall back to local printMetaBlockInfo(conf, fs, path); } } Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.4/src/examples:r1480033 Merged /accumulo/branches/1.5/examples:r1480034 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480034 Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033 Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480033
svn commit: r1480091 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
Author: ctubbsii Date: Tue May 7 21:30:58 2013 New Revision: 1480091 URL: http://svn.apache.org/r1480091 Log: ACCUMULO-970 record merge from superficial changes due to rolling back release candidate Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/pom.xml -- Merged /accumulo/branches/1.5/pom.xml:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1479128-1479129,1479131,1479673 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1479128-1479129,1479131,1479673
svn commit: r1480094 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
Author: ctubbsii Date: Tue May 7 21:35:05 2013 New Revision: 1480094 URL: http://svn.apache.org/r1480094 Log: ACCUMULO-970 record merge from superficial changes due to rolling back release candidate (missed one) Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1479973 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1479973 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1479973 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1479973 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1479973 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1479973 Propchange: accumulo/trunk/pom.xml -- Merged /accumulo/branches/1.5/pom.xml:r1479973 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1479973 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1479973
svn commit: r1480096 - in /accumulo/trunk: ./ .gitignore assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSe
Author: ctubbsii Date: Tue May 7 21:37:56 2013 New Revision: 1480096 URL: http://svn.apache.org/r1480096 Log: ACCUMULO-970 ensure all 1.5 branch changes have been merged to trunk Modified: accumulo/trunk/ (props changed) accumulo/trunk/.gitignore accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/proxy/README (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Modified: accumulo/trunk/.gitignore URL: http://svn.apache.org/viewvc/accumulo/trunk/.gitignore?rev=1480096&r1=1480095&r2=1480096&view=diff == --- accumulo/trunk/.gitignore (original) +++ accumulo/trunk/.gitignore Tue May 7 21:37:56 2013 @@ -108,6 +108,12 @@ /fate/.classpath /fate/.project +# /proxy/ +/proxy/target +/proxy/.settings +/proxy/.classpath +/proxy/.project + # /server/ /server/target /server/.project Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/pom.xml -- Merged /accumulo/branches/1.5/pom.xml:r1479040-1479127,1479130,1479132-1479203,1479205-1479672,1479674-1479931,1479933-1479972,1479974-1480033,1480035-1480095 Propchange: accumulo/trunk/proxy/README -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue May 7 21:37:56 2013 @@ -0,0 +1,21 @@ +/accumulo/branches/1.3/proxy/README:1309369,1328076,1330246,1330264,1330944,1349971,1354669 +/accumulo/branches/1.3/src/proxy/README:1309369,1328076,1330246,1349971,1354669 +/accumulo/branches/1.4/proxy/README:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864,1450271,1451700,1455610,1455639,1455980,1461548,1465687,1466199,1466259,1466627,1468531,1468958,1480033 +/accumulo/branches/1.4/src/proxy/README:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1450271,1455610,1455639,1455980,1461548,1465687,1466259,1466627,1467288-1479121,1480033 +/accumulo/branches/1.4.2/proxy/README:1399210,1402681 +/accumulo/branches/1.4.2/src/proxy/README:1399210,1402681 +/accumulo/branches/1.5/proxy/README:1447769-1480095 +/accumulo/branches/ACCUMULO-259/proxy/README:1343822-1438343 +/accumulo/branches/ACCUMULO-259-polishing/proxy/README:1449464-1451386 +/accumulo/branches/ACCUMULO-672/proxy/README:1357826,13578
svn commit: r1480118 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
Author: ecn Date: Tue May 7 22:15:50 2013 New Revision: 1480118 URL: http://svn.apache.org/r1480118 Log: ACCUMULO-1227 test was failing Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1480118&r1=1480117&r2=1480118&view=diff == --- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original) +++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Tue May 7 22:15:50 2013 @@ -44,8 +44,8 @@ public class LargeRowTest extends Functi private static final String PRE_SPLIT_TABLE_NAME = "lrps"; private static final int NUM_ROWS = 100; private static final int ROW_SIZE = 1 << 17; - private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 4; private static final int NUM_PRE_SPLITS = 9; + private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / NUM_PRE_SPLITS; @Override public void cleanup() {} @@ -97,7 +97,7 @@ public class LargeRowTest extends Functi UtilWaitThread.sleep(12000); Logger.getLogger(LargeRowTest.class).warn("checking splits"); -checkSplits(REG_TABLE_NAME, 9, 16); +checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS); verify(REG_TABLE_NAME); }
svn commit: r1480120 - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/ test/src
Author: ecn Date: Tue May 7 22:16:48 2013 New Revision: 1480120 URL: http://svn.apache.org/r1480120 Log: ACCUMULO-1227 test was failing Modified: accumulo/trunk/ (props changed) accumulo/trunk/assemble/ (props changed) accumulo/trunk/core/ (props changed) accumulo/trunk/examples/ (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed) accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed) accumulo/trunk/pom.xml (props changed) accumulo/trunk/proxy/README (props changed) accumulo/trunk/server/ (props changed) accumulo/trunk/src/ (props changed) accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Propchange: accumulo/trunk/ -- Merged /accumulo/branches/1.5:r1480118 Propchange: accumulo/trunk/assemble/ -- Merged /accumulo/branches/1.5/assemble:r1480118 Propchange: accumulo/trunk/core/ -- Merged /accumulo/branches/1.5/core:r1480118 Propchange: accumulo/trunk/examples/ -- Merged /accumulo/branches/1.5/examples:r1480118 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480118 Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java -- Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1480118 Propchange: accumulo/trunk/pom.xml -- Merged /accumulo/branches/1.5/pom.xml:r1480118 Propchange: accumulo/trunk/proxy/README -- Merged /accumulo/branches/1.5/proxy/README:r1480118 Propchange: accumulo/trunk/server/ -- Merged /accumulo/branches/1.5/server:r1480118 Propchange: accumulo/trunk/src/ -- Merged /accumulo/branches/1.5/src:r1480118 Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java?rev=1480120&r1=1480119&r2=1480120&view=diff == --- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java (original) +++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java Tue May 7 22:16:48 2013 @@ -44,8 +44,8 @@ public class LargeRowTest extends Functi private static final String PRE_SPLIT_TABLE_NAME = "lrps"; private static final int NUM_ROWS = 100; private static final int ROW_SIZE = 1 << 17; - private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 4; private static final int NUM_PRE_SPLITS = 9; + private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / NUM_PRE_SPLITS; @Override public void cleanup() {} @@ -97,7 +97,7 @@ public class LargeRowTest extends Functi UtilWaitThread.sleep(12000); Logger.getLogger(LargeRowTest.class).warn("checking splits"); -checkSplits(REG_TABLE_NAME, 9, 16); +checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS/2, NUM_PRE_SPLITS); verify(REG_TABLE_NAME); }
svn commit: r1480121 - /accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java
Author: ecn Date: Tue May 7 22:24:53 2013 New Revision: 1480121 URL: http://svn.apache.org/r1480121 Log: ACCUMULO-1227 test was failing Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java Modified: accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java?rev=1480121&r1=1480120&r2=1480121&view=diff == --- accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java (original) +++ accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/functional/LargeRowTest.java Tue May 7 22:24:53 2013 @@ -42,8 +42,8 @@ public class LargeRowTest extends Functi private static final String PRE_SPLIT_TABLE_NAME = "lrps"; private static final int NUM_ROWS = 100; private static final int ROW_SIZE = 1 << 17; - private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / 5; private static final int NUM_PRE_SPLITS = 9; + private static final int SPLIT_THRESH = ROW_SIZE * NUM_ROWS / NUM_PRE_SPLITS; @Override public void cleanup() {} @@ -95,7 +95,7 @@ public class LargeRowTest extends Functi UtilWaitThread.sleep(1); -checkSplits(REG_TABLE_NAME, 1, 9); +checkSplits(REG_TABLE_NAME, NUM_PRE_SPLITS / 2, NUM_PRE_SPLITS); verify(REG_TABLE_NAME); }