accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [5/5] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Date Tue, 22 Sep 2015 19:32:30 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


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

Branch: refs/heads/master
Commit: 0c4ae15961d184c2ee807e39cc0de8025a00c658
Parents: 758abd6 45f18c1
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Sep 22 15:31:58 2015 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Sep 22 15:31:58 2015 -0400

----------------------------------------------------------------------
 LICENSE                                         |  134 +-
 NOTICE                                          |   13 +-
 assemble/bin-LICENSE                            |  674 +++++++
 assemble/bin-NOTICE                             |   59 +
 assemble/pom.xml                                |   16 +-
 assemble/src/main/assemblies/component.xml      |   14 +-
 core/pom.xml                                    |    2 +-
 .../main/appended-resources/META-INF/LICENSE    |   46 +
 .../accumulo/core/client/BatchScanner.java      |   24 +-
 .../core/client/ClientSideIteratorScanner.java  |  161 +-
 .../core/client/SampleNotPresentException.java  |   42 +
 .../accumulo/core/client/ScannerBase.java       |   46 +
 .../client/admin/NewTableConfiguration.java     |   31 +
 .../core/client/admin/SamplerConfiguration.java |   91 +
 .../core/client/admin/TableOperations.java      |   29 +
 .../client/impl/BaseIteratorEnvironment.java    |   83 +
 .../core/client/impl/OfflineIterator.java       |   52 +-
 .../core/client/impl/ScannerIterator.java       |    6 +-
 .../core/client/impl/ScannerOptions.java        |   29 +-
 .../core/client/impl/TableOperationsImpl.java   |   39 +
 .../impl/TabletServerBatchReaderIterator.java   |   17 +-
 .../core/client/impl/ThriftScanner.java         |   25 +-
 .../core/client/mapred/AbstractInputFormat.java |   10 +
 .../client/mapred/AccumuloFileOutputFormat.java |   15 +
 .../core/client/mapred/InputFormatBase.java     |   19 +
 .../client/mapreduce/AbstractInputFormat.java   |   10 +
 .../mapreduce/AccumuloFileOutputFormat.java     |   15 +
 .../core/client/mapreduce/InputFormatBase.java  |   19 +
 .../core/client/mapreduce/InputTableConfig.java |   26 +
 .../core/client/mapreduce/RangeInputSplit.java  |   21 +
 .../core/client/mapreduce/impl/SplitUtils.java  |    2 +
 .../lib/impl/FileOutputConfigurator.java        |   29 +-
 .../mapreduce/lib/impl/InputConfigurator.java   |   53 +-
 .../core/client/mock/MockScannerBase.java       |   16 +
 .../core/client/mock/MockTableOperations.java   |   17 +
 .../core/compaction/CompactionSettings.java     |    1 +
 .../accumulo/core/compaction/NullType.java      |   29 +
 .../org/apache/accumulo/core/conf/Property.java |   14 +-
 .../accumulo/core/file/BloomFilterLayer.java    |    6 +
 .../accumulo/core/file/FileSKVIterator.java     |    5 +-
 .../core/file/map/MapFileOperations.java        |    6 +
 .../core/file/rfile/MultiIndexIterator.java     |    6 +
 .../core/file/rfile/MultiLevelIndex.java        |    4 +-
 .../accumulo/core/file/rfile/PrintInfo.java     |   28 +-
 .../apache/accumulo/core/file/rfile/RFile.java  |  511 +++--
 .../core/file/rfile/RFileOperations.java        |   12 +-
 .../core/iterators/IteratorEnvironment.java     |   50 +
 .../core/iterators/SortedMapIterator.java       |    4 +
 .../core/iterators/WrappingIterator.java        |    8 -
 .../core/iterators/system/EmptyIterator.java    |   72 +
 .../core/iterators/system/MapFileIterator.java  |    6 +
 .../core/iterators/system/SampleIterator.java   |   46 +
 .../iterators/system/SequenceFileIterator.java  |    6 +
 .../core/master/thrift/BulkImportState.java     |   76 +
 .../core/master/thrift/BulkImportStatus.java    |  618 ++++++
 .../core/master/thrift/FateService.java         |   76 +-
 .../core/master/thrift/MasterClientService.java |   64 +-
 .../core/master/thrift/MasterMonitorInfo.java   |  358 +++-
 .../core/master/thrift/TabletServerStatus.java  |  214 ++-
 .../core/master/thrift/TabletSplit.java         |   36 +-
 .../core/sample/AbstractHashSampler.java        |  106 ++
 .../accumulo/core/sample/RowColumnSampler.java  |  124 ++
 .../apache/accumulo/core/sample/RowSampler.java |   49 +
 .../apache/accumulo/core/sample/Sampler.java    |   57 +
 .../sample/impl/SamplerConfigurationImpl.java   |  184 ++
 .../core/sample/impl/SamplerFactory.java        |   48 +
 .../thrift/TSampleNotPresentException.java      |  409 ++++
 .../thrift/TSamplerConfiguration.java           |  556 ++++++
 .../thrift/TabletClientService.java             | 1762 ++++++++++++------
 .../accumulo/core/util/LocalityGroupUtil.java   |    4 +-
 core/src/main/thrift/master.thrift              |   24 +
 core/src/main/thrift/tabletserver.thrift        |   19 +-
 .../client/impl/TableOperationsHelperTest.java  |   17 +
 .../mapred/AccumuloFileOutputFormatTest.java    |   14 +-
 .../mapreduce/AccumuloFileOutputFormatTest.java |   13 +
 .../core/file/rfile/MultiLevelIndexTest.java    |    3 +-
 .../accumulo/core/file/rfile/RFileTest.java     |  333 +++-
 .../iterators/DefaultIteratorEnvironment.java   |   25 +-
 .../iterators/FirstEntryInRowIteratorTest.java  |   37 +-
 .../core/iterators/SortedMapIteratorTest.java   |   46 +
 .../iterators/user/RowDeletingIteratorTest.java |   30 +-
 .../iterators/user/RowEncodingIteratorTest.java |   52 +-
 .../user/TransformingIteratorTest.java          |   41 +-
 .../apache/accumulo/core/file/rfile/ver_7.rf    |  Bin 0 -> 14557 bytes
 docs/pom.xml                                    |    2 +-
 .../main/asciidoc/accumulo_user_manual.asciidoc |    2 +
 .../main/asciidoc/chapters/administration.txt   |  126 +-
 docs/src/main/asciidoc/chapters/sampling.txt    |   86 +
 docs/src/main/resources/examples/README         |    2 +
 docs/src/main/resources/examples/README.sample  |  192 ++
 examples/simple/pom.xml                         |    2 +-
 .../examples/simple/sample/SampleExample.java   |  150 ++
 .../shard/CutoffIntersectingIterator.java       |  123 ++
 .../accumulo/examples/simple/shard/Query.java   |   31 +-
 fate/pom.xml                                    |    2 +-
 maven-plugin/pom.xml                            |    2 +-
 minicluster/pom.xml                             |    2 +-
 pom.xml                                         |   12 +-
 proxy/pom.xml                                   |    2 +-
 server/base/pom.xml                             |    2 +-
 .../src/main/appended-resources/META-INF/NOTICE |    9 +
 .../accumulo/server/client/BulkImporter.java    |   21 +-
 .../server/client/ClientServiceHandler.java     |   16 +-
 .../server/util/ServerBulkImportStatus.java     |   51 +
 .../server/util/VerifyTabletAssignments.java    |    2 +-
 .../server/client/BulkImporterTest.java         |   21 +
 .../iterators/MetadataBulkLoadFilterTest.java   |   25 +-
 .../server/replication/StatusCombinerTest.java  |   39 +-
 server/gc/pom.xml                               |    2 +-
 server/master/pom.xml                           |    2 +-
 .../accumulo/master/FateServiceHandler.java     |    2 +
 .../java/org/apache/accumulo/master/Master.java |   14 +-
 .../accumulo/master/tableOps/BulkImport.java    |    7 +-
 .../master/tableOps/CleanUpBulkImport.java      |    3 +
 .../accumulo/master/tableOps/CopyFailed.java    |    3 +-
 .../accumulo/master/tableOps/LoadFiles.java     |    5 +-
 server/monitor/pom.xml                          |    2 +-
 .../main/appended-resources/META-INF/LICENSE    |   74 +
 .../org/apache/accumulo/monitor/Monitor.java    |    7 +-
 .../accumulo/monitor/servlets/BasicServlet.java |    1 +
 .../monitor/servlets/BulkImportServlet.java     |   91 +
 .../monitor/servlets/DefaultServlet.java        |   52 -
 .../monitor/servlets/trace/NullScanner.java     |   11 +
 .../util/celltypes/BulkImportStateType.java     |   45 +
 server/native/pom.xml                           |    2 +-
 server/tracer/pom.xml                           |    2 +-
 server/tserver/pom.xml                          |    2 +-
 .../apache/accumulo/tserver/FileManager.java    |   38 +-
 .../apache/accumulo/tserver/InMemoryMap.java    |  244 ++-
 .../tserver/MemKeyConversionIterator.java       |    6 +-
 .../org/apache/accumulo/tserver/MemValue.java   |   63 +-
 .../org/apache/accumulo/tserver/NativeMap.java  |    4 +
 .../tserver/TabletIteratorEnvironment.java      |   61 +-
 .../apache/accumulo/tserver/TabletServer.java   |   58 +-
 .../ConfigurableCompactionStrategy.java         |   22 +
 .../apache/accumulo/tserver/log/DfsLogger.java  |   71 +-
 .../accumulo/tserver/scan/LookupTask.java       |    5 +-
 .../accumulo/tserver/scan/NextBatchTask.java    |    5 +-
 .../tserver/session/MultiScanSession.java       |    5 +-
 .../accumulo/tserver/tablet/ScanDataSource.java |   24 +-
 .../accumulo/tserver/tablet/ScanOptions.java    |   16 +-
 .../apache/accumulo/tserver/tablet/Tablet.java  |   20 +-
 .../accumulo/tserver/tablet/TabletMemory.java   |    7 +-
 .../accumulo/tserver/InMemoryMapTest.java       |  383 +++-
 .../DefaultCompactionStrategyTest.java          |    6 +
 shell/pom.xml                                   |    2 +-
 .../java/org/apache/accumulo/shell/Shell.java   |   11 +-
 .../shell/commands/ActiveScanIterator.java      |   13 +-
 .../shell/commands/BulkImportListIterator.java  |   70 +
 .../accumulo/shell/commands/CompactCommand.java |   10 +-
 .../accumulo/shell/commands/GrepCommand.java    |    2 +
 .../shell/commands/ListBulkCommand.java         |   92 +
 .../accumulo/shell/commands/ScanCommand.java    |   41 +-
 .../accumulo/shell/commands/SetIterCommand.java |   11 +-
 .../shell/commands/SetScanIterCommand.java      |   15 +-
 .../shell/commands/SetShellIterCommand.java     |   14 -
 start/.gitignore                                |    1 +
 start/pom.xml                                   |    2 +-
 test/pom.xml                                    |    2 +-
 .../apache/accumulo/harness/AccumuloITBase.java |    4 +-
 .../accumulo/test/BulkImportMonitoringIT.java   |  146 ++
 .../test/BulkImportSequentialRowsIT.java        |  108 ++
 .../accumulo/test/GenerateSequentialRFile.java  |   84 +
 .../apache/accumulo/test/GetFileInfoBulkIT.java |    2 +-
 .../apache/accumulo/test/GetMasterStats.java    |   14 +
 .../test/InMemoryMapMemoryUsageTest.java        |    8 +-
 .../accumulo/test/IsolationAndDeepCopyIT.java   |   85 +
 .../java/org/apache/accumulo/test/SampleIT.java |  497 +++++
 .../org/apache/accumulo/test/ShellServerIT.java |   78 +-
 .../test/functional/ConfigurableMacBase.java    |   11 +-
 .../accumulo/test/functional/ExamplesIT.java    |    4 +-
 .../accumulo/test/functional/ReadWriteIT.java   |    4 +-
 .../test/mapred/AccumuloFileOutputFormatIT.java |   18 +
 .../test/mapred/AccumuloInputFormatIT.java      |   57 +-
 .../mapreduce/AccumuloFileOutputFormatIT.java   |   18 +
 .../test/mapreduce/AccumuloInputFormatIT.java   |   49 +-
 .../test/performance/thrift/NullTserver.java    |    6 +-
 .../test/replication/CyclicReplicationIT.java   |    2 +-
 trace/pom.xml                                   |    2 +-
 179 files changed, 10222 insertions(+), 1642 deletions(-)
----------------------------------------------------------------------



Mime
View raw message