accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [48/48] git commit: Merge branch '1.6.0-SNAPSHOT'
Date Tue, 04 Feb 2014 17:55:17 GMT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
	core/src/main/java/org/apache/accumulo/core/data/KeyValue.java


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

Branch: refs/heads/master
Commit: e03be58a7d08834792818409035da6e496ca8bc3
Parents: 5aef9ae 7688eaf
Author: Josh Elser <elserj@apache.org>
Authored: Tue Feb 4 12:53:24 2014 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Feb 4 12:53:24 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  2 +-
 .../accumulo/core/client/ZooKeeperInstance.java |  8 ++--
 .../client/admin/InstanceOperationsImpl.java    |  2 +-
 .../core/client/admin/TableOperationsImpl.java  | 28 ++++++------
 .../accumulo/core/client/impl/ServerClient.java |  2 +-
 .../accumulo/core/client/impl/Tables.java       |  2 +-
 .../accumulo/core/client/impl/Writer.java       |  3 +-
 .../core/client/mapreduce/RangeInputSplit.java  |  4 +-
 .../lib/partition/RangePartitioner.java         |  7 ++-
 .../mapreduce/lib/util/InputConfigurator.java   |  4 +-
 .../accumulo/core/client/mock/MockShell.java    |  5 +-
 .../core/conf/DefaultConfiguration.java         |  8 ++--
 .../accumulo/core/data/ArrayByteSequence.java   |  6 ++-
 .../org/apache/accumulo/core/data/Column.java   |  5 +-
 .../org/apache/accumulo/core/data/KeyValue.java |  4 +-
 .../accumulo/core/file/BloomFilterLayer.java    |  5 +-
 .../core/file/rfile/bcfile/CompareUtils.java    |  9 +++-
 .../core/iterators/ColumnFamilyCounter.java     |  3 +-
 .../accumulo/core/iterators/IteratorUtil.java   |  6 ++-
 .../accumulo/core/iterators/LongCombiner.java   |  5 +-
 .../accumulo/core/iterators/conf/ColumnSet.java |  5 +-
 .../core/iterators/user/BigDecimalCombiner.java |  5 +-
 .../core/iterators/user/GrepIterator.java       |  3 +-
 .../iterators/user/IntersectingIterator.java    | 11 +++--
 .../core/iterators/user/LargeRowFilter.java     |  3 +-
 .../core/iterators/user/RegExFilter.java        |  2 +-
 .../iterators/user/RowDeletingIterator.java     |  3 +-
 .../iterators/user/SummingArrayCombiner.java    |  5 +-
 .../iterators/user/TransformingIterator.java    | 16 ++++---
 .../core/security/ColumnVisibility.java         | 40 ++++++++--------
 .../core/security/VisibilityConstraint.java     |  5 +-
 .../core/security/VisibilityParseException.java |  4 +-
 .../core/trace/InstanceUserPassword.java        |  3 +-
 .../accumulo/core/trace/ZooTraceClient.java     |  5 +-
 .../core/util/ByteArrayBackedCharSequence.java  |  3 +-
 .../apache/accumulo/core/util/ByteArraySet.java |  4 +-
 .../accumulo/core/util/ByteBufferUtil.java      |  3 +-
 .../org/apache/accumulo/core/util/Encoding.java |  5 +-
 .../apache/accumulo/core/util/FastFormat.java   |  4 +-
 .../org/apache/accumulo/core/util/Merge.java    |  3 +-
 .../org/apache/accumulo/core/util/TextUtil.java |  2 +-
 .../apache/accumulo/core/util/shell/Shell.java  |  9 ++--
 .../util/shell/commands/AddSplitsCommand.java   |  5 +-
 .../shell/commands/AuthenticateCommand.java     |  3 +-
 .../util/shell/commands/CreateTableCommand.java |  6 +--
 .../util/shell/commands/ExecfileCommand.java    |  3 +-
 .../util/shell/commands/GetSplitsCommand.java   |  5 +-
 .../core/util/shell/commands/HiddenCommand.java |  3 +-
 .../util/shell/commands/ListIterCommand.java    |  6 ++-
 .../core/util/shell/commands/PasswdCommand.java |  3 +-
 .../shell/commands/QuotedStringTokenizer.java   |  3 +-
 .../util/shell/commands/SetIterCommand.java     |  2 -
 .../core/util/shell/commands/UserCommand.java   |  3 +-
 .../shell/commands/UserPermissionsCommand.java  | 18 ++++----
 .../org/apache/accumulo/fate/AdminUtil.java     |  6 ++-
 .../org/apache/accumulo/fate/AgeOffStore.java   |  1 +
 .../java/org/apache/accumulo/fate/ZooStore.java | 14 +++---
 .../zookeeper/DistributedReadWriteLock.java     | 16 ++++---
 .../accumulo/fate/zookeeper/ZooCache.java       |  6 ++-
 .../apache/accumulo/fate/zookeeper/ZooLock.java |  7 +--
 .../accumulo/fate/zookeeper/ZooReservation.java | 12 +++--
 .../accumulo/fate/zookeeper/ZooSession.java     |  5 +-
 .../org/apache/accumulo/proxy/ProxyServer.java  |  8 ++--
 .../apache/accumulo/proxy/TestProxyClient.java  | 13 +++---
 .../java/org/apache/accumulo/proxy/Util.java    |  9 ++--
 .../org/apache/accumulo/server/Accumulo.java    |  4 +-
 .../accumulo/server/client/HdfsZooInstance.java |  8 ++--
 .../server/conf/TableConfiguration.java         |  2 +-
 .../accumulo/server/conf/ZooConfiguration.java  |  2 +-
 .../server/constraints/MetadataConstraints.java | 14 +++---
 .../apache/accumulo/server/init/Initialize.java | 48 ++++++++++----------
 .../accumulo/server/master/LiveTServerSet.java  |  2 +-
 .../server/master/state/DeadServerList.java     |  5 +-
 .../master/state/MetaDataTableScanner.java      |  2 +-
 .../server/master/state/TServerInstance.java    |  5 +-
 .../master/state/TabletStateChangeIterator.java |  5 +-
 .../accumulo/server/master/state/ZooStore.java  |  3 +-
 .../master/state/ZooTabletStateStore.java       |  9 ++--
 .../server/metrics/AbstractMetricsImpl.java     | 12 +++--
 .../accumulo/server/monitor/LogService.java     |  2 +-
 .../server/security/SecurityOperation.java      |  4 +-
 .../security/handler/ZKAuthenticator.java       |  2 +-
 .../server/security/handler/ZKAuthorizor.java   |  3 +-
 .../server/security/handler/ZKPermHandler.java  |  3 +-
 .../accumulo/server/tables/TableManager.java    | 17 +++----
 .../server/tablets/UniqueNameAllocator.java     |  8 ++--
 .../server/util/AddFilesWithMissingEntries.java |  3 +-
 .../accumulo/server/util/ChangeSecret.java      |  3 +-
 .../accumulo/server/util/CleanZookeeper.java    |  4 +-
 .../accumulo/server/util/DeleteZooInstance.java |  4 +-
 .../accumulo/server/util/ListInstances.java     |  4 +-
 .../accumulo/server/util/LocalityCheck.java     |  6 ++-
 .../accumulo/server/util/SendLogToChainsaw.java | 14 +++---
 .../accumulo/server/util/SystemPropUtil.java    |  2 +-
 .../accumulo/server/util/TabletServerLocks.java |  2 +-
 .../server/zookeeper/DistributedWorkQueue.java  |  2 +-
 .../accumulo/server/zookeeper/ZooQueueLock.java |  7 +--
 .../server/zookeeper/ZooReaderWriter.java       |  3 +-
 .../accumulo/utils/metanalysis/IndexMeta.java   |  7 +--
 .../master/recovery/RecoveryManager.java        |  2 +-
 .../accumulo/master/state/MergeStats.java       |  6 +--
 .../accumulo/master/state/SetGoalState.java     |  2 +-
 .../accumulo/master/tableOps/BulkImport.java    |  6 +--
 .../master/tableOps/CancelCompactions.java      | 11 ++---
 .../accumulo/master/tableOps/CompactRange.java  | 16 +++----
 .../accumulo/master/tableOps/ExportTable.java   |  6 +--
 .../accumulo/master/tableOps/ImportTable.java   | 10 ++--
 .../accumulo/master/tableOps/RenameTable.java   |  4 +-
 .../apache/accumulo/master/tableOps/Utils.java  | 19 ++++----
 .../master/tserverOps/ShutdownTServer.java      |  2 +-
 .../apache/accumulo/master/util/FateAdmin.java  |  8 +++-
 .../accumulo/monitor/EmbeddedWebServer.java     |  9 ++--
 .../org/apache/accumulo/monitor/Monitor.java    |  4 +-
 .../accumulo/monitor/ZooKeeperStatus.java       |  5 +-
 .../monitor/servlets/DefaultServlet.java        |  3 +-
 .../accumulo/monitor/servlets/LogServlet.java   |  6 +--
 .../accumulo/monitor/servlets/ShellServlet.java |  4 +-
 .../monitor/servlets/TServersServlet.java       |  3 +-
 .../accumulo/monitor/servlets/trace/Basic.java  |  3 +-
 .../org/apache/accumulo/tracer/TraceServer.java |  6 +--
 .../tserver/BulkFailedCopyProcessor.java        |  3 +-
 .../org/apache/accumulo/tserver/Compactor.java  |  2 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |  5 +-
 .../org/apache/accumulo/tserver/Tablet.java     | 17 ++++---
 .../apache/accumulo/tserver/TabletServer.java   | 10 ++--
 .../apache/accumulo/tserver/log/DfsLogger.java  |  3 +-
 .../accumulo/tserver/logger/LogFileValue.java   | 12 +++--
 .../accumulo/tserver/logger/LogReader.java      |  3 +-
 .../metrics/TabletServerScanMetrics.java        |  2 +-
 .../start/classloader/AccumuloClassLoader.java  |  6 +--
 .../vfs/providers/HdfsRandomAccessContent.java  |  3 +-
 .../accumulo/test/BulkImportDirectory.java      |  5 +-
 .../accumulo/test/NativeMapConcurrencyTest.java |  3 +-
 .../accumulo/test/NativeMapPerformanceTest.java |  7 +--
 .../accumulo/test/NativeMapStressTest.java      |  5 +-
 .../apache/accumulo/test/TestBinaryRows.java    | 25 +++++-----
 .../org/apache/accumulo/test/TestIngest.java    |  5 +-
 .../accumulo/test/TestMultiTableIngest.java     |  3 +-
 .../org/apache/accumulo/test/VerifyIngest.java  |  1 +
 .../test/continuous/ContinuousIngest.java       |  6 +--
 .../test/continuous/ContinuousMoru.java         |  5 +-
 .../test/continuous/ContinuousQuery.java        |  3 +-
 .../test/continuous/ContinuousScanner.java      |  3 +-
 .../test/continuous/ContinuousVerify.java       |  5 +-
 .../test/continuous/ContinuousWalk.java         | 15 +++---
 .../accumulo/test/continuous/Histogram.java     |  4 +-
 .../test/continuous/PrintScanTimeHistogram.java |  4 +-
 .../accumulo/test/continuous/TimeBinner.java    |  3 +-
 .../test/continuous/UndefinedAnalyzer.java      | 18 ++++----
 .../test/functional/CacheTestReader.java        |  5 +-
 .../test/functional/CacheTestWriter.java        |  9 ++--
 .../accumulo/test/functional/ZombieTServer.java |  2 +-
 .../metadata/MetadataBatchScanTest.java         |  5 +-
 .../apache/accumulo/test/randomwalk/Module.java |  5 +-
 .../test/randomwalk/bulk/BulkMinusOne.java      |  3 +-
 .../test/randomwalk/bulk/BulkPlusOne.java       |  3 +-
 .../accumulo/test/randomwalk/bulk/Verify.java   |  5 +-
 .../test/randomwalk/concurrent/BatchWrite.java  |  3 +-
 .../test/randomwalk/concurrent/BulkImport.java  |  3 +-
 .../concurrent/ChangeAuthorizations.java        |  5 +-
 .../randomwalk/concurrent/StopTabletServer.java |  2 +-
 .../accumulo/test/randomwalk/image/Verify.java  |  7 +--
 .../accumulo/test/randomwalk/image/Write.java   |  7 +--
 .../test/randomwalk/multitable/CopyTable.java   |  2 +-
 .../test/randomwalk/multitable/CreateTable.java |  2 +-
 .../test/randomwalk/multitable/Write.java       |  3 +-
 .../randomwalk/security/SecurityHelper.java     |  7 +--
 .../test/randomwalk/security/TableOp.java       |  7 +--
 .../randomwalk/security/WalkingSecurity.java    |  2 +-
 .../randomwalk/sequential/MapRedVerifyTool.java |  2 +-
 .../test/randomwalk/sequential/Write.java       |  3 +-
 .../test/randomwalk/shard/BulkInsert.java       |  5 +-
 .../test/randomwalk/shard/ExportIndex.java      |  3 +-
 .../test/randomwalk/shard/ShardFixture.java     |  2 +-
 .../accumulo/test/scalability/Ingest.java       |  3 +-
 .../accumulo/test/functional/AddSplitIT.java    |  3 +-
 .../test/functional/BadIteratorMincIT.java      |  6 ++-
 .../test/functional/BatchScanSplitIT.java       |  5 +-
 .../test/functional/BatchWriterFlushIT.java     |  3 +-
 .../accumulo/test/functional/BulkFileIT.java    |  3 +-
 .../accumulo/test/functional/ConcurrencyIT.java |  5 +-
 .../accumulo/test/functional/ConstraintIT.java  | 21 +++++----
 .../test/functional/CreateAndUseIT.java         |  3 +-
 .../test/functional/DeleteEverythingIT.java     |  3 +-
 .../test/functional/DeleteRowsSplitIT.java      |  5 +-
 .../accumulo/test/functional/LargeRowIT.java    |  5 +-
 .../accumulo/test/functional/NativeMapIT.java   | 24 +++++-----
 .../test/functional/ScanIteratorIT.java         |  5 +-
 .../accumulo/test/functional/ScanRangeIT.java   |  3 +-
 .../test/functional/ScanSessionTimeOutIT.java   |  3 +-
 .../test/functional/ServerSideErrorIT.java      |  2 +-
 .../test/functional/SplitRecoveryIT.java        |  4 +-
 .../accumulo/test/functional/TabletIT.java      |  5 +-
 .../accumulo/test/functional/VisibilityIT.java  |  9 ++--
 .../trace/instrument/TraceRunnable.java         |  9 ++++
 .../instrument/receivers/ZooSpanClient.java     |  4 +-
 .../trace/instrument/CountSamplerTest.java      |  2 -
 .../trace/instrument/PerformanceTest.java       |  2 -
 .../accumulo/trace/instrument/TracerTest.java   |  3 --
 199 files changed, 691 insertions(+), 511 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e03be58a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
