[2/3] accumulo git commit: Merge branch '1.5' into 1.6

2015-04-24 Thread kturner 
Merge branch '1.5' into 1.6


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

Branch: refs/heads/1.7
Commit: 0bcbab7d6ab8bd0523b630bda1a1ff254e68f1cf
Parents: dd9cc1c 5ac1b52
Author: Keith Turner ktur...@apache.org
Authored: Fri Apr 24 19:39:04 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Fri Apr 24 19:39:04 2015 -0400

--
 .../system/SourceSwitchingIterator.java | 58 +++-
 1 file changed, 33 insertions(+), 25 deletions(-)
--

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

2015-04-22 Thread kturner 
Merge branch '1.5' into 1.6


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

Branch: refs/heads/1.7
Commit: 5a42b1f2b4a0add3e72d87b244c3ed161e99d43f
Parents: f5c7f05 95e234c
Author: Keith Turner ktur...@apache.org
Authored: Wed Apr 22 15:14:26 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Wed Apr 22 15:14:26 2015 -0400

--
 .../system/SourceSwitchingIterator.java | 29 +---
 1 file changed, 19 insertions(+), 10 deletions(-)
--

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

2015-04-17 Thread ecn 
Merge branch '1.5' into 1.6


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

Branch: refs/heads/1.6
Commit: 14e3a7d5fb2598a5f15c459168809f0dec7210c9
Parents: 2364c26 fca7cb4
Author: Eric C. Newton eric.new...@gmail.com
Authored: Fri Apr 17 17:45:56 2015 -0400
Committer: Eric C. Newton eric.new...@gmail.com
Committed: Fri Apr 17 17:45:56 2015 -0400

--
 .../apache/accumulo/core/client/mapred/AccumuloOutputFormat.java| 1 +
 .../apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e3a7d5/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/14e3a7d5/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
--

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

2015-03-13 Thread kturner 
Merge branch '1.5' into 1.6

Conflicts:

server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java


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

Branch: refs/heads/master
Commit: 1ea901091f6f443359cd46d5d71cb9eb9ca5db8f
Parents: 775cdb1 4ff11d4
Author: Keith Turner ktur...@apache.org
Authored: Fri Mar 13 08:22:52 2015 -0400
Committer: Keith Turner ktur...@apache.org
Committed: Fri Mar 13 08:22:52 2015 -0400

--
 .../accumulo/server/master/LiveTServerSet.java  | 25 
 1 file changed, 20 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ea90109/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 16f9885,000..332bfc9
mode 100644,00..100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@@ -1,401 -1,0 +1,416 @@@
 +/*
 + * 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.server.master;
 +
 +import static com.google.common.base.Charsets.UTF_8;
 +import static 
org.apache.accumulo.fate.zookeeper.ZooUtil.NodeMissingPolicy.SKIP;
 +
 +import java.nio.ByteBuffer;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.Map;
 +import java.util.Map.Entry;
 +import java.util.Set;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 +import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
 +import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 +import org.apache.accumulo.core.util.AddressUtil;
 +import org.apache.accumulo.core.util.ServerServices;
 +import org.apache.accumulo.core.util.ThriftUtil;
 +import org.apache.accumulo.core.zookeeper.ZooUtil;
 +import org.apache.accumulo.server.master.state.TServerInstance;
 +import org.apache.accumulo.server.security.SystemCredentials;
 +import org.apache.accumulo.server.util.Halt;
 +import org.apache.accumulo.server.util.time.SimpleTimer;
 +import org.apache.accumulo.server.zookeeper.ZooCache;
 +import org.apache.accumulo.server.zookeeper.ZooLock;
 +import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
 +import org.apache.accumulo.trace.instrument.Tracer;
 +import org.apache.hadoop.io.Text;
 +import org.apache.log4j.Logger;
 +import org.apache.thrift.TException;
 +import org.apache.thrift.transport.TTransport;
 +import org.apache.zookeeper.KeeperException;
 +import org.apache.zookeeper.KeeperException.NoNodeException;
 +import org.apache.zookeeper.KeeperException.NotEmptyException;
 +import org.apache.zookeeper.WatchedEvent;
 +import org.apache.zookeeper.Watcher;
 +import org.apache.zookeeper.data.Stat;
 +
 +import com.google.common.net.HostAndPort;
 +
 +public class LiveTServerSet implements Watcher {
 +
 +  public interface Listener {
 +void update(LiveTServerSet current, SetTServerInstance deleted, 
SetTServerInstance added);
 +  }
 +
 +  private static final Logger log = Logger.getLogger(LiveTServerSet.class);
 +
 +  private final Listener cback;
 +  private final Instance instance;
 +  private final AccumuloConfiguration conf;
 +  private ZooCache zooCache;
 +
 +  public class TServerConnection {
 +private final HostAndPort address;
 +
 +public TServerConnection(HostAndPort addr) throws TException {
 +  address = addr;
 +}
 +
 +

[2/3] accumulo git commit: Merge branch '1.5' into 1.6

2015-01-29 Thread kturner 
http://git-wip-us.apache.org/repos/asf/accumulo/blob/837a0bdf/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--
diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 7420ec4,000..2b25125
mode 100644,00..100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@@ -1,3859 -1,0 +1,3860 @@@
 +/*
 + * 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;
 +
 +import static com.google.common.base.Charsets.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.Arrays;
 +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.TreeSet;
 +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.Connector;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.impl.ScannerImpl;
 +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.KeyExtent;
 +import org.apache.accumulo.core.data.KeyValue;
 +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.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.IteratorEnvironment;
 +import org.apache.accumulo.core.iterators.IteratorUtil;
 +import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 +import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
 +import org.apache.accumulo.core.iterators.system.ColumnQualifierFilter;
 +import org.apache.accumulo.core.iterators.system.DeletingIterator;
 +import org.apache.accumulo.core.iterators.system.InterruptibleIterator;
 +import org.apache.accumulo.core.iterators.system.MultiIterator;
 +import org.apache.accumulo.core.iterators.system.SourceSwitchingIterator;
 +import 
org.apache.accumulo.core.iterators.system.SourceSwitchingIterator.DataSource;
 +import org.apache.accumulo.core.iterators.system.StatsIterator;
 +import org.apache.accumulo.core.iterators.system.VisibilityFilter;
 +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.DataFileColumnFamily;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
 +import