You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/06/17 22:12:07 UTC
svn commit: r1493916 [1/5] - in /accumulo/branches/ACCUMULO-118: ./
assemble/ assemble/src/main/assemblies/ conf/
conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/ conf...
Author: ecn
Date: Mon Jun 17 20:12:04 2013
New Revision: 1493916
URL: http://svn.apache.org/r1493916
Log:
ACCUMULO-118 merge root, fix bunches of issues with gc
Added:
accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/dev-directory.xml
- copied unchanged from r1489580, accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/conf/Experimental.java
- copied unchanged from r1493757, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Experimental.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/conf/Interpolated.java
- copied unchanged from r1493757, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Interpolated.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/conf/Sensitive.java
- copied unchanged from r1493757, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/conf/Sensitive.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
- copied unchanged from r1493757, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/BigDecimalCombiner.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
- copied unchanged from r1493757, accumulo/trunk/core/src/test/java/org/apache/accumulo/core/iterators/user/BigDecimalCombinerTest.java
Modified:
accumulo/branches/ACCUMULO-118/ (props changed)
accumulo/branches/ACCUMULO-118/.gitignore
accumulo/branches/ACCUMULO-118/assemble/ (props changed)
accumulo/branches/ACCUMULO-118/assemble/build.sh
accumulo/branches/ACCUMULO-118/assemble/pom.xml
accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/binary-release.xml
accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml
accumulo/branches/ACCUMULO-118/conf/ (props changed)
accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/accumulo-site.xml
accumulo/branches/ACCUMULO-118/conf/examples/vfs-classloader/accumulo-site.xml
accumulo/branches/ACCUMULO-118/core/ (props changed)
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/conf/Property.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/ByteBufferUtil.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/Merge.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GetSplitsCommand.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/cli/TestClientOpts.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/client/admin/FindMaxTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/client/mock/TestBatchScanner821.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/iterators/user/IntersectingIteratorTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/iterators/user/RowFilterTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/security/AuthorizationsTest.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/util/shell/command/FormatterCommandTest.java
accumulo/branches/ACCUMULO-118/docs/ (props changed)
accumulo/branches/ACCUMULO-118/docs/examples/README
accumulo/branches/ACCUMULO-118/docs/examples/README.batch
accumulo/branches/ACCUMULO-118/docs/examples/README.classpath
accumulo/branches/ACCUMULO-118/docs/examples/README.client
accumulo/branches/ACCUMULO-118/docs/examples/README.combiner
accumulo/branches/ACCUMULO-118/docs/examples/README.constraints
accumulo/branches/ACCUMULO-118/docs/examples/README.export
accumulo/branches/ACCUMULO-118/docs/examples/README.helloworld
accumulo/branches/ACCUMULO-118/docs/examples/README.tabletofile
accumulo/branches/ACCUMULO-118/docs/examples/README.terasort
accumulo/branches/ACCUMULO-118/docs/pom.xml
accumulo/branches/ACCUMULO-118/docs/src/main/latex/accumulo_user_manual/ (props changed)
accumulo/branches/ACCUMULO-118/docs/src/main/latex/accumulo_user_manual/chapters/ (props changed)
accumulo/branches/ACCUMULO-118/examples/ (props changed)
accumulo/branches/ACCUMULO-118/examples/pom.xml
accumulo/branches/ACCUMULO-118/examples/simple/ (props changed)
accumulo/branches/ACCUMULO-118/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
accumulo/branches/ACCUMULO-118/fate/ (props changed)
accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/ACCUMULO-118/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/ACCUMULO-118/minicluster/ (props changed)
accumulo/branches/ACCUMULO-118/pom.xml (contents, props changed)
accumulo/branches/ACCUMULO-118/proxy/ (props changed)
accumulo/branches/ACCUMULO-118/proxy/README (props changed)
accumulo/branches/ACCUMULO-118/server/ (props changed)
accumulo/branches/ACCUMULO-118/server/src/main/c++/nativeMap/ (props changed)
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/Accumulo.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/fs/FileSystemImpl.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/Master.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/state/MergeStats.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/state/MetaDataTableScanner.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/CompactRange.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TableRangeOp.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/problems/ProblemReports.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/handler/InsecurePermHandler.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/AddFilesWithMissingEntries.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/LocalityCheck.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/MetadataTable.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/VerifyTabletAssignments.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/gc/TestConfirmDeletes.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/util/CloneTest.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/util/TabletIteratorTest.java
accumulo/branches/ACCUMULO-118/src/ (props changed)
accumulo/branches/ACCUMULO-118/start/ (props changed)
accumulo/branches/ACCUMULO-118/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
accumulo/branches/ACCUMULO-118/test/ (props changed)
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/QueryMetadataTable.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/BadIteratorMincTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/BatchWriterFlushTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/BloomFilterTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/BulkFileTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/ConcurrencyTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/ConstraintTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/CreateAndUseTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/CreateManyScannersTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/DeleteEverythingTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsSplitTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/LargeRowTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/LogicalTimeTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/PermissionsTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/RowDeleteTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/ScanRangeTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/ServerSideErrorTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/SplitRecoveryTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/functional/TimeoutTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/metadata/MetadataBatchScanTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/BatchScan.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CheckBalance.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/IsolatedScan.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ScanTable.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ScanMeta.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerify.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteSomeDocs.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/DeleteWord.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Grep.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Reindex.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Search.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/VerifyIndex.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/iterator/RegExTest.java
accumulo/branches/ACCUMULO-118/test/system/auto/ (props changed)
accumulo/branches/ACCUMULO-118/test/system/continuous/ (props changed)
accumulo/branches/ACCUMULO-118/test/system/randomwalk/ (props changed)
accumulo/branches/ACCUMULO-118/test/system/randomwalk/conf/ (props changed)
accumulo/branches/ACCUMULO-118/trace/ (props changed)
accumulo/branches/ACCUMULO-118/trace/src/main/java/org/apache/accumulo/trace/instrument/receivers/ZooSpanClient.java
Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 17 20:12:04 2013
@@ -1,8 +1,3 @@
-logs
-walogs
+.*
target
-.idea
-.project
-.settings
-.pydevproject
-accumulo.iml
+accumulo-project.iml
Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk:r1478775
Merged /accumulo/trunk:r1486112-1486135,1486203-1488406,1488408-1489580,1489976-1489981,1490337-1493757
Merged /incubator/accumulo/branches/1.4:r1201899-1201901
Merged /accumulo/branches/1.5:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1492948
Merged /accumulo/branches/1.4:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947
Modified: accumulo/branches/ACCUMULO-118/.gitignore
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/.gitignore?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/.gitignore (original)
+++ accumulo/branches/ACCUMULO-118/.gitignore Mon Jun 17 20:12:04 2013
@@ -13,64 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# global Eclipse, Maven, Python
+# global IDE, Maven, Python, ignores
target/
.project
.classpath
.settings
.pydevproject
*.pyc
-
-# JetBrains IDE
.idea
*.iml
-
-# /
-/logs
-/walogs
-
-# /conf/
-/conf/accumulo-metrics.xml
-/conf/masters
-/conf/slaves
-/conf/tracers
-/conf/test-*
-/conf/gc
-/conf/monitor
-/conf/accumulo-env.sh
-/conf/accumulo-site.xml
-/conf/accumulo_user_manual.pdf
-
-# /contrib/accumulo_sample/ingest/
-/contrib/accumulo_sample/ingest/lib
-
-# /contrib/accumulo_sample/query/
-/contrib/accumulo_sample/query/lib
-
-# /docs/
-/docs/config.html
-/docs/accumulo_user_manual.pdf
-
-# /docs/src/user_manual/
-/docs/src/user_manual/accumulo_user_manual.toc
-/docs/src/user_manual/accumulo_user_manual.out
-
-# /lib/
-/lib/native
-/lib/*.jar
-
-# /server/src/main/c++/mlock/
-/server/src/main/c++/mlock/*.jnilib
-/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.h
-
-# /server/src/main/c++/nativeMap/
-/server/src/main/c++/nativeMap/*.jnilib
-
-# /test/system/auto/
-/test/system/auto/fake_disk_failure.so
-
-# /test/system/continuous/
-/test/system/continuous/continuous-env.sh
-/test/system/continuous/walkers.txt
-/test/system/continuous/ingesters.txt
-
Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 17 20:12:04 2013
@@ -1,4 +1,3 @@
+.*
target
-.settings
-.project
-accumulo-assemble.iml
+accumulo.iml
Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk/assemble:r1478775
Merged /accumulo/trunk/assemble:r1486112-1486135,1486203-1488406,1488408-1489580,1489976-1489981,1490337-1493757
Merged /incubator/accumulo/branches/1.4/assemble:r1201899-1201901
Merged /accumulo/branches/1.4/assemble:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947
Merged /accumulo/branches/1.5/assemble:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1492948
Modified: accumulo/branches/ACCUMULO-118/assemble/build.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/build.sh?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/build.sh (original)
+++ accumulo/branches/ACCUMULO-118/assemble/build.sh Mon Jun 17 20:12:04 2013
@@ -69,12 +69,12 @@ elif [[ $1 = '--seal-jars' ]]; then
cacheGPG; setupRPM
# build a tag, but with sealed jars
run mvn clean compile javadoc:aggregate install \
- -P apache-release,seal-jars,check-licenses,thrift,native,assemble,docs,rpm,deb
+ -P apache-release,seal-jars,thrift,native,assemble,docs,rpm,deb
elif [[ $1 = '--test' ]]; then
cacheGPG; setupRPM
# build a tag, but with tests
run mvn clean compile javadoc:aggregate install \
- -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb
+ -P apache-release,thrift,native,assemble,docs,rpm,deb
else
fail "Missing one of: --create-release-candidate, --test, --seal-jars"
fi
Modified: accumulo/branches/ACCUMULO-118/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/pom.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/pom.xml (original)
+++ accumulo/branches/ACCUMULO-118/assemble/pom.xml Mon Jun 17 20:12:04 2013
@@ -26,17 +26,26 @@
<packaging>pom</packaging>
<name>Assemblies</name>
<properties>
+ <DEV_ACCUMULO_HOME>${project.build.directory}</DEV_ACCUMULO_HOME>
<accumulo-top>..</accumulo-top>
</properties>
<dependencies>
- <!--
- NOTE: These dependency declarations are required to sort
- this project to the end of the line in the multimodule
- build.
- Further, the dependencies for Accumulo artifacts must be
- here so they will be copied into the lib directory for
- the binary distribution assemblies.
- -->
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
@@ -74,41 +83,14 @@
<artifactId>accumulo-trace</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-vfs2</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>config-webpage</id>
- <goals>
- <goal>java</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <mainClass>org.apache.accumulo.core.conf.DefaultConfiguration</mainClass>
- <classpathScope>compile</classpathScope>
- <arguments>
- <argument>--generate-doc</argument>
- <argument>${project.build.directory}/../../docs/config.html</argument>
- </arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
<profiles>
<profile>
<id>apache-release</id>
@@ -166,6 +148,41 @@
</build>
</profile>
<profile>
+ <id>make-accumulo-home</id>
+ <activation>
+ <!-- always activate, unless explicitly de-activated -->
+ <file>
+ <exists>pom.xml</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>directory-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <descriptors>
+ <descriptor>src/main/assemblies/dev-directory.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>rpm</id>
<build>
<plugins>
@@ -634,16 +651,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>docs</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-docs</artifactId>
- <classifier>user-manual</classifier>
- <type>pdf</type>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/binary-release.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/binary-release.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/binary-release.xml (original)
+++ accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/binary-release.xml Mon Jun 17 20:12:04 2013
@@ -21,193 +21,7 @@
<formats>
<format>tar.gz</format>
</formats>
- <fileSets>
- <fileSet>
- <directory>../bin</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>../lib</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../examples/simple</directory>
- <outputDirectory>/examples/simple</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>src/main/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../lib/native</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>**/*.so</include>
- <include>**/*.jnilib</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../server/src/main/c++</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.so</exclude>
- <exclude>**/*.jnilib</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../lib/ext</directory>
- <outputDirectory>/lib/ext</outputDirectory>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../logs</directory>
- <outputDirectory>/logs</outputDirectory>
- <directoryMode>0700</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../docs</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>examples/**/*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>accumulo.policy.example</include>
- <include>examples/**</include>
- </includes>
- <excludes>
- <exclude>examples/**/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.sh</include>
- <include>**/*.py</include>
- <include>**/*.pl</include>
- </includes>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/continuous-env.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/.*/**</exclude>
- <exclude>pom.xml</exclude>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.pyo</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/randomwalk/conf/logger.xml</exclude>
- <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
- <exclude>**/randomwalk/conf/walkers</exclude>
- </excludes>
- </fileSet>
- <!-- Lift generated thrift proxy code into its own directory -->
- <fileSet>
- <directory>../proxy/target</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>proxy/thrift</outputDirectory>
- <includes>
- <include>gen-cpp/**</include>
- <include>gen-py/**</include>
- <include>gen-rb/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>README</include>
- <include>proxy.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.py</include>
- <include>**/*.rb</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.py</exclude>
- <exclude>**/*.rb</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../proxy/src/main/thrift</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>proxy/thrift</outputDirectory>
- <includes>
- <include>*.thrift</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>scripts</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>../CHANGES</source>
- </file>
- <file>
- <source>../LICENSE</source>
- </file>
- <file>
- <source>../NOTICE</source>
- </file>
- <file>
- <source>../README</source>
- </file>
- </files>
+ <componentDescriptors>
+ <componentDescriptor>src/main/assemblies/component.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml (original)
+++ accumulo/branches/ACCUMULO-118/assemble/src/main/assemblies/component.xml Mon Jun 17 20:12:04 2013
@@ -24,7 +24,6 @@
<fileMode>0644</fileMode>
<useProjectArtifact>false</useProjectArtifact>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>${groupId}:${artifactId}-*</include>
@@ -35,6 +34,20 @@
<include>jline:jline</include>
<include>org.apache.thrift:libthrift</include>
</includes>
+ <excludes>
+ <exclude>${groupId}:${artifactId}-docs</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>docs</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifactId}_user_manual.${artifact.extension}</outputFileNameMapping>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>${groupId}:${artifactId}-docs</include>
+ </includes>
</dependencySet>
</dependencySets>
<fileSets>
@@ -71,7 +84,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../lib/ext</directory>
+ <directory>./</directory>
<outputDirectory>/lib/ext</outputDirectory>
<directoryMode>0755</directoryMode>
<excludes>
@@ -79,7 +92,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>../logs</directory>
+ <directory>./</directory>
<outputDirectory>/logs</outputDirectory>
<directoryMode>0700</directoryMode>
<excludes>
@@ -90,9 +103,10 @@
<directory>../docs</directory>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
+ <includes>
+ <include>*.html</include>
+ <include>examples/*</include>
+ </includes>
</fileSet>
<fileSet>
<directory>../conf</directory>
Propchange: accumulo/branches/ACCUMULO-118/conf/
('svn:ignore' removed)
Modified: accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/native-standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -86,6 +88,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -96,15 +103,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -112,8 +114,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/1GB/standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -50,6 +52,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>15M</value>
</property>
@@ -81,6 +88,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -91,15 +103,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -107,8 +114,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/native-standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -76,6 +78,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -86,15 +93,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -102,8 +104,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/2GB/standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -37,7 +37,10 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
+ </description>
</property>
<property>
@@ -55,6 +58,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>30M</value>
</property>
@@ -83,6 +91,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -93,15 +106,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -109,8 +117,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/native-standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -71,6 +73,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -81,15 +88,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -97,8 +99,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/3GB/standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -50,6 +52,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>128M</value>
</property>
@@ -71,6 +78,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -81,15 +93,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -97,8 +104,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/native-standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -81,6 +83,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -91,15 +98,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -107,8 +109,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/512MB/standalone/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,9 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the
- local filesystem. It is possible to specify a comma-separated list
- of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -53,6 +53,11 @@
</property>
<property>
+ <name>tserver.memory.maps.native.enabled</name>
+ <value>false</value>
+ </property>
+
+ <property>
<name>tserver.cache.data.size</name>
<value>7M</value>
</property>
@@ -84,6 +89,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -94,15 +104,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -110,8 +115,6 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
</configuration>
Modified: accumulo/branches/ACCUMULO-118/conf/examples/vfs-classloader/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/conf/examples/vfs-classloader/accumulo-site.xml?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/conf/examples/vfs-classloader/accumulo-site.xml (original)
+++ accumulo/branches/ACCUMULO-118/conf/examples/vfs-classloader/accumulo-site.xml Mon Jun 17 20:12:04 2013
@@ -30,7 +30,9 @@
<property>
<name>logger.dir.walog</name>
<value>walogs</value>
- <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.
+ <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local
+ filesystem. In 1.5 write-ahead logs are stored in DFS. When 1.5 is started for the first time it will copy any 1.4
+ write ahead logs into DFS. It is possible to specify a comma-separated list of directories.
</description>
</property>
@@ -81,6 +83,11 @@
</property>
<property>
+ <name>general.maven.project.basedir</name>
+ <value></value>
+ </property>
+
+ <property>
<name>general.classpaths</name>
<!--
Add the following for hadoop-2.0
@@ -91,15 +98,10 @@
$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
- $ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/lib/accumulo-server.jar,
- $ACCUMULO_HOME/core/target/classes/,
$ACCUMULO_HOME/lib/accumulo-core.jar,
- $ACCUMULO_HOME/start/target/classes/,
$ACCUMULO_HOME/lib/accumulo-start.jar,
- $ACCUMULO_HOME/fate/target/classes/,
$ACCUMULO_HOME/lib/accumulo-fate.jar,
- $ACCUMULO_HOME/proxy/target/classes/,
$ACCUMULO_HOME/lib/accumulo-proxy.jar,
$ACCUMULO_HOME/lib/[^.].*.jar,
$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
@@ -107,9 +109,7 @@
$HADOOP_PREFIX/[^.].*.jar,
$HADOOP_PREFIX/lib/[^.].*.jar,
</value>
- <description>Classpaths that accumulo checks for updates and class files.
- When using the Security Manager, please remove the ".../target/classes/" values.
- </description>
+ <description>Classpaths that accumulo checks for updates and class files.</description>
</property>
<!-- VFS ClassLoader Settings -->
Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 17 20:12:04 2013
@@ -1,5 +1,3 @@
+.*
target
-.settings
-.project
-.classpath
accumulo-core.iml
Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
Reverse-merged /accumulo/trunk/core:r1478775
Merged /accumulo/trunk/core:r1486112-1486135,1486203-1488406,1488408-1489580,1489976-1489981,1490337-1493757
Merged /incubator/accumulo/branches/1.4/core:r1201899-1201901
Merged /accumulo/branches/1.5/core:r1484971-1484975,1484977-1484982,1484986-1485411,1485413-1485414,1485416-1485661,1485663-1492948
Merged /accumulo/branches/1.4/core:r1382578-1382612,1382614-1388119,1388121-1388628,1388630-1393867,1393869-1396064,1396066-1396571,1396573-1396615,1396617-1396757,1396759-1396771,1396773-1397047,1397049-1397112,1397114-1397116,1397118-1397175,1397177-1397188,1397190-1397382,1397384-1397699,1397701-1397920,1397922-1398285,1398287-1398307,1398309-1398358,1398360-1398392,1398394-1398398,1398400-1398437,1398439-1398513,1398515-1398800,1398802-1399210,1399212-1399716,1399718-1400975,1400977-1402570,1402572-1402681,1402683-1407300,1407302-1423031,1423033-1423628,1423630-1427863,1427865-1450270,1450272-1451699,1451701-1455609,1455611-1455638,1455640-1455979,1455981-1461547,1461549-1465686,1465688-1466198,1466200-1466258,1466260-1466626,1466628-1468530,1468532-1468957,1468959-1480032,1480034-1482988,1482990-1483953,1483955-1492947
Merged /accumulo/branches/1.4/src/core:r1356901-1358205,1491900
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/Constants.java Mon Jun 17 20:12:04 2013
@@ -99,7 +99,8 @@ public class Constants {
public static final String METADATA_DELETE_FLAG_PREFIX = "~del";
public static final String METADATA_DELETE_FLAG_FOR_METADATA_PREFIX = "!!" + METADATA_DELETE_FLAG_PREFIX;
public static final Range METADATA_DELETES_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_PREFIX)), true, new Key(new Text("~dem")), false);
- public static final Range METADATA_DELETES_FOR_METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_FOR_METADATA_PREFIX)), true, new Key(new Text("!!~dem")), false);
+ public static final Range METADATA_DELETES_FOR_METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_DELETE_FLAG_FOR_METADATA_PREFIX)), true, new Key(
+ new Text("!!~dem")), false);
public static final String METADATA_BLIP_FLAG_PREFIX = "~blip"; // BLIP = bulk load in progress
public static final Range METADATA_BLIP_KEYSPACE = new Range(new Key(new Text(METADATA_BLIP_FLAG_PREFIX)), true, new Key(new Text("~bliq")), false);
@@ -154,9 +155,11 @@ public class Constants {
// Security configuration
public static final String PW_HASH_ALGORITHM = "SHA-256";
- // Representation of an empty set of authorizations
- // (used throughout the code, because scans of metadata table and many tests do not set record-level visibility)
- public static final Authorizations NO_AUTHS = new Authorizations();
+ /**
+ * @deprecated since 1.6.0; Use {@link Authorizations#EMPTY} instead
+ */
+ @Deprecated
+ public static final Authorizations NO_AUTHS = Authorizations.EMPTY;
public static final int DEFAULT_MINOR_COMPACTION_MAX_SLEEP_TIME = 60 * 3; // in seconds
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java Mon Jun 17 20:12:04 2013
@@ -114,12 +114,11 @@ public class ClientOpts extends Help {
@Parameter(names = {"-tc", "--tokenClass"}, description = "Token class")
public String tokenClassName = PasswordToken.class.getName();
-
+
@DynamicParameter(names = "-l",
description = "login properties in the format key=value. Reuse -l for each property (prompt for properties if this option is missing")
public Map<String,String> loginProps = new LinkedHashMap<String,String>();
-
public AuthenticationToken getToken() {
if (!loginProps.isEmpty()) {
Properties props = new Properties();
@@ -133,7 +132,7 @@ public class ClientOpts extends Help {
} catch (Exception e) {
throw new RuntimeException(e);
}
-
+
}
if (securePassword != null)
@@ -152,7 +151,7 @@ public class ClientOpts extends Help {
public String instance = null;
@Parameter(names = {"-auths", "--auths"}, converter = AuthConverter.class, description = "the authorizations to use when reading or writing")
- public Authorizations auths = Constants.NO_AUTHS;
+ public Authorizations auths = Authorizations.EMPTY;
@Parameter(names = "--debug", description = "turn on TRACE-level log messages")
public boolean debug = false;
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/InstanceOperationsImpl.java Mon Jun 17 20:12:04 2013
@@ -66,11 +66,6 @@ public class InstanceOperationsImpl impl
this.credentials = credentials;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#setProperty(java.lang.String, java.lang.String)
- */
@Override
public void setProperty(final String property, final String value) throws AccumuloException, AccumuloSecurityException {
ArgumentChecker.notNull(property, value);
@@ -82,11 +77,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#removeProperty(java.lang.String)
- */
@Override
public void removeProperty(final String property) throws AccumuloException, AccumuloSecurityException {
ArgumentChecker.notNull(property);
@@ -98,11 +88,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSystemConfiguration()
- */
@Override
public Map<String,String> getSystemConfiguration() throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -113,11 +98,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSiteConfiguration()
- */
@Override
public Map<String,String> getSiteConfiguration() throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Map<String,String>,ClientService.Client>() {
@@ -128,12 +108,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getTabletServers()
- */
-
@Override
public List<String> getTabletServers() {
ZooCache cache = ZooCache.getInstance(instance.getZooKeepers(), instance.getZooKeepersSessionTimeOut());
@@ -153,12 +127,6 @@ public class InstanceOperationsImpl impl
return results;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveScans(java.lang.String)
- */
-
@Override
public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
Client client = null;
@@ -186,11 +154,6 @@ public class InstanceOperationsImpl impl
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#testClassLoad(java.lang.String, java.lang.String)
- */
@Override
public boolean testClassLoad(final String className, final String asTypeName) throws AccumuloException, AccumuloSecurityException {
return ServerClient.execute(instance, new ClientExecReturn<Boolean,ClientService.Client>() {
@@ -201,11 +164,6 @@ public class InstanceOperationsImpl impl
});
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveCompactions(java.lang.String)
- */
@Override
public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
Client client = null;
@@ -229,11 +187,6 @@ public class InstanceOperationsImpl impl
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#ping(java.lang.String)
- */
@Override
public void ping(String tserver) throws AccumuloException {
TTransport transport = null;
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/MetadataLocationObtainer.java Mon Jun 17 20:12:04 2013
@@ -44,6 +44,7 @@ import org.apache.accumulo.core.data.Ran
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.data.thrift.IterInfo;
import org.apache.accumulo.core.iterators.user.WholeRowIterator;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.util.MetadataTable;
@@ -94,7 +95,7 @@ public class MetadataLocationObtainer im
Map<String,Map<String,String>> serverSideIteratorOptions = Collections.emptyMap();
boolean more = ThriftScanner.getBatchFromServer(credentials, range, src.tablet_extent, src.tablet_location, encodedResults, locCols,
- serverSideIteratorList, serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Constants.NO_AUTHS, false, instance.getConfiguration());
+ serverSideIteratorList, serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Authorizations.EMPTY, false, instance.getConfiguration());
decodeRows(encodedResults, results);
@@ -102,7 +103,7 @@ public class MetadataLocationObtainer im
range = new Range(results.lastKey().followingKey(PartialKey.ROW_COLFAM_COLQUAL_COLVIS_TIME), true, new Key(stopRow).followingKey(PartialKey.ROW), false);
encodedResults.clear();
more = ThriftScanner.getBatchFromServer(credentials, range, src.tablet_extent, src.tablet_location, encodedResults, locCols, serverSideIteratorList,
- serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Constants.NO_AUTHS, false, instance.getConfiguration());
+ serverSideIteratorOptions, Constants.SCAN_BATCH_SIZE, Authorizations.EMPTY, false, instance.getConfiguration());
decodeRows(encodedResults, results);
}
@@ -178,7 +179,7 @@ public class MetadataLocationObtainer im
Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
try {
- TabletServerBatchReaderIterator.doLookup(tserver, tabletsRanges, failures, unscanned, rr, columns, credentials, opts, Constants.NO_AUTHS,
+ TabletServerBatchReaderIterator.doLookup(tserver, tabletsRanges, failures, unscanned, rr, columns, credentials, opts, Authorizations.EMPTY,
instance.getConfiguration());
if (failures.size() > 0) {
// invalidate extents in parents cache
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java Mon Jun 17 20:12:04 2013
@@ -252,7 +252,7 @@ class OfflineIterator implements Iterato
}
private Pair<KeyExtent,String> getTabletFiles(Range nextRange, List<String> relFiles) throws TableNotFoundException {
- Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY);
scanner.setBatchSize(100);
scanner.setRange(nextRange);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java Mon Jun 17 20:12:04 2013
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.Map.Entry;
import java.util.concurrent.ExecutorService;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.data.Key;
@@ -45,7 +44,7 @@ public class TabletServerBatchReader ext
private ArrayList<Range> ranges;
private TCredentials credentials;
- private Authorizations authorizations = Constants.NO_AUTHS;
+ private Authorizations authorizations = Authorizations.EMPTY;
private static int nextBatchReaderInstance = 1;
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Mon Jun 17 20:12:04 2013
@@ -34,9 +34,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Instance;
@@ -66,6 +63,8 @@ import org.apache.accumulo.core.util.Byt
import org.apache.accumulo.core.util.OpTimer;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -81,7 +80,7 @@ public class TabletServerBatchReaderIter
private final Instance instance;
private final TCredentials credentials;
private final String table;
- private Authorizations authorizations = Constants.NO_AUTHS;
+ private Authorizations authorizations = Authorizations.EMPTY;
private final int numThreads;
private final ExecutorService queryThreadPool;
private final ScannerOptions options;
@@ -612,8 +611,8 @@ public class TabletServerBatchReaderIter
}
static void doLookup(String server, Map<KeyExtent,List<Range>> requested, Map<KeyExtent,List<Range>> failures, Map<KeyExtent,List<Range>> unscanned,
- ResultReceiver receiver, List<Column> columns, TCredentials credentials, ScannerOptions options, Authorizations authorizations, AccumuloConfiguration conf,
- TimeoutTracker timeoutTracker) throws IOException, AccumuloSecurityException, AccumuloServerException {
+ ResultReceiver receiver, List<Column> columns, TCredentials credentials, ScannerOptions options, Authorizations authorizations,
+ AccumuloConfiguration conf, TimeoutTracker timeoutTracker) throws IOException, AccumuloSecurityException, AccumuloServerException {
if (requested.size() == 0) {
return;
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java Mon Jun 17 20:12:04 2013
@@ -686,7 +686,7 @@ public abstract class InputFormatBase<K,
startRow = new Text();
Range metadataRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false);
- Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY);
Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner);
scanner.fetchColumnFamily(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY);
scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Mon Jun 17 20:12:04 2013
@@ -710,7 +710,7 @@ public abstract class InputFormatBase<K,
startRow = new Text();
Range metadataRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false);
- Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
+ Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Authorizations.EMPTY);
Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner);
scanner.fetchColumnFamily(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY);
scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java Mon Jun 17 20:12:04 2013
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
@@ -138,7 +137,7 @@ public class InputConfigurator extends C
*/
public static Authorizations getScanAuthorizations(Class<?> implementingClass, Configuration conf) {
String authString = conf.get(enumToConfKey(implementingClass, ScanOpts.AUTHORIZATIONS));
- return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.getBytes());
+ return authString == null ? Authorizations.EMPTY : new Authorizations(authString.getBytes());
}
/**
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java Mon Jun 17 20:12:04 2013
@@ -44,7 +44,7 @@ public class MockAccumulo {
}
{
- MockUser root = new MockUser("root", new PasswordToken(new byte[0]), Constants.NO_AUTHS);
+ MockUser root = new MockUser("root", new PasswordToken(new byte[0]), Authorizations.EMPTY);
root.permissions.add(SystemPermission.SYSTEM);
users.put(root.name, root);
createTable("root", Constants.METADATA_TABLE_NAME, true, TimeType.LOGICAL);
@@ -88,8 +88,8 @@ public class MockAccumulo {
public Collection<Text> getSplits(String tableName) {
return tables.get(tableName).getSplits();
}
-
+
public void merge(String tableName, Text start, Text end) {
tables.get(tableName).merge(start, end);
- }
+ }
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchWriter.java Mon Jun 17 20:12:04 2013
@@ -19,6 +19,7 @@ package org.apache.accumulo.core.client.
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.util.ArgumentChecker;
public class MockBatchWriter implements BatchWriter {
@@ -32,11 +33,13 @@ public class MockBatchWriter implements
@Override
public void addMutation(Mutation m) throws MutationsRejectedException {
+ ArgumentChecker.notNull(m);
acu.addMutation(tablename, m);
}
@Override
public void addMutations(Iterable<Mutation> iterable) throws MutationsRejectedException {
+ ArgumentChecker.notNull(iterable);
for (Mutation m : iterable) {
acu.addMutation(tablename, m);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java?rev=1493916&r1=1493915&r2=1493916&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/mock/MockInstanceOperations.java Mon Jun 17 20:12:04 2013
@@ -33,78 +33,40 @@ import org.apache.accumulo.start.classlo
public class MockInstanceOperations implements InstanceOperations {
MockAccumulo acu;
- /**
- * @param acu
- */
public MockInstanceOperations(MockAccumulo acu) {
this.acu = acu;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#setProperty(java.lang.String, java.lang.String)
- */
@Override
public void setProperty(String property, String value) throws AccumuloException, AccumuloSecurityException {
acu.setProperty(property, value);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#removeProperty(java.lang.String)
- */
@Override
public void removeProperty(String property) throws AccumuloException, AccumuloSecurityException {
acu.removeProperty(property);
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSystemConfiguration()
- */
@Override
public Map<String,String> getSystemConfiguration() throws AccumuloException, AccumuloSecurityException {
return acu.systemProperties;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getSiteConfiguration()
- */
@Override
public Map<String,String> getSiteConfiguration() throws AccumuloException, AccumuloSecurityException {
return acu.systemProperties;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getTabletServers()
- */
@Override
public List<String> getTabletServers() {
return new ArrayList<String>();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveScans(java.lang.String)
- */
@Override
public List<ActiveScan> getActiveScans(String tserver) throws AccumuloException, AccumuloSecurityException {
return new ArrayList<ActiveScan>();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#testClassLoad(java.lang.String, java.lang.String)
- */
@Override
public boolean testClassLoad(String className, String asTypeName) throws AccumuloException, AccumuloSecurityException {
try {
@@ -116,11 +78,6 @@ public class MockInstanceOperations impl
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.accumulo.core.client.admin.InstanceOperations#getActiveCompactions(java.lang.String)
- */
@Override
public List<ActiveCompaction> getActiveCompactions(String tserver) throws AccumuloException, AccumuloSecurityException {
return new ArrayList<ActiveCompaction>();
@@ -128,6 +85,6 @@ public class MockInstanceOperations impl
@Override
public void ping(String tserver) throws AccumuloException {
-
+
}
}