[1/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 d3316b3cf -> ff1e003ae
  refs/heads/1.7 bd9969f1d -> 0faf8b9c0
  refs/heads/master 664012d16 -> 97ce2a758


ACCUMULO-3509 Fix UTF_8 import for 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff1e003a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff1e003a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff1e003a

Branch: refs/heads/1.6
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs 
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 17:59:32 2016 -0500

--
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

[3/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii 
ACCUMULO-3509 Fix UTF_8 import for 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff1e003a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff1e003a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff1e003a

Branch: refs/heads/master
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs 
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 17:59:32 2016 -0500

--
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

[6/6] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ctubbsii 
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97ce2a75
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97ce2a75
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97ce2a75

Branch: refs/heads/master
Commit: 97ce2a7584876d617ecb2171c162b1482336bf62
Parents: 664012d 0faf8b9
Author: Christopher Tubbs 
Authored: Wed Jan 27 18:01:49 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 18:01:49 2016 -0500

--

--

[2/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index b7637a6,d32bc43..15e9d5f
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -85,17 -87,16 +91,18 @@@ import org.apache.accumulo.harness.Accu
  import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
  import org.apache.accumulo.test.functional.BadIterator;
  import org.apache.accumulo.test.functional.SlowIterator;
 -import org.apache.accumulo.trace.instrument.Span;
 -import org.apache.accumulo.trace.instrument.Trace;
 +import org.apache.accumulo.tracer.TraceDump;
 +import org.apache.accumulo.tracer.TraceDump.Printer;
  import org.apache.accumulo.tracer.TraceServer;
  import org.apache.hadoop.io.Text;
 -import org.apache.log4j.Logger;
  import org.junit.Assert;
  import org.junit.Assume;
 +import org.junit.Before;
  import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
+ import com.google.common.base.Charsets;
  import com.google.common.collect.Iterables;
  
  /**

[2/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index b7637a6,d32bc43..15e9d5f
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@@ -85,17 -87,16 +91,18 @@@ import org.apache.accumulo.harness.Accu
  import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
  import org.apache.accumulo.test.functional.BadIterator;
  import org.apache.accumulo.test.functional.SlowIterator;
 -import org.apache.accumulo.trace.instrument.Span;
 -import org.apache.accumulo.trace.instrument.Trace;
 +import org.apache.accumulo.tracer.TraceDump;
 +import org.apache.accumulo.tracer.TraceDump.Printer;
  import org.apache.accumulo.tracer.TraceServer;
  import org.apache.hadoop.io.Text;
 -import org.apache.log4j.Logger;
  import org.junit.Assert;
  import org.junit.Assume;
 +import org.junit.Before;
  import org.junit.Test;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
+ import com.google.common.base.Charsets;
  import com.google.common.collect.Iterables;
  
  /**

[5/5] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread kturner 
Merge branch '1.7'

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java

server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java

server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/ScanDataSource.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4eadac16
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4eadac16
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4eadac16

Branch: refs/heads/master
Commit: 4eadac16bb509f72696dfcf79afa84ecd1cc1adf
Parents: 97ce2a7 d4882a1
Author: Keith Turner 
Authored: Wed Jan 27 20:41:17 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 20:41:17 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  46 +-
 .../accumulo/core/iterators/IteratorUtil.java   |  89 +-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../apache/accumulo/tserver/TabletServer.java   |  79 +++--
 .../accumulo/tserver/tablet/ScanDataSource.java |  19 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 ++
 .../accumulo/test/ConditionalWriterIT.java  | 139 +++-
 9 files changed, 506 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eadac16/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 546de9c,c7756ad..c9ef101
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@@ -17,6 -17,6 +17,7 @@@
  
  package org.apache.accumulo.core.client.impl;
  
++import static 
com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
  import static java.nio.charset.StandardCharsets.UTF_8;
  
  import java.nio.ByteBuffer;
@@@ -74,6 -76,8 +77,7 @@@ import org.apache.accumulo.core.trace.T
  import org.apache.accumulo.core.trace.thrift.TInfo;
  import org.apache.accumulo.core.util.BadArgumentException;
  import org.apache.accumulo.core.util.ByteBufferUtil;
+ import org.apache.accumulo.core.util.NamingThreadFactory;
 -import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.util.LoggingRunnable;
  import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eadac16/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
index 6523367,c739e56..6fee4e6
--- a/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
@@@ -217,10 -205,20 +205,14 @@@ public class IteratorUtil 
  return loadIterators(scope, source, extent, conf, ssiList, ssio, env, 
true);
}
  
 -  public static ,V extends Writable> 
SortedKeyValueIterator loadIterators(IteratorScope scope,
 -  SortedKeyValueIterator source, KeyExtent extent, 
AccumuloConfiguration conf, List ssiList, 
Map> ssio,
 -  IteratorEnvironment env, boolean useAccumuloClassLoader) throws 
IOException {
 -List iters = new ArrayList(ssiList);
 -Map> allOptions = new 
HashMap>();
 -
 +  private static void parseIteratorConfiguration(IteratorScope scope, 
List iters, Map> ssio,
 +  Map> allOptions, AccumuloConfiguration conf) {
  parseIterConf(scope, iters, allOptions, conf);
  
+ mergeOptions(ssio, allOptions);
 -
 -return loadIterators(source, iters, allOptions, env, 
useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH));
+   }
+ 
+   private static void mergeOptions(Map> ssio, 
Map> allOptions) {
  for (Entry> entry : ssio.entrySet()) {
if (entry.getValue() == null)
  continue;
@@@ -233,25 -231,6 +225,24 @@@
  }
}
  
 +  public static ,V extends Writable> 
SortedKeyValueIterator loadIterators(IteratorScope scope,
 +  SortedKeyValueIterator source, KeyExtent extent,

[3/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index a75b35d,000..923b4a1
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -1,2762 -1,0 +1,2780 @@@
 +/*
 + * 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.tserver.tablet;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.ByteArrayInputStream;
 +import java.io.DataInputStream;
 +import java.io.FileNotFoundException;
 +import java.io.IOException;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Comparator;
 +import java.util.EnumSet;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.PriorityQueue;
 +import java.util.Set;
 +import java.util.SortedMap;
 +import java.util.TreeMap;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.atomic.AtomicLong;
 +import java.util.concurrent.atomic.AtomicReference;
 +import java.util.concurrent.locks.ReentrantLock;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.Durability;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.admin.CompactionStrategyConfig;
 +import org.apache.accumulo.core.client.impl.DurabilityImpl;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.ConfigurationCopy;
 +import org.apache.accumulo.core.conf.ConfigurationObserver;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.constraints.Violations;
 +import org.apache.accumulo.core.data.ByteSequence;
 +import org.apache.accumulo.core.data.Column;
 +import org.apache.accumulo.core.data.ColumnUpdate;
 +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.data.impl.KeyExtent;
 +import org.apache.accumulo.core.data.thrift.IterInfo;
 +import org.apache.accumulo.core.data.thrift.MapFileInfo;
 +import org.apache.accumulo.core.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVIterator;
 +import org.apache.accumulo.core.iterators.IterationInterruptedException;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator;
 +import org.apache.accumulo.core.master.thrift.TabletLoadState;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.metadata.schema.DataFileValue;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
 +import org.apache.accumulo.core.protobuf.ProtobufUtil;
 +import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.ColumnVisibility;
 +import org.apache.accumulo.core.tabletserver.log.LogEntry;
 +import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 +import org.apache.accumulo.core.trace.ProbabilitySampler;
 +import org.apache.accumulo.core.trace.Span;
 +import org.apache.accumulo.core.trace.Trace;
 +import org.apache.accumulo.core.util.LocalityGroupUtil;
 +import org.apache.accumulo.core.util.Pair;
 +import

[1/4] accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/1.7 0faf8b9c0 -> d4882a15f


ACCUMULO-4066 Speed up condition checking for conditional mutations


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21d2f615
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/21d2f615

Branch: refs/heads/1.7
Commit: 21d2f61524de1f26ed88c4baaddee70c01081196
Parents: ff1e003
Author: Keith Turner 
Authored: Wed Jan 27 14:13:40 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 19:32:29 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  44 -
 .../accumulo/core/iterators/IteratorUtil.java   |  93 ++-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../org/apache/accumulo/tserver/Tablet.java |  37 -
 .../apache/accumulo/tserver/TabletServer.java   |  95 ---
 .../accumulo/test/ConditionalWriterIT.java  | 137 +++-
 8 files changed, 521 insertions(+), 116 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 3fcce90..96d58a7 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -24,15 +24,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.data.ArrayByteSequence;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.util.UnsynchronizedBuffer;
 
 public class CompressedIterators {
   private Map symbolMap;
   private List symbolTable;
-  private Map cache;
 
   public static class IterConfig {
 public List ssiList = new ArrayList();
@@ -46,7 +43,6 @@ public class CompressedIterators {
 
   public CompressedIterators(List symbols) {
 this.symbolTable = symbols;
-this.cache = new HashMap();
   }
 
   private int getSymbolID(String symbol) {
@@ -85,14 +81,7 @@ public class CompressedIterators {
   }
 
   public IterConfig decompress(ByteBuffer iterators) {
-
-ByteSequence iterKey = new ArrayByteSequence(iterators);
-IterConfig config = cache.get(iterKey);
-if (config != null) {
-  return config;
-}
-
-config = new IterConfig();
+IterConfig config = new IterConfig();
 
 UnsynchronizedBuffer.Reader in = new 
UnsynchronizedBuffer.Reader(iterators);
 
@@ -120,7 +109,6 @@ public class CompressedIterators {
 
 }
 
-cache.put(iterKey, config);
 return config;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 730cf08..9030d77 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -19,7 +19,9 @@ package org.apache.accumulo.core.client.impl;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -70,6 +72,7 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.NamingThreadFactory;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -375,7 +378,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 this.credentials = credentials;
 this.auths = config.getAuthorizations();
 this.ve = new

accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 ff1e003ae -> 21d2f6152


ACCUMULO-4066 Speed up condition checking for conditional mutations


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21d2f615
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/21d2f615

Branch: refs/heads/1.6
Commit: 21d2f61524de1f26ed88c4baaddee70c01081196
Parents: ff1e003
Author: Keith Turner 
Authored: Wed Jan 27 14:13:40 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 19:32:29 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  44 -
 .../accumulo/core/iterators/IteratorUtil.java   |  93 ++-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../org/apache/accumulo/tserver/Tablet.java |  37 -
 .../apache/accumulo/tserver/TabletServer.java   |  95 ---
 .../accumulo/test/ConditionalWriterIT.java  | 137 +++-
 8 files changed, 521 insertions(+), 116 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 3fcce90..96d58a7 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -24,15 +24,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.data.ArrayByteSequence;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.util.UnsynchronizedBuffer;
 
 public class CompressedIterators {
   private Map symbolMap;
   private List symbolTable;
-  private Map cache;
 
   public static class IterConfig {
 public List ssiList = new ArrayList();
@@ -46,7 +43,6 @@ public class CompressedIterators {
 
   public CompressedIterators(List symbols) {
 this.symbolTable = symbols;
-this.cache = new HashMap();
   }
 
   private int getSymbolID(String symbol) {
@@ -85,14 +81,7 @@ public class CompressedIterators {
   }
 
   public IterConfig decompress(ByteBuffer iterators) {
-
-ByteSequence iterKey = new ArrayByteSequence(iterators);
-IterConfig config = cache.get(iterKey);
-if (config != null) {
-  return config;
-}
-
-config = new IterConfig();
+IterConfig config = new IterConfig();
 
 UnsynchronizedBuffer.Reader in = new 
UnsynchronizedBuffer.Reader(iterators);
 
@@ -120,7 +109,6 @@ public class CompressedIterators {
 
 }
 
-cache.put(iterKey, config);
 return config;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 730cf08..9030d77 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -19,7 +19,9 @@ package org.apache.accumulo.core.client.impl;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -70,6 +72,7 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.NamingThreadFactory;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -375,7 +378,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 this.credentials = credentials;
 this.auths = config.getAuthorizations();
 this.ve = new

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0faf8b9c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0faf8b9c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0faf8b9c

Branch: refs/heads/master
Commit: 0faf8b9c0619bdb203be704c7a09547a884fd58b
Parents: bd9969f ff1e003
Author: Christopher Tubbs 
Authored: Wed Jan 27 18:01:32 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 18:01:32 2016 -0500

--

--

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread ctubbsii 
Merge branch '1.6' into 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0faf8b9c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0faf8b9c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0faf8b9c

Branch: refs/heads/1.7
Commit: 0faf8b9c0619bdb203be704c7a09547a884fd58b
Parents: bd9969f ff1e003
Author: Christopher Tubbs 
Authored: Wed Jan 27 18:01:32 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 18:01:32 2016 -0500

--

--

[2/6] accumulo git commit: ACCUMULO-3509 Fix UTF_8 import for 1.6

2016-01-27 Thread ctubbsii 
ACCUMULO-3509 Fix UTF_8 import for 1.6


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ff1e003a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ff1e003a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ff1e003a

Branch: refs/heads/1.7
Commit: ff1e003ae98d11f5164fdce3f92564368ae5dd58
Parents: d3316b3
Author: Christopher Tubbs 
Authored: Wed Jan 27 17:59:32 2016 -0500
Committer: Christopher Tubbs 
Committed: Wed Jan 27 17:59:32 2016 -0500

--
 .../org/apache/accumulo/test/functional/SessionBlockVerifyIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ff1e003a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
index 05f304b..e641c13 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/SessionBlockVerifyIT.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.test.functional;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

[1/2] accumulo git commit: ACCUMULO-4116 fix bad merge

2016-01-27 Thread ecn 
Repository: accumulo
Updated Branches:
  refs/heads/master c3f596ead -> 664012d16


ACCUMULO-4116 fix bad merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd9969f1

Branch: refs/heads/master
Commit: bd9969f1d14a0b719cd8454413231ab33d3b9a12
Parents: 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 11:36:46 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:36:46 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd9969f1/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 9824f67..eb4403d 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,15 +27,11 @@ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-<<< HEAD
-. "${bin}/mapred-setup.sh"
-===
 CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
 . $CONTINUOUS_CONF_DIR/continuous-env.sh
 . $ACCUMULO_CONF_DIR/accumulo-env.sh
 
 SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
->>> 1.6
 
 "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn 
Repository: accumulo
Updated Branches:
  refs/heads/1.7 edaa44a5b -> bd9969f1d


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/1.7
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# 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.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

2016-01-27 Thread ecn 
ACCUMULO-4116 merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

Branch: refs/heads/1.7
Commit: 90363259d25c5ccc43c209041d2824a7699040e3
Parents: edaa44a d3316b3
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:37 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:37 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-moru.sh
--
diff --cc test/system/continuous/run-moru.sh
index f82d5f9,1c8d81a..9824f67
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@@ -27,7 -27,11 +27,15 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
++<<< HEAD
 +. "${bin}/mapred-setup.sh"
++===
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
++>>> 1.6
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-verify.sh
--
diff --cc test/system/continuous/run-verify.sh
index c68c3ea,bd4df66..b163663
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@@ -27,12 -27,20 +27,16 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
- . "${bin}/mapred-setup.sh"
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
  
  AUTH_OPT="";
 +[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS"
  
 -if [ -n "$VERIFY_AUTHS" ] ; then
 -  AUTH_OPT="--auths $VERIFY_AUTHS";
 -fi
  SCAN_OPT=--offline
 -if [ "$SCAN_OFFLINE" == "false" ] ; then
 -   SCAN_OPT=
 -fi
 +[[ $SCAN_OFFLINE == false ]] && SCAN_OPT=
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
$AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE 
--output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS 
$SCAN_OPT
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table 
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers 
"$VERIFY_REDUCERS" "$SCAN_OPT"

[3/3] accumulo git commit: ACCUMULO-4116 fix bad merge

2016-01-27 Thread ecn 
ACCUMULO-4116 fix bad merge


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bd9969f1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bd9969f1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bd9969f1

Branch: refs/heads/1.7
Commit: bd9969f1d14a0b719cd8454413231ab33d3b9a12
Parents: 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 11:36:46 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:36:46 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd9969f1/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 9824f67..eb4403d 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,15 +27,11 @@ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-<<< HEAD
-. "${bin}/mapred-setup.sh"
-===
 CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
 . $CONTINUOUS_CONF_DIR/continuous-env.sh
 . $ACCUMULO_CONF_DIR/accumulo-env.sh
 
 SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
->>> 1.6
 
 "$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"

accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 d89846e8f -> d3316b3cf


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/1.6
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# 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.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";

[2/2] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ecn 
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/664012d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/664012d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/664012d1

Branch: refs/heads/master
Commit: 664012d1679e69b53fd663b840fabad53555c6f3
Parents: c3f596e bd9969f
Author: Eric C. Newton 
Authored: Wed Jan 27 11:37:01 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 11:37:01 2016 -0500

--
 test/system/continuous/run-moru.sh | 4 
 1 file changed, 4 deletions(-)
--

[4/4] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java

server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d4882a15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d4882a15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d4882a15

Branch: refs/heads/1.7
Commit: d4882a15fd85482855783e3a56babc14d31bb5bb
Parents: 0faf8b9 21d2f61
Author: Keith Turner 
Authored: Wed Jan 27 19:57:22 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 19:57:22 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  44 -
 .../accumulo/core/iterators/IteratorUtil.java   |  93 ++-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../apache/accumulo/tserver/TabletServer.java   |  76 ++---
 .../accumulo/tserver/tablet/ScanDataSource.java |  23 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 ++
 .../accumulo/test/ConditionalWriterIT.java  | 137 +++-
 9 files changed, 507 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 24040e6,9030d77..c7756ad
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@@ -17,11 -17,11 +17,13 @@@
  
  package org.apache.accumulo.core.client.impl;
  
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
  import java.nio.ByteBuffer;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Collections;
+ import java.util.Comparator;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
@@@ -69,14 -69,13 +71,15 @@@ import org.apache.accumulo.core.securit
  import org.apache.accumulo.core.security.VisibilityParseException;
  import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
  import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 +import org.apache.accumulo.core.trace.Trace;
 +import org.apache.accumulo.core.trace.Tracer;
 +import org.apache.accumulo.core.trace.thrift.TInfo;
  import org.apache.accumulo.core.util.BadArgumentException;
  import org.apache.accumulo.core.util.ByteBufferUtil;
 -import org.apache.accumulo.core.util.LoggingRunnable;
+ import org.apache.accumulo.core.util.NamingThreadFactory;
 -import org.apache.accumulo.core.util.ThriftUtil;
  import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.fate.util.LoggingRunnable;
  import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
  import org.apache.accumulo.fate.zookeeper.ZooLock;
  import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID;
@@@ -379,12 -373,13 +382,12 @@@ class ConditionalWriterImpl implements 
  }
}
  
 -  ConditionalWriterImpl(Instance instance, Credentials credentials, String 
tableId, ConditionalWriterConfig config) {
 -this.instance = instance;
 -this.credentials = credentials;
 +  ConditionalWriterImpl(ClientContext context, String tableId, 
ConditionalWriterConfig config) {
 +this.context = context;
  this.auths = config.getAuthorizations();
  this.ve = new VisibilityEvaluator(config.getAuthorizations());
- this.threadPool = new 
ScheduledThreadPoolExecutor(config.getMaxWriteThreads());
+ this.threadPool = new 
ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new 
NamingThreadFactory(this.getClass().getSimpleName()));
 -this.locator = TabletLocator.getLocator(instance, new Text(tableId));
 +this.locator = TabletLocator.getLocator(context, new Text(tableId));
  this.serverQueues = new HashMap();
  this.tableId = tableId;
  this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
--
diff --cc

[3/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index a75b35d,000..923b4a1
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -1,2762 -1,0 +1,2780 @@@
 +/*
 + * 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.tserver.tablet;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.ByteArrayInputStream;
 +import java.io.DataInputStream;
 +import java.io.FileNotFoundException;
 +import java.io.IOException;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.Collections;
 +import java.util.Comparator;
 +import java.util.EnumSet;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Iterator;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.PriorityQueue;
 +import java.util.Set;
 +import java.util.SortedMap;
 +import java.util.TreeMap;
 +import java.util.concurrent.atomic.AtomicBoolean;
 +import java.util.concurrent.atomic.AtomicLong;
 +import java.util.concurrent.atomic.AtomicReference;
 +import java.util.concurrent.locks.ReentrantLock;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.Durability;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.admin.CompactionStrategyConfig;
 +import org.apache.accumulo.core.client.impl.DurabilityImpl;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.ConfigurationCopy;
 +import org.apache.accumulo.core.conf.ConfigurationObserver;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.constraints.Violations;
 +import org.apache.accumulo.core.data.ByteSequence;
 +import org.apache.accumulo.core.data.Column;
 +import org.apache.accumulo.core.data.ColumnUpdate;
 +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.data.impl.KeyExtent;
 +import org.apache.accumulo.core.data.thrift.IterInfo;
 +import org.apache.accumulo.core.data.thrift.MapFileInfo;
 +import org.apache.accumulo.core.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVIterator;
 +import org.apache.accumulo.core.iterators.IterationInterruptedException;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator;
 +import org.apache.accumulo.core.master.thrift.TabletLoadState;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.metadata.schema.DataFileValue;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
 +import org.apache.accumulo.core.protobuf.ProtobufUtil;
 +import org.apache.accumulo.core.replication.ReplicationConfigurationUtil;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.security.ColumnVisibility;
 +import org.apache.accumulo.core.tabletserver.log.LogEntry;
 +import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 +import org.apache.accumulo.core.trace.ProbabilitySampler;
 +import org.apache.accumulo.core.trace.Span;
 +import org.apache.accumulo.core.trace.Trace;
 +import org.apache.accumulo.core.util.LocalityGroupUtil;
 +import org.apache.accumulo.core.util.Pair;
 +import

[1/5] accumulo git commit: ACCUMULO-4066 Speed up condition checking for conditional mutations

2016-01-27 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/master 97ce2a758 -> 4eadac16b


ACCUMULO-4066 Speed up condition checking for conditional mutations


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/21d2f615
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/21d2f615
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/21d2f615

Branch: refs/heads/master
Commit: 21d2f61524de1f26ed88c4baaddee70c01081196
Parents: ff1e003
Author: Keith Turner 
Authored: Wed Jan 27 14:13:40 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 19:32:29 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  44 -
 .../accumulo/core/iterators/IteratorUtil.java   |  93 ++-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../org/apache/accumulo/tserver/Tablet.java |  37 -
 .../apache/accumulo/tserver/TabletServer.java   |  95 ---
 .../accumulo/test/ConditionalWriterIT.java  | 137 +++-
 8 files changed, 521 insertions(+), 116 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
index 3fcce90..96d58a7 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/CompressedIterators.java
@@ -24,15 +24,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.data.ArrayByteSequence;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.data.thrift.IterInfo;
 import org.apache.accumulo.core.util.UnsynchronizedBuffer;
 
 public class CompressedIterators {
   private Map symbolMap;
   private List symbolTable;
-  private Map cache;
 
   public static class IterConfig {
 public List ssiList = new ArrayList();
@@ -46,7 +43,6 @@ public class CompressedIterators {
 
   public CompressedIterators(List symbols) {
 this.symbolTable = symbols;
-this.cache = new HashMap();
   }
 
   private int getSymbolID(String symbol) {
@@ -85,14 +81,7 @@ public class CompressedIterators {
   }
 
   public IterConfig decompress(ByteBuffer iterators) {
-
-ByteSequence iterKey = new ArrayByteSequence(iterators);
-IterConfig config = cache.get(iterKey);
-if (config != null) {
-  return config;
-}
-
-config = new IterConfig();
+IterConfig config = new IterConfig();
 
 UnsynchronizedBuffer.Reader in = new 
UnsynchronizedBuffer.Reader(iterators);
 
@@ -120,7 +109,6 @@ public class CompressedIterators {
 
 }
 
-cache.put(iterKey, config);
 return config;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21d2f615/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 730cf08..9030d77 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@ -19,7 +19,9 @@ package org.apache.accumulo.core.client.impl;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -70,6 +72,7 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.LoggingRunnable;
+import org.apache.accumulo.core.util.NamingThreadFactory;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -375,7 +378,7 @@ class ConditionalWriterImpl implements ConditionalWriter {
 this.credentials = credentials;
 this.auths = config.getAuthorizations();
 this.ve = new

[4/5] accumulo git commit: Merge branch '1.6' into 1.7

2016-01-27 Thread kturner 
Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java

server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d4882a15
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d4882a15
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d4882a15

Branch: refs/heads/master
Commit: d4882a15fd85482855783e3a56babc14d31bb5bb
Parents: 0faf8b9 21d2f61
Author: Keith Turner 
Authored: Wed Jan 27 19:57:22 2016 -0500
Committer: Keith Turner 
Committed: Wed Jan 27 19:57:22 2016 -0500

--
 .../core/client/impl/CompressedIterators.java   |  14 +-
 .../core/client/impl/ConditionalWriterImpl.java |  44 -
 .../accumulo/core/iterators/IteratorUtil.java   |  93 ++-
 .../client/impl/ConditionalComparatorTest.java  |  53 ++
 .../tserver/ConditionCheckerContext.java| 164 +++
 .../apache/accumulo/tserver/TabletServer.java   |  76 ++---
 .../accumulo/tserver/tablet/ScanDataSource.java |  23 ++-
 .../apache/accumulo/tserver/tablet/Tablet.java  |  18 ++
 .../accumulo/test/ConditionalWriterIT.java  | 137 +++-
 9 files changed, 507 insertions(+), 115 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
index 24040e6,9030d77..c7756ad
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/ConditionalWriterImpl.java
@@@ -17,11 -17,11 +17,13 @@@
  
  package org.apache.accumulo.core.client.impl;
  
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
  import java.nio.ByteBuffer;
  import java.util.ArrayList;
+ import java.util.Arrays;
  import java.util.Collections;
+ import java.util.Comparator;
  import java.util.HashMap;
  import java.util.HashSet;
  import java.util.Iterator;
@@@ -69,14 -69,13 +71,15 @@@ import org.apache.accumulo.core.securit
  import org.apache.accumulo.core.security.VisibilityParseException;
  import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
  import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 +import org.apache.accumulo.core.trace.Trace;
 +import org.apache.accumulo.core.trace.Tracer;
 +import org.apache.accumulo.core.trace.thrift.TInfo;
  import org.apache.accumulo.core.util.BadArgumentException;
  import org.apache.accumulo.core.util.ByteBufferUtil;
 -import org.apache.accumulo.core.util.LoggingRunnable;
+ import org.apache.accumulo.core.util.NamingThreadFactory;
 -import org.apache.accumulo.core.util.ThriftUtil;
  import org.apache.accumulo.core.util.UtilWaitThread;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.fate.util.LoggingRunnable;
  import org.apache.accumulo.fate.zookeeper.ZooCacheFactory;
  import org.apache.accumulo.fate.zookeeper.ZooLock;
  import org.apache.accumulo.fate.zookeeper.ZooUtil.LockID;
@@@ -379,12 -373,13 +382,12 @@@ class ConditionalWriterImpl implements 
  }
}
  
 -  ConditionalWriterImpl(Instance instance, Credentials credentials, String 
tableId, ConditionalWriterConfig config) {
 -this.instance = instance;
 -this.credentials = credentials;
 +  ConditionalWriterImpl(ClientContext context, String tableId, 
ConditionalWriterConfig config) {
 +this.context = context;
  this.auths = config.getAuthorizations();
  this.ve = new VisibilityEvaluator(config.getAuthorizations());
- this.threadPool = new 
ScheduledThreadPoolExecutor(config.getMaxWriteThreads());
+ this.threadPool = new 
ScheduledThreadPoolExecutor(config.getMaxWriteThreads(), new 
NamingThreadFactory(this.getClass().getSimpleName()));
 -this.locator = TabletLocator.getLocator(instance, new Text(tableId));
 +this.locator = TabletLocator.getLocator(context, new Text(tableId));
  this.serverQueues = new HashMap();
  this.tableId = tableId;
  this.timeout = config.getTimeout(TimeUnit.MILLISECONDS);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d4882a15/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
--
diff --cc

[3/3] accumulo git commit: Merge branch '1.7'

2016-01-27 Thread ecn 
Merge branch '1.7'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3f596ea
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3f596ea
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3f596ea

Branch: refs/heads/master
Commit: c3f596eadc0946eb55dc16575c6b9be8e63f214e
Parents: 2d99238 9036325
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:54 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:54 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--

[1/3] accumulo git commit: ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed by the script template

2016-01-27 Thread ecn 
Repository: accumulo
Updated Branches:
  refs/heads/master 2d99238d5 -> c3f596ead


ACCUMULO-4116 inline mapred-setup.sh to use the more convenient vars computed 
by the script template


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3316b3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3316b3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3316b3c

Branch: refs/heads/master
Commit: d3316b3cfb229f58c8f88c988c47bcd7848967c2
Parents: d89846e
Author: Eric C. Newton 
Authored: Wed Jan 27 09:00:08 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:00:08 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  6 +-
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 10 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/mapred-setup.sh
--
diff --git a/test/system/continuous/mapred-setup.sh 
b/test/system/continuous/mapred-setup.sh
deleted file mode 100755
index e6bd2ca..000
--- a/test/system/continuous/mapred-setup.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /usr/bin/env bash
-
-# 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.
-
-# a little helper script that other scripts can source to setup 
-# for running a map reduce job
-
-CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-$ACCUMULO_HOME/test/system/continuous/}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
-. $ACCUMULO_CONF_DIR/accumulo-env.sh
-
-SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-moru.sh
--
diff --git a/test/system/continuous/run-moru.sh 
b/test/system/continuous/run-moru.sh
index 3133b05..1c8d81a 100755
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 $ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3316b3c/test/system/continuous/run-verify.sh
--
diff --git a/test/system/continuous/run-verify.sh 
b/test/system/continuous/run-verify.sh
index 42eb214..bd4df66 100755
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@ -27,7 +27,11 @@ bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
 script=$( basename "${SOURCE}" )
 # Stop: Resolve Script Directory
 
-. ${bin}/mapred-setup.sh
+CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. $ACCUMULO_CONF_DIR/accumulo-env.sh
+
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
 
 AUTH_OPT="";

[2/3] accumulo git commit: ACCUMULO-4116 merge to 1.7

2016-01-27 Thread ecn 
ACCUMULO-4116 merge to 1.7


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90363259
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90363259
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90363259

Branch: refs/heads/master
Commit: 90363259d25c5ccc43c209041d2824a7699040e3
Parents: edaa44a d3316b3
Author: Eric C. Newton 
Authored: Wed Jan 27 09:01:37 2016 -0500
Committer: Eric C. Newton 
Committed: Wed Jan 27 09:01:37 2016 -0500

--
 test/system/continuous/mapred-setup.sh | 25 -
 test/system/continuous/run-moru.sh |  8 
 test/system/continuous/run-verify.sh   |  6 +-
 3 files changed, 13 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-moru.sh
--
diff --cc test/system/continuous/run-moru.sh
index f82d5f9,1c8d81a..9824f67
--- a/test/system/continuous/run-moru.sh
+++ b/test/system/continuous/run-moru.sh
@@@ -27,7 -27,11 +27,15 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
++<<< HEAD
 +. "${bin}/mapred-setup.sh"
++===
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
++>>> 1.6
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
$INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE --min $MIN 
--max $MAX --maxColF $MAX_CF --maxColQ $MAX_CQ --batchMemory $MAX_MEM 
--batchLatency $MAX_LATENCY --batchThreads $NUM_THREADS --maxMappers 
$VERIFY_MAX_MAPS
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousMoru -libjars "$SERVER_LIBJAR" -i 
"$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table "$TABLE" --min 
"$MIN" --max "$MAX" --maxColF "$MAX_CF" --maxColQ "$MAX_CQ" --batchMemory 
"$MAX_MEM" --batchLatency "$MAX_LATENCY" --batchThreads "$NUM_THREADS" 
--maxMappers "$VERIFY_MAX_MAPS"
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/90363259/test/system/continuous/run-verify.sh
--
diff --cc test/system/continuous/run-verify.sh
index c68c3ea,bd4df66..b163663
--- a/test/system/continuous/run-verify.sh
+++ b/test/system/continuous/run-verify.sh
@@@ -27,12 -27,20 +27,16 @@@ bin=$( cd -P "$( dirname "${SOURCE}" )
  script=$( basename "${SOURCE}" )
  # Stop: Resolve Script Directory
  
- . "${bin}/mapred-setup.sh"
+ CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
+ . $CONTINUOUS_CONF_DIR/continuous-env.sh
+ . $ACCUMULO_CONF_DIR/accumulo-env.sh
+ 
+ SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"
  
  AUTH_OPT="";
 +[[ -n $VERIFY_AUTHS ]] && AUTH_OPT="--auths $VERIFY_AUTHS"
  
 -if [ -n "$VERIFY_AUTHS" ] ; then
 -  AUTH_OPT="--auths $VERIFY_AUTHS";
 -fi
  SCAN_OPT=--offline
 -if [ "$SCAN_OFFLINE" == "false" ] ; then
 -   SCAN_OPT=
 -fi
 +[[ $SCAN_OFFLINE == false ]] && SCAN_OPT=
  
 -$ACCUMULO_HOME/bin/tool.sh "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
$AUTH_OPT -i $INSTANCE_NAME -z $ZOO_KEEPERS -u $USER -p $PASS --table $TABLE 
--output $VERIFY_OUT --maxMappers $VERIFY_MAX_MAPS --reducers $VERIFY_REDUCERS 
$SCAN_OPT
 +"$ACCUMULO_HOME/bin/tool.sh" "$SERVER_LIBJAR" 
org.apache.accumulo.test.continuous.ContinuousVerify 
-Dmapreduce.job.reduce.slowstart.completedmaps=0.95 -libjars "$SERVER_LIBJAR" 
"$AUTH_OPT" -i "$INSTANCE_NAME" -z "$ZOO_KEEPERS" -u "$USER" -p "$PASS" --table 
"$TABLE" --output "$VERIFY_OUT" --maxMappers "$VERIFY_MAX_MAPS" --reducers 
"$VERIFY_REDUCERS" "$SCAN_OPT"