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/19 17:57:14 UTC
svn commit: r1494671 [1/6] - in /accumulo/branches/ACCUMULO-118: ./
assemble/ core/ core/src/main/java/org/apache/accumulo/core/
core/src/main/java/org/apache/accumulo/core/client/
core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main...
Author: ecn
Date: Wed Jun 19 15:57:11 2013
New Revision: 1494671
URL: http://svn.apache.org/r1494671
Log:
ACCUMULO-118 merge trunk to branch
Added:
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/RootTable.java
- copied unchanged from r1494649, accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/RootTable.java
Modified:
accumulo/branches/ACCUMULO-118/ (props changed)
accumulo/branches/ACCUMULO-118/assemble/ (props changed)
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/client/ZooKeeperInstance.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.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/RootTabletLocator.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.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/mock/MockAccumulo.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.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/FlushCommand.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/OfflineCommand.java
accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/util/shell/commands/OnlineCommand.java
accumulo/branches/ACCUMULO-118/core/src/test/java/org/apache/accumulo/core/client/impl/TabletLocatorImplTest.java
accumulo/branches/ACCUMULO-118/examples/ (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/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
accumulo/branches/ACCUMULO-118/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java
accumulo/branches/ACCUMULO-118/pom.xml (props changed)
accumulo/branches/ACCUMULO-118/proxy/README (props changed)
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
accumulo/branches/ACCUMULO-118/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
accumulo/branches/ACCUMULO-118/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
accumulo/branches/ACCUMULO-118/server/ (props changed)
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/ServerConstants.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.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/iterators/MetadataBulkLoadFilter.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/MetaDataStateStore.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/state/RootTabletStateStore.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/state/TServerInstance.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/master/state/ZooTabletStateStore.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/ImportTable.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/metanalysis/FilterMeta.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/metanalysis/IndexMeta.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.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/AuditedSecurityOperation.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/ZKAuthorizor.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/tabletserver/MinorCompactor.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/TabletServerResourceManager.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.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/Admin.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/FindOfflineTablets.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/RemoveEntriesForMissingFiles.java
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TableDiskUsage.java (contents, props changed)
accumulo/branches/ACCUMULO-118/server/src/main/java/org/apache/accumulo/server/util/TabletIterator.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.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/iterators/MetadataBulkLoadFilterTest.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/master/state/RootTabletStateStoreTest.java
accumulo/branches/ACCUMULO-118/server/src/test/java/org/apache/accumulo/server/tabletserver/CheckTabletMetadataTest.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/test/src/main/java/org/apache/accumulo/test/GCLotsOfCandidatesTest.java
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/ContinuousStatsCollector.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/PermissionsTest.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/performance/metadata/MetadataBatchScanTest.java
accumulo/branches/ACCUMULO-118/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/AddSplits.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/Merge.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
accumulo/branches/ACCUMULO-118/test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
accumulo/branches/ACCUMULO-118/test/system/auto/TestUtils.py
accumulo/branches/ACCUMULO-118/test/system/auto/simple/examples.py
Propchange: accumulo/branches/ACCUMULO-118/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1494234-1494649
Merged /accumulo/branches/1.5:r1494361,1494372
Propchange: accumulo/branches/ACCUMULO-118/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1494234-1494649
Merged /accumulo/branches/1.5/assemble:r1494361,1494372
Propchange: accumulo/branches/ACCUMULO-118/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1494234-1494649
Merged /accumulo/branches/1.5/core:r1494361,1494372
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -18,13 +18,7 @@ package org.apache.accumulo.core;
import java.nio.charset.Charset;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.PartialKey;
-import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.ColumnFQ;
-import org.apache.hadoop.io.Text;
public class Constants {
public static final Charset UTF8 = Charset.forName("UTF-8");
@@ -43,12 +37,6 @@ public class Constants {
public static final String ZTABLE_COMPACT_ID = "/compact-id";
public static final String ZTABLE_COMPACT_CANCEL_ID = "/compact-cancel-id";
- public static final String ZROOT_TABLET = "/root_tablet";
- public static final String ZROOT_TABLET_LOCATION = ZROOT_TABLET + "/location";
- public static final String ZROOT_TABLET_FUTURE_LOCATION = ZROOT_TABLET + "/future_location";
- public static final String ZROOT_TABLET_LAST_LOCATION = ZROOT_TABLET + "/lastlocation";
- public static final String ZROOT_TABLET_WALOGS = ZROOT_TABLET + "/walogs";
-
public static final String ZMASTERS = "/masters";
public static final String ZMASTER_LOCK = ZMASTERS + "/lock";
public static final String ZMASTER_GOAL_STATE = ZMASTERS + "/goal_state";
@@ -78,62 +66,17 @@ public class Constants {
public static final String ZHDFS_RESERVATIONS = "/hdfs_reservations";
public static final String ZRECOVERY = "/recovery";
- public static final String METADATA_TABLE_ID = "!0";
- public static final String METADATA_TABLE_NAME = "!METADATA";
+ /**
+ * Initial tablet directory name for the default tablet in all tables
+ */
public static final String DEFAULT_TABLET_LOCATION = "/default_tablet";
- public static final String TABLE_TABLET_LOCATION = "/table_info";
- public static final String ZTABLE_LOCKS = "/table_locks";
- // reserved keyspace is any row that begins with a tilde '~' character
- public static final Key METADATA_RESERVED_KEYSPACE_START_KEY = new Key(new Text(new byte[] {'~'}));
- 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 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);
-
- public static final Text METADATA_SERVER_COLUMN_FAMILY = new Text("srv");
- public static final Text METADATA_TABLET_COLUMN_FAMILY = new Text("~tab"); // this needs to sort after all other column families for that tablet
- public static final Text METADATA_CURRENT_LOCATION_COLUMN_FAMILY = new Text("loc");
- public static final Text METADATA_FUTURE_LOCATION_COLUMN_FAMILY = new Text("future");
- public static final Text METADATA_LAST_LOCATION_COLUMN_FAMILY = new Text("last");
- public static final Text METADATA_BULKFILE_COLUMN_FAMILY = new Text("loaded"); // temporary marker that indicates a tablet loaded a bulk file
- public static final Text METADATA_CLONED_COLUMN_FAMILY = new Text("!cloned"); // temporary marker that indicates a tablet was successfully cloned
-
- // README : very important that prevRow sort last to avoid race conditions between
- // garbage collector and split
- public static final ColumnFQ METADATA_PREV_ROW_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("~pr")); // this needs to sort after everything
- // else for that tablet
- public static final ColumnFQ METADATA_OLD_PREV_ROW_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("oldprevrow"));
- public static final ColumnFQ METADATA_DIRECTORY_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("dir"));
- public static final ColumnFQ METADATA_TIME_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("time"));
- public static final ColumnFQ METADATA_FLUSH_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("flush"));
- public static final ColumnFQ METADATA_COMPACT_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("compact"));
- public static final ColumnFQ METADATA_SPLIT_RATIO_COLUMN = new ColumnFQ(METADATA_TABLET_COLUMN_FAMILY, new Text("splitRatio"));
- public static final ColumnFQ METADATA_LOCK_COLUMN = new ColumnFQ(METADATA_SERVER_COLUMN_FAMILY, new Text("lock"));
-
- public static final Text METADATA_DATAFILE_COLUMN_FAMILY = new Text("file");
- public static final Text METADATA_SCANFILE_COLUMN_FAMILY = new Text("scan");
- public static final Text METADATA_LOG_COLUMN_FAMILY = new Text("log");
- public static final Text METADATA_CHOPPED_COLUMN_FAMILY = new Text("chopped");
- public static final ColumnFQ METADATA_CHOPPED_COLUMN = new ColumnFQ(METADATA_CHOPPED_COLUMN_FAMILY, new Text("chopped"));
-
- public static final Range NON_ROOT_METADATA_KEYSPACE = new Range(
- new Key(KeyExtent.getMetadataEntry(new Text(METADATA_TABLE_ID), null)).followingKey(PartialKey.ROW), true, METADATA_RESERVED_KEYSPACE_START_KEY, false);
- public static final Range METADATA_KEYSPACE = new Range(new Key(new Text(METADATA_TABLE_ID)), true, METADATA_RESERVED_KEYSPACE_START_KEY, false);
-
- public static final KeyExtent ROOT_TABLET_EXTENT = new KeyExtent(new Text(METADATA_TABLE_ID), KeyExtent.getMetadataEntry(new Text(METADATA_TABLE_ID), null),
- null);
- public static final Range METADATA_ROOT_TABLET_KEYSPACE = new Range(ROOT_TABLET_EXTENT.getMetadataEntry(), false, KeyExtent.getMetadataEntry(new Text(
- METADATA_TABLE_ID), null), true);
+ public static final String ZTABLE_LOCKS = "/table_locks";
public static final String BULK_PREFIX = "b-";
- // note: all times are in milliseconds
-
- public static final int SCAN_BATCH_SIZE = 1000; // this affects the table client caching of metadata
+ // this affects the table client caching of metadata
+ public static final int SCAN_BATCH_SIZE = 1000;
// Security configuration
public static final String PW_HASH_ALGORITHM = "SHA-256";
@@ -144,10 +87,7 @@ public class Constants {
@Deprecated
public static final Authorizations NO_AUTHS = Authorizations.EMPTY;
- public static final int DEFAULT_MINOR_COMPACTION_MAX_SLEEP_TIME = 60 * 3; // in seconds
-
public static final int MAX_DATA_TO_PRINT = 64;
- public static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2;
public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
public static final String VALID_TABLE_NAME_REGEX = "^\\w+$";
public static final String MAPFILE_EXTENSION = "map";
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java Wed Jun 19 15:57:11 2013
@@ -36,6 +36,7 @@ import org.apache.accumulo.core.util.Arg
import org.apache.accumulo.core.util.ByteBufferUtil;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.OpTimer;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
import org.apache.accumulo.fate.zookeeper.ZooCache;
@@ -174,7 +175,7 @@ public class ZooKeeperInstance implement
@Override
public String getRootTabletLocation() {
- String zRootLocPath = ZooUtil.getRoot(this) + Constants.ZROOT_TABLET_LOCATION;
+ String zRootLocPath = ZooUtil.getRoot(this) + RootTable.ZROOT_TABLET_LOCATION;
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Looking up root tablet location in zookeeper.");
byte[] loc = zooCache.get(zRootLocPath);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Wed Jun 19 15:57:11 2013
@@ -154,7 +154,7 @@ public class TableOperationsImpl extends
@Override
public boolean exists(String tableName) {
ArgumentChecker.notNull(tableName);
- if (tableName.equals(Constants.METADATA_TABLE_NAME))
+ if (tableName.equals(MetadataTable.NAME))
return true;
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Checking if table " + tableName + "exists...");
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -66,8 +66,8 @@ public class MetadataLocationObtainer im
this.instance = instance;
locCols = new TreeSet<Column>();
- locCols.add(new Column(TextUtil.getBytes(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY), null, null));
- locCols.add(Constants.METADATA_PREV_ROW_COLUMN.toColumn());
+ locCols.add(new Column(TextUtil.getBytes(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY), null, null));
+ locCols.add(MetadataTable.PREV_ROW_COLUMN.toColumn());
columns = new ArrayList<Column>(locCols);
}
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -60,6 +60,7 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.accumulo.core.util.LocalityGroupUtil;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.commons.lang.NotImplementedException;
@@ -253,7 +254,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, Authorizations.EMPTY);
+ Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
scanner.setBatchSize(100);
scanner.setRange(nextRange);
@@ -267,16 +268,16 @@ class OfflineIterator implements Iterato
Entry<Key,Value> entry = row.next();
Key key = entry.getKey();
- if (key.getColumnFamily().equals(Constants.METADATA_DATAFILE_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.DATAFILE_COLUMN_FAMILY)) {
relFiles.add(key.getColumnQualifier().toString());
}
- if (key.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY)
- || key.getColumnFamily().equals(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY)
+ || key.getColumnFamily().equals(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY)) {
location = entry.getValue().toString();
}
- if (Constants.METADATA_PREV_ROW_COLUMN.hasColumns(key)) {
+ if (MetadataTable.PREV_ROW_COLUMN.hasColumns(key)) {
extent = new KeyExtent(key.getRow(), entry.getValue());
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/RootTabletLocator.java Wed Jun 19 15:57:11 2013
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-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;
@@ -30,6 +29,7 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -54,7 +54,7 @@ public class RootTabletLocator extends T
String rootTabletLocation = instance.getRootTabletLocation();
if (rootTabletLocation != null) {
for (Range range : ranges) {
- TabletLocatorImpl.addRange(binnedRanges, rootTabletLocation, Constants.ROOT_TABLET_EXTENT, range);
+ TabletLocatorImpl.addRange(binnedRanges, rootTabletLocation, RootTable.ROOT_TABLET_EXTENT, range);
}
}
return Collections.emptyList();
@@ -78,7 +78,7 @@ public class RootTabletLocator extends T
row = new Text(row);
row.append(new byte[] {0}, 0, 1);
}
- if (!Constants.ROOT_TABLET_EXTENT.contains(row)) {
+ if (!RootTable.ROOT_TABLET_EXTENT.contains(row)) {
throw new AccumuloException("Tried to locate row out side of root tablet " + row);
}
String location = instance.getRootTabletLocation();
@@ -88,7 +88,7 @@ public class RootTabletLocator extends T
location = instance.getRootTabletLocation();
}
if (location != null)
- return new TabletLocation(Constants.ROOT_TABLET_EXTENT, location);
+ return new TabletLocation(RootTable.ROOT_TABLET_EXTENT, location);
return null;
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocator.java Wed Jun 19 15:57:11 2013
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
-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;
@@ -34,6 +33,7 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.util.ArgumentChecker;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.hadoop.io.Text;
public abstract class TabletLocator {
@@ -90,7 +90,7 @@ public abstract class TabletLocator {
private static HashMap<LocatorKey,TabletLocator> locators = new HashMap<LocatorKey,TabletLocator>();
- private static final Text ROOT_TABLET_MDE = KeyExtent.getMetadataEntry(new Text(Constants.METADATA_TABLE_ID), null);
+ private static final Text ROOT_TABLET_MDE = KeyExtent.getMetadataEntry(new Text(MetadataTable.ID), null);
public static synchronized TabletLocator getInstance(Instance instance, Text tableId) {
LocatorKey key = new LocatorKey(instance.getInstanceID(), tableId);
@@ -100,9 +100,9 @@ public abstract class TabletLocator {
if (tl == null) {
MetadataLocationObtainer mlo = new MetadataLocationObtainer(instance);
- if (tableId.toString().equals(Constants.METADATA_TABLE_ID)) {
+ if (tableId.toString().equals(MetadataTable.ID)) {
RootTabletLocator rootTabletLocator = new RootTabletLocator(instance);
- tl = new TabletLocatorImpl(new Text(Constants.METADATA_TABLE_ID), rootTabletLocator, mlo) {
+ tl = new TabletLocatorImpl(new Text(MetadataTable.ID), rootTabletLocator, mlo) {
@Override
public TabletLocation _locateTablet(Text row, boolean skipRow, boolean retry, boolean lock, TCredentials credentials) throws AccumuloException, AccumuloSecurityException,
TableNotFoundException {
@@ -117,7 +117,7 @@ public abstract class TabletLocator {
}
};
} else {
- TabletLocator rootTabletCache = getInstance(instance, new Text(Constants.METADATA_TABLE_ID));
+ TabletLocator rootTabletCache = getInstance(instance, new Text(MetadataTable.ID));
tl = new TabletLocatorImpl(tableId, rootTabletCache, mlo);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Wed Jun 19 15:57:11 2013
@@ -35,7 +35,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
-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.BatchWriterConfig;
@@ -61,6 +60,7 @@ import org.apache.accumulo.core.tabletse
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.SimpleThreadPool;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.trace.instrument.Span;
@@ -673,7 +673,7 @@ public class TabletServerBatchWriter {
// assume an IOError communicating with !METADATA tablet
failedMutations.add(mutationsToProcess);
} catch (AccumuloSecurityException e) {
- updateAuthorizationFailures(Collections.singletonMap(new KeyExtent(new Text(Constants.METADATA_TABLE_ID), null, null),
+ updateAuthorizationFailures(Collections.singletonMap(new KeyExtent(new Text(MetadataTable.ID), null, null),
SecurityErrorCode.valueOf(e.getSecurityErrorCode().name())));
} catch (TableDeletedException e) {
updateUnknownErrors(e.getMessage(), e);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java Wed Jun 19 15:57:11 2013
@@ -5082,7 +5082,7 @@ import org.slf4j.LoggerFactory;
struct.files = new ArrayList<String>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- String _elem10; // required
+ String _elem10; // optional
_elem10 = iprot.readString();
struct.files.add(_elem10);
}
@@ -5259,7 +5259,7 @@ import org.slf4j.LoggerFactory;
struct.files = new ArrayList<String>(_list13.size);
for (int _i14 = 0; _i14 < _list13.size; ++_i14)
{
- String _elem15; // required
+ String _elem15; // optional
_elem15 = iprot.readString();
struct.files.add(_elem15);
}
@@ -5746,7 +5746,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<String>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
- String _elem18; // required
+ String _elem18; // optional
_elem18 = iprot.readString();
struct.success.add(_elem18);
}
@@ -5867,7 +5867,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<String>(_list21.size);
for (int _i22 = 0; _i22 < _list21.size; ++_i22)
{
- String _elem23; // required
+ String _elem23; // optional
_elem23 = iprot.readString();
struct.success.add(_elem23);
}
@@ -7808,7 +7808,7 @@ import org.slf4j.LoggerFactory;
struct.tables = new HashSet<String>(2*_set24.size);
for (int _i25 = 0; _i25 < _set24.size; ++_i25)
{
- String _elem26; // required
+ String _elem26; // optional
_elem26 = iprot.readString();
struct.tables.add(_elem26);
}
@@ -7909,7 +7909,7 @@ import org.slf4j.LoggerFactory;
struct.tables = new HashSet<String>(2*_set29.size);
for (int _i30 = 0; _i30 < _set29.size; ++_i30)
{
- String _elem31; // required
+ String _elem31; // optional
_elem31 = iprot.readString();
struct.tables.add(_elem31);
}
@@ -8393,7 +8393,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<TDiskUsage>(_list32.size);
for (int _i33 = 0; _i33 < _list32.size; ++_i33)
{
- TDiskUsage _elem34; // required
+ TDiskUsage _elem34; // optional
_elem34 = new TDiskUsage();
_elem34.read(iprot);
struct.success.add(_elem34);
@@ -8515,7 +8515,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<TDiskUsage>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38)
{
- TDiskUsage _elem39; // required
+ TDiskUsage _elem39; // optional
_elem39 = new TDiskUsage();
_elem39.read(iprot);
struct.success.add(_elem39);
@@ -9392,7 +9392,7 @@ import org.slf4j.LoggerFactory;
struct.success = new HashSet<String>(2*_set40.size);
for (int _i41 = 0; _i41 < _set40.size; ++_i41)
{
- String _elem42; // required
+ String _elem42; // optional
_elem42 = iprot.readString();
struct.success.add(_elem42);
}
@@ -9493,7 +9493,7 @@ import org.slf4j.LoggerFactory;
struct.success = new HashSet<String>(2*_set45.size);
for (int _i46 = 0; _i46 < _set45.size; ++_i46)
{
- String _elem47; // required
+ String _elem47; // optional
_elem47 = iprot.readString();
struct.success.add(_elem47);
}
@@ -15015,7 +15015,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list48.size);
for (int _i49 = 0; _i49 < _list48.size; ++_i49)
{
- ByteBuffer _elem50; // required
+ ByteBuffer _elem50; // optional
_elem50 = iprot.readBinary();
struct.authorizations.add(_elem50);
}
@@ -15143,7 +15143,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list53.size);
for (int _i54 = 0; _i54 < _list53.size; ++_i54)
{
- ByteBuffer _elem55; // required
+ ByteBuffer _elem55; // optional
_elem55 = iprot.readBinary();
struct.authorizations.add(_elem55);
}
@@ -16467,7 +16467,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<ByteBuffer>(_list56.size);
for (int _i57 = 0; _i57 < _list56.size; ++_i57)
{
- ByteBuffer _elem58; // required
+ ByteBuffer _elem58; // optional
_elem58 = iprot.readBinary();
struct.success.add(_elem58);
}
@@ -16568,7 +16568,7 @@ import org.slf4j.LoggerFactory;
struct.success = new ArrayList<ByteBuffer>(_list61.size);
for (int _i62 = 0; _i62 < _list61.size; ++_i62)
{
- ByteBuffer _elem63; // required
+ ByteBuffer _elem63; // optional
_elem63 = iprot.readBinary();
struct.success.add(_elem63);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java Wed Jun 19 15:57:11 2013
@@ -436,7 +436,7 @@ import org.slf4j.LoggerFactory;
struct.tables = new ArrayList<String>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- String _elem2; // required
+ String _elem2; // optional
_elem2 = iprot.readString();
struct.tables.add(_elem2);
}
@@ -534,7 +534,7 @@ import org.slf4j.LoggerFactory;
struct.tables = new ArrayList<String>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- String _elem7; // required
+ String _elem7; // optional
_elem7 = iprot.readString();
struct.tables.add(_elem7);
}
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.ClientSideIteratorScanner;
@@ -57,6 +56,7 @@ import org.apache.accumulo.core.master.s
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.io.Text;
@@ -686,11 +686,11 @@ 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, 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);
- scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY);
+ Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
+ MetadataTable.PREV_ROW_COLUMN.fetch(scanner);
+ scanner.fetchColumnFamily(MetadataTable.LAST_LOCATION_COLUMN_FAMILY);
+ scanner.fetchColumnFamily(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY);
+ scanner.fetchColumnFamily(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY);
scanner.setRange(metadataRange);
RowIterator rowIter = new RowIterator(scanner);
@@ -707,16 +707,16 @@ public abstract class InputFormatBase<K,
Entry<Key,Value> entry = row.next();
Key key = entry.getKey();
- if (key.getColumnFamily().equals(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.LAST_LOCATION_COLUMN_FAMILY)) {
last = entry.getValue().toString();
}
- if (key.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY)
- || key.getColumnFamily().equals(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY)
+ || key.getColumnFamily().equals(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY)) {
location = entry.getValue().toString();
}
- if (Constants.METADATA_PREV_ROW_COLUMN.hasColumns(key)) {
+ if (MetadataTable.PREV_ROW_COLUMN.hasColumns(key)) {
extent = new KeyExtent(key.getRow(), entry.getValue());
}
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -36,7 +36,6 @@ import java.util.Map.Entry;
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;
@@ -68,6 +67,7 @@ import org.apache.accumulo.core.master.s
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.hadoop.conf.Configuration;
@@ -710,11 +710,11 @@ 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, 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);
- scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY);
+ Scanner scanner = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY);
+ MetadataTable.PREV_ROW_COLUMN.fetch(scanner);
+ scanner.fetchColumnFamily(MetadataTable.LAST_LOCATION_COLUMN_FAMILY);
+ scanner.fetchColumnFamily(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY);
+ scanner.fetchColumnFamily(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY);
scanner.setRange(metadataRange);
RowIterator rowIter = new RowIterator(scanner);
@@ -731,16 +731,16 @@ public abstract class InputFormatBase<K,
Entry<Key,Value> entry = row.next();
Key key = entry.getKey();
- if (key.getColumnFamily().equals(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.LAST_LOCATION_COLUMN_FAMILY)) {
last = entry.getValue().toString();
}
- if (key.getColumnFamily().equals(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY)
- || key.getColumnFamily().equals(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY)) {
+ if (key.getColumnFamily().equals(MetadataTable.CURRENT_LOCATION_COLUMN_FAMILY)
+ || key.getColumnFamily().equals(MetadataTable.FUTURE_LOCATION_COLUMN_FAMILY)) {
location = entry.getValue().toString();
}
- if (Constants.METADATA_PREV_ROW_COLUMN.hasColumns(key)) {
+ if (MetadataTable.PREV_ROW_COLUMN.hasColumns(key)) {
extent = new KeyExtent(key.getRow(), entry.getValue());
}
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=1494671&r1=1494670&r2=1494671&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 Wed Jun 19 15:57:11 2013
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.SortedSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.admin.TimeType;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
@@ -30,6 +29,7 @@ import org.apache.accumulo.core.data.Mut
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.util.MetadataTable;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
@@ -47,7 +47,7 @@ public class MockAccumulo {
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);
+ createTable("root", MetadataTable.NAME, true, TimeType.LOGICAL);
}
public FileSystem getFileSystem() {
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java Wed Jun 19 15:57:11 2013
@@ -39,9 +39,10 @@ import java.util.TreeSet;
import java.util.UUID;
import java.util.WeakHashMap;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.thrift.TKeyExtent;
import org.apache.accumulo.core.util.ByteBufferUtil;
+import org.apache.accumulo.core.util.MetadataTable;
+import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.io.BinaryComparable;
import org.apache.hadoop.io.Text;
@@ -395,7 +396,7 @@ public class KeyExtent implements Writab
public static Mutation getPrevRowUpdateMutation(KeyExtent ke) {
Mutation m = new Mutation(ke.getMetadataEntry());
- Constants.METADATA_PREV_ROW_COLUMN.put(m, encodePrevEndRow(ke.getPrevEndRow()));
+ MetadataTable.PREV_ROW_COLUMN.put(m, encodePrevEndRow(ke.getPrevEndRow()));
return m;
}
@@ -774,10 +775,10 @@ public class KeyExtent implements Writab
}
public boolean isMeta() {
- return getTableId().toString().equals(Constants.METADATA_TABLE_ID);
+ return getTableId().toString().equals(MetadataTable.ID);
}
public boolean isRootTablet() {
- return this.compareTo(Constants.ROOT_TABLET_EXTENT) == 0;
+ return this.compareTo(RootTable.ROOT_TABLET_EXTENT) == 0;
}
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java Wed Jun 19 15:57:11 2013
@@ -854,7 +854,7 @@ import org.slf4j.LoggerFactory;
struct.results = new ArrayList<TKeyValue>(_list16.size);
for (int _i17 = 0; _i17 < _list16.size; ++_i17)
{
- TKeyValue _elem18; // required
+ TKeyValue _elem18; // optional
_elem18 = new TKeyValue();
_elem18.read(iprot);
struct.results.add(_elem18);
@@ -882,7 +882,7 @@ import org.slf4j.LoggerFactory;
_val22 = new ArrayList<TRange>(_list23.size);
for (int _i24 = 0; _i24 < _list23.size; ++_i24)
{
- TRange _elem25; // required
+ TRange _elem25; // optional
_elem25 = new TRange();
_elem25.read(iprot);
_val22.add(_elem25);
@@ -905,7 +905,7 @@ import org.slf4j.LoggerFactory;
struct.fullScans = new ArrayList<TKeyExtent>(_list26.size);
for (int _i27 = 0; _i27 < _list26.size; ++_i27)
{
- TKeyExtent _elem28; // required
+ TKeyExtent _elem28; // optional
_elem28 = new TKeyExtent();
_elem28.read(iprot);
struct.fullScans.add(_elem28);
@@ -1124,7 +1124,7 @@ import org.slf4j.LoggerFactory;
struct.results = new ArrayList<TKeyValue>(_list37.size);
for (int _i38 = 0; _i38 < _list37.size; ++_i38)
{
- TKeyValue _elem39; // required
+ TKeyValue _elem39; // optional
_elem39 = new TKeyValue();
_elem39.read(iprot);
struct.results.add(_elem39);
@@ -1147,7 +1147,7 @@ import org.slf4j.LoggerFactory;
_val43 = new ArrayList<TRange>(_list44.size);
for (int _i45 = 0; _i45 < _list44.size; ++_i45)
{
- TRange _elem46; // required
+ TRange _elem46; // optional
_elem46 = new TRange();
_elem46.read(iprot);
_val43.add(_elem46);
@@ -1164,7 +1164,7 @@ import org.slf4j.LoggerFactory;
struct.fullScans = new ArrayList<TKeyExtent>(_list47.size);
for (int _i48 = 0; _i48 < _list47.size; ++_i48)
{
- TKeyExtent _elem49; // required
+ TKeyExtent _elem49; // optional
_elem49 = new TKeyExtent();
_elem49.read(iprot);
struct.fullScans.add(_elem49);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java Wed Jun 19 15:57:11 2013
@@ -436,7 +436,7 @@ import org.slf4j.LoggerFactory;
struct.results = new ArrayList<TKeyValue>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- TKeyValue _elem10; // required
+ TKeyValue _elem10; // optional
_elem10 = new TKeyValue();
_elem10.read(iprot);
struct.results.add(_elem10);
@@ -535,7 +535,7 @@ import org.slf4j.LoggerFactory;
struct.results = new ArrayList<TKeyValue>(_list13.size);
for (int _i14 = 0; _i14 < _list13.size; ++_i14)
{
- TKeyValue _elem15; // required
+ TKeyValue _elem15; // optional
_elem15 = new TKeyValue();
_elem15.read(iprot);
struct.results.add(_elem15);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java Wed Jun 19 15:57:11 2013
@@ -630,7 +630,7 @@ import org.slf4j.LoggerFactory;
struct.values = new ArrayList<ByteBuffer>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- ByteBuffer _elem2; // required
+ ByteBuffer _elem2; // optional
_elem2 = iprot.readBinary();
struct.values.add(_elem2);
}
@@ -758,7 +758,7 @@ import org.slf4j.LoggerFactory;
struct.values = new ArrayList<ByteBuffer>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- ByteBuffer _elem7; // required
+ ByteBuffer _elem7; // optional
_elem7 = iprot.readBinary();
struct.values.add(_elem7);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java Wed Jun 19 15:57:11 2013
@@ -584,7 +584,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list54.size);
for (int _i55 = 0; _i55 < _list54.size; ++_i55)
{
- TConstraintViolationSummary _elem56; // required
+ TConstraintViolationSummary _elem56; // optional
_elem56 = new TConstraintViolationSummary();
_elem56.read(iprot);
struct.violationSummaries.add(_elem56);
@@ -755,7 +755,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list71.size);
for (int _i72 = 0; _i72 < _list71.size; ++_i72)
{
- TConstraintViolationSummary _elem73; // required
+ TConstraintViolationSummary _elem73; // optional
_elem73 = new TConstraintViolationSummary();
_elem73.read(iprot);
struct.violationSummaries.add(_elem73);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java Wed Jun 19 15:57:11 2013
@@ -15517,7 +15517,7 @@ import org.slf4j.LoggerFactory;
struct.arguments = new ArrayList<ByteBuffer>(_list70.size);
for (int _i71 = 0; _i71 < _list70.size; ++_i71)
{
- ByteBuffer _elem72; // required
+ ByteBuffer _elem72; // optional
_elem72 = iprot.readBinary();
struct.arguments.add(_elem72);
}
@@ -15721,7 +15721,7 @@ import org.slf4j.LoggerFactory;
struct.arguments = new ArrayList<ByteBuffer>(_list81.size);
for (int _i82 = 0; _i82 < _list81.size; ++_i82)
{
- ByteBuffer _elem83; // required
+ ByteBuffer _elem83; // optional
_elem83 = iprot.readBinary();
struct.arguments.add(_elem83);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java Wed Jun 19 15:57:11 2013
@@ -1041,7 +1041,7 @@ import org.slf4j.LoggerFactory;
struct.tServerInfo = new ArrayList<TabletServerStatus>(_list22.size);
for (int _i23 = 0; _i23 < _list22.size; ++_i23)
{
- TabletServerStatus _elem24; // required
+ TabletServerStatus _elem24; // optional
_elem24 = new TabletServerStatus();
_elem24.read(iprot);
struct.tServerInfo.add(_elem24);
@@ -1104,7 +1104,7 @@ import org.slf4j.LoggerFactory;
struct.serversShuttingDown = new HashSet<String>(2*_set29.size);
for (int _i30 = 0; _i30 < _set29.size; ++_i30)
{
- String _elem31; // required
+ String _elem31; // optional
_elem31 = iprot.readString();
struct.serversShuttingDown.add(_elem31);
}
@@ -1122,7 +1122,7 @@ import org.slf4j.LoggerFactory;
struct.deadTabletServers = new ArrayList<DeadServer>(_list32.size);
for (int _i33 = 0; _i33 < _list32.size; ++_i33)
{
- DeadServer _elem34; // required
+ DeadServer _elem34; // optional
_elem34 = new DeadServer();
_elem34.read(iprot);
struct.deadTabletServers.add(_elem34);
@@ -1351,7 +1351,7 @@ import org.slf4j.LoggerFactory;
struct.tServerInfo = new ArrayList<TabletServerStatus>(_list49.size);
for (int _i50 = 0; _i50 < _list49.size; ++_i50)
{
- TabletServerStatus _elem51; // required
+ TabletServerStatus _elem51; // optional
_elem51 = new TabletServerStatus();
_elem51.read(iprot);
struct.tServerInfo.add(_elem51);
@@ -1392,7 +1392,7 @@ import org.slf4j.LoggerFactory;
struct.serversShuttingDown = new HashSet<String>(2*_set56.size);
for (int _i57 = 0; _i57 < _set56.size; ++_i57)
{
- String _elem58; // required
+ String _elem58; // optional
_elem58 = iprot.readString();
struct.serversShuttingDown.add(_elem58);
}
@@ -1405,7 +1405,7 @@ import org.slf4j.LoggerFactory;
struct.deadTabletServers = new ArrayList<DeadServer>(_list59.size);
for (int _i60 = 0; _i60 < _list59.size; ++_i60)
{
- DeadServer _elem61; // required
+ DeadServer _elem61; // optional
_elem61 = new DeadServer();
_elem61.read(iprot);
struct.deadTabletServers.add(_elem61);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Wed Jun 19 15:57:11 2013
@@ -1219,7 +1219,7 @@ import org.slf4j.LoggerFactory;
struct.logSorts = new ArrayList<RecoveryStatus>(_list4.size);
for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
- RecoveryStatus _elem6; // required
+ RecoveryStatus _elem6; // optional
_elem6 = new RecoveryStatus();
_elem6.read(iprot);
struct.logSorts.add(_elem6);
@@ -1462,7 +1462,7 @@ import org.slf4j.LoggerFactory;
struct.logSorts = new ArrayList<RecoveryStatus>(_list15.size);
for (int _i16 = 0; _i16 < _list15.size; ++_i16)
{
- RecoveryStatus _elem17; // required
+ RecoveryStatus _elem17; // optional
_elem17 = new RecoveryStatus();
_elem17.read(iprot);
struct.logSorts.add(_elem17);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Wed Jun 19 15:57:11 2013
@@ -448,7 +448,7 @@ import org.slf4j.LoggerFactory;
struct.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list62.size);
for (int _i63 = 0; _i63 < _list62.size; ++_i63)
{
- org.apache.accumulo.core.data.thrift.TKeyExtent _elem64; // required
+ org.apache.accumulo.core.data.thrift.TKeyExtent _elem64; // optional
_elem64 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
_elem64.read(iprot);
struct.newTablets.add(_elem64);
@@ -546,7 +546,7 @@ import org.slf4j.LoggerFactory;
struct.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list67.size);
for (int _i68 = 0; _i68 < _list67.size; ++_i68)
{
- org.apache.accumulo.core.data.thrift.TKeyExtent _elem69; // required
+ org.apache.accumulo.core.data.thrift.TKeyExtent _elem69; // optional
_elem69 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
_elem69.read(iprot);
struct.newTablets.add(_elem69);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java Wed Jun 19 15:57:11 2013
@@ -1231,7 +1231,7 @@ import org.slf4j.LoggerFactory;
struct.inputFiles = new ArrayList<String>(_list52.size);
for (int _i53 = 0; _i53 < _list52.size; ++_i53)
{
- String _elem54; // required
+ String _elem54; // optional
_elem54 = iprot.readString();
struct.inputFiles.add(_elem54);
}
@@ -1297,7 +1297,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list55.size);
for (int _i56 = 0; _i56 < _list55.size; ++_i56)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem57; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem57; // optional
_elem57 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem57.read(iprot);
struct.ssiList.add(_elem57);
@@ -1567,7 +1567,7 @@ import org.slf4j.LoggerFactory;
struct.inputFiles = new ArrayList<String>(_list74.size);
for (int _i75 = 0; _i75 < _list74.size; ++_i75)
{
- String _elem76; // required
+ String _elem76; // optional
_elem76 = iprot.readString();
struct.inputFiles.add(_elem76);
}
@@ -1604,7 +1604,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list77.size);
for (int _i78 = 0; _i78 < _list77.size; ++_i78)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem79; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem79; // optional
_elem79 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem79.read(iprot);
struct.ssiList.add(_elem79);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java Wed Jun 19 15:57:11 2013
@@ -1382,7 +1382,7 @@ import org.slf4j.LoggerFactory;
struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list8.size);
for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- org.apache.accumulo.core.data.thrift.TColumn _elem10; // required
+ org.apache.accumulo.core.data.thrift.TColumn _elem10; // optional
_elem10 = new org.apache.accumulo.core.data.thrift.TColumn();
_elem10.read(iprot);
struct.columns.add(_elem10);
@@ -1401,7 +1401,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list11.size);
for (int _i12 = 0; _i12 < _list11.size; ++_i12)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem13; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem13; // optional
_elem13 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem13.read(iprot);
struct.ssiList.add(_elem13);
@@ -1452,7 +1452,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list22.size);
for (int _i23 = 0; _i23 < _list22.size; ++_i23)
{
- ByteBuffer _elem24; // required
+ ByteBuffer _elem24; // optional
_elem24 = iprot.readBinary();
struct.authorizations.add(_elem24);
}
@@ -1739,7 +1739,7 @@ import org.slf4j.LoggerFactory;
struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size);
for (int _i36 = 0; _i36 < _list35.size; ++_i36)
{
- org.apache.accumulo.core.data.thrift.TColumn _elem37; // required
+ org.apache.accumulo.core.data.thrift.TColumn _elem37; // optional
_elem37 = new org.apache.accumulo.core.data.thrift.TColumn();
_elem37.read(iprot);
struct.columns.add(_elem37);
@@ -1753,7 +1753,7 @@ import org.slf4j.LoggerFactory;
struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size);
for (int _i39 = 0; _i39 < _list38.size; ++_i39)
{
- org.apache.accumulo.core.data.thrift.IterInfo _elem40; // required
+ org.apache.accumulo.core.data.thrift.IterInfo _elem40; // optional
_elem40 = new org.apache.accumulo.core.data.thrift.IterInfo();
_elem40.read(iprot);
struct.ssiList.add(_elem40);
@@ -1793,7 +1793,7 @@ import org.slf4j.LoggerFactory;
struct.authorizations = new ArrayList<ByteBuffer>(_list49.size);
for (int _i50 = 0; _i50 < _list49.size; ++_i50)
{
- ByteBuffer _elem51; // required
+ ByteBuffer _elem51; // optional
_elem51 = iprot.readBinary();
struct.authorizations.add(_elem51);
}
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java Wed Jun 19 15:57:11 2013
@@ -359,7 +359,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem2; // required
+ org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem2; // optional
_elem2 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
_elem2.read(iprot);
struct.violationSummaries.add(_elem2);
@@ -441,7 +441,7 @@ import org.slf4j.LoggerFactory;
struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list5.size);
for (int _i6 = 0; _i6 < _list5.size; ++_i6)
{
- org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem7; // required
+ org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem7; // optional
_elem7 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
_elem7.read(iprot);
struct.violationSummaries.add(_elem7);
Modified: accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java?rev=1494671&r1=1494670&r2=1494671&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (original)
+++ accumulo/branches/ACCUMULO-118/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java Wed Jun 19 15:57:11 2013
@@ -359,7 +359,7 @@ import org.slf4j.LoggerFactory;
struct.iterators = new ArrayList<TIteratorSetting>(_list98.size);
for (int _i99 = 0; _i99 < _list98.size; ++_i99)
{
- TIteratorSetting _elem100; // required
+ TIteratorSetting _elem100; // optional
_elem100 = new TIteratorSetting();
_elem100.read(iprot);
struct.iterators.add(_elem100);
@@ -441,7 +441,7 @@ import org.slf4j.LoggerFactory;
struct.iterators = new ArrayList<TIteratorSetting>(_list103.size);
for (int _i104 = 0; _i104 < _list103.size; ++_i104)
{
- TIteratorSetting _elem105; // required
+ TIteratorSetting _elem105; // optional
_elem105 = new TIteratorSetting();
_elem105.read(iprot);
struct.iterators.add(_elem105);