index 81b7991,6162bc5..e305866
--- a/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
@@@ -26,12 -27,9 +27,13 @@@ import java.util.Map
  import java.util.Map.Entry;
  import java.util.TreeMap;
  
+ import org.apache.accumulo.core.Constants;
  import org.apache.log4j.Logger;
  
 +/**
 + * An {@link AccumuloConfiguration} that contains only default values for
 + * properties. This class is a singleton.
 + */
  public class DefaultConfiguration extends AccumuloConfiguration {
    private static DefaultConfiguration instance = null;
    private static Logger log = Logger.getLogger(DefaultConfiguration.class);
@@@ -199,15 -186,11 +201,15 @@@
    }
  
    /*
 -   * Generate documentation for conf/accumulo-site.xml file usage
 +   * Generates documentation for conf/accumulo-site.xml file usage. Arguments
 +   * are: "--generate-doc", file to write to.
 +   *
 +   * @param args command-line arguments
 +   * @throws IllegalArgumentException if args is invalid
     */
-   public static void main(String[] args) throws FileNotFoundException {
+   public static void main(String[] args) throws FileNotFoundException, UnsupportedEncodingException
{
      if (args.length == 2 && args[0].equals("--generate-doc")) {
-       generateDocumentation(new PrintStream(args[1]));
+       generateDocumentation(new PrintStream(args[1], Constants.UTF8.name()));
      } else {
        throw new IllegalArgumentException("Usage: " + DefaultConfiguration.class.getName()
+ " --generate-doc <filename>");
      }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e03be58a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 24e5d03,ff56c31..b29a667
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@@ -19,9 -19,8 +19,11 @@@ package org.apache.accumulo.core.data
  import java.io.Serializable;
  import java.nio.ByteBuffer;
  
+ import org.apache.accumulo.core.Constants;
+ 
 +/**
 + * An implementation of {@link ByteSequence} that uses a backing byte array.
 + */
  public class ArrayByteSequence extends ByteSequence implements Serializable {
    
    private static final long serialVersionUID = 1L;
@@@ -66,25 -47,10 +68,25 @@@
      
    }
    
 +  /**
 +   * Creates a new sequence from the given string. The bytes are determined from
 +   * the string using the default platform encoding.
 +   *
 +   * @param s string to represent as bytes
 +   */
    public ArrayByteSequence(String s) {
-     this(s.getBytes());
+     this(s.getBytes(Constants.UTF8));
    }
    
 +  /**
 +   * Creates a new sequence based on a byte buffer. If the byte buffer has an
 +   * array, that array (and the buffer's offset and limit) are used; otherwise,
 +   * a new backing array is created and a relative bulk get is performed to
 +   * transfer the buffer's contents (starting at its current position and
 +   * not beyond its limit).
 +   *
 +   * @param buffer byte buffer
 +   */
    public ArrayByteSequence(ByteBuffer buffer) {
      if (buffer.hasArray()) {
        this.data = buffer.array();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e03be58a/core/src/main/java/org/apache/accumulo/core/data/Column.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/Column.java
index 91c4ed2,054899f..abf14ef
--- a/core/src/main/java/org/apache/accumulo/core/data/Column.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Column.java
@@@ -203,23 -158,11 +204,23 @@@ public class Column implements Writable
      return columnVisibility;
    }
    
 +  /**
 +   * Gets a string representation of this column. The family, qualifier, and
 +   * visibility are interpreted as strings using the platform default encoding;
 +   * nulls are interpreted as empty strings.
 +   *
 +   * @return string form of column
 +   */
    public String toString() {
-     return new String(columnFamily == null ? new byte[0] : columnFamily) + ":" + new String(columnQualifier
== null ? new byte[0] : columnQualifier) + ":"
-         + new String(columnVisibility == null ? new byte[0] : columnVisibility);
+     return new String(columnFamily == null ? new byte[0] : columnFamily, Constants.UTF8)
+ ":" + new String(columnQualifier == null ? new byte[0] : columnQualifier, Constants.UTF8)
+ ":"
+         + new String(columnVisibility == null ? new byte[0] : columnVisibility, Constants.UTF8);
    }
    
 +  /**
 +   * Converts this column to Thrift.
 +   *
 +   * @return Thrift column
 +   */
    public TColumn toThrift() {
      return new TColumn(columnFamily == null ? null : ByteBuffer.wrap(columnFamily), columnQualifier
== null ? null : ByteBuffer.wrap(columnQualifier),
          columnVisibility == null ? null : ByteBuffer.wrap(columnVisibility));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e03be58a/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
index ee90b6e,90b2d7c..83996f8
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
@@@ -21,9 -21,8 +21,11 @@@ import static org.apache.accumulo.core.
  import java.nio.ByteBuffer;
  import java.util.Map;
  
+ import org.apache.accumulo.core.Constants;
+ 
 +/**
 + * A key/value pair. The key and value may not be set after construction.
 + */
  public class KeyValue implements Map.Entry<Key,Value> {
    
    public Key key;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e03be58a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
----------------------------------------------------------------------


Mime
View raw message