From c22e64e4bdb264296fccad50ecfcd95f412aad47 Mon Sep 17 00:00:00 2001 From: Dave Marion Date: Fri, 29 May 2026 21:35:44 +0000 Subject: [PATCH] Removed old monitor code, ManagerMonitorInfo This change removes the old monitor code from the Monitor module, removes ManagerMonitorInfo and DeadServerList from the Manager, and other related code that was unused elsewhere. --- .../org/apache/accumulo/core/Constants.java | 1 - .../core/clientImpl/ClientContext.java | 11 +- .../accumulo/core/lock/ServiceLockPaths.java | 26 +- .../core/manager/thrift/DeadServer.java | 716 -- .../core/manager/thrift/FateService.java | 76 +- .../manager/thrift/FateWorkerService.java | 72 +- .../manager/thrift/ManagerClientService.java | 10555 +++++++--------- .../manager/thrift/ManagerMonitorInfo.java | 1445 --- .../core/manager/thrift/TFatePartitions.java | 36 +- core/src/main/thrift/manager.thrift | 28 - .../core/lock/ServiceLockPathsTest.java | 126 - minicluster/pom.xml | 4 - .../MiniAccumuloClusterImpl.java | 21 - .../MiniAccumuloClusterImplTest.java | 45 - .../server/manager/state/DeadServerList.java | 111 - .../accumulo/server/util/TableInfoUtil.java | 83 - .../org/apache/accumulo/manager/Manager.java | 42 - .../manager/ManagerClientServiceHandler.java | 6 - .../manager/tserverOps/ShutdownTServer.java | 6 - .../manager/upgrade/Upgrader11to12.java | 4 +- .../org/apache/accumulo/monitor/Monitor.java | 444 - .../monitor/rest/SummaryInformation.java | 65 - .../accumulo/monitor/rest/XMLResource.java | 84 - .../rest/compactions/CompactionInfo.java | 50 - .../monitor/rest/compactions/Compactions.java | 42 - .../rest/compactions/CompactionsResource.java | 65 - .../rest/gc/GarbageCollectorResource.java | 50 - .../rest/gc/GarbageCollectorStats.java | 59 - .../rest/gc/GarbageCollectorStatus.java | 49 - .../rest/logs/DeadLoggerInformation.java | 54 - .../monitor/rest/scans/ScanInformation.java | 48 - .../accumulo/monitor/rest/scans/Scans.java | 42 - .../monitor/rest/scans/ScansResource.java | 76 - .../rest/statistics/StatisticsResource.java | 151 - .../monitor/rest/tables/CompactionsList.java | 44 - .../monitor/rest/tables/CompactionsTypes.java | 44 - .../monitor/rest/tables/TableInformation.java | 167 - .../rest/tables/TableInformationList.java | 42 - .../monitor/rest/tables/TableNamespace.java | 52 - .../monitor/rest/tables/TablesList.java | 42 - .../monitor/rest/tables/TablesResource.java | 197 - .../rest/trace/RecoveryStatusInformation.java | 60 - .../rest/tservers/AllTimeTabletResults.java | 63 - .../rest/tservers/CurrentOperations.java | 74 - .../rest/tservers/CurrentTabletResults.java | 44 - .../monitor/rest/tservers/ServerStat.java | 57 - .../monitor/rest/tservers/ServerStats.java | 42 - .../monitor/rest/tservers/TabletServer.java | 46 - .../TabletServerDetailInformation.java | 47 - .../tservers/TabletServerInformation.java | 170 - .../TabletServerRecoveryInformation.java | 50 - .../rest/tservers/TabletServerResource.java | 304 - .../rest/tservers/TabletServerSummary.java | 63 - .../monitor/rest/tservers/TabletServers.java | 52 - .../rest/tservers/TabletServersRecovery.java | 43 - .../monitor/resources/js/functions.js | 107 +- .../tservers/TabletServerInformationTest.java | 112 - .../org/apache/accumulo/test/BalanceIT.java | 4 +- .../accumulo/test/CountNameNodeOpsBulkIT.java | 5 +- .../test/DetectDeadTabletServersIT.java | 35 +- .../apache/accumulo/test/GetManagerStats.java | 124 - .../BalanceAfterCommsFailureIT.java | 43 +- .../BalanceInPresenceOfOfflineTableIT.java | 52 +- .../test/functional/MetadataMaxFilesIT.java | 29 +- .../functional/SimpleBalancerFairnessIT.java | 64 +- 65 files changed, 4849 insertions(+), 12122 deletions(-) delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java delete mode 100644 core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionInfo.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/Compactions.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStats.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java delete mode 100644 server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java delete mode 100644 server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java delete mode 100644 test/src/main/java/org/apache/accumulo/test/GetManagerStats.java diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java index bb6e49eda45..b4d8dedfacf 100644 --- a/core/src/main/java/org/apache/accumulo/core/Constants.java +++ b/core/src/main/java/org/apache/accumulo/core/Constants.java @@ -74,7 +74,6 @@ public class Constants { public static final String ZCOMPACTORS = "/compactors"; public static final String ZDEAD = "/dead"; - public static final String ZDEADTSERVERS = ZDEAD + "/tservers"; public static final String ZSHUTTING_DOWN_TSERVERS = "/shutting-down-tservers"; diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java index a51bcf0d980..33a633af69e 100644 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java @@ -1327,12 +1327,11 @@ public void clearTabletLocationCache() { } private static Set createPersistentWatcherPaths() { - return Set.of(Constants.ZCOMPACTORS, Constants.ZDEADTSERVERS, Constants.ZGC_LOCK, - Constants.ZMANAGER_LOCK, Constants.ZMINI_LOCK, Constants.ZMONITOR_LOCK, - Constants.ZNAMESPACES, Constants.ZRECOVERY, Constants.ZSSERVERS, Constants.ZTABLES, - Constants.ZTSERVERS, Constants.ZUSERS, RootTable.ZROOT_TABLET, Constants.ZTEST_LOCK, - Constants.ZMANAGER_ASSISTANT_LOCK, Constants.ZRESOURCEGROUPS, - Constants.ZMANAGER_ASSIGNMENTS); + return Set.of(Constants.ZCOMPACTORS, Constants.ZGC_LOCK, Constants.ZMANAGER_LOCK, + Constants.ZMINI_LOCK, Constants.ZMONITOR_LOCK, Constants.ZNAMESPACES, Constants.ZRECOVERY, + Constants.ZSSERVERS, Constants.ZTABLES, Constants.ZTSERVERS, Constants.ZUSERS, + RootTable.ZROOT_TABLET, Constants.ZTEST_LOCK, Constants.ZMANAGER_ASSISTANT_LOCK, + Constants.ZRESOURCEGROUPS, Constants.ZMANAGER_ASSIGNMENTS); } } diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java index 363f3cc4022..2bc97fb1f75 100644 --- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java +++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java @@ -104,11 +104,9 @@ private ServiceLockPath(String type, String content) { */ private ServiceLockPath(String type, ResourceGroupId resourceGroup, HostAndPort server) { this.type = requireNonNull(type); - Preconditions.checkArgument( - this.type.equals(Constants.ZCOMPACTORS) || this.type.equals(Constants.ZSSERVERS) - || this.type.equals(Constants.ZTSERVERS) || this.type.equals(Constants.ZDEADTSERVERS) - || this.type.equals(Constants.ZMANAGER_ASSISTANT_LOCK), - "Unsupported type: " + type); + Preconditions.checkArgument(this.type.equals(Constants.ZCOMPACTORS) + || this.type.equals(Constants.ZSSERVERS) || this.type.equals(Constants.ZTSERVERS) + || this.type.equals(Constants.ZMANAGER_ASSISTANT_LOCK), "Unsupported type: " + type); this.resourceGroup = requireNonNull(resourceGroup); this.server = requireNonNull(server).toString(); this.path = this.type + "/" + this.resourceGroup + "/" + this.server; @@ -186,8 +184,6 @@ private static String determineServerType(final String path) { return Constants.ZCOMPACTORS; } else if (pathStartsWith(path, Constants.ZSSERVERS)) { return Constants.ZSSERVERS; - } else if (pathStartsWith(path, Constants.ZDEADTSERVERS)) { - return Constants.ZDEADTSERVERS; } else if (pathStartsWith(path, Constants.ZTSERVERS)) { return Constants.ZTSERVERS; } else { @@ -223,7 +219,7 @@ public static ServiceLockPath parse(Optional serverType, String path) { return switch (type) { case Constants.ZMINI_LOCK -> new ServiceLockPath(type, server); case Constants.ZCOMPACTORS, Constants.ZSSERVERS, Constants.ZTSERVERS, - Constants.ZDEADTSERVERS, Constants.ZMANAGER_ASSISTANT_LOCK -> + Constants.ZMANAGER_ASSISTANT_LOCK -> new ServiceLockPath(type, ResourceGroupId.of(resourceGroup), HostAndPort.fromString(server)); default -> @@ -278,11 +274,6 @@ public ServiceLockPath createTabletServerPath(ResourceGroupId resourceGroup, return new ServiceLockPath(Constants.ZTSERVERS, resourceGroup, serverAddress); } - public ServiceLockPath createDeadTabletServerPath(ResourceGroupId resourceGroup, - HostAndPort serverAddress) { - return new ServiceLockPath(Constants.ZDEADTSERVERS, resourceGroup, serverAddress); - } - public ServiceLockPath createAdminLockPath() { return new ServiceLockPath(Constants.ZADMIN_LOCK); } @@ -356,11 +347,6 @@ public Set getTabletServer(ResourceGroupPredicate resourceGroup return get(Constants.ZTSERVERS, resourceGroupPredicate, address, withLock); } - public Set getDeadTabletServer(ResourceGroupPredicate resourceGroupPredicate, - AddressSelector address, boolean withLock) { - return get(Constants.ZDEADTSERVERS, resourceGroupPredicate, address, withLock); - } - public interface ResourceGroupPredicate extends Predicate { ResourceGroupPredicate ANY = rgid -> true; ResourceGroupPredicate DEFAULT_RG_ONLY = ResourceGroupId.DEFAULT::equals; @@ -445,7 +431,7 @@ private Set get(final String serverType, } } } else if (serverType.equals(Constants.ZCOMPACTORS) || serverType.equals(Constants.ZSSERVERS) - || serverType.equals(Constants.ZTSERVERS) || serverType.equals(Constants.ZDEADTSERVERS) + || serverType.equals(Constants.ZTSERVERS) || serverType.equals(Constants.ZMANAGER_ASSISTANT_LOCK)) { final List resourceGroups = zooCache.getChildren(typePath); for (final String group : resourceGroups) { @@ -484,7 +470,7 @@ private Set get(final String serverType, if (addressPredicate.test(server)) { final ServiceLockPath slp = parse(Optional.of(serverType), typePath + "/" + group + "/" + server); - if (!withLock || slp.getType().equals(Constants.ZDEADTSERVERS)) { + if (!withLock) { // Dead TServers don't have lock data results.add(slp); } else { diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java deleted file mode 100644 index 348185b5067..00000000000 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/DeadServer.java +++ /dev/null @@ -1,716 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Autogenerated by Thrift Compiler (0.17.0) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package org.apache.accumulo.core.manager.thrift; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -public class DeadServer implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DeadServer"); - - private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField LAST_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("lastStatus", org.apache.thrift.protocol.TType.I64, (short)2); - private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)4); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new DeadServerStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new DeadServerTupleSchemeFactory(); - - public @org.apache.thrift.annotation.Nullable java.lang.String server; // required - public long lastStatus; // required - public @org.apache.thrift.annotation.Nullable java.lang.String status; // required - public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SERVER((short)1, "server"), - LAST_STATUS((short)2, "lastStatus"), - STATUS((short)3, "status"), - RESOURCE_GROUP((short)4, "resourceGroup"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // SERVER - return SERVER; - case 2: // LAST_STATUS - return LAST_STATUS; - case 3: // STATUS - return STATUS; - case 4: // RESOURCE_GROUP - return RESOURCE_GROUP; - default: - return null; - } - } - - /** - * Find the _Fields constant that matches fieldId, throwing an exception - * if it is not found. - */ - public static _Fields findByThriftIdOrThrow(int fieldId) { - _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - @Override - public short getThriftFieldId() { - return _thriftId; - } - - @Override - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - private static final int __LASTSTATUS_ISSET_ID = 0; - private byte __isset_bitfield = 0; - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SERVER, new org.apache.thrift.meta_data.FieldMetaData("server", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.LAST_STATUS, new org.apache.thrift.meta_data.FieldMetaData("lastStatus", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.STATUS, new org.apache.thrift.meta_data.FieldMetaData("status", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DeadServer.class, metaDataMap); - } - - public DeadServer() { - } - - public DeadServer( - java.lang.String server, - long lastStatus, - java.lang.String status, - java.lang.String resourceGroup) - { - this(); - this.server = server; - this.lastStatus = lastStatus; - setLastStatusIsSet(true); - this.status = status; - this.resourceGroup = resourceGroup; - } - - /** - * Performs a deep copy on other. - */ - public DeadServer(DeadServer other) { - __isset_bitfield = other.__isset_bitfield; - if (other.isSetServer()) { - this.server = other.server; - } - this.lastStatus = other.lastStatus; - if (other.isSetStatus()) { - this.status = other.status; - } - if (other.isSetResourceGroup()) { - this.resourceGroup = other.resourceGroup; - } - } - - @Override - public DeadServer deepCopy() { - return new DeadServer(this); - } - - @Override - public void clear() { - this.server = null; - setLastStatusIsSet(false); - this.lastStatus = 0; - this.status = null; - this.resourceGroup = null; - } - - @org.apache.thrift.annotation.Nullable - public java.lang.String getServer() { - return this.server; - } - - public DeadServer setServer(@org.apache.thrift.annotation.Nullable java.lang.String server) { - this.server = server; - return this; - } - - public void unsetServer() { - this.server = null; - } - - /** Returns true if field server is set (has been assigned a value) and false otherwise */ - public boolean isSetServer() { - return this.server != null; - } - - public void setServerIsSet(boolean value) { - if (!value) { - this.server = null; - } - } - - public long getLastStatus() { - return this.lastStatus; - } - - public DeadServer setLastStatus(long lastStatus) { - this.lastStatus = lastStatus; - setLastStatusIsSet(true); - return this; - } - - public void unsetLastStatus() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTSTATUS_ISSET_ID); - } - - /** Returns true if field lastStatus is set (has been assigned a value) and false otherwise */ - public boolean isSetLastStatus() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTSTATUS_ISSET_ID); - } - - public void setLastStatusIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTSTATUS_ISSET_ID, value); - } - - @org.apache.thrift.annotation.Nullable - public java.lang.String getStatus() { - return this.status; - } - - public DeadServer setStatus(@org.apache.thrift.annotation.Nullable java.lang.String status) { - this.status = status; - return this; - } - - public void unsetStatus() { - this.status = null; - } - - /** Returns true if field status is set (has been assigned a value) and false otherwise */ - public boolean isSetStatus() { - return this.status != null; - } - - public void setStatusIsSet(boolean value) { - if (!value) { - this.status = null; - } - } - - @org.apache.thrift.annotation.Nullable - public java.lang.String getResourceGroup() { - return this.resourceGroup; - } - - public DeadServer setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { - this.resourceGroup = resourceGroup; - return this; - } - - public void unsetResourceGroup() { - this.resourceGroup = null; - } - - /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceGroup() { - return this.resourceGroup != null; - } - - public void setResourceGroupIsSet(boolean value) { - if (!value) { - this.resourceGroup = null; - } - } - - @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { - switch (field) { - case SERVER: - if (value == null) { - unsetServer(); - } else { - setServer((java.lang.String)value); - } - break; - - case LAST_STATUS: - if (value == null) { - unsetLastStatus(); - } else { - setLastStatus((java.lang.Long)value); - } - break; - - case STATUS: - if (value == null) { - unsetStatus(); - } else { - setStatus((java.lang.String)value); - } - break; - - case RESOURCE_GROUP: - if (value == null) { - unsetResourceGroup(); - } else { - setResourceGroup((java.lang.String)value); - } - break; - - } - } - - @org.apache.thrift.annotation.Nullable - @Override - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case SERVER: - return getServer(); - - case LAST_STATUS: - return getLastStatus(); - - case STATUS: - return getStatus(); - - case RESOURCE_GROUP: - return getResourceGroup(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - @Override - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case SERVER: - return isSetServer(); - case LAST_STATUS: - return isSetLastStatus(); - case STATUS: - return isSetStatus(); - case RESOURCE_GROUP: - return isSetResourceGroup(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that instanceof DeadServer) - return this.equals((DeadServer)that); - return false; - } - - public boolean equals(DeadServer that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_server = true && this.isSetServer(); - boolean that_present_server = true && that.isSetServer(); - if (this_present_server || that_present_server) { - if (!(this_present_server && that_present_server)) - return false; - if (!this.server.equals(that.server)) - return false; - } - - boolean this_present_lastStatus = true; - boolean that_present_lastStatus = true; - if (this_present_lastStatus || that_present_lastStatus) { - if (!(this_present_lastStatus && that_present_lastStatus)) - return false; - if (this.lastStatus != that.lastStatus) - return false; - } - - boolean this_present_status = true && this.isSetStatus(); - boolean that_present_status = true && that.isSetStatus(); - if (this_present_status || that_present_status) { - if (!(this_present_status && that_present_status)) - return false; - if (!this.status.equals(that.status)) - return false; - } - - boolean this_present_resourceGroup = true && this.isSetResourceGroup(); - boolean that_present_resourceGroup = true && that.isSetResourceGroup(); - if (this_present_resourceGroup || that_present_resourceGroup) { - if (!(this_present_resourceGroup && that_present_resourceGroup)) - return false; - if (!this.resourceGroup.equals(that.resourceGroup)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetServer()) ? 131071 : 524287); - if (isSetServer()) - hashCode = hashCode * 8191 + server.hashCode(); - - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastStatus); - - hashCode = hashCode * 8191 + ((isSetStatus()) ? 131071 : 524287); - if (isSetStatus()) - hashCode = hashCode * 8191 + status.hashCode(); - - hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287); - if (isSetResourceGroup()) - hashCode = hashCode * 8191 + resourceGroup.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(DeadServer other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.compare(isSetServer(), other.isSetServer()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetServer()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.server, other.server); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetLastStatus(), other.isSetLastStatus()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetLastStatus()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastStatus, other.lastStatus); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetStatus(), other.isSetStatus()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetStatus()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetResourceGroup()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup); - if (lastComparison != 0) { - return lastComparison; - } - } - return 0; - } - - @org.apache.thrift.annotation.Nullable - @Override - public _Fields fieldForId(int fieldId) { - return _Fields.findByThriftId(fieldId); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - scheme(iprot).read(iprot, this); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("DeadServer("); - boolean first = true; - - sb.append("server:"); - if (this.server == null) { - sb.append("null"); - } else { - sb.append(this.server); - } - first = false; - if (!first) sb.append(", "); - sb.append("lastStatus:"); - sb.append(this.lastStatus); - first = false; - if (!first) sb.append(", "); - sb.append("status:"); - if (this.status == null) { - sb.append("null"); - } else { - sb.append(this.status); - } - first = false; - if (!first) sb.append(", "); - sb.append("resourceGroup:"); - if (this.resourceGroup == null) { - sb.append("null"); - } else { - sb.append(this.resourceGroup); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - // check for sub-struct validity - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { - try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private static class DeadServerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public DeadServerStandardScheme getScheme() { - return new DeadServerStandardScheme(); - } - } - - private static class DeadServerStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, DeadServer struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; - iprot.readStructBegin(); - while (true) - { - schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (schemeField.id) { - case 1: // SERVER - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.server = iprot.readString(); - struct.setServerIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // LAST_STATUS - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.lastStatus = iprot.readI64(); - struct.setLastStatusIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // STATUS - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.status = iprot.readString(); - struct.setStatusIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // RESOURCE_GROUP - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, DeadServer struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.server != null) { - oprot.writeFieldBegin(SERVER_FIELD_DESC); - oprot.writeString(struct.server); - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(LAST_STATUS_FIELD_DESC); - oprot.writeI64(struct.lastStatus); - oprot.writeFieldEnd(); - if (struct.status != null) { - oprot.writeFieldBegin(STATUS_FIELD_DESC); - oprot.writeString(struct.status); - oprot.writeFieldEnd(); - } - if (struct.resourceGroup != null) { - oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC); - oprot.writeString(struct.resourceGroup); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class DeadServerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public DeadServerTupleScheme getScheme() { - return new DeadServerTupleScheme(); - } - } - - private static class DeadServerTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, DeadServer struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetServer()) { - optionals.set(0); - } - if (struct.isSetLastStatus()) { - optionals.set(1); - } - if (struct.isSetStatus()) { - optionals.set(2); - } - if (struct.isSetResourceGroup()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); - if (struct.isSetServer()) { - oprot.writeString(struct.server); - } - if (struct.isSetLastStatus()) { - oprot.writeI64(struct.lastStatus); - } - if (struct.isSetStatus()) { - oprot.writeString(struct.status); - } - if (struct.isSetResourceGroup()) { - oprot.writeString(struct.resourceGroup); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, DeadServer struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); - if (incoming.get(0)) { - struct.server = iprot.readString(); - struct.setServerIsSet(true); - } - if (incoming.get(1)) { - struct.lastStatus = iprot.readI64(); - struct.setLastStatusIsSet(true); - } - if (incoming.get(2)) { - struct.status = iprot.readString(); - struct.setStatusIsSet(true); - } - if (incoming.get(3)) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - private static void unusedMethod() {} -} - diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java index 5fbeeb4276c..c308cdaec9e 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java @@ -3182,13 +3182,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeFateOperatio case 5: // ARGUMENTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list78 = iprot.readListBegin(); - struct.arguments = new java.util.ArrayList(_list78.size); - @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem79; - for (int _i80 = 0; _i80 < _list78.size; ++_i80) + org.apache.thrift.protocol.TList _list34 = iprot.readListBegin(); + struct.arguments = new java.util.ArrayList(_list34.size); + @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem35; + for (int _i36 = 0; _i36 < _list34.size; ++_i36) { - _elem79 = iprot.readBinary(); - struct.arguments.add(_elem79); + _elem35 = iprot.readBinary(); + struct.arguments.add(_elem35); } iprot.readListEnd(); } @@ -3200,15 +3200,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeFateOperatio case 6: // OPTIONS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map81 = iprot.readMapBegin(); - struct.options = new java.util.HashMap(2*_map81.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key82; - @org.apache.thrift.annotation.Nullable java.lang.String _val83; - for (int _i84 = 0; _i84 < _map81.size; ++_i84) + org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin(); + struct.options = new java.util.HashMap(2*_map37.size); + @org.apache.thrift.annotation.Nullable java.lang.String _key38; + @org.apache.thrift.annotation.Nullable java.lang.String _val39; + for (int _i40 = 0; _i40 < _map37.size; ++_i40) { - _key82 = iprot.readString(); - _val83 = iprot.readString(); - struct.options.put(_key82, _val83); + _key38 = iprot.readString(); + _val39 = iprot.readString(); + struct.options.put(_key38, _val39); } iprot.readMapEnd(); } @@ -3265,9 +3265,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeFateOperati oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.arguments.size())); - for (java.nio.ByteBuffer _iter85 : struct.arguments) + for (java.nio.ByteBuffer _iter41 : struct.arguments) { - oprot.writeBinary(_iter85); + oprot.writeBinary(_iter41); } oprot.writeListEnd(); } @@ -3277,10 +3277,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, executeFateOperati oprot.writeFieldBegin(OPTIONS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.options.size())); - for (java.util.Map.Entry _iter86 : struct.options.entrySet()) + for (java.util.Map.Entry _iter42 : struct.options.entrySet()) { - oprot.writeString(_iter86.getKey()); - oprot.writeString(_iter86.getValue()); + oprot.writeString(_iter42.getKey()); + oprot.writeString(_iter42.getValue()); } oprot.writeMapEnd(); } @@ -3345,19 +3345,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, executeFateOperatio if (struct.isSetArguments()) { { oprot.writeI32(struct.arguments.size()); - for (java.nio.ByteBuffer _iter87 : struct.arguments) + for (java.nio.ByteBuffer _iter43 : struct.arguments) { - oprot.writeBinary(_iter87); + oprot.writeBinary(_iter43); } } } if (struct.isSetOptions()) { { oprot.writeI32(struct.options.size()); - for (java.util.Map.Entry _iter88 : struct.options.entrySet()) + for (java.util.Map.Entry _iter44 : struct.options.entrySet()) { - oprot.writeString(_iter88.getKey()); - oprot.writeString(_iter88.getValue()); + oprot.writeString(_iter44.getKey()); + oprot.writeString(_iter44.getValue()); } } } @@ -3391,28 +3391,28 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executeFateOperation } if (incoming.get(4)) { { - org.apache.thrift.protocol.TList _list89 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); - struct.arguments = new java.util.ArrayList(_list89.size); - @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem90; - for (int _i91 = 0; _i91 < _list89.size; ++_i91) + org.apache.thrift.protocol.TList _list45 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); + struct.arguments = new java.util.ArrayList(_list45.size); + @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem46; + for (int _i47 = 0; _i47 < _list45.size; ++_i47) { - _elem90 = iprot.readBinary(); - struct.arguments.add(_elem90); + _elem46 = iprot.readBinary(); + struct.arguments.add(_elem46); } } struct.setArgumentsIsSet(true); } if (incoming.get(5)) { { - org.apache.thrift.protocol.TMap _map92 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); - struct.options = new java.util.HashMap(2*_map92.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key93; - @org.apache.thrift.annotation.Nullable java.lang.String _val94; - for (int _i95 = 0; _i95 < _map92.size; ++_i95) + org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); + struct.options = new java.util.HashMap(2*_map48.size); + @org.apache.thrift.annotation.Nullable java.lang.String _key49; + @org.apache.thrift.annotation.Nullable java.lang.String _val50; + for (int _i51 = 0; _i51 < _map48.size; ++_i51) { - _key93 = iprot.readString(); - _val94 = iprot.readString(); - struct.options.put(_key93, _val94); + _key49 = iprot.readString(); + _val50 = iprot.readString(); + struct.options.put(_key49, _val50); } } struct.setOptionsIsSet(true); diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java index 7cfbb74d300..b2b859df0cc 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateWorkerService.java @@ -2224,14 +2224,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setPartitions_args case 4: // DESIRED if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list138 = iprot.readListBegin(); - struct.desired = new java.util.ArrayList(_list138.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem139; - for (int _i140 = 0; _i140 < _list138.size; ++_i140) + org.apache.thrift.protocol.TList _list94 = iprot.readListBegin(); + struct.desired = new java.util.ArrayList(_list94.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem95; + for (int _i96 = 0; _i96 < _list94.size; ++_i96) { - _elem139 = new TFatePartition(); - _elem139.read(iprot); - struct.desired.add(_elem139); + _elem95 = new TFatePartition(); + _elem95.read(iprot); + struct.desired.add(_elem95); } iprot.readListEnd(); } @@ -2273,9 +2273,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setPartitions_args oprot.writeFieldBegin(DESIRED_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.desired.size())); - for (TFatePartition _iter141 : struct.desired) + for (TFatePartition _iter97 : struct.desired) { - _iter141.write(oprot); + _iter97.write(oprot); } oprot.writeListEnd(); } @@ -2325,9 +2325,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setPartitions_args if (struct.isSetDesired()) { { oprot.writeI32(struct.desired.size()); - for (TFatePartition _iter142 : struct.desired) + for (TFatePartition _iter98 : struct.desired) { - _iter142.write(oprot); + _iter98.write(oprot); } } } @@ -2353,14 +2353,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setPartitions_args s } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list143 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.desired = new java.util.ArrayList(_list143.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem144; - for (int _i145 = 0; _i145 < _list143.size; ++_i145) + org.apache.thrift.protocol.TList _list99 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.desired = new java.util.ArrayList(_list99.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem100; + for (int _i101 = 0; _i101 < _list99.size; ++_i101) { - _elem144 = new TFatePartition(); - _elem144.read(iprot); - struct.desired.add(_elem144); + _elem100 = new TFatePartition(); + _elem100.read(iprot); + struct.desired.add(_elem100); } } struct.setDesiredIsSet(true); @@ -3373,14 +3373,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, seeded_args struct) case 3: // TPARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list146 = iprot.readListBegin(); - struct.tpartitions = new java.util.ArrayList(_list146.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem147; - for (int _i148 = 0; _i148 < _list146.size; ++_i148) + org.apache.thrift.protocol.TList _list102 = iprot.readListBegin(); + struct.tpartitions = new java.util.ArrayList(_list102.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem103; + for (int _i104 = 0; _i104 < _list102.size; ++_i104) { - _elem147 = new TFatePartition(); - _elem147.read(iprot); - struct.tpartitions.add(_elem147); + _elem103 = new TFatePartition(); + _elem103.read(iprot); + struct.tpartitions.add(_elem103); } iprot.readListEnd(); } @@ -3419,9 +3419,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, seeded_args struct oprot.writeFieldBegin(TPARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tpartitions.size())); - for (TFatePartition _iter149 : struct.tpartitions) + for (TFatePartition _iter105 : struct.tpartitions) { - _iter149.write(oprot); + _iter105.write(oprot); } oprot.writeListEnd(); } @@ -3465,9 +3465,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, seeded_args struct) if (struct.isSetTpartitions()) { { oprot.writeI32(struct.tpartitions.size()); - for (TFatePartition _iter150 : struct.tpartitions) + for (TFatePartition _iter106 : struct.tpartitions) { - _iter150.write(oprot); + _iter106.write(oprot); } } } @@ -3489,14 +3489,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, seeded_args struct) } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list151 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.tpartitions = new java.util.ArrayList(_list151.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem152; - for (int _i153 = 0; _i153 < _list151.size; ++_i153) + org.apache.thrift.protocol.TList _list107 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.tpartitions = new java.util.ArrayList(_list107.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem108; + for (int _i109 = 0; _i109 < _list107.size; ++_i109) { - _elem152 = new TFatePartition(); - _elem152.read(iprot); - struct.tpartitions.add(_elem152); + _elem108 = new TFatePartition(); + _elem108.read(iprot); + struct.tpartitions.add(_elem108); } } struct.setTpartitionsIsSet(true); diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java index 0455f9be21a..59fdd092e9b 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerClientService.java @@ -69,8 +69,6 @@ public interface Iface { public void removeResourceGroupProperty(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException, org.apache.thrift.TException; - public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException; - public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException; public void reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String serverName, TabletLoadState status, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet) throws org.apache.thrift.TException; @@ -131,8 +129,6 @@ public interface AsyncIface { public void removeResourceGroupProperty(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, java.lang.String property, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void reportTabletStatus(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String serverName, TabletLoadState status, org.apache.accumulo.core.dataImpl.thrift.TKeyExtent tablet, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -847,37 +843,6 @@ public void recv_removeResourceGroupProperty() throws org.apache.accumulo.core.c return; } - @Override - public ManagerMonitorInfo getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException - { - send_getManagerStats(tinfo, credentials); - return recv_getManagerStats(); - } - - public void send_getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) throws org.apache.thrift.TException - { - getManagerStats_args args = new getManagerStats_args(); - args.setTinfo(tinfo); - args.setCredentials(credentials); - sendBase("getManagerStats", args); - } - - public ManagerMonitorInfo recv_getManagerStats() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException - { - getManagerStats_result result = new getManagerStats_result(); - receiveBase(result, "getManagerStats"); - if (result.isSetSuccess()) { - return result.success; - } - if (result.sec != null) { - throw result.sec; - } - if (result.tnase != null) { - throw result.tnase; - } - throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getManagerStats failed: unknown result"); - } - @Override public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) throws org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException { @@ -2026,44 +1991,6 @@ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.Thrift } } - @Override - public void getManagerStats(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - checkReady(); - getManagerStats_call method_call = new getManagerStats_call(tinfo, credentials, resultHandler, this, ___protocolFactory, ___transport); - this.___currentMethod = method_call; - ___manager.call(method_call); - } - - public static class getManagerStats_call extends org.apache.thrift.async.TAsyncMethodCall { - private org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; - private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; - public getManagerStats_call(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { - super(client, protocolFactory, transport, resultHandler, false); - this.tinfo = tinfo; - this.credentials = credentials; - } - - @Override - public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getManagerStats", org.apache.thrift.protocol.TMessageType.CALL, 0)); - getManagerStats_args args = new getManagerStats_args(); - args.setTinfo(tinfo); - args.setCredentials(credentials); - args.write(prot); - prot.writeMessageEnd(); - } - - @Override - public ManagerMonitorInfo getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException { - if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) { - throw new java.lang.IllegalStateException("Method call not finished!"); - } - org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array()); - org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport); - return (new Client(prot)).recv_getManagerStats(); - } - } - @Override public void waitForBalance(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); @@ -2428,7 +2355,6 @@ protected Processor(I iface, java.util.Map extends org.apache.thrift.ProcessFunction { - public getManagerStats() { - super("getManagerStats"); - } - - @Override - public getManagerStats_args getEmptyArgsInstance() { - return new getManagerStats_args(); - } - - @Override - protected boolean isOneway() { - return false; - } - - @Override - protected boolean rethrowUnhandledExceptions() { - return false; - } - - @Override - public getManagerStats_result getResult(I iface, getManagerStats_args args) throws org.apache.thrift.TException { - getManagerStats_result result = new getManagerStats_result(); - try { - result.success = iface.getManagerStats(args.tinfo, args.credentials); - } catch (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { - result.sec = sec; - } catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { - result.tnase = tnase; - } - return result; - } - } - public static class waitForBalance extends org.apache.thrift.ProcessFunction { public waitForBalance() { super("waitForBalance"); @@ -3504,7 +3396,6 @@ protected AsyncProcessor(I iface, java.util.Map extends org.apache.thrift.AsyncProcessFunction { - public getManagerStats() { - super("getManagerStats"); + public static class waitForBalance extends org.apache.thrift.AsyncProcessFunction { + public waitForBalance() { + super("waitForBalance"); } @Override - public getManagerStats_args getEmptyArgsInstance() { - return new getManagerStats_args(); + public waitForBalance_args getEmptyArgsInstance() { + return new waitForBalance_args(); } @Override - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { @Override - public void onComplete(ManagerMonitorInfo o) { - getManagerStats_result result = new getManagerStats_result(); - result.success = o; + public void onComplete(Void o) { + waitForBalance_result result = new waitForBalance_result(); try { fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); } catch (org.apache.thrift.transport.TTransportException e) { @@ -5126,12 +5016,8 @@ public void onComplete(ManagerMonitorInfo o) { public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; - getManagerStats_result result = new getManagerStats_result(); - if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { - result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; - result.setSecIsSet(true); - msg = result; - } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { + waitForBalance_result result = new waitForBalance_result(); + if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; result.setTnaseIsSet(true); msg = result; @@ -5164,19 +5050,19 @@ protected boolean isOneway() { } @Override - public void start(I iface, getManagerStats_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.getManagerStats(args.tinfo, args.credentials,resultHandler); + public void start(I iface, waitForBalance_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + iface.waitForBalance(args.tinfo,resultHandler); } } - public static class waitForBalance extends org.apache.thrift.AsyncProcessFunction { - public waitForBalance() { - super("waitForBalance"); + public static class reportTabletStatus extends org.apache.thrift.AsyncProcessFunction { + public reportTabletStatus() { + super("reportTabletStatus"); } @Override - public waitForBalance_args getEmptyArgsInstance() { - return new waitForBalance_args(); + public reportTabletStatus_args getEmptyArgsInstance() { + return new reportTabletStatus_args(); } @Override @@ -5185,7 +5071,48 @@ public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final return new org.apache.thrift.async.AsyncMethodCallback() { @Override public void onComplete(Void o) { - waitForBalance_result result = new waitForBalance_result(); + } + @Override + public void onError(java.lang.Exception e) { + if (e instanceof org.apache.thrift.transport.TTransportException) { + _LOGGER.error("TTransportException inside handler", e); + fb.close(); + } else { + _LOGGER.error("Exception inside oneway handler", e); + } + } + }; + } + + @Override + protected boolean isOneway() { + return true; + } + + @Override + public void start(I iface, reportTabletStatus_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + iface.reportTabletStatus(args.tinfo, args.credentials, args.serverName, args.status, args.tablet,resultHandler); + } + } + + public static class getActiveTservers extends org.apache.thrift.AsyncProcessFunction> { + public getActiveTservers() { + super("getActiveTservers"); + } + + @Override + public getActiveTservers_args getEmptyArgsInstance() { + return new getActiveTservers_args(); + } + + @Override + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + final org.apache.thrift.AsyncProcessFunction fcall = this; + return new org.apache.thrift.async.AsyncMethodCallback>() { + @Override + public void onComplete(java.util.List o) { + getActiveTservers_result result = new getActiveTservers_result(); + result.success = o; try { fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); } catch (org.apache.thrift.transport.TTransportException e) { @@ -5200,8 +5127,12 @@ public void onComplete(Void o) { public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; - waitForBalance_result result = new waitForBalance_result(); - if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { + getActiveTservers_result result = new getActiveTservers_result(); + if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { + result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; + result.setSecIsSet(true); + msg = result; + } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; result.setTnaseIsSet(true); msg = result; @@ -5234,35 +5165,70 @@ protected boolean isOneway() { } @Override - public void start(I iface, waitForBalance_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.waitForBalance(args.tinfo,resultHandler); + public void start(I iface, getActiveTservers_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { + iface.getActiveTservers(args.tinfo, args.credentials,resultHandler); } } - public static class reportTabletStatus extends org.apache.thrift.AsyncProcessFunction { - public reportTabletStatus() { - super("reportTabletStatus"); + public static class getDelegationToken extends org.apache.thrift.AsyncProcessFunction { + public getDelegationToken() { + super("getDelegationToken"); } @Override - public reportTabletStatus_args getEmptyArgsInstance() { - return new reportTabletStatus_args(); + public getDelegationToken_args getEmptyArgsInstance() { + return new getDelegationToken_args(); } @Override - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { @Override - public void onComplete(Void o) { + public void onComplete(org.apache.accumulo.core.securityImpl.thrift.TDelegationToken o) { + getDelegationToken_result result = new getDelegationToken_result(); + result.success = o; + try { + fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); + } catch (org.apache.thrift.transport.TTransportException e) { + _LOGGER.error("TTransportException writing to internal frame buffer", e); + fb.close(); + } catch (java.lang.Exception e) { + _LOGGER.error("Exception writing to internal frame buffer", e); + onError(e); + } } @Override public void onError(java.lang.Exception e) { - if (e instanceof org.apache.thrift.transport.TTransportException) { + byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; + org.apache.thrift.TSerializable msg; + getDelegationToken_result result = new getDelegationToken_result(); + if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { + result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; + result.setSecIsSet(true); + msg = result; + } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { + result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; + result.setTnaseIsSet(true); + msg = result; + } else if (e instanceof org.apache.thrift.transport.TTransportException) { _LOGGER.error("TTransportException inside handler", e); fb.close(); + return; + } else if (e instanceof org.apache.thrift.TApplicationException) { + _LOGGER.error("TApplicationException inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = (org.apache.thrift.TApplicationException)e; } else { - _LOGGER.error("Exception inside oneway handler", e); + _LOGGER.error("Exception inside handler", e); + msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; + msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); + } + try { + fcall.sendResponse(fb,msg,msgType,seqid); + } catch (java.lang.Exception ex) { + _LOGGER.error("Exception writing to internal frame buffer", ex); + fb.close(); } } }; @@ -5270,33 +5236,32 @@ public void onError(java.lang.Exception e) { @Override protected boolean isOneway() { - return true; + return false; } @Override - public void start(I iface, reportTabletStatus_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.reportTabletStatus(args.tinfo, args.credentials, args.serverName, args.status, args.tablet,resultHandler); + public void start(I iface, getDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + iface.getDelegationToken(args.tinfo, args.credentials, args.cfg,resultHandler); } } - public static class getActiveTservers extends org.apache.thrift.AsyncProcessFunction> { - public getActiveTservers() { - super("getActiveTservers"); + public static class requestTabletHosting extends org.apache.thrift.AsyncProcessFunction { + public requestTabletHosting() { + super("requestTabletHosting"); } @Override - public getActiveTservers_args getEmptyArgsInstance() { - return new getActiveTservers_args(); + public requestTabletHosting_args getEmptyArgsInstance() { + return new requestTabletHosting_args(); } @Override - public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback>() { + return new org.apache.thrift.async.AsyncMethodCallback() { @Override - public void onComplete(java.util.List o) { - getActiveTservers_result result = new getActiveTservers_result(); - result.success = o; + public void onComplete(Void o) { + requestTabletHosting_result result = new requestTabletHosting_result(); try { fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); } catch (org.apache.thrift.transport.TTransportException e) { @@ -5311,11 +5276,15 @@ public void onComplete(java.util.List o) { public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; - getActiveTservers_result result = new getActiveTservers_result(); + requestTabletHosting_result result = new requestTabletHosting_result(); if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; result.setSecIsSet(true); msg = result; + } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) { + result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e; + result.setToeIsSet(true); + msg = result; } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; result.setTnaseIsSet(true); @@ -5349,28 +5318,28 @@ protected boolean isOneway() { } @Override - public void start(I iface, getActiveTservers_args args, org.apache.thrift.async.AsyncMethodCallback> resultHandler) throws org.apache.thrift.TException { - iface.getActiveTservers(args.tinfo, args.credentials,resultHandler); + public void start(I iface, requestTabletHosting_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + iface.requestTabletHosting(args.tinfo, args.credentials, args.tableId, args.extents,resultHandler); } } - public static class getDelegationToken extends org.apache.thrift.AsyncProcessFunction { - public getDelegationToken() { - super("getDelegationToken"); + public static class updateTabletMergeability extends org.apache.thrift.AsyncProcessFunction> { + public updateTabletMergeability() { + super("updateTabletMergeability"); } @Override - public getDelegationToken_args getEmptyArgsInstance() { - return new getDelegationToken_args(); + public updateTabletMergeability_args getEmptyArgsInstance() { + return new updateTabletMergeability_args(); } @Override - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { + public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback>() { @Override - public void onComplete(org.apache.accumulo.core.securityImpl.thrift.TDelegationToken o) { - getDelegationToken_result result = new getDelegationToken_result(); + public void onComplete(java.util.List o) { + updateTabletMergeability_result result = new updateTabletMergeability_result(); result.success = o; try { fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); @@ -5386,167 +5355,14 @@ public void onComplete(org.apache.accumulo.core.securityImpl.thrift.TDelegationT public void onError(java.lang.Exception e) { byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; org.apache.thrift.TSerializable msg; - getDelegationToken_result result = new getDelegationToken_result(); + updateTabletMergeability_result result = new updateTabletMergeability_result(); if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; result.setSecIsSet(true); - msg = result; - } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { - result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; - result.setTnaseIsSet(true); - msg = result; - } else if (e instanceof org.apache.thrift.transport.TTransportException) { - _LOGGER.error("TTransportException inside handler", e); - fb.close(); - return; - } else if (e instanceof org.apache.thrift.TApplicationException) { - _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException)e; - } else { - _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); - } - try { - fcall.sendResponse(fb,msg,msgType,seqid); - } catch (java.lang.Exception ex) { - _LOGGER.error("Exception writing to internal frame buffer", ex); - fb.close(); - } - } - }; - } - - @Override - protected boolean isOneway() { - return false; - } - - @Override - public void start(I iface, getDelegationToken_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.getDelegationToken(args.tinfo, args.credentials, args.cfg,resultHandler); - } - } - - public static class requestTabletHosting extends org.apache.thrift.AsyncProcessFunction { - public requestTabletHosting() { - super("requestTabletHosting"); - } - - @Override - public requestTabletHosting_args getEmptyArgsInstance() { - return new requestTabletHosting_args(); - } - - @Override - public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { - @Override - public void onComplete(Void o) { - requestTabletHosting_result result = new requestTabletHosting_result(); - try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - } catch (org.apache.thrift.transport.TTransportException e) { - _LOGGER.error("TTransportException writing to internal frame buffer", e); - fb.close(); - } catch (java.lang.Exception e) { - _LOGGER.error("Exception writing to internal frame buffer", e); - onError(e); - } - } - @Override - public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; - requestTabletHosting_result result = new requestTabletHosting_result(); - if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { - result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; - result.setSecIsSet(true); - msg = result; - } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) { - result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e; - result.setToeIsSet(true); - msg = result; - } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { - result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; - result.setTnaseIsSet(true); - msg = result; - } else if (e instanceof org.apache.thrift.transport.TTransportException) { - _LOGGER.error("TTransportException inside handler", e); - fb.close(); - return; - } else if (e instanceof org.apache.thrift.TApplicationException) { - _LOGGER.error("TApplicationException inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = (org.apache.thrift.TApplicationException)e; - } else { - _LOGGER.error("Exception inside handler", e); - msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION; - msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage()); - } - try { - fcall.sendResponse(fb,msg,msgType,seqid); - } catch (java.lang.Exception ex) { - _LOGGER.error("Exception writing to internal frame buffer", ex); - fb.close(); - } - } - }; - } - - @Override - protected boolean isOneway() { - return false; - } - - @Override - public void start(I iface, requestTabletHosting_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.requestTabletHosting(args.tinfo, args.credentials, args.tableId, args.extents,resultHandler); - } - } - - public static class updateTabletMergeability extends org.apache.thrift.AsyncProcessFunction> { - public updateTabletMergeability() { - super("updateTabletMergeability"); - } - - @Override - public updateTabletMergeability_args getEmptyArgsInstance() { - return new updateTabletMergeability_args(); - } - - @Override - public org.apache.thrift.async.AsyncMethodCallback> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { - final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback>() { - @Override - public void onComplete(java.util.List o) { - updateTabletMergeability_result result = new updateTabletMergeability_result(); - result.success = o; - try { - fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid); - } catch (org.apache.thrift.transport.TTransportException e) { - _LOGGER.error("TTransportException writing to internal frame buffer", e); - fb.close(); - } catch (java.lang.Exception e) { - _LOGGER.error("Exception writing to internal frame buffer", e); - onError(e); - } - } - @Override - public void onError(java.lang.Exception e) { - byte msgType = org.apache.thrift.protocol.TMessageType.REPLY; - org.apache.thrift.TSerializable msg; - updateTabletMergeability_result result = new updateTabletMergeability_result(); - if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) { - result.sec = (org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException) e; - result.setSecIsSet(true); - msg = result; - } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) { - result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e; - result.setToeIsSet(true); + msg = result; + } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) { + result.toe = (org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException) e; + result.setToeIsSet(true); msg = result; } else if (e instanceof org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) { result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e; @@ -6569,1695 +6385,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public initiateFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { - this.tnase = tnase; - return this; - } - - public void unsetTnase() { - this.tnase = null; - } - - /** Returns true if field tnase is set (has been assigned a value) and false otherwise */ - public boolean isSetTnase() { - return this.tnase != null; - } - - public void setTnaseIsSet(boolean value) { - if (!value) { - this.tnase = null; - } - } - - @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { - switch (field) { - case SUCCESS: - if (value == null) { - unsetSuccess(); - } else { - setSuccess((java.lang.Long)value); - } - break; - - case SEC: - if (value == null) { - unsetSec(); - } else { - setSec((org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException)value); - } - break; - - case TOPE: - if (value == null) { - unsetTope(); - } else { - setTope((org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException)value); - } - break; - - case TNASE: - if (value == null) { - unsetTnase(); - } else { - setTnase((org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException)value); - } - break; - - } - } - - @org.apache.thrift.annotation.Nullable - @Override - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case SUCCESS: - return getSuccess(); - - case SEC: - return getSec(); - - case TOPE: - return getTope(); - - case TNASE: - return getTnase(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - @Override - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case SUCCESS: - return isSetSuccess(); - case SEC: - return isSetSec(); - case TOPE: - return isSetTope(); - case TNASE: - return isSetTnase(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that instanceof initiateFlush_result) - return this.equals((initiateFlush_result)that); - return false; - } - - public boolean equals(initiateFlush_result that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_success = true; - boolean that_present_success = true; - if (this_present_success || that_present_success) { - if (!(this_present_success && that_present_success)) - return false; - if (this.success != that.success) - return false; - } - - boolean this_present_sec = true && this.isSetSec(); - boolean that_present_sec = true && that.isSetSec(); - if (this_present_sec || that_present_sec) { - if (!(this_present_sec && that_present_sec)) - return false; - if (!this.sec.equals(that.sec)) - return false; - } - - boolean this_present_tope = true && this.isSetTope(); - boolean that_present_tope = true && that.isSetTope(); - if (this_present_tope || that_present_tope) { - if (!(this_present_tope && that_present_tope)) - return false; - if (!this.tope.equals(that.tope)) - return false; - } - - boolean this_present_tnase = true && this.isSetTnase(); - boolean that_present_tnase = true && that.isSetTnase(); - if (this_present_tnase || that_present_tnase) { - if (!(this_present_tnase && that_present_tnase)) - return false; - if (!this.tnase.equals(that.tnase)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success); - - hashCode = hashCode * 8191 + ((isSetSec()) ? 131071 : 524287); - if (isSetSec()) - hashCode = hashCode * 8191 + sec.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTope()) ? 131071 : 524287); - if (isSetTope()) - hashCode = hashCode * 8191 + tope.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTnase()) ? 131071 : 524287); - if (isSetTnase()) - hashCode = hashCode * 8191 + tnase.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(initiateFlush_result other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetSec()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, other.sec); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTope()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tope, other.tope); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTnase()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tnase, other.tnase); - if (lastComparison != 0) { - return lastComparison; - } - } - return 0; - } - - @org.apache.thrift.annotation.Nullable - @Override - public _Fields fieldForId(int fieldId) { - return _Fields.findByThriftId(fieldId); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - scheme(iprot).read(iprot, this); - } - - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("initiateFlush_result("); - boolean first = true; - - sb.append("success:"); - sb.append(this.success); - first = false; - if (!first) sb.append(", "); - sb.append("sec:"); - if (this.sec == null) { - sb.append("null"); - } else { - sb.append(this.sec); - } - first = false; - if (!first) sb.append(", "); - sb.append("tope:"); - if (this.tope == null) { - sb.append("null"); - } else { - sb.append(this.tope); - } - first = false; - if (!first) sb.append(", "); - sb.append("tnase:"); - if (this.tnase == null) { - sb.append("null"); - } else { - sb.append(this.tnase); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - // check for sub-struct validity - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { - try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private static class initiateFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public initiateFlush_resultStandardScheme getScheme() { - return new initiateFlush_resultStandardScheme(); - } - } - - private static class initiateFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, initiateFlush_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; - iprot.readStructBegin(); - while (true) - { - schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (schemeField.id) { - case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.success = iprot.readI64(); - struct.setSuccessIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 1: // SEC - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); - struct.sec.read(iprot); - struct.setSecIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // TOPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(); - struct.tope.read(iprot); - struct.setTopeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // TNASE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); - struct.tnase.read(iprot); - struct.setTnaseIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, initiateFlush_result struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.isSetSuccess()) { - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - oprot.writeI64(struct.success); - oprot.writeFieldEnd(); - } - if (struct.sec != null) { - oprot.writeFieldBegin(SEC_FIELD_DESC); - struct.sec.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.tope != null) { - oprot.writeFieldBegin(TOPE_FIELD_DESC); - struct.tope.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.tnase != null) { - oprot.writeFieldBegin(TNASE_FIELD_DESC); - struct.tnase.write(oprot); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class initiateFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public initiateFlush_resultTupleScheme getScheme() { - return new initiateFlush_resultTupleScheme(); - } - } - - private static class initiateFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetSuccess()) { - optionals.set(0); - } - if (struct.isSetSec()) { - optionals.set(1); - } - if (struct.isSetTope()) { - optionals.set(2); - } - if (struct.isSetTnase()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); - if (struct.isSetSuccess()) { - oprot.writeI64(struct.success); - } - if (struct.isSetSec()) { - struct.sec.write(oprot); - } - if (struct.isSetTope()) { - struct.tope.write(oprot); - } - if (struct.isSetTnase()) { - struct.tnase.write(oprot); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); - if (incoming.get(0)) { - struct.success = iprot.readI64(); - struct.setSuccessIsSet(true); - } - if (incoming.get(1)) { - struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); - struct.sec.read(iprot); - struct.setSecIsSet(true); - } - if (incoming.get(2)) { - struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(); - struct.tope.read(iprot); - struct.setTopeIsSet(true); - } - if (incoming.get(3)) { - struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); - struct.tnase.read(iprot); - struct.setTnaseIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - - @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class waitForFlush_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_args"); - - private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField END_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("endRow", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.protocol.TField FLUSH_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("flushID", org.apache.thrift.protocol.TType.I64, (short)6); - private static final org.apache.thrift.protocol.TField MAX_LOOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxLoops", org.apache.thrift.protocol.TType.I64, (short)7); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_argsTupleSchemeFactory(); - - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow; // required - public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow; // required - public long flushID; // required - public long maxLoops; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - TINFO((short)1, "tinfo"), - CREDENTIALS((short)2, "credentials"), - TABLE_NAME((short)3, "tableName"), - START_ROW((short)4, "startRow"), - END_ROW((short)5, "endRow"), - FLUSH_ID((short)6, "flushID"), - MAX_LOOPS((short)7, "maxLoops"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // TINFO - return TINFO; - case 2: // CREDENTIALS - return CREDENTIALS; - case 3: // TABLE_NAME - return TABLE_NAME; - case 4: // START_ROW - return START_ROW; - case 5: // END_ROW - return END_ROW; - case 6: // FLUSH_ID - return FLUSH_ID; - case 7: // MAX_LOOPS - return MAX_LOOPS; - default: - return null; - } - } - - /** - * Find the _Fields constant that matches fieldId, throwing an exception - * if it is not found. - */ - public static _Fields findByThriftIdOrThrow(int fieldId) { - _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - @Override - public short getThriftFieldId() { - return _thriftId; - } - - @Override - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - private static final int __FLUSHID_ISSET_ID = 0; - private static final int __MAXLOOPS_ISSET_ID = 1; - private byte __isset_bitfield = 0; - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); - tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - tmpMap.put(_Fields.END_ROW, new org.apache.thrift.meta_data.FieldMetaData("endRow", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); - tmpMap.put(_Fields.FLUSH_ID, new org.apache.thrift.meta_data.FieldMetaData("flushID", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - tmpMap.put(_Fields.MAX_LOOPS, new org.apache.thrift.meta_data.FieldMetaData("maxLoops", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_args.class, metaDataMap); - } - - public waitForFlush_args() { - } - - public waitForFlush_args( - org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, - org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String tableName, - java.nio.ByteBuffer startRow, - java.nio.ByteBuffer endRow, - long flushID, - long maxLoops) - { - this(); - this.tinfo = tinfo; - this.credentials = credentials; - this.tableName = tableName; - this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); - this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); - this.flushID = flushID; - setFlushIDIsSet(true); - this.maxLoops = maxLoops; - setMaxLoopsIsSet(true); - } - - /** - * Performs a deep copy on other. - */ - public waitForFlush_args(waitForFlush_args other) { - __isset_bitfield = other.__isset_bitfield; - if (other.isSetTinfo()) { - this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); - } - if (other.isSetCredentials()) { - this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); - } - if (other.isSetTableName()) { - this.tableName = other.tableName; - } - if (other.isSetStartRow()) { - this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow); - } - if (other.isSetEndRow()) { - this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow); - } - this.flushID = other.flushID; - this.maxLoops = other.maxLoops; - } - - @Override - public waitForFlush_args deepCopy() { - return new waitForFlush_args(this); - } - - @Override - public void clear() { - this.tinfo = null; - this.credentials = null; - this.tableName = null; - this.startRow = null; - this.endRow = null; - setFlushIDIsSet(false); - this.flushID = 0; - setMaxLoopsIsSet(false); - this.maxLoops = 0; - } - - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { - return this.tinfo; - } - - public waitForFlush_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { - this.tinfo = tinfo; - return this; - } - - public void unsetTinfo() { - this.tinfo = null; - } - - /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */ - public boolean isSetTinfo() { - return this.tinfo != null; - } - - public void setTinfoIsSet(boolean value) { - if (!value) { - this.tinfo = null; - } - } - - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials() { - return this.credentials; - } - - public waitForFlush_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { - this.credentials = credentials; - return this; - } - - public void unsetCredentials() { - this.credentials = null; - } - - /** Returns true if field credentials is set (has been assigned a value) and false otherwise */ - public boolean isSetCredentials() { - return this.credentials != null; - } - - public void setCredentialsIsSet(boolean value) { - if (!value) { - this.credentials = null; - } - } - - @org.apache.thrift.annotation.Nullable - public java.lang.String getTableName() { - return this.tableName; - } - - public waitForFlush_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { - this.tableName = tableName; - return this; - } - - public void unsetTableName() { - this.tableName = null; - } - - /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ - public boolean isSetTableName() { - return this.tableName != null; - } - - public void setTableNameIsSet(boolean value) { - if (!value) { - this.tableName = null; - } - } - - public byte[] getStartRow() { - setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); - return startRow == null ? null : startRow.array(); - } - - public java.nio.ByteBuffer bufferForStartRow() { - return org.apache.thrift.TBaseHelper.copyBinary(startRow); - } - - public waitForFlush_args setStartRow(byte[] startRow) { - this.startRow = startRow == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(startRow.clone()); - return this; - } - - public waitForFlush_args setStartRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow) { - this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); - return this; - } - - public void unsetStartRow() { - this.startRow = null; - } - - /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ - public boolean isSetStartRow() { - return this.startRow != null; - } - - public void setStartRowIsSet(boolean value) { - if (!value) { - this.startRow = null; - } - } - - public byte[] getEndRow() { - setEndRow(org.apache.thrift.TBaseHelper.rightSize(endRow)); - return endRow == null ? null : endRow.array(); - } - - public java.nio.ByteBuffer bufferForEndRow() { - return org.apache.thrift.TBaseHelper.copyBinary(endRow); - } - - public waitForFlush_args setEndRow(byte[] endRow) { - this.endRow = endRow == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(endRow.clone()); - return this; - } - - public waitForFlush_args setEndRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow) { - this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); - return this; - } - - public void unsetEndRow() { - this.endRow = null; - } - - /** Returns true if field endRow is set (has been assigned a value) and false otherwise */ - public boolean isSetEndRow() { - return this.endRow != null; - } - - public void setEndRowIsSet(boolean value) { - if (!value) { - this.endRow = null; - } - } - - public long getFlushID() { - return this.flushID; - } - - public waitForFlush_args setFlushID(long flushID) { - this.flushID = flushID; - setFlushIDIsSet(true); - return this; - } - - public void unsetFlushID() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLUSHID_ISSET_ID); - } - - /** Returns true if field flushID is set (has been assigned a value) and false otherwise */ - public boolean isSetFlushID() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLUSHID_ISSET_ID); - } - - public void setFlushIDIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLUSHID_ISSET_ID, value); - } - - public long getMaxLoops() { - return this.maxLoops; - } - - public waitForFlush_args setMaxLoops(long maxLoops) { - this.maxLoops = maxLoops; - setMaxLoopsIsSet(true); - return this; - } - - public void unsetMaxLoops() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLOOPS_ISSET_ID); - } - - /** Returns true if field maxLoops is set (has been assigned a value) and false otherwise */ - public boolean isSetMaxLoops() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLOOPS_ISSET_ID); - } - - public void setMaxLoopsIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLOOPS_ISSET_ID, value); - } - - @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { - switch (field) { - case TINFO: - if (value == null) { - unsetTinfo(); - } else { - setTinfo((org.apache.accumulo.core.clientImpl.thrift.TInfo)value); - } - break; - - case CREDENTIALS: - if (value == null) { - unsetCredentials(); - } else { - setCredentials((org.apache.accumulo.core.securityImpl.thrift.TCredentials)value); - } - break; - - case TABLE_NAME: - if (value == null) { - unsetTableName(); - } else { - setTableName((java.lang.String)value); - } - break; - - case START_ROW: - if (value == null) { - unsetStartRow(); - } else { - if (value instanceof byte[]) { - setStartRow((byte[])value); - } else { - setStartRow((java.nio.ByteBuffer)value); - } - } - break; - - case END_ROW: - if (value == null) { - unsetEndRow(); - } else { - if (value instanceof byte[]) { - setEndRow((byte[])value); - } else { - setEndRow((java.nio.ByteBuffer)value); - } - } - break; - - case FLUSH_ID: - if (value == null) { - unsetFlushID(); - } else { - setFlushID((java.lang.Long)value); - } - break; - - case MAX_LOOPS: - if (value == null) { - unsetMaxLoops(); - } else { - setMaxLoops((java.lang.Long)value); - } - break; - - } - } - - @org.apache.thrift.annotation.Nullable - @Override - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case TINFO: - return getTinfo(); - - case CREDENTIALS: - return getCredentials(); - - case TABLE_NAME: - return getTableName(); - - case START_ROW: - return getStartRow(); - - case END_ROW: - return getEndRow(); - - case FLUSH_ID: - return getFlushID(); - - case MAX_LOOPS: - return getMaxLoops(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - @Override - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case TINFO: - return isSetTinfo(); - case CREDENTIALS: - return isSetCredentials(); - case TABLE_NAME: - return isSetTableName(); - case START_ROW: - return isSetStartRow(); - case END_ROW: - return isSetEndRow(); - case FLUSH_ID: - return isSetFlushID(); - case MAX_LOOPS: - return isSetMaxLoops(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that instanceof waitForFlush_args) - return this.equals((waitForFlush_args)that); - return false; - } - - public boolean equals(waitForFlush_args that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_tinfo = true && this.isSetTinfo(); - boolean that_present_tinfo = true && that.isSetTinfo(); - if (this_present_tinfo || that_present_tinfo) { - if (!(this_present_tinfo && that_present_tinfo)) - return false; - if (!this.tinfo.equals(that.tinfo)) - return false; - } - - boolean this_present_credentials = true && this.isSetCredentials(); - boolean that_present_credentials = true && that.isSetCredentials(); - if (this_present_credentials || that_present_credentials) { - if (!(this_present_credentials && that_present_credentials)) - return false; - if (!this.credentials.equals(that.credentials)) - return false; - } - - boolean this_present_tableName = true && this.isSetTableName(); - boolean that_present_tableName = true && that.isSetTableName(); - if (this_present_tableName || that_present_tableName) { - if (!(this_present_tableName && that_present_tableName)) - return false; - if (!this.tableName.equals(that.tableName)) - return false; - } - - boolean this_present_startRow = true && this.isSetStartRow(); - boolean that_present_startRow = true && that.isSetStartRow(); - if (this_present_startRow || that_present_startRow) { - if (!(this_present_startRow && that_present_startRow)) - return false; - if (!this.startRow.equals(that.startRow)) - return false; - } - - boolean this_present_endRow = true && this.isSetEndRow(); - boolean that_present_endRow = true && that.isSetEndRow(); - if (this_present_endRow || that_present_endRow) { - if (!(this_present_endRow && that_present_endRow)) - return false; - if (!this.endRow.equals(that.endRow)) - return false; - } - - boolean this_present_flushID = true; - boolean that_present_flushID = true; - if (this_present_flushID || that_present_flushID) { - if (!(this_present_flushID && that_present_flushID)) - return false; - if (this.flushID != that.flushID) - return false; - } - - boolean this_present_maxLoops = true; - boolean that_present_maxLoops = true; - if (this_present_maxLoops || that_present_maxLoops) { - if (!(this_present_maxLoops && that_present_maxLoops)) - return false; - if (this.maxLoops != that.maxLoops) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetTinfo()) ? 131071 : 524287); - if (isSetTinfo()) - hashCode = hashCode * 8191 + tinfo.hashCode(); - - hashCode = hashCode * 8191 + ((isSetCredentials()) ? 131071 : 524287); - if (isSetCredentials()) - hashCode = hashCode * 8191 + credentials.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287); - if (isSetTableName()) - hashCode = hashCode * 8191 + tableName.hashCode(); - - hashCode = hashCode * 8191 + ((isSetStartRow()) ? 131071 : 524287); - if (isSetStartRow()) - hashCode = hashCode * 8191 + startRow.hashCode(); - - hashCode = hashCode * 8191 + ((isSetEndRow()) ? 131071 : 524287); - if (isSetEndRow()) - hashCode = hashCode * 8191 + endRow.hashCode(); - - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(flushID); - - hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(maxLoops); - - return hashCode; - } - - @Override - public int compareTo(waitForFlush_args other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.compare(isSetTinfo(), other.isSetTinfo()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTinfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tinfo, other.tinfo); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetCredentials(), other.isSetCredentials()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetCredentials()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.credentials, other.credentials); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetEndRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, other.endRow); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetFlushID(), other.isSetFlushID()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetFlushID()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flushID, other.flushID); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetMaxLoops(), other.isSetMaxLoops()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetMaxLoops()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxLoops, other.maxLoops); - if (lastComparison != 0) { - return lastComparison; - } - } - return 0; - } - - @org.apache.thrift.annotation.Nullable - @Override - public _Fields fieldForId(int fieldId) { - return _Fields.findByThriftId(fieldId); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - scheme(iprot).read(iprot, this); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_args("); - boolean first = true; - - sb.append("tinfo:"); - if (this.tinfo == null) { - sb.append("null"); - } else { - sb.append(this.tinfo); - } - first = false; - if (!first) sb.append(", "); - sb.append("credentials:"); - if (this.credentials == null) { - sb.append("null"); - } else { - sb.append(this.credentials); - } - first = false; - if (!first) sb.append(", "); - sb.append("tableName:"); - if (this.tableName == null) { - sb.append("null"); - } else { - sb.append(this.tableName); - } - first = false; - if (!first) sb.append(", "); - sb.append("startRow:"); - if (this.startRow == null) { - sb.append("null"); - } else { - org.apache.thrift.TBaseHelper.toString(this.startRow, sb); - } - first = false; - if (!first) sb.append(", "); - sb.append("endRow:"); - if (this.endRow == null) { - sb.append("null"); - } else { - org.apache.thrift.TBaseHelper.toString(this.endRow, sb); - } - first = false; - if (!first) sb.append(", "); - sb.append("flushID:"); - sb.append(this.flushID); - first = false; - if (!first) sb.append(", "); - sb.append("maxLoops:"); - sb.append(this.maxLoops); - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - // check for sub-struct validity - if (tinfo != null) { - tinfo.validate(); - } - if (credentials != null) { - credentials.validate(); - } - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { - try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private static class waitForFlush_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public waitForFlush_argsStandardScheme getScheme() { - return new waitForFlush_argsStandardScheme(); - } - } - - private static class waitForFlush_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; - iprot.readStructBegin(); - while (true) - { - schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (schemeField.id) { - case 1: // TINFO - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); - struct.tinfo.read(iprot); - struct.setTinfoIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // CREDENTIALS - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(); - struct.credentials.read(iprot); - struct.setCredentialsIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // TABLE_NAME - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.tableName = iprot.readString(); - struct.setTableNameIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // START_ROW - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.startRow = iprot.readBinary(); - struct.setStartRowIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // END_ROW - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.endRow = iprot.readBinary(); - struct.setEndRowIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 6: // FLUSH_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.flushID = iprot.readI64(); - struct.setFlushIDIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 7: // MAX_LOOPS - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.maxLoops = iprot.readI64(); - struct.setMaxLoopsIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_args struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.tinfo != null) { - oprot.writeFieldBegin(TINFO_FIELD_DESC); - struct.tinfo.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.credentials != null) { - oprot.writeFieldBegin(CREDENTIALS_FIELD_DESC); - struct.credentials.write(oprot); - oprot.writeFieldEnd(); - } - if (struct.tableName != null) { - oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC); - oprot.writeString(struct.tableName); - oprot.writeFieldEnd(); - } - if (struct.startRow != null) { - oprot.writeFieldBegin(START_ROW_FIELD_DESC); - oprot.writeBinary(struct.startRow); - oprot.writeFieldEnd(); - } - if (struct.endRow != null) { - oprot.writeFieldBegin(END_ROW_FIELD_DESC); - oprot.writeBinary(struct.endRow); - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(FLUSH_ID_FIELD_DESC); - oprot.writeI64(struct.flushID); - oprot.writeFieldEnd(); - oprot.writeFieldBegin(MAX_LOOPS_FIELD_DESC); - oprot.writeI64(struct.maxLoops); - oprot.writeFieldEnd(); - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class waitForFlush_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public waitForFlush_argsTupleScheme getScheme() { - return new waitForFlush_argsTupleScheme(); - } - } - - private static class waitForFlush_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetTinfo()) { - optionals.set(0); - } - if (struct.isSetCredentials()) { - optionals.set(1); - } - if (struct.isSetTableName()) { - optionals.set(2); - } - if (struct.isSetStartRow()) { - optionals.set(3); - } - if (struct.isSetEndRow()) { - optionals.set(4); - } - if (struct.isSetFlushID()) { - optionals.set(5); - } - if (struct.isSetMaxLoops()) { - optionals.set(6); - } - oprot.writeBitSet(optionals, 7); - if (struct.isSetTinfo()) { - struct.tinfo.write(oprot); - } - if (struct.isSetCredentials()) { - struct.credentials.write(oprot); - } - if (struct.isSetTableName()) { - oprot.writeString(struct.tableName); - } - if (struct.isSetStartRow()) { - oprot.writeBinary(struct.startRow); - } - if (struct.isSetEndRow()) { - oprot.writeBinary(struct.endRow); - } - if (struct.isSetFlushID()) { - oprot.writeI64(struct.flushID); - } - if (struct.isSetMaxLoops()) { - oprot.writeI64(struct.maxLoops); - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(7); - if (incoming.get(0)) { - struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); - struct.tinfo.read(iprot); - struct.setTinfoIsSet(true); - } - if (incoming.get(1)) { - struct.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(); - struct.credentials.read(iprot); - struct.setCredentialsIsSet(true); - } - if (incoming.get(2)) { - struct.tableName = iprot.readString(); - struct.setTableNameIsSet(true); - } - if (incoming.get(3)) { - struct.startRow = iprot.readBinary(); - struct.setStartRowIsSet(true); - } - if (incoming.get(4)) { - struct.endRow = iprot.readBinary(); - struct.setEndRowIsSet(true); - } - if (incoming.get(5)) { - struct.flushID = iprot.readI64(); - struct.setFlushIDIsSet(true); - } - if (incoming.get(6)) { - struct.maxLoops = iprot.readI64(); - struct.setMaxLoopsIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - } - - @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class waitForFlush_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_result"); - - private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_resultTupleSchemeFactory(); - - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SEC((short)1, "sec"), - TOPE((short)2, "tope"), - TNASE((short)3, "tnase"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // SEC - return SEC; - case 2: // TOPE - return TOPE; - case 3: // TNASE - return TNASE; - default: - return null; - } - } - - /** - * Find the _Fields constant that matches fieldId, throwing an exception - * if it is not found. - */ - public static _Fields findByThriftIdOrThrow(int fieldId) { - _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - @Override - public short getThriftFieldId() { - return _thriftId; - } - - @Override - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); - tmpMap.put(_Fields.TOPE, new org.apache.thrift.meta_data.FieldMetaData("tope", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); - tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_result.class, metaDataMap); - } - - public waitForFlush_result() { - } - - public waitForFlush_result( - org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, - org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) - { - this(); - this.sec = sec; - this.tope = tope; - this.tnase = tnase; - } - - /** - * Performs a deep copy on other. - */ - public waitForFlush_result(waitForFlush_result other) { - if (other.isSetSec()) { - this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); - } - if (other.isSetTope()) { - this.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(other.tope); - } - if (other.isSetTnase()) { - this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); - } - } - - @Override - public waitForFlush_result deepCopy() { - return new waitForFlush_result(this); - } - - @Override - public void clear() { - this.sec = null; - this.tope = null; - this.tnase = null; - } - - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec() { - return this.sec; - } - - public waitForFlush_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { - this.sec = sec; - return this; - } - - public void unsetSec() { - this.sec = null; - } - - /** Returns true if field sec is set (has been assigned a value) and false otherwise */ - public boolean isSetSec() { - return this.sec != null; - } - - public void setSecIsSet(boolean value) { - if (!value) { - this.sec = null; - } - } - - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException getTope() { - return this.tope; - } - - public waitForFlush_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { - this.tope = tope; - return this; - } - - public void unsetTope() { - this.tope = null; - } - - /** Returns true if field tope is set (has been assigned a value) and false otherwise */ - public boolean isSetTope() { - return this.tope != null; - } - - public void setTopeIsSet(boolean value) { - if (!value) { - this.tope = null; - } - } - - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException getTnase() { - return this.tnase; - } - - public waitForFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public initiateFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -8280,6 +6408,14 @@ public void setTnaseIsSet(boolean value) { @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { + case SUCCESS: + if (value == null) { + unsetSuccess(); + } else { + setSuccess((java.lang.Long)value); + } + break; + case SEC: if (value == null) { unsetSec(); @@ -8311,6 +6447,9 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { + case SUCCESS: + return getSuccess(); + case SEC: return getSec(); @@ -8332,6 +6471,8 @@ public boolean isSet(_Fields field) { } switch (field) { + case SUCCESS: + return isSetSuccess(); case SEC: return isSetSec(); case TOPE: @@ -8344,17 +6485,26 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof waitForFlush_result) - return this.equals((waitForFlush_result)that); + if (that instanceof initiateFlush_result) + return this.equals((initiateFlush_result)that); return false; } - public boolean equals(waitForFlush_result that) { + public boolean equals(initiateFlush_result that) { if (that == null) return false; if (this == that) return true; + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + boolean this_present_sec = true && this.isSetSec(); boolean that_present_sec = true && that.isSetSec(); if (this_present_sec || that_present_sec) { @@ -8389,6 +6539,8 @@ public boolean equals(waitForFlush_result that) { public int hashCode() { int hashCode = 1; + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success); + hashCode = hashCode * 8191 + ((isSetSec()) ? 131071 : 524287); if (isSetSec()) hashCode = hashCode * 8191 + sec.hashCode(); @@ -8405,13 +6557,23 @@ public int hashCode() { } @Override - public int compareTo(waitForFlush_result other) { + public int compareTo(initiateFlush_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSuccess()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec()); if (lastComparison != 0) { return lastComparison; @@ -8462,9 +6624,13 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("initiateFlush_result("); boolean first = true; + sb.append("success:"); + sb.append(this.success); + first = false; + if (!first) sb.append(", "); sb.append("sec:"); if (this.sec == null) { sb.append("null"); @@ -8507,23 +6673,25 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } - private static class waitForFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class initiateFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public waitForFlush_resultStandardScheme getScheme() { - return new waitForFlush_resultStandardScheme(); + public initiateFlush_resultStandardScheme getScheme() { + return new initiateFlush_resultStandardScheme(); } } - private static class waitForFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class initiateFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, initiateFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -8533,6 +6701,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result break; } switch (schemeField.id) { + case 0: // SUCCESS + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.success = iprot.readI64(); + struct.setSuccessIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; case 1: // SEC if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); @@ -8572,10 +6748,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, initiateFlush_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.isSetSuccess()) { + oprot.writeFieldBegin(SUCCESS_FIELD_DESC); + oprot.writeI64(struct.success); + oprot.writeFieldEnd(); + } if (struct.sec != null) { oprot.writeFieldBegin(SEC_FIELD_DESC); struct.sec.write(oprot); @@ -8597,29 +6778,35 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_resul } - private static class waitForFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class initiateFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public waitForFlush_resultTupleScheme getScheme() { - return new waitForFlush_resultTupleScheme(); + public initiateFlush_resultTupleScheme getScheme() { + return new initiateFlush_resultTupleScheme(); } } - private static class waitForFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class initiateFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetSec()) { + if (struct.isSetSuccess()) { optionals.set(0); } - if (struct.isSetTope()) { + if (struct.isSetSec()) { optionals.set(1); } - if (struct.isSetTnase()) { + if (struct.isSetTope()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetTnase()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetSuccess()) { + oprot.writeI64(struct.success); + } if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -8632,20 +6819,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, initiateFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { + struct.success = iprot.readI64(); + struct.setSuccessIsSet(true); + } + if (incoming.get(1)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); struct.setSecIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(2)) { struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(); struct.tope.read(iprot); struct.setTopeIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); struct.tnase.read(iprot); struct.setTnaseIsSet(true); @@ -8659,31 +6850,37 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setTableProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_args"); + public static class waitForFlush_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField END_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("endRow", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField FLUSH_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("flushID", org.apache.thrift.protocol.TType.I64, (short)6); + private static final org.apache.thrift.protocol.TField MAX_LOOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxLoops", org.apache.thrift.protocol.TType.I64, (short)7); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required - public @org.apache.thrift.annotation.Nullable java.lang.String value; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow; // required + public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow; // required + public long flushID; // required + public long maxLoops; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), TABLE_NAME((short)3, "tableName"), - PROPERTY((short)4, "property"), - VALUE((short)5, "value"); + START_ROW((short)4, "startRow"), + END_ROW((short)5, "endRow"), + FLUSH_ID((short)6, "flushID"), + MAX_LOOPS((short)7, "maxLoops"); private static final java.util.Map byName = new java.util.HashMap(); @@ -8705,10 +6902,14 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // TABLE_NAME return TABLE_NAME; - case 4: // PROPERTY - return PROPERTY; - case 5: // VALUE - return VALUE; + case 4: // START_ROW + return START_ROW; + case 5: // END_ROW + return END_ROW; + case 6: // FLUSH_ID + return FLUSH_ID; + case 7: // MAX_LOOPS + return MAX_LOOPS; default: return null; } @@ -8752,6 +6953,9 @@ public java.lang.String getFieldName() { } // isset id assignments + private static final int __FLUSHID_ISSET_ID = 0; + private static final int __MAXLOOPS_ISSET_ID = 1; + private byte __isset_bitfield = 0; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -8761,36 +6965,47 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.START_ROW, new org.apache.thrift.meta_data.FieldMetaData("startRow", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); + tmpMap.put(_Fields.END_ROW, new org.apache.thrift.meta_data.FieldMetaData("endRow", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))); + tmpMap.put(_Fields.FLUSH_ID, new org.apache.thrift.meta_data.FieldMetaData("flushID", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.MAX_LOOPS, new org.apache.thrift.meta_data.FieldMetaData("maxLoops", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_args.class, metaDataMap); } - public setTableProperty_args() { + public waitForFlush_args() { } - public setTableProperty_args( + public waitForFlush_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, - java.lang.String property, - java.lang.String value) + java.nio.ByteBuffer startRow, + java.nio.ByteBuffer endRow, + long flushID, + long maxLoops) { this(); this.tinfo = tinfo; this.credentials = credentials; this.tableName = tableName; - this.property = property; - this.value = value; + this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); + this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); + this.flushID = flushID; + setFlushIDIsSet(true); + this.maxLoops = maxLoops; + setMaxLoopsIsSet(true); } /** * Performs a deep copy on other. */ - public setTableProperty_args(setTableProperty_args other) { + public waitForFlush_args(waitForFlush_args other) { + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -8800,17 +7015,19 @@ public setTableProperty_args(setTableProperty_args other) { if (other.isSetTableName()) { this.tableName = other.tableName; } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetStartRow()) { + this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow); } - if (other.isSetValue()) { - this.value = other.value; + if (other.isSetEndRow()) { + this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow); } + this.flushID = other.flushID; + this.maxLoops = other.maxLoops; } @Override - public setTableProperty_args deepCopy() { - return new setTableProperty_args(this); + public waitForFlush_args deepCopy() { + return new waitForFlush_args(this); } @Override @@ -8818,8 +7035,12 @@ public void clear() { this.tinfo = null; this.credentials = null; this.tableName = null; - this.property = null; - this.value = null; + this.startRow = null; + this.endRow = null; + setFlushIDIsSet(false); + this.flushID = 0; + setMaxLoopsIsSet(false); + this.maxLoops = 0; } @org.apache.thrift.annotation.Nullable @@ -8827,7 +7048,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public setTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public waitForFlush_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -8852,7 +7073,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public setTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public waitForFlush_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -8877,7 +7098,7 @@ public java.lang.String getTableName() { return this.tableName; } - public setTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { + public waitForFlush_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { this.tableName = tableName; return this; } @@ -8897,56 +7118,120 @@ public void setTableNameIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public byte[] getStartRow() { + setStartRow(org.apache.thrift.TBaseHelper.rightSize(startRow)); + return startRow == null ? null : startRow.array(); } - public setTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public java.nio.ByteBuffer bufferForStartRow() { + return org.apache.thrift.TBaseHelper.copyBinary(startRow); + } + + public waitForFlush_args setStartRow(byte[] startRow) { + this.startRow = startRow == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(startRow.clone()); return this; } - public void unsetProperty() { - this.property = null; + public waitForFlush_args setStartRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer startRow) { + this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); + return this; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + public void unsetStartRow() { + this.startRow = null; } - public void setPropertyIsSet(boolean value) { + /** Returns true if field startRow is set (has been assigned a value) and false otherwise */ + public boolean isSetStartRow() { + return this.startRow != null; + } + + public void setStartRowIsSet(boolean value) { if (!value) { - this.property = null; + this.startRow = null; } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValue() { - return this.value; + public byte[] getEndRow() { + setEndRow(org.apache.thrift.TBaseHelper.rightSize(endRow)); + return endRow == null ? null : endRow.array(); } - public setTableProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { - this.value = value; + public java.nio.ByteBuffer bufferForEndRow() { + return org.apache.thrift.TBaseHelper.copyBinary(endRow); + } + + public waitForFlush_args setEndRow(byte[] endRow) { + this.endRow = endRow == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(endRow.clone()); return this; } - public void unsetValue() { - this.value = null; + public waitForFlush_args setEndRow(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer endRow) { + this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); + return this; } - /** Returns true if field value is set (has been assigned a value) and false otherwise */ - public boolean isSetValue() { - return this.value != null; + public void unsetEndRow() { + this.endRow = null; } - public void setValueIsSet(boolean value) { + /** Returns true if field endRow is set (has been assigned a value) and false otherwise */ + public boolean isSetEndRow() { + return this.endRow != null; + } + + public void setEndRowIsSet(boolean value) { if (!value) { - this.value = null; + this.endRow = null; } } + public long getFlushID() { + return this.flushID; + } + + public waitForFlush_args setFlushID(long flushID) { + this.flushID = flushID; + setFlushIDIsSet(true); + return this; + } + + public void unsetFlushID() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLUSHID_ISSET_ID); + } + + /** Returns true if field flushID is set (has been assigned a value) and false otherwise */ + public boolean isSetFlushID() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLUSHID_ISSET_ID); + } + + public void setFlushIDIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLUSHID_ISSET_ID, value); + } + + public long getMaxLoops() { + return this.maxLoops; + } + + public waitForFlush_args setMaxLoops(long maxLoops) { + this.maxLoops = maxLoops; + setMaxLoopsIsSet(true); + return this; + } + + public void unsetMaxLoops() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLOOPS_ISSET_ID); + } + + /** Returns true if field maxLoops is set (has been assigned a value) and false otherwise */ + public boolean isSetMaxLoops() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLOOPS_ISSET_ID); + } + + public void setMaxLoopsIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLOOPS_ISSET_ID, value); + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -8974,19 +7259,43 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case START_ROW: if (value == null) { - unsetProperty(); + unsetStartRow(); } else { - setProperty((java.lang.String)value); + if (value instanceof byte[]) { + setStartRow((byte[])value); + } else { + setStartRow((java.nio.ByteBuffer)value); + } } break; - case VALUE: + case END_ROW: if (value == null) { - unsetValue(); + unsetEndRow(); } else { - setValue((java.lang.String)value); + if (value instanceof byte[]) { + setEndRow((byte[])value); + } else { + setEndRow((java.nio.ByteBuffer)value); + } + } + break; + + case FLUSH_ID: + if (value == null) { + unsetFlushID(); + } else { + setFlushID((java.lang.Long)value); + } + break; + + case MAX_LOOPS: + if (value == null) { + unsetMaxLoops(); + } else { + setMaxLoops((java.lang.Long)value); } break; @@ -9006,11 +7315,17 @@ public java.lang.Object getFieldValue(_Fields field) { case TABLE_NAME: return getTableName(); - case PROPERTY: - return getProperty(); + case START_ROW: + return getStartRow(); - case VALUE: - return getValue(); + case END_ROW: + return getEndRow(); + + case FLUSH_ID: + return getFlushID(); + + case MAX_LOOPS: + return getMaxLoops(); } throw new java.lang.IllegalStateException(); @@ -9030,22 +7345,26 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case TABLE_NAME: return isSetTableName(); - case PROPERTY: - return isSetProperty(); - case VALUE: - return isSetValue(); + case START_ROW: + return isSetStartRow(); + case END_ROW: + return isSetEndRow(); + case FLUSH_ID: + return isSetFlushID(); + case MAX_LOOPS: + return isSetMaxLoops(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setTableProperty_args) - return this.equals((setTableProperty_args)that); + if (that instanceof waitForFlush_args) + return this.equals((waitForFlush_args)that); return false; } - public boolean equals(setTableProperty_args that) { + public boolean equals(waitForFlush_args that) { if (that == null) return false; if (this == that) @@ -9078,21 +7397,39 @@ public boolean equals(setTableProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_startRow = true && this.isSetStartRow(); + boolean that_present_startRow = true && that.isSetStartRow(); + if (this_present_startRow || that_present_startRow) { + if (!(this_present_startRow && that_present_startRow)) return false; - if (!this.property.equals(that.property)) + if (!this.startRow.equals(that.startRow)) return false; } - boolean this_present_value = true && this.isSetValue(); - boolean that_present_value = true && that.isSetValue(); - if (this_present_value || that_present_value) { - if (!(this_present_value && that_present_value)) + boolean this_present_endRow = true && this.isSetEndRow(); + boolean that_present_endRow = true && that.isSetEndRow(); + if (this_present_endRow || that_present_endRow) { + if (!(this_present_endRow && that_present_endRow)) return false; - if (!this.value.equals(that.value)) + if (!this.endRow.equals(that.endRow)) + return false; + } + + boolean this_present_flushID = true; + boolean that_present_flushID = true; + if (this_present_flushID || that_present_flushID) { + if (!(this_present_flushID && that_present_flushID)) + return false; + if (this.flushID != that.flushID) + return false; + } + + boolean this_present_maxLoops = true; + boolean that_present_maxLoops = true; + if (this_present_maxLoops || that_present_maxLoops) { + if (!(this_present_maxLoops && that_present_maxLoops)) + return false; + if (this.maxLoops != that.maxLoops) return false; } @@ -9115,19 +7452,23 @@ public int hashCode() { if (isSetTableName()) hashCode = hashCode * 8191 + tableName.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetStartRow()) ? 131071 : 524287); + if (isSetStartRow()) + hashCode = hashCode * 8191 + startRow.hashCode(); - hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); - if (isSetValue()) - hashCode = hashCode * 8191 + value.hashCode(); + hashCode = hashCode * 8191 + ((isSetEndRow()) ? 131071 : 524287); + if (isSetEndRow()) + hashCode = hashCode * 8191 + endRow.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(flushID); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(maxLoops); return hashCode; } @Override - public int compareTo(setTableProperty_args other) { + public int compareTo(waitForFlush_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -9164,22 +7505,42 @@ public int compareTo(setTableProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetStartRow(), other.isSetStartRow()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetStartRow()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow); if (lastComparison != 0) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + lastComparison = java.lang.Boolean.compare(isSetEndRow(), other.isSetEndRow()); if (lastComparison != 0) { return lastComparison; } - if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); + if (isSetEndRow()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endRow, other.endRow); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetFlushID(), other.isSetFlushID()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetFlushID()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.flushID, other.flushID); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetMaxLoops(), other.isSetMaxLoops()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetMaxLoops()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxLoops, other.maxLoops); if (lastComparison != 0) { return lastComparison; } @@ -9205,7 +7566,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_args("); boolean first = true; sb.append("tinfo:"); @@ -9232,21 +7593,29 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("startRow:"); + if (this.startRow == null) { sb.append("null"); } else { - sb.append(this.property); + org.apache.thrift.TBaseHelper.toString(this.startRow, sb); } first = false; if (!first) sb.append(", "); - sb.append("value:"); - if (this.value == null) { + sb.append("endRow:"); + if (this.endRow == null) { sb.append("null"); } else { - sb.append(this.value); + org.apache.thrift.TBaseHelper.toString(this.endRow, sb); } first = false; + if (!first) sb.append(", "); + sb.append("flushID:"); + sb.append(this.flushID); + first = false; + if (!first) sb.append(", "); + sb.append("maxLoops:"); + sb.append(this.maxLoops); + first = false; sb.append(")"); return sb.toString(); } @@ -9272,23 +7641,25 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } - private static class setTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class waitForFlush_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setTableProperty_argsStandardScheme getScheme() { - return new setTableProperty_argsStandardScheme(); + public waitForFlush_argsStandardScheme getScheme() { + return new waitForFlush_argsStandardScheme(); } } - private static class setTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class waitForFlush_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -9324,18 +7695,34 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_ar org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PROPERTY + case 4: // START_ROW if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.startRow = iprot.readBinary(); + struct.setStartRowIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // VALUE + case 5: // END_ROW if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); + struct.endRow = iprot.readBinary(); + struct.setEndRowIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 6: // FLUSH_ID + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.flushID = iprot.readI64(); + struct.setFlushIDIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 7: // MAX_LOOPS + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.maxLoops = iprot.readI64(); + struct.setMaxLoopsIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -9352,7 +7739,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_ar } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -9371,33 +7758,39 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_a oprot.writeString(struct.tableName); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.startRow != null) { + oprot.writeFieldBegin(START_ROW_FIELD_DESC); + oprot.writeBinary(struct.startRow); oprot.writeFieldEnd(); } - if (struct.value != null) { - oprot.writeFieldBegin(VALUE_FIELD_DESC); - oprot.writeString(struct.value); + if (struct.endRow != null) { + oprot.writeFieldBegin(END_ROW_FIELD_DESC); + oprot.writeBinary(struct.endRow); oprot.writeFieldEnd(); } + oprot.writeFieldBegin(FLUSH_ID_FIELD_DESC); + oprot.writeI64(struct.flushID); + oprot.writeFieldEnd(); + oprot.writeFieldBegin(MAX_LOOPS_FIELD_DESC); + oprot.writeI64(struct.maxLoops); + oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class waitForFlush_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setTableProperty_argsTupleScheme getScheme() { - return new setTableProperty_argsTupleScheme(); + public waitForFlush_argsTupleScheme getScheme() { + return new waitForFlush_argsTupleScheme(); } } - private static class setTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class waitForFlush_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -9409,13 +7802,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_ar if (struct.isSetTableName()) { optionals.set(2); } - if (struct.isSetProperty()) { + if (struct.isSetStartRow()) { optionals.set(3); } - if (struct.isSetValue()) { + if (struct.isSetEndRow()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetFlushID()) { + optionals.set(5); + } + if (struct.isSetMaxLoops()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } @@ -9425,18 +7824,24 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_ar if (struct.isSetTableName()) { oprot.writeString(struct.tableName); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetStartRow()) { + oprot.writeBinary(struct.startRow); } - if (struct.isSetValue()) { - oprot.writeString(struct.value); + if (struct.isSetEndRow()) { + oprot.writeBinary(struct.endRow); + } + if (struct.isSetFlushID()) { + oprot.writeI64(struct.flushID); + } + if (struct.isSetMaxLoops()) { + oprot.writeI64(struct.maxLoops); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -9452,12 +7857,20 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_arg struct.setTableNameIsSet(true); } if (incoming.get(3)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.startRow = iprot.readBinary(); + struct.setStartRowIsSet(true); } if (incoming.get(4)) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); + struct.endRow = iprot.readBinary(); + struct.setEndRowIsSet(true); + } + if (incoming.get(5)) { + struct.flushID = iprot.readI64(); + struct.setFlushIDIsSet(true); + } + if (incoming.get(6)) { + struct.maxLoops = iprot.readI64(); + struct.setMaxLoopsIsSet(true); } } } @@ -9468,28 +7881,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setTableProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_result"); + public static class waitForFlush_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("waitForFlush_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new waitForFlush_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new waitForFlush_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), - TNASE((short)3, "tnase"), - TPE((short)4, "tpe"); + TNASE((short)3, "tnase"); private static final java.util.Map byName = new java.util.HashMap(); @@ -9511,8 +7921,6 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; - case 4: // TPE - return TPE; default: return null; } @@ -9565,32 +7973,28 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(waitForFlush_result.class, metaDataMap); } - public setTableProperty_result() { + public waitForFlush_result() { } - public setTableProperty_result( + public waitForFlush_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - ThriftPropertyException tpe) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; - this.tpe = tpe; } /** * Performs a deep copy on other. */ - public setTableProperty_result(setTableProperty_result other) { + public waitForFlush_result(waitForFlush_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -9600,14 +8004,11 @@ public setTableProperty_result(setTableProperty_result other) { if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTpe()) { - this.tpe = new ThriftPropertyException(other.tpe); - } } @Override - public setTableProperty_result deepCopy() { - return new setTableProperty_result(this); + public waitForFlush_result deepCopy() { + return new waitForFlush_result(this); } @Override @@ -9615,7 +8016,6 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; - this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -9623,7 +8023,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public setTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public waitForFlush_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -9648,7 +8048,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public setTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public waitForFlush_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -9673,7 +8073,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public setTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public waitForFlush_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -9693,31 +8093,6 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public ThriftPropertyException getTpe() { - return this.tpe; - } - - public setTableProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { - this.tpe = tpe; - return this; - } - - public void unsetTpe() { - this.tpe = null; - } - - /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ - public boolean isSetTpe() { - return this.tpe != null; - } - - public void setTpeIsSet(boolean value) { - if (!value) { - this.tpe = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -9745,14 +8120,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TPE: - if (value == null) { - unsetTpe(); - } else { - setTpe((ThriftPropertyException)value); - } - break; - } } @@ -9769,9 +8136,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TPE: - return getTpe(); - } throw new java.lang.IllegalStateException(); } @@ -9790,20 +8154,18 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); - case TPE: - return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setTableProperty_result) - return this.equals((setTableProperty_result)that); + if (that instanceof waitForFlush_result) + return this.equals((waitForFlush_result)that); return false; } - public boolean equals(setTableProperty_result that) { + public boolean equals(waitForFlush_result that) { if (that == null) return false; if (this == that) @@ -9836,15 +8198,6 @@ public boolean equals(setTableProperty_result that) { return false; } - boolean this_present_tpe = true && this.isSetTpe(); - boolean that_present_tpe = true && that.isSetTpe(); - if (this_present_tpe || that_present_tpe) { - if (!(this_present_tpe && that_present_tpe)) - return false; - if (!this.tpe.equals(that.tpe)) - return false; - } - return true; } @@ -9864,15 +8217,11 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); - if (isSetTpe()) - hashCode = hashCode * 8191 + tpe.hashCode(); - return hashCode; } @Override - public int compareTo(setTableProperty_result other) { + public int compareTo(waitForFlush_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -9909,16 +8258,6 @@ public int compareTo(setTableProperty_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTpe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -9939,7 +8278,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("waitForFlush_result("); boolean first = true; sb.append("sec:"); @@ -9965,14 +8304,6 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; - if (!first) sb.append(", "); - sb.append("tpe:"); - if (this.tpe == null) { - sb.append("null"); - } else { - sb.append(this.tpe); - } - first = false; sb.append(")"); return sb.toString(); } @@ -9998,17 +8329,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class waitForFlush_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setTableProperty_resultStandardScheme getScheme() { - return new setTableProperty_resultStandardScheme(); + public waitForFlush_resultStandardScheme getScheme() { + return new waitForFlush_resultStandardScheme(); } } - private static class setTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class waitForFlush_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, waitForFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -10045,15 +8376,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_re org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -10066,7 +8388,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_re } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, waitForFlush_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -10085,28 +8407,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_r struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tpe != null) { - oprot.writeFieldBegin(TPE_FIELD_DESC); - struct.tpe.write(oprot); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class waitForFlush_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setTableProperty_resultTupleScheme getScheme() { - return new setTableProperty_resultTupleScheme(); + public waitForFlush_resultTupleScheme getScheme() { + return new waitForFlush_resultTupleScheme(); } } - private static class setTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class waitForFlush_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -10118,10 +8435,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_re if (struct.isSetTnase()) { optionals.set(2); } - if (struct.isSetTpe()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -10131,15 +8445,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_re if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTpe()) { - struct.tpe.write(oprot); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, waitForFlush_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -10155,11 +8466,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_res struct.tnase.read(iprot); struct.setTnaseIsSet(true); } - if (incoming.get(3)) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } } } @@ -10169,28 +8475,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyTableProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_args"); + public static class setTableProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), TABLE_NAME((short)3, "tableName"), - V_PROPERTIES((short)4, "vProperties"); + PROPERTY((short)4, "property"), + VALUE((short)5, "value"); private static final java.util.Map byName = new java.util.HashMap(); @@ -10212,8 +8521,10 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // TABLE_NAME return TABLE_NAME; - case 4: // V_PROPERTIES - return V_PROPERTIES; + case 4: // PROPERTY + return PROPERTY; + case 5: // VALUE + return VALUE; default: return null; } @@ -10266,32 +8577,36 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_args.class, metaDataMap); } - public modifyTableProperties_args() { + public setTableProperty_args() { } - public modifyTableProperties_args( + public setTableProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, - org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) + java.lang.String property, + java.lang.String value) { this(); this.tinfo = tinfo; this.credentials = credentials; this.tableName = tableName; - this.vProperties = vProperties; + this.property = property; + this.value = value; } /** * Performs a deep copy on other. */ - public modifyTableProperties_args(modifyTableProperties_args other) { + public setTableProperty_args(setTableProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -10301,14 +8616,17 @@ public modifyTableProperties_args(modifyTableProperties_args other) { if (other.isSetTableName()) { this.tableName = other.tableName; } - if (other.isSetVProperties()) { - this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); + if (other.isSetProperty()) { + this.property = other.property; + } + if (other.isSetValue()) { + this.value = other.value; } } @Override - public modifyTableProperties_args deepCopy() { - return new modifyTableProperties_args(this); + public setTableProperty_args deepCopy() { + return new setTableProperty_args(this); } @Override @@ -10316,7 +8634,8 @@ public void clear() { this.tinfo = null; this.credentials = null; this.tableName = null; - this.vProperties = null; + this.property = null; + this.value = null; } @org.apache.thrift.annotation.Nullable @@ -10324,7 +8643,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public modifyTableProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public setTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -10349,7 +8668,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public modifyTableProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public setTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -10374,7 +8693,7 @@ public java.lang.String getTableName() { return this.tableName; } - public modifyTableProperties_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { + public setTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { this.tableName = tableName; return this; } @@ -10395,27 +8714,52 @@ public void setTableNameIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { - return this.vProperties; + public java.lang.String getProperty() { + return this.property; } - public modifyTableProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { - this.vProperties = vProperties; + public setTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; return this; } - public void unsetVProperties() { - this.vProperties = null; + public void unsetProperty() { + this.property = null; } - /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ - public boolean isSetVProperties() { - return this.vProperties != null; + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; } - public void setVPropertiesIsSet(boolean value) { + public void setPropertyIsSet(boolean value) { if (!value) { - this.vProperties = null; + this.property = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getValue() { + return this.value; + } + + public setTableProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { + this.value = value; + return this; + } + + public void unsetValue() { + this.value = null; + } + + /** Returns true if field value is set (has been assigned a value) and false otherwise */ + public boolean isSetValue() { + return this.value != null; + } + + public void setValueIsSet(boolean value) { + if (!value) { + this.value = null; } } @@ -10446,11 +8790,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case V_PROPERTIES: + case PROPERTY: if (value == null) { - unsetVProperties(); + unsetProperty(); } else { - setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); + setProperty((java.lang.String)value); + } + break; + + case VALUE: + if (value == null) { + unsetValue(); + } else { + setValue((java.lang.String)value); } break; @@ -10470,8 +8822,11 @@ public java.lang.Object getFieldValue(_Fields field) { case TABLE_NAME: return getTableName(); - case V_PROPERTIES: - return getVProperties(); + case PROPERTY: + return getProperty(); + + case VALUE: + return getValue(); } throw new java.lang.IllegalStateException(); @@ -10491,20 +8846,22 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case TABLE_NAME: return isSetTableName(); - case V_PROPERTIES: - return isSetVProperties(); + case PROPERTY: + return isSetProperty(); + case VALUE: + return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyTableProperties_args) - return this.equals((modifyTableProperties_args)that); + if (that instanceof setTableProperty_args) + return this.equals((setTableProperty_args)that); return false; } - public boolean equals(modifyTableProperties_args that) { + public boolean equals(setTableProperty_args that) { if (that == null) return false; if (this == that) @@ -10537,12 +8894,21 @@ public boolean equals(modifyTableProperties_args that) { return false; } - boolean this_present_vProperties = true && this.isSetVProperties(); - boolean that_present_vProperties = true && that.isSetVProperties(); - if (this_present_vProperties || that_present_vProperties) { - if (!(this_present_vProperties && that_present_vProperties)) + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) return false; - if (!this.vProperties.equals(that.vProperties)) + if (!this.property.equals(that.property)) + return false; + } + + boolean this_present_value = true && this.isSetValue(); + boolean that_present_value = true && that.isSetValue(); + if (this_present_value || that_present_value) { + if (!(this_present_value && that_present_value)) + return false; + if (!this.value.equals(that.value)) return false; } @@ -10565,15 +8931,19 @@ public int hashCode() { if (isSetTableName()) hashCode = hashCode * 8191 + tableName.hashCode(); - hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); - if (isSetVProperties()) - hashCode = hashCode * 8191 + vProperties.hashCode(); + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); + + hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); + if (isSetValue()) + hashCode = hashCode * 8191 + value.hashCode(); return hashCode; } @Override - public int compareTo(modifyTableProperties_args other) { + public int compareTo(setTableProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -10610,12 +8980,22 @@ public int compareTo(modifyTableProperties_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); if (lastComparison != 0) { return lastComparison; } - if (isSetVProperties()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetValue()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } @@ -10641,7 +9021,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -10668,11 +9048,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("vProperties:"); - if (this.vProperties == null) { + sb.append("property:"); + if (this.property == null) { sb.append("null"); } else { - sb.append(this.vProperties); + sb.append(this.property); + } + first = false; + if (!first) sb.append(", "); + sb.append("value:"); + if (this.value == null) { + sb.append("null"); + } else { + sb.append(this.value); } first = false; sb.append(")"); @@ -10688,9 +9076,6 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } - if (vProperties != null) { - vProperties.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -10709,17 +9094,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyTableProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyTableProperties_argsStandardScheme getScheme() { - return new modifyTableProperties_argsStandardScheme(); + public setTableProperty_argsStandardScheme getScheme() { + return new setTableProperty_argsStandardScheme(); } } - private static class modifyTableProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -10755,11 +9140,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperti org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // V_PROPERTIES - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + case 4: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // VALUE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -10776,7 +9168,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperti } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -10795,9 +9187,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTablePropert oprot.writeString(struct.tableName); oprot.writeFieldEnd(); } - if (struct.vProperties != null) { - oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); - struct.vProperties.write(oprot); + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); + oprot.writeFieldEnd(); + } + if (struct.value != null) { + oprot.writeFieldBegin(VALUE_FIELD_DESC); + oprot.writeString(struct.value); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -10806,17 +9203,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTablePropert } - private static class modifyTableProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyTableProperties_argsTupleScheme getScheme() { - return new modifyTableProperties_argsTupleScheme(); + public setTableProperty_argsTupleScheme getScheme() { + return new setTableProperty_argsTupleScheme(); } } - private static class modifyTableProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -10828,10 +9225,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperti if (struct.isSetTableName()) { optionals.set(2); } - if (struct.isSetVProperties()) { + if (struct.isSetProperty()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetValue()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } @@ -10841,15 +9241,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperti if (struct.isSetTableName()) { oprot.writeString(struct.tableName); } - if (struct.isSetVProperties()) { - struct.vProperties.write(oprot); + if (struct.isSetProperty()) { + oprot.writeString(struct.property); + } + if (struct.isSetValue()) { + oprot.writeString(struct.value); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -10865,9 +9268,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyTablePropertie struct.setTableNameIsSet(true); } if (incoming.get(3)) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } + if (incoming.get(4)) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } } } @@ -10878,22 +9284,20 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyTableProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_result"); + public static class setTableProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setTableProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setTableProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setTableProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -10901,8 +9305,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), TNASE((short)3, "tnase"), - TCME((short)4, "tcme"), - TPE((short)5, "tpe"); + TPE((short)4, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -10924,9 +9327,7 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; - case 4: // TCME - return TCME; - case 5: // TPE + case 4: // TPE return TPE; default: return null; @@ -10980,36 +9381,32 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setTableProperty_result.class, metaDataMap); } - public modifyTableProperties_result() { + public setTableProperty_result() { } - public modifyTableProperties_result( + public setTableProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, ThriftPropertyException tpe) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; - this.tcme = tcme; this.tpe = tpe; } /** * Performs a deep copy on other. */ - public modifyTableProperties_result(modifyTableProperties_result other) { + public setTableProperty_result(setTableProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -11019,17 +9416,14 @@ public modifyTableProperties_result(modifyTableProperties_result other) { if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTcme()) { - this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); - } if (other.isSetTpe()) { this.tpe = new ThriftPropertyException(other.tpe); } } @Override - public modifyTableProperties_result deepCopy() { - return new modifyTableProperties_result(this); + public setTableProperty_result deepCopy() { + return new setTableProperty_result(this); } @Override @@ -11037,7 +9431,6 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; - this.tcme = null; this.tpe = null; } @@ -11046,7 +9439,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public modifyTableProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public setTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -11071,7 +9464,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public modifyTableProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public setTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -11096,7 +9489,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public modifyTableProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public setTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -11116,37 +9509,12 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { - return this.tcme; - } - - public modifyTableProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { - this.tcme = tcme; - return this; - } - - public void unsetTcme() { - this.tcme = null; - } - - /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ - public boolean isSetTcme() { - return this.tcme != null; - } - - public void setTcmeIsSet(boolean value) { - if (!value) { - this.tcme = null; - } - } - @org.apache.thrift.annotation.Nullable public ThriftPropertyException getTpe() { return this.tpe; } - public modifyTableProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + public setTableProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { this.tpe = tpe; return this; } @@ -11193,14 +9561,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TCME: - if (value == null) { - unsetTcme(); - } else { - setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); - } - break; - case TPE: if (value == null) { unsetTpe(); @@ -11225,9 +9585,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TCME: - return getTcme(); - case TPE: return getTpe(); @@ -11249,8 +9606,6 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); - case TCME: - return isSetTcme(); case TPE: return isSetTpe(); } @@ -11259,12 +9614,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyTableProperties_result) - return this.equals((modifyTableProperties_result)that); + if (that instanceof setTableProperty_result) + return this.equals((setTableProperty_result)that); return false; } - public boolean equals(modifyTableProperties_result that) { + public boolean equals(setTableProperty_result that) { if (that == null) return false; if (this == that) @@ -11297,15 +9652,6 @@ public boolean equals(modifyTableProperties_result that) { return false; } - boolean this_present_tcme = true && this.isSetTcme(); - boolean that_present_tcme = true && that.isSetTcme(); - if (this_present_tcme || that_present_tcme) { - if (!(this_present_tcme && that_present_tcme)) - return false; - if (!this.tcme.equals(that.tcme)) - return false; - } - boolean this_present_tpe = true && this.isSetTpe(); boolean that_present_tpe = true && that.isSetTpe(); if (this_present_tpe || that_present_tpe) { @@ -11334,10 +9680,6 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); - if (isSetTcme()) - hashCode = hashCode * 8191 + tcme.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); if (isSetTpe()) hashCode = hashCode * 8191 + tpe.hashCode(); @@ -11346,7 +9688,7 @@ public int hashCode() { } @Override - public int compareTo(modifyTableProperties_result other) { + public int compareTo(setTableProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -11383,16 +9725,6 @@ public int compareTo(modifyTableProperties_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTcme()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); if (lastComparison != 0) { return lastComparison; @@ -11423,7 +9755,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setTableProperty_result("); boolean first = true; sb.append("sec:"); @@ -11450,14 +9782,6 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tcme:"); - if (this.tcme == null) { - sb.append("null"); - } else { - sb.append(this.tcme); - } - first = false; - if (!first) sb.append(", "); sb.append("tpe:"); if (this.tpe == null) { sb.append("null"); @@ -11490,17 +9814,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyTableProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyTableProperties_resultStandardScheme getScheme() { - return new modifyTableProperties_resultStandardScheme(); + public setTableProperty_resultStandardScheme getScheme() { + return new setTableProperty_resultStandardScheme(); } } - private static class modifyTableProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -11537,16 +9861,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperti org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TCME - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // TPE + case 4: // TPE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); @@ -11567,7 +9882,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperti } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setTableProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -11586,11 +9901,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTablePropert struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tcme != null) { - oprot.writeFieldBegin(TCME_FIELD_DESC); - struct.tcme.write(oprot); - oprot.writeFieldEnd(); - } if (struct.tpe != null) { oprot.writeFieldBegin(TPE_FIELD_DESC); struct.tpe.write(oprot); @@ -11602,17 +9912,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTablePropert } - private static class modifyTableProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyTableProperties_resultTupleScheme getScheme() { - return new modifyTableProperties_resultTupleScheme(); + public setTableProperty_resultTupleScheme getScheme() { + return new setTableProperty_resultTupleScheme(); } } - private static class modifyTableProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -11624,13 +9934,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperti if (struct.isSetTnase()) { optionals.set(2); } - if (struct.isSetTcme()) { - optionals.set(3); - } if (struct.isSetTpe()) { - optionals.set(4); + optionals.set(3); } - oprot.writeBitSet(optionals, 5); + oprot.writeBitSet(optionals, 4); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -11640,18 +9947,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperti if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTcme()) { - struct.tcme.write(oprot); - } if (struct.isSetTpe()) { struct.tpe.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -11668,11 +9972,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyTablePropertie struct.setTnaseIsSet(true); } if (incoming.get(3)) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } - if (incoming.get(4)) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); struct.setTpeIsSet(true); @@ -11686,28 +9985,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeTableProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_args"); + public static class modifyTableProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), TABLE_NAME((short)3, "tableName"), - PROPERTY((short)4, "property"); + V_PROPERTIES((short)4, "vProperties"); private static final java.util.Map byName = new java.util.HashMap(); @@ -11729,8 +10028,8 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // TABLE_NAME return TABLE_NAME; - case 4: // PROPERTY - return PROPERTY; + case 4: // V_PROPERTIES + return V_PROPERTIES; default: return null; } @@ -11783,32 +10082,32 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_args.class, metaDataMap); } - public removeTableProperty_args() { + public modifyTableProperties_args() { } - public removeTableProperty_args( + public modifyTableProperties_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, - java.lang.String property) + org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { this(); this.tinfo = tinfo; this.credentials = credentials; this.tableName = tableName; - this.property = property; + this.vProperties = vProperties; } /** * Performs a deep copy on other. */ - public removeTableProperty_args(removeTableProperty_args other) { + public modifyTableProperties_args(modifyTableProperties_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -11818,14 +10117,14 @@ public removeTableProperty_args(removeTableProperty_args other) { if (other.isSetTableName()) { this.tableName = other.tableName; } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetVProperties()) { + this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); } } @Override - public removeTableProperty_args deepCopy() { - return new removeTableProperty_args(this); + public modifyTableProperties_args deepCopy() { + return new modifyTableProperties_args(this); } @Override @@ -11833,7 +10132,7 @@ public void clear() { this.tinfo = null; this.credentials = null; this.tableName = null; - this.property = null; + this.vProperties = null; } @org.apache.thrift.annotation.Nullable @@ -11841,7 +10140,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public removeTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public modifyTableProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -11866,7 +10165,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public removeTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public modifyTableProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -11891,7 +10190,7 @@ public java.lang.String getTableName() { return this.tableName; } - public removeTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { + public modifyTableProperties_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { this.tableName = tableName; return this; } @@ -11912,27 +10211,27 @@ public void setTableNameIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { + return this.vProperties; } - public removeTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public modifyTableProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { + this.vProperties = vProperties; return this; } - public void unsetProperty() { - this.property = null; + public void unsetVProperties() { + this.vProperties = null; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetVProperties() { + return this.vProperties != null; } - public void setPropertyIsSet(boolean value) { + public void setVPropertiesIsSet(boolean value) { if (!value) { - this.property = null; + this.vProperties = null; } } @@ -11963,11 +10262,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case V_PROPERTIES: if (value == null) { - unsetProperty(); + unsetVProperties(); } else { - setProperty((java.lang.String)value); + setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); } break; @@ -11987,8 +10286,8 @@ public java.lang.Object getFieldValue(_Fields field) { case TABLE_NAME: return getTableName(); - case PROPERTY: - return getProperty(); + case V_PROPERTIES: + return getVProperties(); } throw new java.lang.IllegalStateException(); @@ -12008,20 +10307,20 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case TABLE_NAME: return isSetTableName(); - case PROPERTY: - return isSetProperty(); + case V_PROPERTIES: + return isSetVProperties(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeTableProperty_args) - return this.equals((removeTableProperty_args)that); + if (that instanceof modifyTableProperties_args) + return this.equals((modifyTableProperties_args)that); return false; } - public boolean equals(removeTableProperty_args that) { + public boolean equals(modifyTableProperties_args that) { if (that == null) return false; if (this == that) @@ -12054,12 +10353,12 @@ public boolean equals(removeTableProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_vProperties = true && this.isSetVProperties(); + boolean that_present_vProperties = true && that.isSetVProperties(); + if (this_present_vProperties || that_present_vProperties) { + if (!(this_present_vProperties && that_present_vProperties)) return false; - if (!this.property.equals(that.property)) + if (!this.vProperties.equals(that.vProperties)) return false; } @@ -12082,15 +10381,15 @@ public int hashCode() { if (isSetTableName()) hashCode = hashCode * 8191 + tableName.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); + if (isSetVProperties()) + hashCode = hashCode * 8191 + vProperties.hashCode(); return hashCode; } @Override - public int compareTo(removeTableProperty_args other) { + public int compareTo(modifyTableProperties_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -12127,12 +10426,12 @@ public int compareTo(removeTableProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetVProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); if (lastComparison != 0) { return lastComparison; } @@ -12158,7 +10457,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_args("); boolean first = true; sb.append("tinfo:"); @@ -12185,11 +10484,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("vProperties:"); + if (this.vProperties == null) { sb.append("null"); } else { - sb.append(this.property); + sb.append(this.vProperties); } first = false; sb.append(")"); @@ -12205,6 +10504,9 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } + if (vProperties != null) { + vProperties.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -12223,17 +10525,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyTableProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeTableProperty_argsStandardScheme getScheme() { - return new removeTableProperty_argsStandardScheme(); + public modifyTableProperties_argsStandardScheme getScheme() { + return new modifyTableProperties_argsStandardScheme(); } } - private static class removeTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyTableProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -12269,10 +10571,11 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PROPERTY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + case 4: // V_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -12289,7 +10592,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -12308,9 +10611,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeTablePropert oprot.writeString(struct.tableName); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.vProperties != null) { + oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); + struct.vProperties.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -12319,17 +10622,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeTablePropert } - private static class removeTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyTableProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeTableProperty_argsTupleScheme getScheme() { - return new removeTableProperty_argsTupleScheme(); + public modifyTableProperties_argsTupleScheme getScheme() { + return new modifyTableProperties_argsTupleScheme(); } } - private static class removeTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyTableProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -12341,7 +10644,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty if (struct.isSetTableName()) { optionals.set(2); } - if (struct.isSetProperty()) { + if (struct.isSetVProperties()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -12354,13 +10657,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty if (struct.isSetTableName()) { oprot.writeString(struct.tableName); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetVProperties()) { + struct.vProperties.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -12378,8 +10681,9 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_ struct.setTableNameIsSet(true); } if (incoming.get(3)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } } } @@ -12390,25 +10694,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeTableProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_result"); + public static class modifyTableProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyTableProperties_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyTableProperties_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required + public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), - TNASE((short)3, "tnase"); + TNASE((short)3, "tnase"), + TCME((short)4, "tcme"), + TPE((short)5, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -12430,6 +10740,10 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; + case 4: // TCME + return TCME; + case 5: // TPE + return TPE; default: return null; } @@ -12482,28 +10796,36 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); + tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); + tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyTableProperties_result.class, metaDataMap); } - public removeTableProperty_result() { + public modifyTableProperties_result() { } - public removeTableProperty_result( + public modifyTableProperties_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, + org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, + ThriftPropertyException tpe) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; + this.tcme = tcme; + this.tpe = tpe; } /** * Performs a deep copy on other. */ - public removeTableProperty_result(removeTableProperty_result other) { + public modifyTableProperties_result(modifyTableProperties_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -12513,11 +10835,17 @@ public removeTableProperty_result(removeTableProperty_result other) { if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } + if (other.isSetTcme()) { + this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); + } + if (other.isSetTpe()) { + this.tpe = new ThriftPropertyException(other.tpe); + } } @Override - public removeTableProperty_result deepCopy() { - return new removeTableProperty_result(this); + public modifyTableProperties_result deepCopy() { + return new modifyTableProperties_result(this); } @Override @@ -12525,6 +10853,8 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; + this.tcme = null; + this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -12532,7 +10862,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public removeTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public modifyTableProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -12557,7 +10887,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public removeTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public modifyTableProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -12582,7 +10912,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public removeTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public modifyTableProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -12602,6 +10932,56 @@ public void setTnaseIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { + return this.tcme; + } + + public modifyTableProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { + this.tcme = tcme; + return this; + } + + public void unsetTcme() { + this.tcme = null; + } + + /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ + public boolean isSetTcme() { + return this.tcme != null; + } + + public void setTcmeIsSet(boolean value) { + if (!value) { + this.tcme = null; + } + } + + @org.apache.thrift.annotation.Nullable + public ThriftPropertyException getTpe() { + return this.tpe; + } + + public modifyTableProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + this.tpe = tpe; + return this; + } + + public void unsetTpe() { + this.tpe = null; + } + + /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ + public boolean isSetTpe() { + return this.tpe != null; + } + + public void setTpeIsSet(boolean value) { + if (!value) { + this.tpe = null; + } + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -12629,6 +11009,22 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case TCME: + if (value == null) { + unsetTcme(); + } else { + setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); + } + break; + + case TPE: + if (value == null) { + unsetTpe(); + } else { + setTpe((ThriftPropertyException)value); + } + break; + } } @@ -12645,6 +11041,12 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); + case TCME: + return getTcme(); + + case TPE: + return getTpe(); + } throw new java.lang.IllegalStateException(); } @@ -12663,18 +11065,22 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); + case TCME: + return isSetTcme(); + case TPE: + return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeTableProperty_result) - return this.equals((removeTableProperty_result)that); + if (that instanceof modifyTableProperties_result) + return this.equals((modifyTableProperties_result)that); return false; } - public boolean equals(removeTableProperty_result that) { + public boolean equals(modifyTableProperties_result that) { if (that == null) return false; if (this == that) @@ -12707,6 +11113,24 @@ public boolean equals(removeTableProperty_result that) { return false; } + boolean this_present_tcme = true && this.isSetTcme(); + boolean that_present_tcme = true && that.isSetTcme(); + if (this_present_tcme || that_present_tcme) { + if (!(this_present_tcme && that_present_tcme)) + return false; + if (!this.tcme.equals(that.tcme)) + return false; + } + + boolean this_present_tpe = true && this.isSetTpe(); + boolean that_present_tpe = true && that.isSetTpe(); + if (this_present_tpe || that_present_tpe) { + if (!(this_present_tpe && that_present_tpe)) + return false; + if (!this.tpe.equals(that.tpe)) + return false; + } + return true; } @@ -12726,11 +11150,19 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); + hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); + if (isSetTcme()) + hashCode = hashCode * 8191 + tcme.hashCode(); + + hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); + if (isSetTpe()) + hashCode = hashCode * 8191 + tpe.hashCode(); + return hashCode; } @Override - public int compareTo(removeTableProperty_result other) { + public int compareTo(modifyTableProperties_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -12767,6 +11199,26 @@ public int compareTo(removeTableProperty_result other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTcme()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTpe()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -12787,7 +11239,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyTableProperties_result("); boolean first = true; sb.append("sec:"); @@ -12813,6 +11265,22 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; + if (!first) sb.append(", "); + sb.append("tcme:"); + if (this.tcme == null) { + sb.append("null"); + } else { + sb.append(this.tcme); + } + first = false; + if (!first) sb.append(", "); + sb.append("tpe:"); + if (this.tpe == null) { + sb.append("null"); + } else { + sb.append(this.tpe); + } + first = false; sb.append(")"); return sb.toString(); } @@ -12838,17 +11306,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyTableProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeTableProperty_resultStandardScheme getScheme() { - return new removeTableProperty_resultStandardScheme(); + public modifyTableProperties_resultStandardScheme getScheme() { + return new modifyTableProperties_resultStandardScheme(); } } - private static class removeTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyTableProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyTableProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -12885,6 +11353,24 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 4: // TCME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // TPE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -12897,7 +11383,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyTableProperties_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -12916,23 +11402,33 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeTablePropert struct.tnase.write(oprot); oprot.writeFieldEnd(); } + if (struct.tcme != null) { + oprot.writeFieldBegin(TCME_FIELD_DESC); + struct.tcme.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.tpe != null) { + oprot.writeFieldBegin(TPE_FIELD_DESC); + struct.tpe.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class removeTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyTableProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeTableProperty_resultTupleScheme getScheme() { - return new removeTableProperty_resultTupleScheme(); + public modifyTableProperties_resultTupleScheme getScheme() { + return new modifyTableProperties_resultTupleScheme(); } } - private static class removeTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyTableProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -12944,7 +11440,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty if (struct.isSetTnase()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetTcme()) { + optionals.set(3); + } + if (struct.isSetTpe()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -12954,12 +11456,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty if (struct.isSetTnase()) { struct.tnase.write(oprot); } + if (struct.isSetTcme()) { + struct.tcme.write(oprot); + } + if (struct.isSetTpe()) { + struct.tpe.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyTableProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -12975,6 +11483,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_ struct.tnase.read(iprot); struct.setTnaseIsSet(true); } + if (incoming.get(3)) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } + if (incoming.get(4)) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } } } @@ -12984,31 +11502,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setNamespaceProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_args"); + public static class removeTableProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required + public @org.apache.thrift.annotation.Nullable java.lang.String tableName; // required public @org.apache.thrift.annotation.Nullable java.lang.String property; // required - public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - NS((short)3, "ns"), - PROPERTY((short)4, "property"), - VALUE((short)5, "value"); + TABLE_NAME((short)3, "tableName"), + PROPERTY((short)4, "property"); private static final java.util.Map byName = new java.util.HashMap(); @@ -13028,12 +11543,10 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // NS - return NS; + case 3: // TABLE_NAME + return TABLE_NAME; case 4: // PROPERTY return PROPERTY; - case 5: // VALUE - return VALUE; default: return null; } @@ -13084,67 +11597,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_args.class, metaDataMap); } - public setNamespaceProperty_args() { + public removeTableProperty_args() { } - public setNamespaceProperty_args( + public removeTableProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String ns, - java.lang.String property, - java.lang.String value) + java.lang.String tableName, + java.lang.String property) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.ns = ns; + this.tableName = tableName; this.property = property; - this.value = value; } /** * Performs a deep copy on other. */ - public setNamespaceProperty_args(setNamespaceProperty_args other) { + public removeTableProperty_args(removeTableProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetNs()) { - this.ns = other.ns; + if (other.isSetTableName()) { + this.tableName = other.tableName; } if (other.isSetProperty()) { this.property = other.property; } - if (other.isSetValue()) { - this.value = other.value; - } } @Override - public setNamespaceProperty_args deepCopy() { - return new setNamespaceProperty_args(this); + public removeTableProperty_args deepCopy() { + return new removeTableProperty_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.ns = null; + this.tableName = null; this.property = null; - this.value = null; } @org.apache.thrift.annotation.Nullable @@ -13152,7 +11657,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public setNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public removeTableProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -13177,7 +11682,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public setNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public removeTableProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -13198,27 +11703,27 @@ public void setCredentialsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getNs() { - return this.ns; + public java.lang.String getTableName() { + return this.tableName; } - public setNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { - this.ns = ns; + public removeTableProperty_args setTableName(@org.apache.thrift.annotation.Nullable java.lang.String tableName) { + this.tableName = tableName; return this; } - public void unsetNs() { - this.ns = null; + public void unsetTableName() { + this.tableName = null; } - /** Returns true if field ns is set (has been assigned a value) and false otherwise */ - public boolean isSetNs() { - return this.ns != null; + /** Returns true if field tableName is set (has been assigned a value) and false otherwise */ + public boolean isSetTableName() { + return this.tableName != null; } - public void setNsIsSet(boolean value) { + public void setTableNameIsSet(boolean value) { if (!value) { - this.ns = null; + this.tableName = null; } } @@ -13227,7 +11732,7 @@ public java.lang.String getProperty() { return this.property; } - public setNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + public removeTableProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { this.property = property; return this; } @@ -13247,31 +11752,6 @@ public void setPropertyIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getValue() { - return this.value; - } - - public setNamespaceProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { - this.value = value; - return this; - } - - public void unsetValue() { - this.value = null; - } - - /** Returns true if field value is set (has been assigned a value) and false otherwise */ - public boolean isSetValue() { - return this.value != null; - } - - public void setValueIsSet(boolean value) { - if (!value) { - this.value = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -13291,11 +11771,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case NS: + case TABLE_NAME: if (value == null) { - unsetNs(); + unsetTableName(); } else { - setNs((java.lang.String)value); + setTableName((java.lang.String)value); } break; @@ -13307,14 +11787,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case VALUE: - if (value == null) { - unsetValue(); - } else { - setValue((java.lang.String)value); - } - break; - } } @@ -13328,15 +11800,12 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case NS: - return getNs(); + case TABLE_NAME: + return getTableName(); case PROPERTY: return getProperty(); - case VALUE: - return getValue(); - } throw new java.lang.IllegalStateException(); } @@ -13353,24 +11822,22 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case NS: - return isSetNs(); + case TABLE_NAME: + return isSetTableName(); case PROPERTY: return isSetProperty(); - case VALUE: - return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setNamespaceProperty_args) - return this.equals((setNamespaceProperty_args)that); + if (that instanceof removeTableProperty_args) + return this.equals((removeTableProperty_args)that); return false; } - public boolean equals(setNamespaceProperty_args that) { + public boolean equals(removeTableProperty_args that) { if (that == null) return false; if (this == that) @@ -13394,12 +11861,12 @@ public boolean equals(setNamespaceProperty_args that) { return false; } - boolean this_present_ns = true && this.isSetNs(); - boolean that_present_ns = true && that.isSetNs(); - if (this_present_ns || that_present_ns) { - if (!(this_present_ns && that_present_ns)) + boolean this_present_tableName = true && this.isSetTableName(); + boolean that_present_tableName = true && that.isSetTableName(); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) return false; - if (!this.ns.equals(that.ns)) + if (!this.tableName.equals(that.tableName)) return false; } @@ -13412,15 +11879,6 @@ public boolean equals(setNamespaceProperty_args that) { return false; } - boolean this_present_value = true && this.isSetValue(); - boolean that_present_value = true && that.isSetValue(); - if (this_present_value || that_present_value) { - if (!(this_present_value && that_present_value)) - return false; - if (!this.value.equals(that.value)) - return false; - } - return true; } @@ -13436,23 +11894,19 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetNs()) ? 131071 : 524287); - if (isSetNs()) - hashCode = hashCode * 8191 + ns.hashCode(); + hashCode = hashCode * 8191 + ((isSetTableName()) ? 131071 : 524287); + if (isSetTableName()) + hashCode = hashCode * 8191 + tableName.hashCode(); hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); if (isSetProperty()) hashCode = hashCode * 8191 + property.hashCode(); - hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); - if (isSetValue()) - hashCode = hashCode * 8191 + value.hashCode(); - return hashCode; } @Override - public int compareTo(setNamespaceProperty_args other) { + public int compareTo(removeTableProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -13479,12 +11933,12 @@ public int compareTo(setNamespaceProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs()); + lastComparison = java.lang.Boolean.compare(isSetTableName(), other.isSetTableName()); if (lastComparison != 0) { return lastComparison; } - if (isSetNs()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ns, other.ns); + if (isSetTableName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName); if (lastComparison != 0) { return lastComparison; } @@ -13499,16 +11953,6 @@ public int compareTo(setNamespaceProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -13530,7 +11974,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -13549,11 +11993,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("ns:"); - if (this.ns == null) { + sb.append("tableName:"); + if (this.tableName == null) { sb.append("null"); } else { - sb.append(this.ns); + sb.append(this.tableName); } first = false; if (!first) sb.append(", "); @@ -13564,14 +12008,6 @@ public java.lang.String toString() { sb.append(this.property); } first = false; - if (!first) sb.append(", "); - sb.append("value:"); - if (this.value == null) { - sb.append("null"); - } else { - sb.append(this.value); - } - first = false; sb.append(")"); return sb.toString(); } @@ -13603,17 +12039,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeTableProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setNamespaceProperty_argsStandardScheme getScheme() { - return new setNamespaceProperty_argsStandardScheme(); + public removeTableProperty_argsStandardScheme getScheme() { + return new removeTableProperty_argsStandardScheme(); } } - private static class setNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeTableProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -13641,10 +12077,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespacePropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // NS + case 3: // TABLE_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.ns = iprot.readString(); - struct.setNsIsSet(true); + struct.tableName = iprot.readString(); + struct.setTableNameIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -13657,14 +12093,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespacePropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // VALUE - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -13677,7 +12105,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespacePropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -13691,9 +12119,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProper struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.ns != null) { - oprot.writeFieldBegin(NS_FIELD_DESC); - oprot.writeString(struct.ns); + if (struct.tableName != null) { + oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC); + oprot.writeString(struct.tableName); oprot.writeFieldEnd(); } if (struct.property != null) { @@ -13701,28 +12129,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProper oprot.writeString(struct.property); oprot.writeFieldEnd(); } - if (struct.value != null) { - oprot.writeFieldBegin(VALUE_FIELD_DESC); - oprot.writeString(struct.value); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeTableProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setNamespaceProperty_argsTupleScheme getScheme() { - return new setNamespaceProperty_argsTupleScheme(); + public removeTableProperty_argsTupleScheme getScheme() { + return new removeTableProperty_argsTupleScheme(); } } - private static class setNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeTableProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -13731,37 +12154,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setNamespacePropert if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetNs()) { + if (struct.isSetTableName()) { optionals.set(2); } if (struct.isSetProperty()) { optionals.set(3); } - if (struct.isSetValue()) { - optionals.set(4); - } - oprot.writeBitSet(optionals, 5); + oprot.writeBitSet(optionals, 4); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetNs()) { - oprot.writeString(struct.ns); + if (struct.isSetTableName()) { + oprot.writeString(struct.tableName); } if (struct.isSetProperty()) { oprot.writeString(struct.property); } - if (struct.isSetValue()) { - oprot.writeString(struct.value); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -13773,17 +12190,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.ns = iprot.readString(); - struct.setNsIsSet(true); + struct.tableName = iprot.readString(); + struct.setTableNameIsSet(true); } if (incoming.get(3)) { struct.property = iprot.readString(); struct.setPropertyIsSet(true); } - if (incoming.get(4)) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); - } } } @@ -13793,28 +12206,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setNamespaceProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_result"); + public static class removeTableProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeTableProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeTableProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeTableProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), - TNASE((short)3, "tnase"), - TPE((short)4, "tpe"); + TNASE((short)3, "tnase"); private static final java.util.Map byName = new java.util.HashMap(); @@ -13836,8 +12246,6 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; - case 4: // TPE - return TPE; default: return null; } @@ -13890,32 +12298,28 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeTableProperty_result.class, metaDataMap); } - public setNamespaceProperty_result() { + public removeTableProperty_result() { } - public setNamespaceProperty_result( + public removeTableProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - ThriftPropertyException tpe) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; - this.tpe = tpe; } /** * Performs a deep copy on other. */ - public setNamespaceProperty_result(setNamespaceProperty_result other) { + public removeTableProperty_result(removeTableProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -13925,14 +12329,11 @@ public setNamespaceProperty_result(setNamespaceProperty_result other) { if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTpe()) { - this.tpe = new ThriftPropertyException(other.tpe); - } } @Override - public setNamespaceProperty_result deepCopy() { - return new setNamespaceProperty_result(this); + public removeTableProperty_result deepCopy() { + return new removeTableProperty_result(this); } @Override @@ -13940,7 +12341,6 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; - this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -13948,7 +12348,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public setNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public removeTableProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -13973,7 +12373,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public setNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public removeTableProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -13998,7 +12398,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public setNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public removeTableProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -14018,31 +12418,6 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public ThriftPropertyException getTpe() { - return this.tpe; - } - - public setNamespaceProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { - this.tpe = tpe; - return this; - } - - public void unsetTpe() { - this.tpe = null; - } - - /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ - public boolean isSetTpe() { - return this.tpe != null; - } - - public void setTpeIsSet(boolean value) { - if (!value) { - this.tpe = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -14070,14 +12445,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TPE: - if (value == null) { - unsetTpe(); - } else { - setTpe((ThriftPropertyException)value); - } - break; - } } @@ -14094,9 +12461,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TPE: - return getTpe(); - } throw new java.lang.IllegalStateException(); } @@ -14115,20 +12479,18 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); - case TPE: - return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setNamespaceProperty_result) - return this.equals((setNamespaceProperty_result)that); + if (that instanceof removeTableProperty_result) + return this.equals((removeTableProperty_result)that); return false; } - public boolean equals(setNamespaceProperty_result that) { + public boolean equals(removeTableProperty_result that) { if (that == null) return false; if (this == that) @@ -14161,15 +12523,6 @@ public boolean equals(setNamespaceProperty_result that) { return false; } - boolean this_present_tpe = true && this.isSetTpe(); - boolean that_present_tpe = true && that.isSetTpe(); - if (this_present_tpe || that_present_tpe) { - if (!(this_present_tpe && that_present_tpe)) - return false; - if (!this.tpe.equals(that.tpe)) - return false; - } - return true; } @@ -14189,15 +12542,11 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); - if (isSetTpe()) - hashCode = hashCode * 8191 + tpe.hashCode(); - return hashCode; } @Override - public int compareTo(setNamespaceProperty_result other) { + public int compareTo(removeTableProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -14234,16 +12583,6 @@ public int compareTo(setNamespaceProperty_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTpe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -14264,7 +12603,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeTableProperty_result("); boolean first = true; sb.append("sec:"); @@ -14290,14 +12629,6 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; - if (!first) sb.append(", "); - sb.append("tpe:"); - if (this.tpe == null) { - sb.append("null"); - } else { - sb.append(this.tpe); - } - first = false; sb.append(")"); return sb.toString(); } @@ -14323,17 +12654,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeTableProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setNamespaceProperty_resultStandardScheme getScheme() { - return new setNamespaceProperty_resultStandardScheme(); + public removeTableProperty_resultStandardScheme getScheme() { + return new removeTableProperty_resultStandardScheme(); } } - private static class setNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeTableProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -14370,15 +12701,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespacePropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -14391,7 +12713,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespacePropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeTableProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -14410,28 +12732,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProper struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tpe != null) { - oprot.writeFieldBegin(TPE_FIELD_DESC); - struct.tpe.write(oprot); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeTableProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setNamespaceProperty_resultTupleScheme getScheme() { - return new setNamespaceProperty_resultTupleScheme(); + public removeTableProperty_resultTupleScheme getScheme() { + return new removeTableProperty_resultTupleScheme(); } } - private static class setNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeTableProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -14443,10 +12760,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setNamespacePropert if (struct.isSetTnase()) { optionals.set(2); } - if (struct.isSetTpe()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -14456,15 +12770,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setNamespacePropert if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTpe()) { - struct.tpe.write(oprot); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeTableProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -14480,11 +12791,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty struct.tnase.read(iprot); struct.setTnaseIsSet(true); } - if (incoming.get(3)) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } } } @@ -14494,28 +12800,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyNamespaceProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_args"); + public static class setNamespaceProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), NS((short)3, "ns"), - V_PROPERTIES((short)4, "vProperties"); + PROPERTY((short)4, "property"), + VALUE((short)5, "value"); private static final java.util.Map byName = new java.util.HashMap(); @@ -14537,8 +12846,10 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // NS return NS; - case 4: // V_PROPERTIES - return V_PROPERTIES; + case 4: // PROPERTY + return PROPERTY; + case 5: // VALUE + return VALUE; default: return null; } @@ -14591,32 +12902,36 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_args.class, metaDataMap); } - public modifyNamespaceProperties_args() { + public setNamespaceProperty_args() { } - public modifyNamespaceProperties_args( + public setNamespaceProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, - org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) + java.lang.String property, + java.lang.String value) { this(); this.tinfo = tinfo; this.credentials = credentials; this.ns = ns; - this.vProperties = vProperties; + this.property = property; + this.value = value; } /** * Performs a deep copy on other. */ - public modifyNamespaceProperties_args(modifyNamespaceProperties_args other) { + public setNamespaceProperty_args(setNamespaceProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -14626,14 +12941,17 @@ public modifyNamespaceProperties_args(modifyNamespaceProperties_args other) { if (other.isSetNs()) { this.ns = other.ns; } - if (other.isSetVProperties()) { - this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); + if (other.isSetProperty()) { + this.property = other.property; + } + if (other.isSetValue()) { + this.value = other.value; } } @Override - public modifyNamespaceProperties_args deepCopy() { - return new modifyNamespaceProperties_args(this); + public setNamespaceProperty_args deepCopy() { + return new setNamespaceProperty_args(this); } @Override @@ -14641,7 +12959,8 @@ public void clear() { this.tinfo = null; this.credentials = null; this.ns = null; - this.vProperties = null; + this.property = null; + this.value = null; } @org.apache.thrift.annotation.Nullable @@ -14649,7 +12968,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public modifyNamespaceProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public setNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -14674,7 +12993,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public modifyNamespaceProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public setNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -14699,7 +13018,7 @@ public java.lang.String getNs() { return this.ns; } - public modifyNamespaceProperties_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { + public setNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { this.ns = ns; return this; } @@ -14720,27 +13039,52 @@ public void setNsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { - return this.vProperties; + public java.lang.String getProperty() { + return this.property; } - public modifyNamespaceProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { - this.vProperties = vProperties; + public setNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; return this; } - public void unsetVProperties() { - this.vProperties = null; + public void unsetProperty() { + this.property = null; } - /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ - public boolean isSetVProperties() { - return this.vProperties != null; + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; } - public void setVPropertiesIsSet(boolean value) { + public void setPropertyIsSet(boolean value) { if (!value) { - this.vProperties = null; + this.property = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getValue() { + return this.value; + } + + public setNamespaceProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { + this.value = value; + return this; + } + + public void unsetValue() { + this.value = null; + } + + /** Returns true if field value is set (has been assigned a value) and false otherwise */ + public boolean isSetValue() { + return this.value != null; + } + + public void setValueIsSet(boolean value) { + if (!value) { + this.value = null; } } @@ -14771,11 +13115,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case V_PROPERTIES: + case PROPERTY: if (value == null) { - unsetVProperties(); + unsetProperty(); } else { - setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); + setProperty((java.lang.String)value); + } + break; + + case VALUE: + if (value == null) { + unsetValue(); + } else { + setValue((java.lang.String)value); } break; @@ -14795,8 +13147,11 @@ public java.lang.Object getFieldValue(_Fields field) { case NS: return getNs(); - case V_PROPERTIES: - return getVProperties(); + case PROPERTY: + return getProperty(); + + case VALUE: + return getValue(); } throw new java.lang.IllegalStateException(); @@ -14816,20 +13171,22 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case NS: return isSetNs(); - case V_PROPERTIES: - return isSetVProperties(); + case PROPERTY: + return isSetProperty(); + case VALUE: + return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyNamespaceProperties_args) - return this.equals((modifyNamespaceProperties_args)that); + if (that instanceof setNamespaceProperty_args) + return this.equals((setNamespaceProperty_args)that); return false; } - public boolean equals(modifyNamespaceProperties_args that) { + public boolean equals(setNamespaceProperty_args that) { if (that == null) return false; if (this == that) @@ -14862,12 +13219,21 @@ public boolean equals(modifyNamespaceProperties_args that) { return false; } - boolean this_present_vProperties = true && this.isSetVProperties(); - boolean that_present_vProperties = true && that.isSetVProperties(); - if (this_present_vProperties || that_present_vProperties) { - if (!(this_present_vProperties && that_present_vProperties)) + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) return false; - if (!this.vProperties.equals(that.vProperties)) + if (!this.property.equals(that.property)) + return false; + } + + boolean this_present_value = true && this.isSetValue(); + boolean that_present_value = true && that.isSetValue(); + if (this_present_value || that_present_value) { + if (!(this_present_value && that_present_value)) + return false; + if (!this.value.equals(that.value)) return false; } @@ -14890,15 +13256,19 @@ public int hashCode() { if (isSetNs()) hashCode = hashCode * 8191 + ns.hashCode(); - hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); - if (isSetVProperties()) - hashCode = hashCode * 8191 + vProperties.hashCode(); + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); + + hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); + if (isSetValue()) + hashCode = hashCode * 8191 + value.hashCode(); return hashCode; } @Override - public int compareTo(modifyNamespaceProperties_args other) { + public int compareTo(setNamespaceProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -14935,12 +13305,22 @@ public int compareTo(modifyNamespaceProperties_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); if (lastComparison != 0) { return lastComparison; } - if (isSetVProperties()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetValue()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } @@ -14966,7 +13346,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -14993,11 +13373,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("vProperties:"); - if (this.vProperties == null) { + sb.append("property:"); + if (this.property == null) { sb.append("null"); } else { - sb.append(this.vProperties); + sb.append(this.property); + } + first = false; + if (!first) sb.append(", "); + sb.append("value:"); + if (this.value == null) { + sb.append("null"); + } else { + sb.append(this.value); } first = false; sb.append(")"); @@ -15013,9 +13401,6 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } - if (vProperties != null) { - vProperties.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -15034,17 +13419,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyNamespaceProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyNamespaceProperties_argsStandardScheme getScheme() { - return new modifyNamespaceProperties_argsStandardScheme(); + public setNamespaceProperty_argsStandardScheme getScheme() { + return new setNamespaceProperty_argsStandardScheme(); } } - private static class modifyNamespaceProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -15080,11 +13465,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProp org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // V_PROPERTIES - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + case 4: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // VALUE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -15101,7 +13493,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProp } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -15120,9 +13512,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespacePro oprot.writeString(struct.ns); oprot.writeFieldEnd(); } - if (struct.vProperties != null) { - oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); - struct.vProperties.write(oprot); + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); + oprot.writeFieldEnd(); + } + if (struct.value != null) { + oprot.writeFieldBegin(VALUE_FIELD_DESC); + oprot.writeString(struct.value); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -15131,17 +13528,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespacePro } - private static class modifyNamespaceProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyNamespaceProperties_argsTupleScheme getScheme() { - return new modifyNamespaceProperties_argsTupleScheme(); + public setNamespaceProperty_argsTupleScheme getScheme() { + return new setNamespaceProperty_argsTupleScheme(); } } - private static class modifyNamespaceProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -15153,10 +13550,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProp if (struct.isSetNs()) { optionals.set(2); } - if (struct.isSetVProperties()) { + if (struct.isSetProperty()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetValue()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } @@ -15166,15 +13566,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProp if (struct.isSetNs()) { oprot.writeString(struct.ns); } - if (struct.isSetVProperties()) { - struct.vProperties.write(oprot); + if (struct.isSetProperty()) { + oprot.writeString(struct.property); + } + if (struct.isSetValue()) { + oprot.writeString(struct.value); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -15190,9 +13593,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespacePrope struct.setNsIsSet(true); } if (incoming.get(3)) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } + if (incoming.get(4)) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } } } @@ -15203,22 +13609,20 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyNamespaceProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_result"); + public static class setNamespaceProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setNamespaceProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setNamespaceProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setNamespaceProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -15226,8 +13630,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), TNASE((short)3, "tnase"), - TCME((short)4, "tcme"), - TPE((short)5, "tpe"); + TPE((short)4, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -15249,9 +13652,7 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; - case 4: // TCME - return TCME; - case 5: // TPE + case 4: // TPE return TPE; default: return null; @@ -15305,36 +13706,32 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setNamespaceProperty_result.class, metaDataMap); } - public modifyNamespaceProperties_result() { + public setNamespaceProperty_result() { } - public modifyNamespaceProperties_result( + public setNamespaceProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, ThriftPropertyException tpe) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; - this.tcme = tcme; this.tpe = tpe; } /** * Performs a deep copy on other. */ - public modifyNamespaceProperties_result(modifyNamespaceProperties_result other) { + public setNamespaceProperty_result(setNamespaceProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -15344,17 +13741,14 @@ public modifyNamespaceProperties_result(modifyNamespaceProperties_result other) if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTcme()) { - this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); - } if (other.isSetTpe()) { this.tpe = new ThriftPropertyException(other.tpe); } } @Override - public modifyNamespaceProperties_result deepCopy() { - return new modifyNamespaceProperties_result(this); + public setNamespaceProperty_result deepCopy() { + return new setNamespaceProperty_result(this); } @Override @@ -15362,7 +13756,6 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; - this.tcme = null; this.tpe = null; } @@ -15371,7 +13764,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public modifyNamespaceProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public setNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -15396,7 +13789,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public modifyNamespaceProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public setNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -15421,7 +13814,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public modifyNamespaceProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public setNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -15441,37 +13834,12 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { - return this.tcme; - } - - public modifyNamespaceProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { - this.tcme = tcme; - return this; - } - - public void unsetTcme() { - this.tcme = null; - } - - /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ - public boolean isSetTcme() { - return this.tcme != null; - } - - public void setTcmeIsSet(boolean value) { - if (!value) { - this.tcme = null; - } - } - @org.apache.thrift.annotation.Nullable public ThriftPropertyException getTpe() { return this.tpe; } - public modifyNamespaceProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + public setNamespaceProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { this.tpe = tpe; return this; } @@ -15518,14 +13886,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TCME: - if (value == null) { - unsetTcme(); - } else { - setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); - } - break; - case TPE: if (value == null) { unsetTpe(); @@ -15550,9 +13910,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TCME: - return getTcme(); - case TPE: return getTpe(); @@ -15574,8 +13931,6 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); - case TCME: - return isSetTcme(); case TPE: return isSetTpe(); } @@ -15584,12 +13939,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyNamespaceProperties_result) - return this.equals((modifyNamespaceProperties_result)that); + if (that instanceof setNamespaceProperty_result) + return this.equals((setNamespaceProperty_result)that); return false; } - public boolean equals(modifyNamespaceProperties_result that) { + public boolean equals(setNamespaceProperty_result that) { if (that == null) return false; if (this == that) @@ -15622,15 +13977,6 @@ public boolean equals(modifyNamespaceProperties_result that) { return false; } - boolean this_present_tcme = true && this.isSetTcme(); - boolean that_present_tcme = true && that.isSetTcme(); - if (this_present_tcme || that_present_tcme) { - if (!(this_present_tcme && that_present_tcme)) - return false; - if (!this.tcme.equals(that.tcme)) - return false; - } - boolean this_present_tpe = true && this.isSetTpe(); boolean that_present_tpe = true && that.isSetTpe(); if (this_present_tpe || that_present_tpe) { @@ -15659,10 +14005,6 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); - if (isSetTcme()) - hashCode = hashCode * 8191 + tcme.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); if (isSetTpe()) hashCode = hashCode * 8191 + tpe.hashCode(); @@ -15671,7 +14013,7 @@ public int hashCode() { } @Override - public int compareTo(modifyNamespaceProperties_result other) { + public int compareTo(setNamespaceProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -15708,16 +14050,6 @@ public int compareTo(modifyNamespaceProperties_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTcme()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); if (lastComparison != 0) { return lastComparison; @@ -15748,7 +14080,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setNamespaceProperty_result("); boolean first = true; sb.append("sec:"); @@ -15775,14 +14107,6 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tcme:"); - if (this.tcme == null) { - sb.append("null"); - } else { - sb.append(this.tcme); - } - first = false; - if (!first) sb.append(", "); sb.append("tpe:"); if (this.tpe == null) { sb.append("null"); @@ -15815,17 +14139,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyNamespaceProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyNamespaceProperties_resultStandardScheme getScheme() { - return new modifyNamespaceProperties_resultStandardScheme(); + public setNamespaceProperty_resultStandardScheme getScheme() { + return new setNamespaceProperty_resultStandardScheme(); } } - private static class modifyNamespaceProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -15862,16 +14186,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProp org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TCME - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // TPE + case 4: // TPE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); @@ -15892,7 +14207,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProp } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -15911,11 +14226,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespacePro struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tcme != null) { - oprot.writeFieldBegin(TCME_FIELD_DESC); - struct.tcme.write(oprot); - oprot.writeFieldEnd(); - } if (struct.tpe != null) { oprot.writeFieldBegin(TPE_FIELD_DESC); struct.tpe.write(oprot); @@ -15927,17 +14237,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespacePro } - private static class modifyNamespaceProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyNamespaceProperties_resultTupleScheme getScheme() { - return new modifyNamespaceProperties_resultTupleScheme(); + public setNamespaceProperty_resultTupleScheme getScheme() { + return new setNamespaceProperty_resultTupleScheme(); } } - private static class modifyNamespaceProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -15949,13 +14259,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProp if (struct.isSetTnase()) { optionals.set(2); } - if (struct.isSetTcme()) { - optionals.set(3); - } if (struct.isSetTpe()) { - optionals.set(4); + optionals.set(3); } - oprot.writeBitSet(optionals, 5); + oprot.writeBitSet(optionals, 4); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -15965,18 +14272,15 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProp if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTcme()) { - struct.tcme.write(oprot); - } if (struct.isSetTpe()) { struct.tpe.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -15993,11 +14297,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespacePrope struct.setTnaseIsSet(true); } if (incoming.get(3)) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } - if (incoming.get(4)) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); struct.setTpeIsSet(true); @@ -16011,28 +14310,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeNamespaceProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_args"); + public static class modifyNamespaceProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), NS((short)3, "ns"), - PROPERTY((short)4, "property"); + V_PROPERTIES((short)4, "vProperties"); private static final java.util.Map byName = new java.util.HashMap(); @@ -16054,8 +14353,8 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // NS return NS; - case 4: // PROPERTY - return PROPERTY; + case 4: // V_PROPERTIES + return V_PROPERTIES; default: return null; } @@ -16108,32 +14407,32 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_args.class, metaDataMap); } - public removeNamespaceProperty_args() { + public modifyNamespaceProperties_args() { } - public removeNamespaceProperty_args( + public modifyNamespaceProperties_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, - java.lang.String property) + org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { this(); this.tinfo = tinfo; this.credentials = credentials; this.ns = ns; - this.property = property; + this.vProperties = vProperties; } /** * Performs a deep copy on other. */ - public removeNamespaceProperty_args(removeNamespaceProperty_args other) { + public modifyNamespaceProperties_args(modifyNamespaceProperties_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -16143,14 +14442,14 @@ public removeNamespaceProperty_args(removeNamespaceProperty_args other) { if (other.isSetNs()) { this.ns = other.ns; } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetVProperties()) { + this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); } } @Override - public removeNamespaceProperty_args deepCopy() { - return new removeNamespaceProperty_args(this); + public modifyNamespaceProperties_args deepCopy() { + return new modifyNamespaceProperties_args(this); } @Override @@ -16158,7 +14457,7 @@ public void clear() { this.tinfo = null; this.credentials = null; this.ns = null; - this.property = null; + this.vProperties = null; } @org.apache.thrift.annotation.Nullable @@ -16166,7 +14465,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public removeNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public modifyNamespaceProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -16191,7 +14490,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public removeNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public modifyNamespaceProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -16216,7 +14515,7 @@ public java.lang.String getNs() { return this.ns; } - public removeNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { + public modifyNamespaceProperties_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { this.ns = ns; return this; } @@ -16237,27 +14536,27 @@ public void setNsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { + return this.vProperties; } - public removeNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public modifyNamespaceProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { + this.vProperties = vProperties; return this; } - public void unsetProperty() { - this.property = null; + public void unsetVProperties() { + this.vProperties = null; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetVProperties() { + return this.vProperties != null; } - public void setPropertyIsSet(boolean value) { + public void setVPropertiesIsSet(boolean value) { if (!value) { - this.property = null; + this.vProperties = null; } } @@ -16288,11 +14587,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case V_PROPERTIES: if (value == null) { - unsetProperty(); + unsetVProperties(); } else { - setProperty((java.lang.String)value); + setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); } break; @@ -16312,8 +14611,8 @@ public java.lang.Object getFieldValue(_Fields field) { case NS: return getNs(); - case PROPERTY: - return getProperty(); + case V_PROPERTIES: + return getVProperties(); } throw new java.lang.IllegalStateException(); @@ -16333,20 +14632,20 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case NS: return isSetNs(); - case PROPERTY: - return isSetProperty(); + case V_PROPERTIES: + return isSetVProperties(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeNamespaceProperty_args) - return this.equals((removeNamespaceProperty_args)that); + if (that instanceof modifyNamespaceProperties_args) + return this.equals((modifyNamespaceProperties_args)that); return false; } - public boolean equals(removeNamespaceProperty_args that) { + public boolean equals(modifyNamespaceProperties_args that) { if (that == null) return false; if (this == that) @@ -16379,12 +14678,12 @@ public boolean equals(removeNamespaceProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_vProperties = true && this.isSetVProperties(); + boolean that_present_vProperties = true && that.isSetVProperties(); + if (this_present_vProperties || that_present_vProperties) { + if (!(this_present_vProperties && that_present_vProperties)) return false; - if (!this.property.equals(that.property)) + if (!this.vProperties.equals(that.vProperties)) return false; } @@ -16407,15 +14706,15 @@ public int hashCode() { if (isSetNs()) hashCode = hashCode * 8191 + ns.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); + if (isSetVProperties()) + hashCode = hashCode * 8191 + vProperties.hashCode(); return hashCode; } @Override - public int compareTo(removeNamespaceProperty_args other) { + public int compareTo(modifyNamespaceProperties_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -16452,12 +14751,12 @@ public int compareTo(removeNamespaceProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetVProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); if (lastComparison != 0) { return lastComparison; } @@ -16483,7 +14782,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_args("); boolean first = true; sb.append("tinfo:"); @@ -16510,11 +14809,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("vProperties:"); + if (this.vProperties == null) { sb.append("null"); } else { - sb.append(this.property); + sb.append(this.vProperties); } first = false; sb.append(")"); @@ -16530,6 +14829,9 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } + if (vProperties != null) { + vProperties.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -16548,17 +14850,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyNamespaceProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeNamespaceProperty_argsStandardScheme getScheme() { - return new removeNamespaceProperty_argsStandardScheme(); + public modifyNamespaceProperties_argsStandardScheme getScheme() { + return new modifyNamespaceProperties_argsStandardScheme(); } } - private static class removeNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyNamespaceProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -16594,10 +14896,11 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProp org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PROPERTY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + case 4: // V_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -16614,7 +14917,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProp } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -16633,9 +14936,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespacePro oprot.writeString(struct.ns); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.vProperties != null) { + oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); + struct.vProperties.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -16644,17 +14947,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespacePro } - private static class removeNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyNamespaceProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeNamespaceProperty_argsTupleScheme getScheme() { - return new removeNamespaceProperty_argsTupleScheme(); + public modifyNamespaceProperties_argsTupleScheme getScheme() { + return new modifyNamespaceProperties_argsTupleScheme(); } } - private static class removeNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyNamespaceProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -16666,7 +14969,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProp if (struct.isSetNs()) { optionals.set(2); } - if (struct.isSetProperty()) { + if (struct.isSetVProperties()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -16679,13 +14982,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProp if (struct.isSetNs()) { oprot.writeString(struct.ns); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetVProperties()) { + struct.vProperties.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -16703,8 +15006,9 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespacePrope struct.setNsIsSet(true); } if (incoming.get(3)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } } } @@ -16715,25 +15019,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeNamespaceProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_result"); + public static class modifyNamespaceProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyNamespaceProperties_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyNamespaceProperties_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyNamespaceProperties_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required + public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TOPE((short)2, "tope"), - TNASE((short)3, "tnase"); + TNASE((short)3, "tnase"), + TCME((short)4, "tcme"), + TPE((short)5, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -16755,6 +15065,10 @@ public static _Fields findByThriftId(int fieldId) { return TOPE; case 3: // TNASE return TNASE; + case 4: // TCME + return TCME; + case 5: // TPE + return TPE; default: return null; } @@ -16807,28 +15121,36 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); + tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); + tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyNamespaceProperties_result.class, metaDataMap); } - public removeNamespaceProperty_result() { + public modifyNamespaceProperties_result() { } - public removeNamespaceProperty_result( + public modifyNamespaceProperties_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, + org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, + ThriftPropertyException tpe) { this(); this.sec = sec; this.tope = tope; this.tnase = tnase; + this.tcme = tcme; + this.tpe = tpe; } /** * Performs a deep copy on other. */ - public removeNamespaceProperty_result(removeNamespaceProperty_result other) { + public modifyNamespaceProperties_result(modifyNamespaceProperties_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -16838,11 +15160,17 @@ public removeNamespaceProperty_result(removeNamespaceProperty_result other) { if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } + if (other.isSetTcme()) { + this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); + } + if (other.isSetTpe()) { + this.tpe = new ThriftPropertyException(other.tpe); + } } @Override - public removeNamespaceProperty_result deepCopy() { - return new removeNamespaceProperty_result(this); + public modifyNamespaceProperties_result deepCopy() { + return new modifyNamespaceProperties_result(this); } @Override @@ -16850,6 +15178,8 @@ public void clear() { this.sec = null; this.tope = null; this.tnase = null; + this.tcme = null; + this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -16857,7 +15187,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public removeNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public modifyNamespaceProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -16882,7 +15212,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException return this.tope; } - public removeNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + public modifyNamespaceProperties_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { this.tope = tope; return this; } @@ -16907,7 +15237,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public removeNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public modifyNamespaceProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -16927,6 +15257,56 @@ public void setTnaseIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { + return this.tcme; + } + + public modifyNamespaceProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { + this.tcme = tcme; + return this; + } + + public void unsetTcme() { + this.tcme = null; + } + + /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ + public boolean isSetTcme() { + return this.tcme != null; + } + + public void setTcmeIsSet(boolean value) { + if (!value) { + this.tcme = null; + } + } + + @org.apache.thrift.annotation.Nullable + public ThriftPropertyException getTpe() { + return this.tpe; + } + + public modifyNamespaceProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + this.tpe = tpe; + return this; + } + + public void unsetTpe() { + this.tpe = null; + } + + /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ + public boolean isSetTpe() { + return this.tpe != null; + } + + public void setTpeIsSet(boolean value) { + if (!value) { + this.tpe = null; + } + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -16954,6 +15334,22 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case TCME: + if (value == null) { + unsetTcme(); + } else { + setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); + } + break; + + case TPE: + if (value == null) { + unsetTpe(); + } else { + setTpe((ThriftPropertyException)value); + } + break; + } } @@ -16970,6 +15366,12 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); + case TCME: + return getTcme(); + + case TPE: + return getTpe(); + } throw new java.lang.IllegalStateException(); } @@ -16988,18 +15390,22 @@ public boolean isSet(_Fields field) { return isSetTope(); case TNASE: return isSetTnase(); + case TCME: + return isSetTcme(); + case TPE: + return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeNamespaceProperty_result) - return this.equals((removeNamespaceProperty_result)that); + if (that instanceof modifyNamespaceProperties_result) + return this.equals((modifyNamespaceProperties_result)that); return false; } - public boolean equals(removeNamespaceProperty_result that) { + public boolean equals(modifyNamespaceProperties_result that) { if (that == null) return false; if (this == that) @@ -17032,6 +15438,24 @@ public boolean equals(removeNamespaceProperty_result that) { return false; } + boolean this_present_tcme = true && this.isSetTcme(); + boolean that_present_tcme = true && that.isSetTcme(); + if (this_present_tcme || that_present_tcme) { + if (!(this_present_tcme && that_present_tcme)) + return false; + if (!this.tcme.equals(that.tcme)) + return false; + } + + boolean this_present_tpe = true && this.isSetTpe(); + boolean that_present_tpe = true && that.isSetTpe(); + if (this_present_tpe || that_present_tpe) { + if (!(this_present_tpe && that_present_tpe)) + return false; + if (!this.tpe.equals(that.tpe)) + return false; + } + return true; } @@ -17051,11 +15475,19 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); + hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); + if (isSetTcme()) + hashCode = hashCode * 8191 + tcme.hashCode(); + + hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); + if (isSetTpe()) + hashCode = hashCode * 8191 + tpe.hashCode(); + return hashCode; } @Override - public int compareTo(removeNamespaceProperty_result other) { + public int compareTo(modifyNamespaceProperties_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -17092,6 +15524,26 @@ public int compareTo(removeNamespaceProperty_result other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTcme()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTpe()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -17112,7 +15564,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyNamespaceProperties_result("); boolean first = true; sb.append("sec:"); @@ -17138,6 +15590,22 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; + if (!first) sb.append(", "); + sb.append("tcme:"); + if (this.tcme == null) { + sb.append("null"); + } else { + sb.append(this.tcme); + } + first = false; + if (!first) sb.append(", "); + sb.append("tpe:"); + if (this.tpe == null) { + sb.append("null"); + } else { + sb.append(this.tpe); + } + first = false; sb.append(")"); return sb.toString(); } @@ -17163,17 +15631,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyNamespaceProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeNamespaceProperty_resultStandardScheme getScheme() { - return new removeNamespaceProperty_resultStandardScheme(); + public modifyNamespaceProperties_resultStandardScheme getScheme() { + return new modifyNamespaceProperties_resultStandardScheme(); } } - private static class removeNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyNamespaceProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -17210,6 +15678,24 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProp org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 4: // TCME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // TPE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -17222,7 +15708,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProp } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -17241,23 +15727,33 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespacePro struct.tnase.write(oprot); oprot.writeFieldEnd(); } + if (struct.tcme != null) { + oprot.writeFieldBegin(TCME_FIELD_DESC); + struct.tcme.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.tpe != null) { + oprot.writeFieldBegin(TPE_FIELD_DESC); + struct.tpe.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class removeNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyNamespaceProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeNamespaceProperty_resultTupleScheme getScheme() { - return new removeNamespaceProperty_resultTupleScheme(); + public modifyNamespaceProperties_resultTupleScheme getScheme() { + return new modifyNamespaceProperties_resultTupleScheme(); } } - private static class removeNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyNamespaceProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -17269,7 +15765,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProp if (struct.isSetTnase()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetTcme()) { + optionals.set(3); + } + if (struct.isSetTpe()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetSec()) { struct.sec.write(oprot); } @@ -17279,12 +15781,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProp if (struct.isSetTnase()) { struct.tnase.write(oprot); } + if (struct.isSetTcme()) { + struct.tcme.write(oprot); + } + if (struct.isSetTpe()) { + struct.tpe.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyNamespaceProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -17300,6 +15808,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespacePrope struct.tnase.read(iprot); struct.setTnaseIsSet(true); } + if (incoming.get(3)) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } + if (incoming.get(4)) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } } } @@ -17309,33 +15827,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setManagerGoalState_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_args"); + public static class removeNamespaceProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField NS_FIELD_DESC = new org.apache.thrift.protocol.TField("ns", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - /** - * - * @see ManagerGoalState - */ - public @org.apache.thrift.annotation.Nullable ManagerGoalState state; // required + public @org.apache.thrift.annotation.Nullable java.lang.String ns; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - /** - * - * @see ManagerGoalState - */ - STATE((short)3, "state"); + NS((short)3, "ns"), + PROPERTY((short)4, "property"); private static final java.util.Map byName = new java.util.HashMap(); @@ -17355,8 +15868,10 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // STATE - return STATE; + case 3: // NS + return NS; + case 4: // PROPERTY + return PROPERTY; default: return null; } @@ -17407,51 +15922,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerGoalState.class))); + tmpMap.put(_Fields.NS, new org.apache.thrift.meta_data.FieldMetaData("ns", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_args.class, metaDataMap); } - public setManagerGoalState_args() { + public removeNamespaceProperty_args() { } - public setManagerGoalState_args( + public removeNamespaceProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - ManagerGoalState state) + java.lang.String ns, + java.lang.String property) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.state = state; + this.ns = ns; + this.property = property; } /** * Performs a deep copy on other. */ - public setManagerGoalState_args(setManagerGoalState_args other) { + public removeNamespaceProperty_args(removeNamespaceProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetState()) { - this.state = other.state; + if (other.isSetNs()) { + this.ns = other.ns; + } + if (other.isSetProperty()) { + this.property = other.property; } } @Override - public setManagerGoalState_args deepCopy() { - return new setManagerGoalState_args(this); + public removeNamespaceProperty_args deepCopy() { + return new removeNamespaceProperty_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.state = null; + this.ns = null; + this.property = null; } @org.apache.thrift.annotation.Nullable @@ -17459,7 +15982,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public setManagerGoalState_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public removeNamespaceProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -17484,7 +16007,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public setManagerGoalState_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public removeNamespaceProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -17504,36 +16027,53 @@ public void setCredentialsIsSet(boolean value) { } } - /** - * - * @see ManagerGoalState - */ @org.apache.thrift.annotation.Nullable - public ManagerGoalState getState() { - return this.state; + public java.lang.String getNs() { + return this.ns; } - /** - * - * @see ManagerGoalState - */ - public setManagerGoalState_args setState(@org.apache.thrift.annotation.Nullable ManagerGoalState state) { - this.state = state; + public removeNamespaceProperty_args setNs(@org.apache.thrift.annotation.Nullable java.lang.String ns) { + this.ns = ns; return this; } - public void unsetState() { - this.state = null; + public void unsetNs() { + this.ns = null; } - /** Returns true if field state is set (has been assigned a value) and false otherwise */ - public boolean isSetState() { - return this.state != null; + /** Returns true if field ns is set (has been assigned a value) and false otherwise */ + public boolean isSetNs() { + return this.ns != null; } - public void setStateIsSet(boolean value) { + public void setNsIsSet(boolean value) { if (!value) { - this.state = null; + this.ns = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getProperty() { + return this.property; + } + + public removeNamespaceProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; + return this; + } + + public void unsetProperty() { + this.property = null; + } + + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; + } + + public void setPropertyIsSet(boolean value) { + if (!value) { + this.property = null; } } @@ -17556,11 +16096,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case STATE: + case NS: if (value == null) { - unsetState(); + unsetNs(); } else { - setState((ManagerGoalState)value); + setNs((java.lang.String)value); + } + break; + + case PROPERTY: + if (value == null) { + unsetProperty(); + } else { + setProperty((java.lang.String)value); } break; @@ -17577,8 +16125,11 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case STATE: - return getState(); + case NS: + return getNs(); + + case PROPERTY: + return getProperty(); } throw new java.lang.IllegalStateException(); @@ -17596,20 +16147,22 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case STATE: - return isSetState(); + case NS: + return isSetNs(); + case PROPERTY: + return isSetProperty(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setManagerGoalState_args) - return this.equals((setManagerGoalState_args)that); + if (that instanceof removeNamespaceProperty_args) + return this.equals((removeNamespaceProperty_args)that); return false; } - public boolean equals(setManagerGoalState_args that) { + public boolean equals(removeNamespaceProperty_args that) { if (that == null) return false; if (this == that) @@ -17633,12 +16186,21 @@ public boolean equals(setManagerGoalState_args that) { return false; } - boolean this_present_state = true && this.isSetState(); - boolean that_present_state = true && that.isSetState(); - if (this_present_state || that_present_state) { - if (!(this_present_state && that_present_state)) + boolean this_present_ns = true && this.isSetNs(); + boolean that_present_ns = true && that.isSetNs(); + if (this_present_ns || that_present_ns) { + if (!(this_present_ns && that_present_ns)) return false; - if (!this.state.equals(that.state)) + if (!this.ns.equals(that.ns)) + return false; + } + + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) + return false; + if (!this.property.equals(that.property)) return false; } @@ -17657,15 +16219,19 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287); - if (isSetState()) - hashCode = hashCode * 8191 + state.getValue(); + hashCode = hashCode * 8191 + ((isSetNs()) ? 131071 : 524287); + if (isSetNs()) + hashCode = hashCode * 8191 + ns.hashCode(); + + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); return hashCode; } @Override - public int compareTo(setManagerGoalState_args other) { + public int compareTo(removeNamespaceProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -17692,12 +16258,22 @@ public int compareTo(setManagerGoalState_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState()); + lastComparison = java.lang.Boolean.compare(isSetNs(), other.isSetNs()); if (lastComparison != 0) { return lastComparison; } - if (isSetState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); + if (isSetNs()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ns, other.ns); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); if (lastComparison != 0) { return lastComparison; } @@ -17723,7 +16299,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -17742,11 +16318,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("state:"); - if (this.state == null) { + sb.append("ns:"); + if (this.ns == null) { sb.append("null"); } else { - sb.append(this.state); + sb.append(this.ns); + } + first = false; + if (!first) sb.append(", "); + sb.append("property:"); + if (this.property == null) { + sb.append("null"); + } else { + sb.append(this.property); } first = false; sb.append(")"); @@ -17780,17 +16364,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setManagerGoalState_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeNamespaceProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setManagerGoalState_argsStandardScheme getScheme() { - return new setManagerGoalState_argsStandardScheme(); + public removeNamespaceProperty_argsStandardScheme getScheme() { + return new removeNamespaceProperty_argsStandardScheme(); } } - private static class setManagerGoalState_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeNamespaceProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -17818,10 +16402,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // STATE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); - struct.setStateIsSet(true); + case 3: // NS + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -17838,7 +16430,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -17852,9 +16444,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalStat struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.state != null) { - oprot.writeFieldBegin(STATE_FIELD_DESC); - oprot.writeI32(struct.state.getValue()); + if (struct.ns != null) { + oprot.writeFieldBegin(NS_FIELD_DESC); + oprot.writeString(struct.ns); + oprot.writeFieldEnd(); + } + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -17863,17 +16460,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalStat } - private static class setManagerGoalState_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeNamespaceProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setManagerGoalState_argsTupleScheme getScheme() { - return new setManagerGoalState_argsTupleScheme(); + public removeNamespaceProperty_argsTupleScheme getScheme() { + return new removeNamespaceProperty_argsTupleScheme(); } } - private static class setManagerGoalState_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeNamespaceProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -17882,25 +16479,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetState()) { + if (struct.isSetNs()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetProperty()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetState()) { - oprot.writeI32(struct.state.getValue()); + if (struct.isSetNs()) { + oprot.writeString(struct.ns); + } + if (struct.isSetProperty()) { + oprot.writeString(struct.property); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -17912,8 +16515,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_ struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.state = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); - struct.setStateIsSet(true); + struct.ns = iprot.readString(); + struct.setNsIsSet(true); + } + if (incoming.get(3)) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); } } } @@ -17924,22 +16531,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setManagerGoalState_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_result"); + public static class removeNamespaceProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeNamespaceProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); - private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField TOPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tope", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeNamespaceProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeNamespaceProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), - TNASE((short)2, "tnase"); + TOPE((short)2, "tope"), + TNASE((short)3, "tnase"); private static final java.util.Map byName = new java.util.HashMap(); @@ -17957,7 +16567,9 @@ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { case 1: // SEC return SEC; - case 2: // TNASE + case 2: // TOPE + return TOPE; + case 3: // TNASE return TNASE; default: return null; @@ -18007,44 +16619,52 @@ public java.lang.String getFieldName() { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); + tmpMap.put(_Fields.TOPE, new org.apache.thrift.meta_data.FieldMetaData("tope", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeNamespaceProperty_result.class, metaDataMap); } - public setManagerGoalState_result() { + public removeNamespaceProperty_result() { } - public setManagerGoalState_result( + public removeNamespaceProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, + org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this(); this.sec = sec; + this.tope = tope; this.tnase = tnase; } /** * Performs a deep copy on other. */ - public setManagerGoalState_result(setManagerGoalState_result other) { + public removeNamespaceProperty_result(removeNamespaceProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } + if (other.isSetTope()) { + this.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(other.tope); + } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } } @Override - public setManagerGoalState_result deepCopy() { - return new setManagerGoalState_result(this); + public removeNamespaceProperty_result deepCopy() { + return new removeNamespaceProperty_result(this); } @Override public void clear() { this.sec = null; + this.tope = null; this.tnase = null; } @@ -18053,7 +16673,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public setManagerGoalState_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public removeNamespaceProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -18073,12 +16693,37 @@ public void setSecIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException getTope() { + return this.tope; + } + + public removeNamespaceProperty_result setTope(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException tope) { + this.tope = tope; + return this; + } + + public void unsetTope() { + this.tope = null; + } + + /** Returns true if field tope is set (has been assigned a value) and false otherwise */ + public boolean isSetTope() { + return this.tope != null; + } + + public void setTopeIsSet(boolean value) { + if (!value) { + this.tope = null; + } + } + @org.apache.thrift.annotation.Nullable public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException getTnase() { return this.tnase; } - public setManagerGoalState_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public removeNamespaceProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -18109,6 +16754,14 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case TOPE: + if (value == null) { + unsetTope(); + } else { + setTope((org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException)value); + } + break; + case TNASE: if (value == null) { unsetTnase(); @@ -18127,6 +16780,9 @@ public java.lang.Object getFieldValue(_Fields field) { case SEC: return getSec(); + case TOPE: + return getTope(); + case TNASE: return getTnase(); @@ -18144,6 +16800,8 @@ public boolean isSet(_Fields field) { switch (field) { case SEC: return isSetSec(); + case TOPE: + return isSetTope(); case TNASE: return isSetTnase(); } @@ -18152,12 +16810,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof setManagerGoalState_result) - return this.equals((setManagerGoalState_result)that); + if (that instanceof removeNamespaceProperty_result) + return this.equals((removeNamespaceProperty_result)that); return false; } - public boolean equals(setManagerGoalState_result that) { + public boolean equals(removeNamespaceProperty_result that) { if (that == null) return false; if (this == that) @@ -18172,6 +16830,15 @@ public boolean equals(setManagerGoalState_result that) { return false; } + boolean this_present_tope = true && this.isSetTope(); + boolean that_present_tope = true && that.isSetTope(); + if (this_present_tope || that_present_tope) { + if (!(this_present_tope && that_present_tope)) + return false; + if (!this.tope.equals(that.tope)) + return false; + } + boolean this_present_tnase = true && this.isSetTnase(); boolean that_present_tnase = true && that.isSetTnase(); if (this_present_tnase || that_present_tnase) { @@ -18192,6 +16859,10 @@ public int hashCode() { if (isSetSec()) hashCode = hashCode * 8191 + sec.hashCode(); + hashCode = hashCode * 8191 + ((isSetTope()) ? 131071 : 524287); + if (isSetTope()) + hashCode = hashCode * 8191 + tope.hashCode(); + hashCode = hashCode * 8191 + ((isSetTnase()) ? 131071 : 524287); if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); @@ -18200,7 +16871,7 @@ public int hashCode() { } @Override - public int compareTo(setManagerGoalState_result other) { + public int compareTo(removeNamespaceProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -18217,6 +16888,16 @@ public int compareTo(setManagerGoalState_result other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetTope(), other.isSetTope()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTope()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tope, other.tope); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase()); if (lastComparison != 0) { return lastComparison; @@ -18247,7 +16928,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeNamespaceProperty_result("); boolean first = true; sb.append("sec:"); @@ -18258,6 +16939,14 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); + sb.append("tope:"); + if (this.tope == null) { + sb.append("null"); + } else { + sb.append(this.tope); + } + first = false; + if (!first) sb.append(", "); sb.append("tnase:"); if (this.tnase == null) { sb.append("null"); @@ -18290,17 +16979,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setManagerGoalState_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeNamespaceProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setManagerGoalState_resultStandardScheme getScheme() { - return new setManagerGoalState_resultStandardScheme(); + public removeNamespaceProperty_resultStandardScheme getScheme() { + return new removeNamespaceProperty_resultStandardScheme(); } } - private static class setManagerGoalState_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeNamespaceProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -18319,7 +17008,16 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // TNASE + case 2: // TOPE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(); + struct.tope.read(iprot); + struct.setTopeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // TNASE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); struct.tnase.read(iprot); @@ -18340,7 +17038,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -18349,6 +17047,11 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalStat struct.sec.write(oprot); oprot.writeFieldEnd(); } + if (struct.tope != null) { + oprot.writeFieldBegin(TOPE_FIELD_DESC); + struct.tope.write(oprot); + oprot.writeFieldEnd(); + } if (struct.tnase != null) { oprot.writeFieldBegin(TNASE_FIELD_DESC); struct.tnase.write(oprot); @@ -18360,44 +17063,55 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalStat } - private static class setManagerGoalState_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeNamespaceProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setManagerGoalState_resultTupleScheme getScheme() { - return new setManagerGoalState_resultTupleScheme(); + public removeNamespaceProperty_resultTupleScheme getScheme() { + return new removeNamespaceProperty_resultTupleScheme(); } } - private static class setManagerGoalState_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeNamespaceProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { optionals.set(0); } - if (struct.isSetTnase()) { + if (struct.isSetTope()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetTnase()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetSec()) { struct.sec.write(oprot); } + if (struct.isSetTope()) { + struct.tope.write(oprot); + } if (struct.isSetTnase()) { struct.tnase.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeNamespaceProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); struct.setSecIsSet(true); } if (incoming.get(1)) { + struct.tope = new org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException(); + struct.tope.read(iprot); + struct.setTopeIsSet(true); + } + if (incoming.get(2)) { struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); struct.tnase.read(iprot); struct.setTnaseIsSet(true); @@ -18411,25 +17125,33 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class shutdown_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_args"); + public static class setManagerGoalState_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField STOP_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("stopTabletServers", org.apache.thrift.protocol.TType.BOOL, (short)3); + private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdown_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdown_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public boolean stopTabletServers; // required + /** + * + * @see ManagerGoalState + */ + public @org.apache.thrift.annotation.Nullable ManagerGoalState state; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - STOP_TABLET_SERVERS((short)3, "stopTabletServers"); + /** + * + * @see ManagerGoalState + */ + STATE((short)3, "state"); private static final java.util.Map byName = new java.util.HashMap(); @@ -18449,8 +17171,8 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // STOP_TABLET_SERVERS - return STOP_TABLET_SERVERS; + case 3: // STATE + return STATE; default: return null; } @@ -18494,8 +17216,6 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __STOPTABLETSERVERS_ISSET_ID = 0; - private byte __isset_bitfield = 0; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -18503,52 +17223,51 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.STOP_TABLET_SERVERS, new org.apache.thrift.meta_data.FieldMetaData("stopTabletServers", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerGoalState.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_args.class, metaDataMap); } - public shutdown_args() { + public setManagerGoalState_args() { } - public shutdown_args( + public setManagerGoalState_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - boolean stopTabletServers) + ManagerGoalState state) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.stopTabletServers = stopTabletServers; - setStopTabletServersIsSet(true); + this.state = state; } /** * Performs a deep copy on other. */ - public shutdown_args(shutdown_args other) { - __isset_bitfield = other.__isset_bitfield; + public setManagerGoalState_args(setManagerGoalState_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - this.stopTabletServers = other.stopTabletServers; + if (other.isSetState()) { + this.state = other.state; + } } @Override - public shutdown_args deepCopy() { - return new shutdown_args(this); + public setManagerGoalState_args deepCopy() { + return new setManagerGoalState_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - setStopTabletServersIsSet(false); - this.stopTabletServers = false; + this.state = null; } @org.apache.thrift.annotation.Nullable @@ -18556,7 +17275,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public shutdown_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public setManagerGoalState_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -18581,7 +17300,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public shutdown_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public setManagerGoalState_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -18601,27 +17320,37 @@ public void setCredentialsIsSet(boolean value) { } } - public boolean isStopTabletServers() { - return this.stopTabletServers; + /** + * + * @see ManagerGoalState + */ + @org.apache.thrift.annotation.Nullable + public ManagerGoalState getState() { + return this.state; } - public shutdown_args setStopTabletServers(boolean stopTabletServers) { - this.stopTabletServers = stopTabletServers; - setStopTabletServersIsSet(true); + /** + * + * @see ManagerGoalState + */ + public setManagerGoalState_args setState(@org.apache.thrift.annotation.Nullable ManagerGoalState state) { + this.state = state; return this; } - public void unsetStopTabletServers() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID); + public void unsetState() { + this.state = null; } - /** Returns true if field stopTabletServers is set (has been assigned a value) and false otherwise */ - public boolean isSetStopTabletServers() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID); + /** Returns true if field state is set (has been assigned a value) and false otherwise */ + public boolean isSetState() { + return this.state != null; } - public void setStopTabletServersIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID, value); + public void setStateIsSet(boolean value) { + if (!value) { + this.state = null; + } } @Override @@ -18643,11 +17372,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case STOP_TABLET_SERVERS: + case STATE: if (value == null) { - unsetStopTabletServers(); + unsetState(); } else { - setStopTabletServers((java.lang.Boolean)value); + setState((ManagerGoalState)value); } break; @@ -18664,8 +17393,8 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case STOP_TABLET_SERVERS: - return isStopTabletServers(); + case STATE: + return getState(); } throw new java.lang.IllegalStateException(); @@ -18683,20 +17412,20 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case STOP_TABLET_SERVERS: - return isSetStopTabletServers(); + case STATE: + return isSetState(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof shutdown_args) - return this.equals((shutdown_args)that); + if (that instanceof setManagerGoalState_args) + return this.equals((setManagerGoalState_args)that); return false; } - public boolean equals(shutdown_args that) { + public boolean equals(setManagerGoalState_args that) { if (that == null) return false; if (this == that) @@ -18720,12 +17449,12 @@ public boolean equals(shutdown_args that) { return false; } - boolean this_present_stopTabletServers = true; - boolean that_present_stopTabletServers = true; - if (this_present_stopTabletServers || that_present_stopTabletServers) { - if (!(this_present_stopTabletServers && that_present_stopTabletServers)) + boolean this_present_state = true && this.isSetState(); + boolean that_present_state = true && that.isSetState(); + if (this_present_state || that_present_state) { + if (!(this_present_state && that_present_state)) return false; - if (this.stopTabletServers != that.stopTabletServers) + if (!this.state.equals(that.state)) return false; } @@ -18744,13 +17473,15 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((stopTabletServers) ? 131071 : 524287); + hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287); + if (isSetState()) + hashCode = hashCode * 8191 + state.getValue(); return hashCode; } @Override - public int compareTo(shutdown_args other) { + public int compareTo(setManagerGoalState_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -18777,12 +17508,12 @@ public int compareTo(shutdown_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetStopTabletServers(), other.isSetStopTabletServers()); + lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState()); if (lastComparison != 0) { return lastComparison; } - if (isSetStopTabletServers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopTabletServers, other.stopTabletServers); + if (isSetState()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); if (lastComparison != 0) { return lastComparison; } @@ -18808,7 +17539,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdown_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_args("); boolean first = true; sb.append("tinfo:"); @@ -18827,8 +17558,12 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("stopTabletServers:"); - sb.append(this.stopTabletServers); + sb.append("state:"); + if (this.state == null) { + sb.append("null"); + } else { + sb.append(this.state); + } first = false; sb.append(")"); return sb.toString(); @@ -18855,25 +17590,23 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } - private static class shutdown_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setManagerGoalState_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdown_argsStandardScheme getScheme() { - return new shutdown_argsStandardScheme(); + public setManagerGoalState_argsStandardScheme getScheme() { + return new setManagerGoalState_argsStandardScheme(); } } - private static class shutdown_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setManagerGoalState_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -18901,10 +17634,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_args struc org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // STOP_TABLET_SERVERS - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.stopTabletServers = iprot.readBool(); - struct.setStopTabletServersIsSet(true); + case 3: // STATE + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.state = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -18921,7 +17654,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_args struc } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -18935,26 +17668,28 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_args stru struct.credentials.write(oprot); oprot.writeFieldEnd(); } - oprot.writeFieldBegin(STOP_TABLET_SERVERS_FIELD_DESC); - oprot.writeBool(struct.stopTabletServers); - oprot.writeFieldEnd(); + if (struct.state != null) { + oprot.writeFieldBegin(STATE_FIELD_DESC); + oprot.writeI32(struct.state.getValue()); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class shutdown_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setManagerGoalState_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdown_argsTupleScheme getScheme() { - return new shutdown_argsTupleScheme(); + public setManagerGoalState_argsTupleScheme getScheme() { + return new setManagerGoalState_argsTupleScheme(); } } - private static class shutdown_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setManagerGoalState_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -18963,7 +17698,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_args struc if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetStopTabletServers()) { + if (struct.isSetState()) { optionals.set(2); } oprot.writeBitSet(optionals, 3); @@ -18973,13 +17708,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_args struc if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetStopTabletServers()) { - oprot.writeBool(struct.stopTabletServers); + if (struct.isSetState()) { + oprot.writeI32(struct.state.getValue()); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { @@ -18993,8 +17728,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.stopTabletServers = iprot.readBool(); - struct.setStopTabletServersIsSet(true); + struct.state = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); + struct.setStateIsSet(true); } } } @@ -19005,14 +17740,14 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class shutdown_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_result"); + public static class setManagerGoalState_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setManagerGoalState_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdown_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdown_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setManagerGoalState_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setManagerGoalState_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required @@ -19091,13 +17826,13 @@ public java.lang.String getFieldName() { tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setManagerGoalState_result.class, metaDataMap); } - public shutdown_result() { + public setManagerGoalState_result() { } - public shutdown_result( + public setManagerGoalState_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { @@ -19109,7 +17844,7 @@ public shutdown_result( /** * Performs a deep copy on other. */ - public shutdown_result(shutdown_result other) { + public setManagerGoalState_result(setManagerGoalState_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -19119,8 +17854,8 @@ public shutdown_result(shutdown_result other) { } @Override - public shutdown_result deepCopy() { - return new shutdown_result(this); + public setManagerGoalState_result deepCopy() { + return new setManagerGoalState_result(this); } @Override @@ -19134,7 +17869,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public shutdown_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public setManagerGoalState_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -19159,7 +17894,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public shutdown_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public setManagerGoalState_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -19233,12 +17968,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof shutdown_result) - return this.equals((shutdown_result)that); + if (that instanceof setManagerGoalState_result) + return this.equals((setManagerGoalState_result)that); return false; } - public boolean equals(shutdown_result that) { + public boolean equals(setManagerGoalState_result that) { if (that == null) return false; if (this == that) @@ -19281,7 +18016,7 @@ public int hashCode() { } @Override - public int compareTo(shutdown_result other) { + public int compareTo(setManagerGoalState_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -19328,7 +18063,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdown_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setManagerGoalState_result("); boolean first = true; sb.append("sec:"); @@ -19371,17 +18106,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class shutdown_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setManagerGoalState_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdown_resultStandardScheme getScheme() { - return new shutdown_resultStandardScheme(); + public setManagerGoalState_resultStandardScheme getScheme() { + return new setManagerGoalState_resultStandardScheme(); } } - private static class shutdown_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setManagerGoalState_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setManagerGoalState_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -19421,7 +18156,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_result str } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setManagerGoalState_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -19441,17 +18176,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_result st } - private static class shutdown_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setManagerGoalState_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdown_resultTupleScheme getScheme() { - return new shutdown_resultTupleScheme(); + public setManagerGoalState_resultTupleScheme getScheme() { + return new setManagerGoalState_resultTupleScheme(); } } - private static class shutdown_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setManagerGoalState_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -19470,7 +18205,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_result str } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setManagerGoalState_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { @@ -19492,28 +18227,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class shutdownTabletServer_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdownTabletServer_args"); + public static class shutdown_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TABLET_SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("tabletServer", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField FORCE_FIELD_DESC = new org.apache.thrift.protocol.TField("force", org.apache.thrift.protocol.TType.BOOL, (short)4); + private static final org.apache.thrift.protocol.TField STOP_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("stopTabletServers", org.apache.thrift.protocol.TType.BOOL, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdownTabletServer_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdownTabletServer_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdown_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdown_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String tabletServer; // required - public boolean force; // required + public boolean stopTabletServers; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - TABLET_SERVER((short)3, "tabletServer"), - FORCE((short)4, "force"); + STOP_TABLET_SERVERS((short)3, "stopTabletServers"); private static final java.util.Map byName = new java.util.HashMap(); @@ -19533,10 +18265,8 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // TABLET_SERVER - return TABLET_SERVER; - case 4: // FORCE - return FORCE; + case 3: // STOP_TABLET_SERVERS + return STOP_TABLET_SERVERS; default: return null; } @@ -19580,7 +18310,7 @@ public java.lang.String getFieldName() { } // isset id assignments - private static final int __FORCE_ISSET_ID = 0; + private static final int __STOPTABLETSERVERS_ISSET_ID = 0; private byte __isset_bitfield = 0; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { @@ -19589,35 +18319,31 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.TABLET_SERVER, new org.apache.thrift.meta_data.FieldMetaData("tabletServer", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.FORCE, new org.apache.thrift.meta_data.FieldMetaData("force", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.STOP_TABLET_SERVERS, new org.apache.thrift.meta_data.FieldMetaData("stopTabletServers", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdownTabletServer_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_args.class, metaDataMap); } - public shutdownTabletServer_args() { + public shutdown_args() { } - public shutdownTabletServer_args( + public shutdown_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String tabletServer, - boolean force) + boolean stopTabletServers) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.tabletServer = tabletServer; - this.force = force; - setForceIsSet(true); + this.stopTabletServers = stopTabletServers; + setStopTabletServersIsSet(true); } /** * Performs a deep copy on other. */ - public shutdownTabletServer_args(shutdownTabletServer_args other) { + public shutdown_args(shutdown_args other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); @@ -19625,24 +18351,20 @@ public shutdownTabletServer_args(shutdownTabletServer_args other) { if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetTabletServer()) { - this.tabletServer = other.tabletServer; - } - this.force = other.force; + this.stopTabletServers = other.stopTabletServers; } @Override - public shutdownTabletServer_args deepCopy() { - return new shutdownTabletServer_args(this); + public shutdown_args deepCopy() { + return new shutdown_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.tabletServer = null; - setForceIsSet(false); - this.force = false; + setStopTabletServersIsSet(false); + this.stopTabletServers = false; } @org.apache.thrift.annotation.Nullable @@ -19650,7 +18372,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public shutdownTabletServer_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public shutdown_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -19675,7 +18397,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public shutdownTabletServer_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public shutdown_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -19695,52 +18417,27 @@ public void setCredentialsIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getTabletServer() { - return this.tabletServer; - } - - public shutdownTabletServer_args setTabletServer(@org.apache.thrift.annotation.Nullable java.lang.String tabletServer) { - this.tabletServer = tabletServer; - return this; - } - - public void unsetTabletServer() { - this.tabletServer = null; - } - - /** Returns true if field tabletServer is set (has been assigned a value) and false otherwise */ - public boolean isSetTabletServer() { - return this.tabletServer != null; - } - - public void setTabletServerIsSet(boolean value) { - if (!value) { - this.tabletServer = null; - } - } - - public boolean isForce() { - return this.force; + public boolean isStopTabletServers() { + return this.stopTabletServers; } - public shutdownTabletServer_args setForce(boolean force) { - this.force = force; - setForceIsSet(true); + public shutdown_args setStopTabletServers(boolean stopTabletServers) { + this.stopTabletServers = stopTabletServers; + setStopTabletServersIsSet(true); return this; } - public void unsetForce() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FORCE_ISSET_ID); + public void unsetStopTabletServers() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID); } - /** Returns true if field force is set (has been assigned a value) and false otherwise */ - public boolean isSetForce() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FORCE_ISSET_ID); + /** Returns true if field stopTabletServers is set (has been assigned a value) and false otherwise */ + public boolean isSetStopTabletServers() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID); } - public void setForceIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FORCE_ISSET_ID, value); + public void setStopTabletServersIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STOPTABLETSERVERS_ISSET_ID, value); } @Override @@ -19762,19 +18459,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TABLET_SERVER: - if (value == null) { - unsetTabletServer(); - } else { - setTabletServer((java.lang.String)value); - } - break; - - case FORCE: + case STOP_TABLET_SERVERS: if (value == null) { - unsetForce(); + unsetStopTabletServers(); } else { - setForce((java.lang.Boolean)value); + setStopTabletServers((java.lang.Boolean)value); } break; @@ -19791,11 +18480,8 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case TABLET_SERVER: - return getTabletServer(); - - case FORCE: - return isForce(); + case STOP_TABLET_SERVERS: + return isStopTabletServers(); } throw new java.lang.IllegalStateException(); @@ -19813,22 +18499,20 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case TABLET_SERVER: - return isSetTabletServer(); - case FORCE: - return isSetForce(); + case STOP_TABLET_SERVERS: + return isSetStopTabletServers(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof shutdownTabletServer_args) - return this.equals((shutdownTabletServer_args)that); + if (that instanceof shutdown_args) + return this.equals((shutdown_args)that); return false; } - public boolean equals(shutdownTabletServer_args that) { + public boolean equals(shutdown_args that) { if (that == null) return false; if (this == that) @@ -19852,21 +18536,12 @@ public boolean equals(shutdownTabletServer_args that) { return false; } - boolean this_present_tabletServer = true && this.isSetTabletServer(); - boolean that_present_tabletServer = true && that.isSetTabletServer(); - if (this_present_tabletServer || that_present_tabletServer) { - if (!(this_present_tabletServer && that_present_tabletServer)) - return false; - if (!this.tabletServer.equals(that.tabletServer)) - return false; - } - - boolean this_present_force = true; - boolean that_present_force = true; - if (this_present_force || that_present_force) { - if (!(this_present_force && that_present_force)) + boolean this_present_stopTabletServers = true; + boolean that_present_stopTabletServers = true; + if (this_present_stopTabletServers || that_present_stopTabletServers) { + if (!(this_present_stopTabletServers && that_present_stopTabletServers)) return false; - if (this.force != that.force) + if (this.stopTabletServers != that.stopTabletServers) return false; } @@ -19885,17 +18560,13 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetTabletServer()) ? 131071 : 524287); - if (isSetTabletServer()) - hashCode = hashCode * 8191 + tabletServer.hashCode(); - - hashCode = hashCode * 8191 + ((force) ? 131071 : 524287); + hashCode = hashCode * 8191 + ((stopTabletServers) ? 131071 : 524287); return hashCode; } @Override - public int compareTo(shutdownTabletServer_args other) { + public int compareTo(shutdown_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -19922,22 +18593,12 @@ public int compareTo(shutdownTabletServer_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTabletServer(), other.isSetTabletServer()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTabletServer()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tabletServer, other.tabletServer); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetForce(), other.isSetForce()); + lastComparison = java.lang.Boolean.compare(isSetStopTabletServers(), other.isSetStopTabletServers()); if (lastComparison != 0) { return lastComparison; } - if (isSetForce()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.force, other.force); + if (isSetStopTabletServers()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopTabletServers, other.stopTabletServers); if (lastComparison != 0) { return lastComparison; } @@ -19963,7 +18624,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdownTabletServer_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdown_args("); boolean first = true; sb.append("tinfo:"); @@ -19982,16 +18643,8 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tabletServer:"); - if (this.tabletServer == null) { - sb.append("null"); - } else { - sb.append(this.tabletServer); - } - first = false; - if (!first) sb.append(", "); - sb.append("force:"); - sb.append(this.force); + sb.append("stopTabletServers:"); + sb.append(this.stopTabletServers); first = false; sb.append(")"); return sb.toString(); @@ -20026,17 +18679,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class shutdownTabletServer_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdown_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdownTabletServer_argsStandardScheme getScheme() { - return new shutdownTabletServer_argsStandardScheme(); + public shutdown_argsStandardScheme getScheme() { + return new shutdown_argsStandardScheme(); } } - private static class shutdownTabletServer_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class shutdown_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -20064,18 +18717,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServe org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TABLET_SERVER - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.tabletServer = iprot.readString(); - struct.setTabletServerIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // FORCE + case 3: // STOP_TABLET_SERVERS if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.force = iprot.readBool(); - struct.setForceIsSet(true); + struct.stopTabletServers = iprot.readBool(); + struct.setStopTabletServersIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -20092,7 +18737,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServe } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -20106,13 +18751,8 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServ struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.tabletServer != null) { - oprot.writeFieldBegin(TABLET_SERVER_FIELD_DESC); - oprot.writeString(struct.tabletServer); - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(FORCE_FIELD_DESC); - oprot.writeBool(struct.force); + oprot.writeFieldBegin(STOP_TABLET_SERVERS_FIELD_DESC); + oprot.writeBool(struct.stopTabletServers); oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); @@ -20120,17 +18760,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServ } - private static class shutdownTabletServer_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdown_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdownTabletServer_argsTupleScheme getScheme() { - return new shutdownTabletServer_argsTupleScheme(); + public shutdown_argsTupleScheme getScheme() { + return new shutdown_argsTupleScheme(); } } - private static class shutdownTabletServer_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class shutdown_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -20139,31 +18779,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServe if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetTabletServer()) { + if (struct.isSetStopTabletServers()) { optionals.set(2); } - if (struct.isSetForce()) { - optionals.set(3); - } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetTabletServer()) { - oprot.writeString(struct.tabletServer); - } - if (struct.isSetForce()) { - oprot.writeBool(struct.force); + if (struct.isSetStopTabletServers()) { + oprot.writeBool(struct.stopTabletServers); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -20175,12 +18809,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.tabletServer = iprot.readString(); - struct.setTabletServerIsSet(true); - } - if (incoming.get(3)) { - struct.force = iprot.readBool(); - struct.setForceIsSet(true); + struct.stopTabletServers = iprot.readBool(); + struct.setStopTabletServersIsSet(true); } } } @@ -20191,14 +18821,14 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class shutdownTabletServer_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdownTabletServer_result"); + public static class shutdown_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdown_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdownTabletServer_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdownTabletServer_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdown_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdown_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required @@ -20277,13 +18907,13 @@ public java.lang.String getFieldName() { tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdownTabletServer_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdown_result.class, metaDataMap); } - public shutdownTabletServer_result() { + public shutdown_result() { } - public shutdownTabletServer_result( + public shutdown_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { @@ -20295,7 +18925,7 @@ public shutdownTabletServer_result( /** * Performs a deep copy on other. */ - public shutdownTabletServer_result(shutdownTabletServer_result other) { + public shutdown_result(shutdown_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -20305,8 +18935,8 @@ public shutdownTabletServer_result(shutdownTabletServer_result other) { } @Override - public shutdownTabletServer_result deepCopy() { - return new shutdownTabletServer_result(this); + public shutdown_result deepCopy() { + return new shutdown_result(this); } @Override @@ -20320,7 +18950,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public shutdownTabletServer_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public shutdown_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -20345,7 +18975,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public shutdownTabletServer_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public shutdown_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -20419,12 +19049,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof shutdownTabletServer_result) - return this.equals((shutdownTabletServer_result)that); + if (that instanceof shutdown_result) + return this.equals((shutdown_result)that); return false; } - public boolean equals(shutdownTabletServer_result that) { + public boolean equals(shutdown_result that) { if (that == null) return false; if (this == that) @@ -20467,7 +19097,7 @@ public int hashCode() { } @Override - public int compareTo(shutdownTabletServer_result other) { + public int compareTo(shutdown_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -20514,7 +19144,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdownTabletServer_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdown_result("); boolean first = true; sb.append("sec:"); @@ -20557,17 +19187,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class shutdownTabletServer_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdown_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdownTabletServer_resultStandardScheme getScheme() { - return new shutdownTabletServer_resultStandardScheme(); + public shutdown_resultStandardScheme getScheme() { + return new shutdown_resultStandardScheme(); } } - private static class shutdownTabletServer_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class shutdown_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, shutdown_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -20607,7 +19237,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServe } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, shutdown_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -20627,17 +19257,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServ } - private static class shutdownTabletServer_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdown_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public shutdownTabletServer_resultTupleScheme getScheme() { - return new shutdownTabletServer_resultTupleScheme(); + public shutdown_resultTupleScheme getScheme() { + return new shutdown_resultTupleScheme(); } } - private static class shutdownTabletServer_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class shutdown_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, shutdown_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -20656,7 +19286,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServe } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, shutdown_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { @@ -20678,28 +19308,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class tabletServerStopping_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("tabletServerStopping_args"); + public static class shutdownTabletServer_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdownTabletServer_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField TABLET_SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("tabletServer", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField FORCE_FIELD_DESC = new org.apache.thrift.protocol.TField("force", org.apache.thrift.protocol.TType.BOOL, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new tabletServerStopping_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new tabletServerStopping_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdownTabletServer_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdownTabletServer_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String tabletServer; // required - public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required + public boolean force; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), TABLET_SERVER((short)3, "tabletServer"), - RESOURCE_GROUP((short)4, "resourceGroup"); + FORCE((short)4, "force"); private static final java.util.Map byName = new java.util.HashMap(); @@ -20721,8 +19351,8 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // TABLET_SERVER return TABLET_SERVER; - case 4: // RESOURCE_GROUP - return RESOURCE_GROUP; + case 4: // FORCE + return FORCE; default: return null; } @@ -20766,6 +19396,8 @@ public java.lang.String getFieldName() { } // isset id assignments + private static final int __FORCE_ISSET_ID = 0; + private byte __isset_bitfield = 0; public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -20775,32 +19407,34 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.TABLET_SERVER, new org.apache.thrift.meta_data.FieldMetaData("tabletServer", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.FORCE, new org.apache.thrift.meta_data.FieldMetaData("force", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(tabletServerStopping_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdownTabletServer_args.class, metaDataMap); } - public tabletServerStopping_args() { + public shutdownTabletServer_args() { } - public tabletServerStopping_args( + public shutdownTabletServer_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tabletServer, - java.lang.String resourceGroup) + boolean force) { this(); this.tinfo = tinfo; this.credentials = credentials; this.tabletServer = tabletServer; - this.resourceGroup = resourceGroup; + this.force = force; + setForceIsSet(true); } /** * Performs a deep copy on other. */ - public tabletServerStopping_args(tabletServerStopping_args other) { + public shutdownTabletServer_args(shutdownTabletServer_args other) { + __isset_bitfield = other.__isset_bitfield; if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -20810,14 +19444,12 @@ public tabletServerStopping_args(tabletServerStopping_args other) { if (other.isSetTabletServer()) { this.tabletServer = other.tabletServer; } - if (other.isSetResourceGroup()) { - this.resourceGroup = other.resourceGroup; - } + this.force = other.force; } @Override - public tabletServerStopping_args deepCopy() { - return new tabletServerStopping_args(this); + public shutdownTabletServer_args deepCopy() { + return new shutdownTabletServer_args(this); } @Override @@ -20825,7 +19457,8 @@ public void clear() { this.tinfo = null; this.credentials = null; this.tabletServer = null; - this.resourceGroup = null; + setForceIsSet(false); + this.force = false; } @org.apache.thrift.annotation.Nullable @@ -20833,7 +19466,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public tabletServerStopping_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public shutdownTabletServer_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -20858,7 +19491,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public tabletServerStopping_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public shutdownTabletServer_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -20883,7 +19516,7 @@ public java.lang.String getTabletServer() { return this.tabletServer; } - public tabletServerStopping_args setTabletServer(@org.apache.thrift.annotation.Nullable java.lang.String tabletServer) { + public shutdownTabletServer_args setTabletServer(@org.apache.thrift.annotation.Nullable java.lang.String tabletServer) { this.tabletServer = tabletServer; return this; } @@ -20903,29 +19536,27 @@ public void setTabletServerIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getResourceGroup() { - return this.resourceGroup; + public boolean isForce() { + return this.force; } - public tabletServerStopping_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { - this.resourceGroup = resourceGroup; + public shutdownTabletServer_args setForce(boolean force) { + this.force = force; + setForceIsSet(true); return this; } - public void unsetResourceGroup() { - this.resourceGroup = null; + public void unsetForce() { + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FORCE_ISSET_ID); } - /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceGroup() { - return this.resourceGroup != null; + /** Returns true if field force is set (has been assigned a value) and false otherwise */ + public boolean isSetForce() { + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FORCE_ISSET_ID); } - public void setResourceGroupIsSet(boolean value) { - if (!value) { - this.resourceGroup = null; - } + public void setForceIsSet(boolean value) { + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FORCE_ISSET_ID, value); } @Override @@ -20955,11 +19586,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case RESOURCE_GROUP: + case FORCE: if (value == null) { - unsetResourceGroup(); + unsetForce(); } else { - setResourceGroup((java.lang.String)value); + setForce((java.lang.Boolean)value); } break; @@ -20979,8 +19610,8 @@ public java.lang.Object getFieldValue(_Fields field) { case TABLET_SERVER: return getTabletServer(); - case RESOURCE_GROUP: - return getResourceGroup(); + case FORCE: + return isForce(); } throw new java.lang.IllegalStateException(); @@ -21000,20 +19631,20 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case TABLET_SERVER: return isSetTabletServer(); - case RESOURCE_GROUP: - return isSetResourceGroup(); + case FORCE: + return isSetForce(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof tabletServerStopping_args) - return this.equals((tabletServerStopping_args)that); + if (that instanceof shutdownTabletServer_args) + return this.equals((shutdownTabletServer_args)that); return false; } - public boolean equals(tabletServerStopping_args that) { + public boolean equals(shutdownTabletServer_args that) { if (that == null) return false; if (this == that) @@ -21046,12 +19677,12 @@ public boolean equals(tabletServerStopping_args that) { return false; } - boolean this_present_resourceGroup = true && this.isSetResourceGroup(); - boolean that_present_resourceGroup = true && that.isSetResourceGroup(); - if (this_present_resourceGroup || that_present_resourceGroup) { - if (!(this_present_resourceGroup && that_present_resourceGroup)) + boolean this_present_force = true; + boolean that_present_force = true; + if (this_present_force || that_present_force) { + if (!(this_present_force && that_present_force)) return false; - if (!this.resourceGroup.equals(that.resourceGroup)) + if (this.force != that.force) return false; } @@ -21074,15 +19705,13 @@ public int hashCode() { if (isSetTabletServer()) hashCode = hashCode * 8191 + tabletServer.hashCode(); - hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287); - if (isSetResourceGroup()) - hashCode = hashCode * 8191 + resourceGroup.hashCode(); + hashCode = hashCode * 8191 + ((force) ? 131071 : 524287); return hashCode; } @Override - public int compareTo(tabletServerStopping_args other) { + public int compareTo(shutdownTabletServer_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -21119,12 +19748,12 @@ public int compareTo(tabletServerStopping_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup()); + lastComparison = java.lang.Boolean.compare(isSetForce(), other.isSetForce()); if (lastComparison != 0) { return lastComparison; } - if (isSetResourceGroup()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup); + if (isSetForce()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.force, other.force); if (lastComparison != 0) { return lastComparison; } @@ -21150,7 +19779,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("tabletServerStopping_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdownTabletServer_args("); boolean first = true; sb.append("tinfo:"); @@ -21177,12 +19806,8 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("resourceGroup:"); - if (this.resourceGroup == null) { - sb.append("null"); - } else { - sb.append(this.resourceGroup); - } + sb.append("force:"); + sb.append(this.force); first = false; sb.append(")"); return sb.toString(); @@ -21209,23 +19834,25 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { + // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. + __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); } } - private static class tabletServerStopping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdownTabletServer_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public tabletServerStopping_argsStandardScheme getScheme() { - return new tabletServerStopping_argsStandardScheme(); + public shutdownTabletServer_argsStandardScheme getScheme() { + return new shutdownTabletServer_argsStandardScheme(); } } - private static class tabletServerStopping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class shutdownTabletServer_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStopping_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -21261,10 +19888,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStoppin org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // RESOURCE_GROUP - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); + case 4: // FORCE + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.force = iprot.readBool(); + struct.setForceIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -21281,7 +19908,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStoppin } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStopping_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -21300,28 +19927,26 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStoppi oprot.writeString(struct.tabletServer); oprot.writeFieldEnd(); } - if (struct.resourceGroup != null) { - oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC); - oprot.writeString(struct.resourceGroup); - oprot.writeFieldEnd(); - } + oprot.writeFieldBegin(FORCE_FIELD_DESC); + oprot.writeBool(struct.force); + oprot.writeFieldEnd(); oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class tabletServerStopping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdownTabletServer_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public tabletServerStopping_argsTupleScheme getScheme() { - return new tabletServerStopping_argsTupleScheme(); + public shutdownTabletServer_argsTupleScheme getScheme() { + return new shutdownTabletServer_argsTupleScheme(); } } - private static class tabletServerStopping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class shutdownTabletServer_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -21333,7 +19958,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStoppin if (struct.isSetTabletServer()) { optionals.set(2); } - if (struct.isSetResourceGroup()) { + if (struct.isSetForce()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -21346,13 +19971,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStoppin if (struct.isSetTabletServer()) { oprot.writeString(struct.tabletServer); } - if (struct.isSetResourceGroup()) { - oprot.writeString(struct.resourceGroup); + if (struct.isSetForce()) { + oprot.writeBool(struct.force); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -21370,8 +19995,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping struct.setTabletServerIsSet(true); } if (incoming.get(3)) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); + struct.force = iprot.readBool(); + struct.setForceIsSet(true); } } } @@ -21382,14 +20007,14 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class tabletServerStopping_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("tabletServerStopping_result"); + public static class shutdownTabletServer_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("shutdownTabletServer_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new tabletServerStopping_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new tabletServerStopping_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shutdownTabletServer_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new shutdownTabletServer_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required @@ -21468,13 +20093,13 @@ public java.lang.String getFieldName() { tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(tabletServerStopping_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(shutdownTabletServer_result.class, metaDataMap); } - public tabletServerStopping_result() { + public shutdownTabletServer_result() { } - public tabletServerStopping_result( + public shutdownTabletServer_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { @@ -21486,7 +20111,7 @@ public tabletServerStopping_result( /** * Performs a deep copy on other. */ - public tabletServerStopping_result(tabletServerStopping_result other) { + public shutdownTabletServer_result(shutdownTabletServer_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -21496,8 +20121,8 @@ public tabletServerStopping_result(tabletServerStopping_result other) { } @Override - public tabletServerStopping_result deepCopy() { - return new tabletServerStopping_result(this); + public shutdownTabletServer_result deepCopy() { + return new shutdownTabletServer_result(this); } @Override @@ -21511,7 +20136,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public tabletServerStopping_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public shutdownTabletServer_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -21536,7 +20161,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public tabletServerStopping_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public shutdownTabletServer_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -21610,12 +20235,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof tabletServerStopping_result) - return this.equals((tabletServerStopping_result)that); + if (that instanceof shutdownTabletServer_result) + return this.equals((shutdownTabletServer_result)that); return false; } - public boolean equals(tabletServerStopping_result that) { + public boolean equals(shutdownTabletServer_result that) { if (that == null) return false; if (this == that) @@ -21658,7 +20283,7 @@ public int hashCode() { } @Override - public int compareTo(tabletServerStopping_result other) { + public int compareTo(shutdownTabletServer_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -21705,7 +20330,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("tabletServerStopping_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("shutdownTabletServer_result("); boolean first = true; sb.append("sec:"); @@ -21748,17 +20373,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class tabletServerStopping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdownTabletServer_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public tabletServerStopping_resultStandardScheme getScheme() { - return new tabletServerStopping_resultStandardScheme(); + public shutdownTabletServer_resultStandardScheme getScheme() { + return new shutdownTabletServer_resultStandardScheme(); } } - private static class tabletServerStopping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class shutdownTabletServer_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStopping_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -21798,7 +20423,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStoppin } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStopping_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -21818,17 +20443,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStoppi } - private static class tabletServerStopping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class shutdownTabletServer_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public tabletServerStopping_resultTupleScheme getScheme() { - return new tabletServerStopping_resultTupleScheme(); + public shutdownTabletServer_resultTupleScheme getScheme() { + return new shutdownTabletServer_resultTupleScheme(); } } - private static class tabletServerStopping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class shutdownTabletServer_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -21847,7 +20472,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStoppin } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, shutdownTabletServer_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { @@ -21869,28 +20494,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setSystemProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSystemProperty_args"); + public static class tabletServerStopping_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("tabletServerStopping_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField TABLET_SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("tabletServer", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setSystemProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setSystemProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new tabletServerStopping_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new tabletServerStopping_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required - public @org.apache.thrift.annotation.Nullable java.lang.String value; // required + public @org.apache.thrift.annotation.Nullable java.lang.String tabletServer; // required + public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - PROPERTY((short)3, "property"), - VALUE((short)4, "value"); + TABLET_SERVER((short)3, "tabletServer"), + RESOURCE_GROUP((short)4, "resourceGroup"); private static final java.util.Map byName = new java.util.HashMap(); @@ -21910,10 +20535,10 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // PROPERTY - return PROPERTY; - case 4: // VALUE - return VALUE; + case 3: // TABLET_SERVER + return TABLET_SERVER; + case 4: // RESOURCE_GROUP + return RESOURCE_GROUP; default: return null; } @@ -21964,59 +20589,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TABLET_SERVER, new org.apache.thrift.meta_data.FieldMetaData("tabletServer", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSystemProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(tabletServerStopping_args.class, metaDataMap); } - public setSystemProperty_args() { + public tabletServerStopping_args() { } - public setSystemProperty_args( + public tabletServerStopping_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String property, - java.lang.String value) + java.lang.String tabletServer, + java.lang.String resourceGroup) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.property = property; - this.value = value; + this.tabletServer = tabletServer; + this.resourceGroup = resourceGroup; } /** * Performs a deep copy on other. */ - public setSystemProperty_args(setSystemProperty_args other) { + public tabletServerStopping_args(tabletServerStopping_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetTabletServer()) { + this.tabletServer = other.tabletServer; } - if (other.isSetValue()) { - this.value = other.value; + if (other.isSetResourceGroup()) { + this.resourceGroup = other.resourceGroup; } } @Override - public setSystemProperty_args deepCopy() { - return new setSystemProperty_args(this); + public tabletServerStopping_args deepCopy() { + return new tabletServerStopping_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.property = null; - this.value = null; + this.tabletServer = null; + this.resourceGroup = null; } @org.apache.thrift.annotation.Nullable @@ -22024,7 +20649,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public setSystemProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public tabletServerStopping_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -22049,7 +20674,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public setSystemProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public tabletServerStopping_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -22070,52 +20695,52 @@ public void setCredentialsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public java.lang.String getTabletServer() { + return this.tabletServer; } - public setSystemProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public tabletServerStopping_args setTabletServer(@org.apache.thrift.annotation.Nullable java.lang.String tabletServer) { + this.tabletServer = tabletServer; return this; } - public void unsetProperty() { - this.property = null; + public void unsetTabletServer() { + this.tabletServer = null; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + /** Returns true if field tabletServer is set (has been assigned a value) and false otherwise */ + public boolean isSetTabletServer() { + return this.tabletServer != null; } - public void setPropertyIsSet(boolean value) { + public void setTabletServerIsSet(boolean value) { if (!value) { - this.property = null; + this.tabletServer = null; } } @org.apache.thrift.annotation.Nullable - public java.lang.String getValue() { - return this.value; + public java.lang.String getResourceGroup() { + return this.resourceGroup; } - public setSystemProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { - this.value = value; + public tabletServerStopping_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + this.resourceGroup = resourceGroup; return this; } - public void unsetValue() { - this.value = null; + public void unsetResourceGroup() { + this.resourceGroup = null; } - /** Returns true if field value is set (has been assigned a value) and false otherwise */ - public boolean isSetValue() { - return this.value != null; + /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */ + public boolean isSetResourceGroup() { + return this.resourceGroup != null; } - public void setValueIsSet(boolean value) { + public void setResourceGroupIsSet(boolean value) { if (!value) { - this.value = null; + this.resourceGroup = null; } } @@ -22138,19 +20763,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case TABLET_SERVER: if (value == null) { - unsetProperty(); + unsetTabletServer(); } else { - setProperty((java.lang.String)value); + setTabletServer((java.lang.String)value); } break; - case VALUE: + case RESOURCE_GROUP: if (value == null) { - unsetValue(); + unsetResourceGroup(); } else { - setValue((java.lang.String)value); + setResourceGroup((java.lang.String)value); } break; @@ -22167,11 +20792,11 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case PROPERTY: - return getProperty(); + case TABLET_SERVER: + return getTabletServer(); - case VALUE: - return getValue(); + case RESOURCE_GROUP: + return getResourceGroup(); } throw new java.lang.IllegalStateException(); @@ -22189,22 +20814,22 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case PROPERTY: - return isSetProperty(); - case VALUE: - return isSetValue(); + case TABLET_SERVER: + return isSetTabletServer(); + case RESOURCE_GROUP: + return isSetResourceGroup(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setSystemProperty_args) - return this.equals((setSystemProperty_args)that); + if (that instanceof tabletServerStopping_args) + return this.equals((tabletServerStopping_args)that); return false; } - public boolean equals(setSystemProperty_args that) { + public boolean equals(tabletServerStopping_args that) { if (that == null) return false; if (this == that) @@ -22228,21 +20853,21 @@ public boolean equals(setSystemProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_tabletServer = true && this.isSetTabletServer(); + boolean that_present_tabletServer = true && that.isSetTabletServer(); + if (this_present_tabletServer || that_present_tabletServer) { + if (!(this_present_tabletServer && that_present_tabletServer)) return false; - if (!this.property.equals(that.property)) + if (!this.tabletServer.equals(that.tabletServer)) return false; } - boolean this_present_value = true && this.isSetValue(); - boolean that_present_value = true && that.isSetValue(); - if (this_present_value || that_present_value) { - if (!(this_present_value && that_present_value)) + boolean this_present_resourceGroup = true && this.isSetResourceGroup(); + boolean that_present_resourceGroup = true && that.isSetResourceGroup(); + if (this_present_resourceGroup || that_present_resourceGroup) { + if (!(this_present_resourceGroup && that_present_resourceGroup)) return false; - if (!this.value.equals(that.value)) + if (!this.resourceGroup.equals(that.resourceGroup)) return false; } @@ -22261,19 +20886,19 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetTabletServer()) ? 131071 : 524287); + if (isSetTabletServer()) + hashCode = hashCode * 8191 + tabletServer.hashCode(); - hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); - if (isSetValue()) - hashCode = hashCode * 8191 + value.hashCode(); + hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287); + if (isSetResourceGroup()) + hashCode = hashCode * 8191 + resourceGroup.hashCode(); return hashCode; } @Override - public int compareTo(setSystemProperty_args other) { + public int compareTo(tabletServerStopping_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -22300,22 +20925,22 @@ public int compareTo(setSystemProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetTabletServer(), other.isSetTabletServer()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetTabletServer()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tabletServer, other.tabletServer); if (lastComparison != 0) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup()); if (lastComparison != 0) { return lastComparison; } - if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); + if (isSetResourceGroup()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup); if (lastComparison != 0) { return lastComparison; } @@ -22341,7 +20966,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setSystemProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("tabletServerStopping_args("); boolean first = true; sb.append("tinfo:"); @@ -22360,19 +20985,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("tabletServer:"); + if (this.tabletServer == null) { sb.append("null"); } else { - sb.append(this.property); + sb.append(this.tabletServer); } first = false; if (!first) sb.append(", "); - sb.append("value:"); - if (this.value == null) { + sb.append("resourceGroup:"); + if (this.resourceGroup == null) { sb.append("null"); } else { - sb.append(this.value); + sb.append(this.resourceGroup); } first = false; sb.append(")"); @@ -22406,17 +21031,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setSystemProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class tabletServerStopping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setSystemProperty_argsStandardScheme getScheme() { - return new setSystemProperty_argsStandardScheme(); + public tabletServerStopping_argsStandardScheme getScheme() { + return new tabletServerStopping_argsStandardScheme(); } } - private static class setSystemProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class tabletServerStopping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStopping_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -22444,18 +21069,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_a org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PROPERTY + case 3: // TABLET_SERVER if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.tabletServer = iprot.readString(); + struct.setTabletServerIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // VALUE + case 4: // RESOURCE_GROUP if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); + struct.resourceGroup = iprot.readString(); + struct.setResourceGroupIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -22472,7 +21097,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_a } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStopping_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -22486,14 +21111,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_ struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.tabletServer != null) { + oprot.writeFieldBegin(TABLET_SERVER_FIELD_DESC); + oprot.writeString(struct.tabletServer); oprot.writeFieldEnd(); } - if (struct.value != null) { - oprot.writeFieldBegin(VALUE_FIELD_DESC); - oprot.writeString(struct.value); + if (struct.resourceGroup != null) { + oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC); + oprot.writeString(struct.resourceGroup); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -22502,17 +21127,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_ } - private static class setSystemProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class tabletServerStopping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setSystemProperty_argsTupleScheme getScheme() { - return new setSystemProperty_argsTupleScheme(); + public tabletServerStopping_argsTupleScheme getScheme() { + return new tabletServerStopping_argsTupleScheme(); } } - private static class setSystemProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class tabletServerStopping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -22521,10 +21146,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_a if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetProperty()) { + if (struct.isSetTabletServer()) { optionals.set(2); } - if (struct.isSetValue()) { + if (struct.isSetResourceGroup()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -22534,16 +21159,16 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_a if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetTabletServer()) { + oprot.writeString(struct.tabletServer); } - if (struct.isSetValue()) { - oprot.writeString(struct.value); + if (struct.isSetResourceGroup()) { + oprot.writeString(struct.resourceGroup); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -22557,12 +21182,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_ar struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.tabletServer = iprot.readString(); + struct.setTabletServerIsSet(true); } if (incoming.get(3)) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); + struct.resourceGroup = iprot.readString(); + struct.setResourceGroupIsSet(true); } } } @@ -22573,25 +21198,22 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setSystemProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSystemProperty_result"); + public static class tabletServerStopping_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("tabletServerStopping_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setSystemProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setSystemProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new tabletServerStopping_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new tabletServerStopping_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), - TNASE((short)2, "tnase"), - TPE((short)3, "tpe"); + TNASE((short)2, "tnase"); private static final java.util.Map byName = new java.util.HashMap(); @@ -22611,8 +21233,6 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // TPE - return TPE; default: return null; } @@ -22663,51 +21283,43 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSystemProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(tabletServerStopping_result.class, metaDataMap); } - public setSystemProperty_result() { + public tabletServerStopping_result() { } - public setSystemProperty_result( + public tabletServerStopping_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - ThriftPropertyException tpe) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this(); this.sec = sec; this.tnase = tnase; - this.tpe = tpe; } /** * Performs a deep copy on other. */ - public setSystemProperty_result(setSystemProperty_result other) { + public tabletServerStopping_result(tabletServerStopping_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTpe()) { - this.tpe = new ThriftPropertyException(other.tpe); - } } @Override - public setSystemProperty_result deepCopy() { - return new setSystemProperty_result(this); + public tabletServerStopping_result deepCopy() { + return new tabletServerStopping_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; - this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -22715,7 +21327,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public setSystemProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public tabletServerStopping_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -22740,7 +21352,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public setSystemProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public tabletServerStopping_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -22760,31 +21372,6 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public ThriftPropertyException getTpe() { - return this.tpe; - } - - public setSystemProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { - this.tpe = tpe; - return this; - } - - public void unsetTpe() { - this.tpe = null; - } - - /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ - public boolean isSetTpe() { - return this.tpe != null; - } - - public void setTpeIsSet(boolean value) { - if (!value) { - this.tpe = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -22804,14 +21391,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TPE: - if (value == null) { - unsetTpe(); - } else { - setTpe((ThriftPropertyException)value); - } - break; - } } @@ -22825,9 +21404,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TPE: - return getTpe(); - } throw new java.lang.IllegalStateException(); } @@ -22844,20 +21420,18 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); - case TPE: - return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setSystemProperty_result) - return this.equals((setSystemProperty_result)that); + if (that instanceof tabletServerStopping_result) + return this.equals((tabletServerStopping_result)that); return false; } - public boolean equals(setSystemProperty_result that) { + public boolean equals(tabletServerStopping_result that) { if (that == null) return false; if (this == that) @@ -22881,15 +21455,6 @@ public boolean equals(setSystemProperty_result that) { return false; } - boolean this_present_tpe = true && this.isSetTpe(); - boolean that_present_tpe = true && that.isSetTpe(); - if (this_present_tpe || that_present_tpe) { - if (!(this_present_tpe && that_present_tpe)) - return false; - if (!this.tpe.equals(that.tpe)) - return false; - } - return true; } @@ -22905,15 +21470,11 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); - if (isSetTpe()) - hashCode = hashCode * 8191 + tpe.hashCode(); - return hashCode; } @Override - public int compareTo(setSystemProperty_result other) { + public int compareTo(tabletServerStopping_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -22940,16 +21501,6 @@ public int compareTo(setSystemProperty_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTpe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -22970,7 +21521,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setSystemProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("tabletServerStopping_result("); boolean first = true; sb.append("sec:"); @@ -22988,14 +21539,6 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; - if (!first) sb.append(", "); - sb.append("tpe:"); - if (this.tpe == null) { - sb.append("null"); - } else { - sb.append(this.tpe); - } - first = false; sb.append(")"); return sb.toString(); } @@ -23021,17 +21564,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setSystemProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class tabletServerStopping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setSystemProperty_resultStandardScheme getScheme() { - return new setSystemProperty_resultStandardScheme(); + public tabletServerStopping_resultStandardScheme getScheme() { + return new tabletServerStopping_resultStandardScheme(); } } - private static class setSystemProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class tabletServerStopping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, tabletServerStopping_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -23059,15 +21602,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_r org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -23080,7 +21614,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_r } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, tabletServerStopping_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -23094,28 +21628,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_ struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tpe != null) { - oprot.writeFieldBegin(TPE_FIELD_DESC); - struct.tpe.write(oprot); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setSystemProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class tabletServerStopping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setSystemProperty_resultTupleScheme getScheme() { - return new setSystemProperty_resultTupleScheme(); + public tabletServerStopping_resultTupleScheme getScheme() { + return new tabletServerStopping_resultTupleScheme(); } } - private static class setSystemProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class tabletServerStopping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -23124,25 +21653,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_r if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetTpe()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 2); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTpe()) { - struct.tpe.write(oprot); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, tabletServerStopping_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -23153,11 +21676,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_re struct.tnase.read(iprot); struct.setTnaseIsSet(true); } - if (incoming.get(2)) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } } } @@ -23167,25 +21685,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifySystemProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifySystemProperties_args"); + public static class setSystemProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSystemProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifySystemProperties_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifySystemProperties_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setSystemProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setSystemProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - V_PROPERTIES((short)3, "vProperties"); + PROPERTY((short)3, "property"), + VALUE((short)4, "value"); private static final java.util.Map byName = new java.util.HashMap(); @@ -23205,8 +21726,10 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // V_PROPERTIES - return V_PROPERTIES; + case 3: // PROPERTY + return PROPERTY; + case 4: // VALUE + return VALUE; default: return null; } @@ -23257,51 +21780,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifySystemProperties_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSystemProperty_args.class, metaDataMap); } - public modifySystemProperties_args() { + public setSystemProperty_args() { } - public modifySystemProperties_args( + public setSystemProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) + java.lang.String property, + java.lang.String value) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.vProperties = vProperties; + this.property = property; + this.value = value; } /** * Performs a deep copy on other. */ - public modifySystemProperties_args(modifySystemProperties_args other) { + public setSystemProperty_args(setSystemProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetVProperties()) { - this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); + if (other.isSetProperty()) { + this.property = other.property; + } + if (other.isSetValue()) { + this.value = other.value; } } @Override - public modifySystemProperties_args deepCopy() { - return new modifySystemProperties_args(this); + public setSystemProperty_args deepCopy() { + return new setSystemProperty_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.vProperties = null; + this.property = null; + this.value = null; } @org.apache.thrift.annotation.Nullable @@ -23309,7 +21840,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public modifySystemProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public setSystemProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -23334,7 +21865,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public modifySystemProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public setSystemProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -23355,27 +21886,52 @@ public void setCredentialsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { - return this.vProperties; + public java.lang.String getProperty() { + return this.property; } - public modifySystemProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { - this.vProperties = vProperties; + public setSystemProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; return this; } - public void unsetVProperties() { - this.vProperties = null; + public void unsetProperty() { + this.property = null; } - /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ - public boolean isSetVProperties() { - return this.vProperties != null; + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; } - public void setVPropertiesIsSet(boolean value) { + public void setPropertyIsSet(boolean value) { if (!value) { - this.vProperties = null; + this.property = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getValue() { + return this.value; + } + + public setSystemProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { + this.value = value; + return this; + } + + public void unsetValue() { + this.value = null; + } + + /** Returns true if field value is set (has been assigned a value) and false otherwise */ + public boolean isSetValue() { + return this.value != null; + } + + public void setValueIsSet(boolean value) { + if (!value) { + this.value = null; } } @@ -23398,11 +21954,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case V_PROPERTIES: + case PROPERTY: if (value == null) { - unsetVProperties(); + unsetProperty(); } else { - setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); + setProperty((java.lang.String)value); + } + break; + + case VALUE: + if (value == null) { + unsetValue(); + } else { + setValue((java.lang.String)value); } break; @@ -23419,8 +21983,11 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case V_PROPERTIES: - return getVProperties(); + case PROPERTY: + return getProperty(); + + case VALUE: + return getValue(); } throw new java.lang.IllegalStateException(); @@ -23438,20 +22005,22 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case V_PROPERTIES: - return isSetVProperties(); + case PROPERTY: + return isSetProperty(); + case VALUE: + return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifySystemProperties_args) - return this.equals((modifySystemProperties_args)that); + if (that instanceof setSystemProperty_args) + return this.equals((setSystemProperty_args)that); return false; } - public boolean equals(modifySystemProperties_args that) { + public boolean equals(setSystemProperty_args that) { if (that == null) return false; if (this == that) @@ -23475,12 +22044,21 @@ public boolean equals(modifySystemProperties_args that) { return false; } - boolean this_present_vProperties = true && this.isSetVProperties(); - boolean that_present_vProperties = true && that.isSetVProperties(); - if (this_present_vProperties || that_present_vProperties) { - if (!(this_present_vProperties && that_present_vProperties)) + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) return false; - if (!this.vProperties.equals(that.vProperties)) + if (!this.property.equals(that.property)) + return false; + } + + boolean this_present_value = true && this.isSetValue(); + boolean that_present_value = true && that.isSetValue(); + if (this_present_value || that_present_value) { + if (!(this_present_value && that_present_value)) + return false; + if (!this.value.equals(that.value)) return false; } @@ -23499,15 +22077,19 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); - if (isSetVProperties()) - hashCode = hashCode * 8191 + vProperties.hashCode(); + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); + + hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); + if (isSetValue()) + hashCode = hashCode * 8191 + value.hashCode(); return hashCode; } @Override - public int compareTo(modifySystemProperties_args other) { + public int compareTo(setSystemProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -23534,12 +22116,22 @@ public int compareTo(modifySystemProperties_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); if (lastComparison != 0) { return lastComparison; } - if (isSetVProperties()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetValue()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } @@ -23565,7 +22157,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifySystemProperties_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setSystemProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -23584,11 +22176,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("vProperties:"); - if (this.vProperties == null) { + sb.append("property:"); + if (this.property == null) { sb.append("null"); } else { - sb.append(this.vProperties); + sb.append(this.property); + } + first = false; + if (!first) sb.append(", "); + sb.append("value:"); + if (this.value == null) { + sb.append("null"); + } else { + sb.append(this.value); } first = false; sb.append(")"); @@ -23604,9 +22204,6 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } - if (vProperties != null) { - vProperties.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -23625,17 +22222,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifySystemProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setSystemProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifySystemProperties_argsStandardScheme getScheme() { - return new modifySystemProperties_argsStandardScheme(); + public setSystemProperty_argsStandardScheme getScheme() { + return new setSystemProperty_argsStandardScheme(); } } - private static class modifySystemProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setSystemProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -23663,11 +22260,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemPropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // V_PROPERTIES - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + case 3: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // VALUE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -23684,7 +22288,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemPropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -23698,9 +22302,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProper struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.vProperties != null) { - oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); - struct.vProperties.write(oprot); + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); + oprot.writeFieldEnd(); + } + if (struct.value != null) { + oprot.writeFieldBegin(VALUE_FIELD_DESC); + oprot.writeString(struct.value); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -23709,17 +22318,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProper } - private static class modifySystemProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setSystemProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifySystemProperties_argsTupleScheme getScheme() { - return new modifySystemProperties_argsTupleScheme(); + public setSystemProperty_argsTupleScheme getScheme() { + return new setSystemProperty_argsTupleScheme(); } } - private static class modifySystemProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setSystemProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -23728,25 +22337,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemPropert if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetVProperties()) { + if (struct.isSetProperty()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetValue()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetVProperties()) { - struct.vProperties.write(oprot); + if (struct.isSetProperty()) { + oprot.writeString(struct.property); + } + if (struct.isSetValue()) { + oprot.writeString(struct.value); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -23758,9 +22373,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperti struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } + if (incoming.get(3)) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } } } @@ -23771,28 +22389,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifySystemProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifySystemProperties_result"); + public static class setSystemProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setSystemProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifySystemProperties_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifySystemProperties_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setSystemProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setSystemProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TNASE((short)2, "tnase"), - TCME((short)3, "tcme"), - TPE((short)4, "tpe"); + TPE((short)3, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -23812,9 +22427,7 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // TCME - return TCME; - case 4: // TPE + case 3: // TPE return TPE; default: return null; @@ -23866,58 +22479,50 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifySystemProperties_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setSystemProperty_result.class, metaDataMap); } - public modifySystemProperties_result() { + public setSystemProperty_result() { } - public modifySystemProperties_result( + public setSystemProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, ThriftPropertyException tpe) { this(); this.sec = sec; this.tnase = tnase; - this.tcme = tcme; this.tpe = tpe; } /** * Performs a deep copy on other. */ - public modifySystemProperties_result(modifySystemProperties_result other) { + public setSystemProperty_result(setSystemProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTcme()) { - this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); - } if (other.isSetTpe()) { this.tpe = new ThriftPropertyException(other.tpe); } } @Override - public modifySystemProperties_result deepCopy() { - return new modifySystemProperties_result(this); + public setSystemProperty_result deepCopy() { + return new setSystemProperty_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; - this.tcme = null; this.tpe = null; } @@ -23926,7 +22531,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public modifySystemProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public setSystemProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -23951,7 +22556,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public modifySystemProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public setSystemProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -23971,37 +22576,12 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { - return this.tcme; - } - - public modifySystemProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { - this.tcme = tcme; - return this; - } - - public void unsetTcme() { - this.tcme = null; - } - - /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ - public boolean isSetTcme() { - return this.tcme != null; - } - - public void setTcmeIsSet(boolean value) { - if (!value) { - this.tcme = null; - } - } - @org.apache.thrift.annotation.Nullable public ThriftPropertyException getTpe() { return this.tpe; } - public modifySystemProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + public setSystemProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { this.tpe = tpe; return this; } @@ -24040,14 +22620,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TCME: - if (value == null) { - unsetTcme(); - } else { - setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); - } - break; - case TPE: if (value == null) { unsetTpe(); @@ -24069,9 +22641,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TCME: - return getTcme(); - case TPE: return getTpe(); @@ -24091,8 +22660,6 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); - case TCME: - return isSetTcme(); case TPE: return isSetTpe(); } @@ -24101,12 +22668,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifySystemProperties_result) - return this.equals((modifySystemProperties_result)that); + if (that instanceof setSystemProperty_result) + return this.equals((setSystemProperty_result)that); return false; } - public boolean equals(modifySystemProperties_result that) { + public boolean equals(setSystemProperty_result that) { if (that == null) return false; if (this == that) @@ -24130,15 +22697,6 @@ public boolean equals(modifySystemProperties_result that) { return false; } - boolean this_present_tcme = true && this.isSetTcme(); - boolean that_present_tcme = true && that.isSetTcme(); - if (this_present_tcme || that_present_tcme) { - if (!(this_present_tcme && that_present_tcme)) - return false; - if (!this.tcme.equals(that.tcme)) - return false; - } - boolean this_present_tpe = true && this.isSetTpe(); boolean that_present_tpe = true && that.isSetTpe(); if (this_present_tpe || that_present_tpe) { @@ -24163,10 +22721,6 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); - if (isSetTcme()) - hashCode = hashCode * 8191 + tcme.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); if (isSetTpe()) hashCode = hashCode * 8191 + tpe.hashCode(); @@ -24175,7 +22729,7 @@ public int hashCode() { } @Override - public int compareTo(modifySystemProperties_result other) { + public int compareTo(setSystemProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -24202,16 +22756,6 @@ public int compareTo(modifySystemProperties_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTcme()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); if (lastComparison != 0) { return lastComparison; @@ -24242,7 +22786,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifySystemProperties_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setSystemProperty_result("); boolean first = true; sb.append("sec:"); @@ -24261,14 +22805,6 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tcme:"); - if (this.tcme == null) { - sb.append("null"); - } else { - sb.append(this.tcme); - } - first = false; - if (!first) sb.append(", "); sb.append("tpe:"); if (this.tpe == null) { sb.append("null"); @@ -24301,17 +22837,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifySystemProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setSystemProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifySystemProperties_resultStandardScheme getScheme() { - return new modifySystemProperties_resultStandardScheme(); + public setSystemProperty_resultStandardScheme getScheme() { + return new setSystemProperty_resultStandardScheme(); } } - private static class modifySystemProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setSystemProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -24339,16 +22875,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemPropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TCME - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // TPE + case 3: // TPE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); @@ -24369,7 +22896,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemPropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setSystemProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -24383,11 +22910,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProper struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tcme != null) { - oprot.writeFieldBegin(TCME_FIELD_DESC); - struct.tcme.write(oprot); - oprot.writeFieldEnd(); - } if (struct.tpe != null) { oprot.writeFieldBegin(TPE_FIELD_DESC); struct.tpe.write(oprot); @@ -24399,17 +22921,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProper } - private static class modifySystemProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setSystemProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifySystemProperties_resultTupleScheme getScheme() { - return new modifySystemProperties_resultTupleScheme(); + public setSystemProperty_resultTupleScheme getScheme() { + return new setSystemProperty_resultTupleScheme(); } } - private static class modifySystemProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setSystemProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -24418,31 +22940,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemPropert if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetTcme()) { - optionals.set(2); - } if (struct.isSetTpe()) { - optionals.set(3); + optionals.set(2); } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTcme()) { - struct.tcme.write(oprot); - } if (struct.isSetTpe()) { struct.tpe.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -24454,11 +22970,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperti struct.setTnaseIsSet(true); } if (incoming.get(2)) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } - if (incoming.get(3)) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); struct.setTpeIsSet(true); @@ -24472,25 +22983,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeSystemProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeSystemProperty_args"); + public static class modifySystemProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifySystemProperties_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeSystemProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeSystemProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifySystemProperties_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifySystemProperties_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - PROPERTY((short)3, "property"); + V_PROPERTIES((short)3, "vProperties"); private static final java.util.Map byName = new java.util.HashMap(); @@ -24510,8 +23021,8 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // PROPERTY - return PROPERTY; + case 3: // V_PROPERTIES + return V_PROPERTIES; default: return null; } @@ -24562,51 +23073,51 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeSystemProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifySystemProperties_args.class, metaDataMap); } - public removeSystemProperty_args() { + public modifySystemProperties_args() { } - public removeSystemProperty_args( + public modifySystemProperties_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String property) + org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.property = property; + this.vProperties = vProperties; } /** * Performs a deep copy on other. */ - public removeSystemProperty_args(removeSystemProperty_args other) { + public modifySystemProperties_args(modifySystemProperties_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetVProperties()) { + this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); } } @Override - public removeSystemProperty_args deepCopy() { - return new removeSystemProperty_args(this); + public modifySystemProperties_args deepCopy() { + return new modifySystemProperties_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.property = null; + this.vProperties = null; } @org.apache.thrift.annotation.Nullable @@ -24614,7 +23125,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public removeSystemProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public modifySystemProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -24639,7 +23150,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public removeSystemProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public modifySystemProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -24660,27 +23171,27 @@ public void setCredentialsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { + return this.vProperties; } - public removeSystemProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public modifySystemProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { + this.vProperties = vProperties; return this; } - public void unsetProperty() { - this.property = null; + public void unsetVProperties() { + this.vProperties = null; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetVProperties() { + return this.vProperties != null; } - public void setPropertyIsSet(boolean value) { + public void setVPropertiesIsSet(boolean value) { if (!value) { - this.property = null; + this.vProperties = null; } } @@ -24703,11 +23214,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case V_PROPERTIES: if (value == null) { - unsetProperty(); + unsetVProperties(); } else { - setProperty((java.lang.String)value); + setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); } break; @@ -24724,8 +23235,8 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case PROPERTY: - return getProperty(); + case V_PROPERTIES: + return getVProperties(); } throw new java.lang.IllegalStateException(); @@ -24743,20 +23254,20 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case PROPERTY: - return isSetProperty(); + case V_PROPERTIES: + return isSetVProperties(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeSystemProperty_args) - return this.equals((removeSystemProperty_args)that); + if (that instanceof modifySystemProperties_args) + return this.equals((modifySystemProperties_args)that); return false; } - public boolean equals(removeSystemProperty_args that) { + public boolean equals(modifySystemProperties_args that) { if (that == null) return false; if (this == that) @@ -24780,12 +23291,12 @@ public boolean equals(removeSystemProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_vProperties = true && this.isSetVProperties(); + boolean that_present_vProperties = true && that.isSetVProperties(); + if (this_present_vProperties || that_present_vProperties) { + if (!(this_present_vProperties && that_present_vProperties)) return false; - if (!this.property.equals(that.property)) + if (!this.vProperties.equals(that.vProperties)) return false; } @@ -24804,15 +23315,15 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); + if (isSetVProperties()) + hashCode = hashCode * 8191 + vProperties.hashCode(); return hashCode; } @Override - public int compareTo(removeSystemProperty_args other) { + public int compareTo(modifySystemProperties_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -24839,12 +23350,12 @@ public int compareTo(removeSystemProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetVProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); if (lastComparison != 0) { return lastComparison; } @@ -24870,7 +23381,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeSystemProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifySystemProperties_args("); boolean first = true; sb.append("tinfo:"); @@ -24889,11 +23400,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("vProperties:"); + if (this.vProperties == null) { sb.append("null"); } else { - sb.append(this.property); + sb.append(this.vProperties); } first = false; sb.append(")"); @@ -24909,6 +23420,9 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } + if (vProperties != null) { + vProperties.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -24927,17 +23441,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeSystemProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifySystemProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeSystemProperty_argsStandardScheme getScheme() { - return new removeSystemProperty_argsStandardScheme(); + public modifySystemProperties_argsStandardScheme getScheme() { + return new modifySystemProperties_argsStandardScheme(); } } - private static class removeSystemProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifySystemProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -24965,10 +23479,11 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemPropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PROPERTY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + case 3: // V_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -24985,7 +23500,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemPropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProperties_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -24999,9 +23514,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProper struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.vProperties != null) { + oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); + struct.vProperties.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -25010,17 +23525,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProper } - private static class removeSystemProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifySystemProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeSystemProperty_argsTupleScheme getScheme() { - return new removeSystemProperty_argsTupleScheme(); + public modifySystemProperties_argsTupleScheme getScheme() { + return new modifySystemProperties_argsTupleScheme(); } } - private static class removeSystemProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifySystemProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -25029,7 +23544,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemPropert if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetProperty()) { + if (struct.isSetVProperties()) { optionals.set(2); } oprot.writeBitSet(optionals, 3); @@ -25039,13 +23554,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemPropert if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetVProperties()) { + struct.vProperties.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { @@ -25059,8 +23574,9 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } } } @@ -25071,22 +23587,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeSystemProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeSystemProperty_result"); + public static class modifySystemProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifySystemProperties_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeSystemProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeSystemProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifySystemProperties_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifySystemProperties_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required + public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), - TNASE((short)2, "tnase"); + TNASE((short)2, "tnase"), + TCME((short)3, "tcme"), + TPE((short)4, "tpe"); private static final java.util.Map byName = new java.util.HashMap(); @@ -25106,6 +23628,10 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; + case 3: // TCME + return TCME; + case 4: // TPE + return TPE; default: return null; } @@ -25156,43 +23682,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); + tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); + tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeSystemProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifySystemProperties_result.class, metaDataMap); } - public removeSystemProperty_result() { + public modifySystemProperties_result() { } - public removeSystemProperty_result( + public modifySystemProperties_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, + org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, + ThriftPropertyException tpe) { this(); this.sec = sec; this.tnase = tnase; + this.tcme = tcme; + this.tpe = tpe; } /** * Performs a deep copy on other. */ - public removeSystemProperty_result(removeSystemProperty_result other) { + public modifySystemProperties_result(modifySystemProperties_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } + if (other.isSetTcme()) { + this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); + } + if (other.isSetTpe()) { + this.tpe = new ThriftPropertyException(other.tpe); + } } @Override - public removeSystemProperty_result deepCopy() { - return new removeSystemProperty_result(this); + public modifySystemProperties_result deepCopy() { + return new modifySystemProperties_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; + this.tcme = null; + this.tpe = null; } @org.apache.thrift.annotation.Nullable @@ -25200,7 +23742,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public removeSystemProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public modifySystemProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -25225,7 +23767,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public removeSystemProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public modifySystemProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -25245,6 +23787,56 @@ public void setTnaseIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { + return this.tcme; + } + + public modifySystemProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { + this.tcme = tcme; + return this; + } + + public void unsetTcme() { + this.tcme = null; + } + + /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ + public boolean isSetTcme() { + return this.tcme != null; + } + + public void setTcmeIsSet(boolean value) { + if (!value) { + this.tcme = null; + } + } + + @org.apache.thrift.annotation.Nullable + public ThriftPropertyException getTpe() { + return this.tpe; + } + + public modifySystemProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + this.tpe = tpe; + return this; + } + + public void unsetTpe() { + this.tpe = null; + } + + /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ + public boolean isSetTpe() { + return this.tpe != null; + } + + public void setTpeIsSet(boolean value) { + if (!value) { + this.tpe = null; + } + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -25264,6 +23856,22 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case TCME: + if (value == null) { + unsetTcme(); + } else { + setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); + } + break; + + case TPE: + if (value == null) { + unsetTpe(); + } else { + setTpe((ThriftPropertyException)value); + } + break; + } } @@ -25277,6 +23885,12 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); + case TCME: + return getTcme(); + + case TPE: + return getTpe(); + } throw new java.lang.IllegalStateException(); } @@ -25293,18 +23907,22 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); + case TCME: + return isSetTcme(); + case TPE: + return isSetTpe(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeSystemProperty_result) - return this.equals((removeSystemProperty_result)that); + if (that instanceof modifySystemProperties_result) + return this.equals((modifySystemProperties_result)that); return false; } - public boolean equals(removeSystemProperty_result that) { + public boolean equals(modifySystemProperties_result that) { if (that == null) return false; if (this == that) @@ -25328,6 +23946,24 @@ public boolean equals(removeSystemProperty_result that) { return false; } + boolean this_present_tcme = true && this.isSetTcme(); + boolean that_present_tcme = true && that.isSetTcme(); + if (this_present_tcme || that_present_tcme) { + if (!(this_present_tcme && that_present_tcme)) + return false; + if (!this.tcme.equals(that.tcme)) + return false; + } + + boolean this_present_tpe = true && this.isSetTpe(); + boolean that_present_tpe = true && that.isSetTpe(); + if (this_present_tpe || that_present_tpe) { + if (!(this_present_tpe && that_present_tpe)) + return false; + if (!this.tpe.equals(that.tpe)) + return false; + } + return true; } @@ -25343,11 +23979,19 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); + hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); + if (isSetTcme()) + hashCode = hashCode * 8191 + tcme.hashCode(); + + hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); + if (isSetTpe()) + hashCode = hashCode * 8191 + tpe.hashCode(); + return hashCode; } @Override - public int compareTo(removeSystemProperty_result other) { + public int compareTo(modifySystemProperties_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -25374,6 +24018,26 @@ public int compareTo(removeSystemProperty_result other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTcme()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTpe()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -25394,7 +24058,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeSystemProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifySystemProperties_result("); boolean first = true; sb.append("sec:"); @@ -25412,6 +24076,22 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; + if (!first) sb.append(", "); + sb.append("tcme:"); + if (this.tcme == null) { + sb.append("null"); + } else { + sb.append(this.tcme); + } + first = false; + if (!first) sb.append(", "); + sb.append("tpe:"); + if (this.tpe == null) { + sb.append("null"); + } else { + sb.append(this.tpe); + } + first = false; sb.append(")"); return sb.toString(); } @@ -25437,17 +24117,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeSystemProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifySystemProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeSystemProperty_resultStandardScheme getScheme() { - return new removeSystemProperty_resultStandardScheme(); + public modifySystemProperties_resultStandardScheme getScheme() { + return new modifySystemProperties_resultStandardScheme(); } } - private static class removeSystemProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifySystemProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifySystemProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -25475,6 +24155,24 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemPropert org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // TCME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // TPE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -25487,7 +24185,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemPropert } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifySystemProperties_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -25501,23 +24199,33 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProper struct.tnase.write(oprot); oprot.writeFieldEnd(); } + if (struct.tcme != null) { + oprot.writeFieldBegin(TCME_FIELD_DESC); + struct.tcme.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.tpe != null) { + oprot.writeFieldBegin(TPE_FIELD_DESC); + struct.tpe.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class removeSystemProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifySystemProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeSystemProperty_resultTupleScheme getScheme() { - return new removeSystemProperty_resultTupleScheme(); + public modifySystemProperties_resultTupleScheme getScheme() { + return new modifySystemProperties_resultTupleScheme(); } } - private static class removeSystemProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifySystemProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -25526,19 +24234,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemPropert if (struct.isSetTnase()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetTcme()) { + optionals.set(2); + } + if (struct.isSetTpe()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } + if (struct.isSetTcme()) { + struct.tcme.write(oprot); + } + if (struct.isSetTpe()) { + struct.tpe.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifySystemProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -25549,6 +24269,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty struct.tnase.read(iprot); struct.setTnaseIsSet(true); } + if (incoming.get(2)) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } + if (incoming.get(3)) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } } } @@ -25558,25 +24288,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class createResourceGroupNode_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createResourceGroupNode_args"); + public static class removeSystemProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeSystemProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createResourceGroupNode_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createResourceGroupNode_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeSystemProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeSystemProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required - public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - RESOURCE_GROUP((short)3, "resourceGroup"); + PROPERTY((short)3, "property"); private static final java.util.Map byName = new java.util.HashMap(); @@ -25596,8 +24326,8 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; - case 3: // RESOURCE_GROUP - return RESOURCE_GROUP; + case 3: // PROPERTY + return PROPERTY; default: return null; } @@ -25648,51 +24378,51 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); - tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createResourceGroupNode_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeSystemProperty_args.class, metaDataMap); } - public createResourceGroupNode_args() { + public removeSystemProperty_args() { } - public createResourceGroupNode_args( + public removeSystemProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String resourceGroup) + java.lang.String property) { this(); this.tinfo = tinfo; this.credentials = credentials; - this.resourceGroup = resourceGroup; + this.property = property; } /** * Performs a deep copy on other. */ - public createResourceGroupNode_args(createResourceGroupNode_args other) { + public removeSystemProperty_args(removeSystemProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } - if (other.isSetResourceGroup()) { - this.resourceGroup = other.resourceGroup; + if (other.isSetProperty()) { + this.property = other.property; } } @Override - public createResourceGroupNode_args deepCopy() { - return new createResourceGroupNode_args(this); + public removeSystemProperty_args deepCopy() { + return new removeSystemProperty_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; - this.resourceGroup = null; + this.property = null; } @org.apache.thrift.annotation.Nullable @@ -25700,7 +24430,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public createResourceGroupNode_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public removeSystemProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -25725,7 +24455,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public createResourceGroupNode_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public removeSystemProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -25746,27 +24476,27 @@ public void setCredentialsIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getResourceGroup() { - return this.resourceGroup; + public java.lang.String getProperty() { + return this.property; } - public createResourceGroupNode_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { - this.resourceGroup = resourceGroup; + public removeSystemProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; return this; } - public void unsetResourceGroup() { - this.resourceGroup = null; + public void unsetProperty() { + this.property = null; } - /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */ - public boolean isSetResourceGroup() { - return this.resourceGroup != null; + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; } - public void setResourceGroupIsSet(boolean value) { + public void setPropertyIsSet(boolean value) { if (!value) { - this.resourceGroup = null; + this.property = null; } } @@ -25789,11 +24519,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case RESOURCE_GROUP: + case PROPERTY: if (value == null) { - unsetResourceGroup(); + unsetProperty(); } else { - setResourceGroup((java.lang.String)value); + setProperty((java.lang.String)value); } break; @@ -25810,8 +24540,8 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); - case RESOURCE_GROUP: - return getResourceGroup(); + case PROPERTY: + return getProperty(); } throw new java.lang.IllegalStateException(); @@ -25829,20 +24559,20 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); - case RESOURCE_GROUP: - return isSetResourceGroup(); + case PROPERTY: + return isSetProperty(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof createResourceGroupNode_args) - return this.equals((createResourceGroupNode_args)that); + if (that instanceof removeSystemProperty_args) + return this.equals((removeSystemProperty_args)that); return false; } - public boolean equals(createResourceGroupNode_args that) { + public boolean equals(removeSystemProperty_args that) { if (that == null) return false; if (this == that) @@ -25866,12 +24596,12 @@ public boolean equals(createResourceGroupNode_args that) { return false; } - boolean this_present_resourceGroup = true && this.isSetResourceGroup(); - boolean that_present_resourceGroup = true && that.isSetResourceGroup(); - if (this_present_resourceGroup || that_present_resourceGroup) { - if (!(this_present_resourceGroup && that_present_resourceGroup)) + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) return false; - if (!this.resourceGroup.equals(that.resourceGroup)) + if (!this.property.equals(that.property)) return false; } @@ -25890,15 +24620,15 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); - hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287); - if (isSetResourceGroup()) - hashCode = hashCode * 8191 + resourceGroup.hashCode(); + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); return hashCode; } @Override - public int compareTo(createResourceGroupNode_args other) { + public int compareTo(removeSystemProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -25925,12 +24655,12 @@ public int compareTo(createResourceGroupNode_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup()); + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); if (lastComparison != 0) { return lastComparison; } - if (isSetResourceGroup()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup); + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); if (lastComparison != 0) { return lastComparison; } @@ -25956,7 +24686,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("createResourceGroupNode_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeSystemProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -25975,11 +24705,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("resourceGroup:"); - if (this.resourceGroup == null) { + sb.append("property:"); + if (this.property == null) { sb.append("null"); } else { - sb.append(this.resourceGroup); + sb.append(this.property); } first = false; sb.append(")"); @@ -26013,17 +24743,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class createResourceGroupNode_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeSystemProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public createResourceGroupNode_argsStandardScheme getScheme() { - return new createResourceGroupNode_argsStandardScheme(); + public removeSystemProperty_argsStandardScheme getScheme() { + return new removeSystemProperty_argsStandardScheme(); } } - private static class createResourceGroupNode_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeSystemProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -26051,10 +24781,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // RESOURCE_GROUP + case 3: // PROPERTY if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -26071,7 +24801,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -26085,9 +24815,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGrou struct.credentials.write(oprot); oprot.writeFieldEnd(); } - if (struct.resourceGroup != null) { - oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC); - oprot.writeString(struct.resourceGroup); + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -26096,17 +24826,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGrou } - private static class createResourceGroupNode_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeSystemProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public createResourceGroupNode_argsTupleScheme getScheme() { - return new createResourceGroupNode_argsTupleScheme(); + public removeSystemProperty_argsTupleScheme getScheme() { + return new removeSystemProperty_argsTupleScheme(); } } - private static class createResourceGroupNode_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeSystemProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -26115,7 +24845,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroup if (struct.isSetCredentials()) { optionals.set(1); } - if (struct.isSetResourceGroup()) { + if (struct.isSetProperty()) { optionals.set(2); } oprot.writeBitSet(optionals, 3); @@ -26125,13 +24855,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroup if (struct.isSetCredentials()) { struct.credentials.write(oprot); } - if (struct.isSetResourceGroup()) { - oprot.writeString(struct.resourceGroup); + if (struct.isSetProperty()) { + oprot.writeString(struct.property); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { @@ -26145,8 +24875,8 @@ public void read(org.apache.thrift.protocol.TProtocol prot, createResourceGroupN struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.resourceGroup = iprot.readString(); - struct.setResourceGroupIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); } } } @@ -26157,14 +24887,14 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class createResourceGroupNode_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createResourceGroupNode_result"); + public static class removeSystemProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeSystemProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createResourceGroupNode_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createResourceGroupNode_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeSystemProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeSystemProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required @@ -26243,13 +24973,13 @@ public java.lang.String getFieldName() { tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createResourceGroupNode_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeSystemProperty_result.class, metaDataMap); } - public createResourceGroupNode_result() { + public removeSystemProperty_result() { } - public createResourceGroupNode_result( + public removeSystemProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { @@ -26261,7 +24991,7 @@ public createResourceGroupNode_result( /** * Performs a deep copy on other. */ - public createResourceGroupNode_result(createResourceGroupNode_result other) { + public removeSystemProperty_result(removeSystemProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } @@ -26271,8 +25001,8 @@ public createResourceGroupNode_result(createResourceGroupNode_result other) { } @Override - public createResourceGroupNode_result deepCopy() { - return new createResourceGroupNode_result(this); + public removeSystemProperty_result deepCopy() { + return new removeSystemProperty_result(this); } @Override @@ -26286,7 +25016,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public createResourceGroupNode_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public removeSystemProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -26311,7 +25041,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public createResourceGroupNode_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public removeSystemProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -26385,12 +25115,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof createResourceGroupNode_result) - return this.equals((createResourceGroupNode_result)that); + if (that instanceof removeSystemProperty_result) + return this.equals((removeSystemProperty_result)that); return false; } - public boolean equals(createResourceGroupNode_result that) { + public boolean equals(removeSystemProperty_result that) { if (that == null) return false; if (this == that) @@ -26433,7 +25163,7 @@ public int hashCode() { } @Override - public int compareTo(createResourceGroupNode_result other) { + public int compareTo(removeSystemProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -26480,7 +25210,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("createResourceGroupNode_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeSystemProperty_result("); boolean first = true; sb.append("sec:"); @@ -26523,17 +25253,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class createResourceGroupNode_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeSystemProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public createResourceGroupNode_resultStandardScheme getScheme() { - return new createResourceGroupNode_resultStandardScheme(); + public removeSystemProperty_resultStandardScheme getScheme() { + return new removeSystemProperty_resultStandardScheme(); } } - private static class createResourceGroupNode_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeSystemProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -26573,7 +25303,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeSystemProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -26593,17 +25323,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGrou } - private static class createResourceGroupNode_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeSystemProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public createResourceGroupNode_resultTupleScheme getScheme() { - return new createResourceGroupNode_resultTupleScheme(); + public removeSystemProperty_resultTupleScheme getScheme() { + return new removeSystemProperty_resultTupleScheme(); } } - private static class createResourceGroupNode_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeSystemProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -26622,7 +25352,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroup } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeSystemProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { @@ -26644,15 +25374,15 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeResourceGroupNode_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupNode_args"); + public static class createResourceGroupNode_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createResourceGroupNode_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupNode_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupNode_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createResourceGroupNode_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createResourceGroupNode_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required @@ -26737,13 +25467,13 @@ public java.lang.String getFieldName() { tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupNode_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createResourceGroupNode_args.class, metaDataMap); } - public removeResourceGroupNode_args() { + public createResourceGroupNode_args() { } - public removeResourceGroupNode_args( + public createResourceGroupNode_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup) @@ -26757,7 +25487,7 @@ public removeResourceGroupNode_args( /** * Performs a deep copy on other. */ - public removeResourceGroupNode_args(removeResourceGroupNode_args other) { + public createResourceGroupNode_args(createResourceGroupNode_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -26770,8 +25500,8 @@ public removeResourceGroupNode_args(removeResourceGroupNode_args other) { } @Override - public removeResourceGroupNode_args deepCopy() { - return new removeResourceGroupNode_args(this); + public createResourceGroupNode_args deepCopy() { + return new createResourceGroupNode_args(this); } @Override @@ -26786,7 +25516,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public removeResourceGroupNode_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public createResourceGroupNode_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -26811,7 +25541,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public removeResourceGroupNode_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public createResourceGroupNode_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -26836,7 +25566,7 @@ public java.lang.String getResourceGroup() { return this.resourceGroup; } - public removeResourceGroupNode_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + public createResourceGroupNode_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { this.resourceGroup = resourceGroup; return this; } @@ -26923,12 +25653,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeResourceGroupNode_args) - return this.equals((removeResourceGroupNode_args)that); + if (that instanceof createResourceGroupNode_args) + return this.equals((createResourceGroupNode_args)that); return false; } - public boolean equals(removeResourceGroupNode_args that) { + public boolean equals(createResourceGroupNode_args that) { if (that == null) return false; if (this == that) @@ -26984,7 +25714,7 @@ public int hashCode() { } @Override - public int compareTo(removeResourceGroupNode_args other) { + public int compareTo(createResourceGroupNode_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -27042,7 +25772,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupNode_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("createResourceGroupNode_args("); boolean first = true; sb.append("tinfo:"); @@ -27099,17 +25829,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeResourceGroupNode_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class createResourceGroupNode_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupNode_argsStandardScheme getScheme() { - return new removeResourceGroupNode_argsStandardScheme(); + public createResourceGroupNode_argsStandardScheme getScheme() { + return new createResourceGroupNode_argsStandardScheme(); } } - private static class removeResourceGroupNode_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class createResourceGroupNode_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -27157,7 +25887,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -27182,17 +25912,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou } - private static class removeResourceGroupNode_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class createResourceGroupNode_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupNode_argsTupleScheme getScheme() { - return new removeResourceGroupNode_argsTupleScheme(); + public createResourceGroupNode_argsTupleScheme getScheme() { + return new createResourceGroupNode_argsTupleScheme(); } } - private static class removeResourceGroupNode_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class createResourceGroupNode_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -27217,7 +25947,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroup } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { @@ -27243,25 +25973,22 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeResourceGroupNode_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupNode_result"); + public static class createResourceGroupNode_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("createResourceGroupNode_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupNode_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupNode_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createResourceGroupNode_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createResourceGroupNode_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), - TNASE((short)2, "tnase"), - RGNE((short)3, "rgne"); + TNASE((short)2, "tnase"); private static final java.util.Map byName = new java.util.HashMap(); @@ -27281,8 +26008,6 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // RGNE - return RGNE; default: return null; } @@ -27333,51 +26058,43 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.RGNE, new org.apache.thrift.meta_data.FieldMetaData("rgne", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupNode_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createResourceGroupNode_result.class, metaDataMap); } - public removeResourceGroupNode_result() { + public createResourceGroupNode_result() { } - public removeResourceGroupNode_result( + public createResourceGroupNode_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this(); this.sec = sec; this.tnase = tnase; - this.rgne = rgne; } /** * Performs a deep copy on other. */ - public removeResourceGroupNode_result(removeResourceGroupNode_result other) { + public createResourceGroupNode_result(createResourceGroupNode_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetRgne()) { - this.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(other.rgne); - } } @Override - public removeResourceGroupNode_result deepCopy() { - return new removeResourceGroupNode_result(this); + public createResourceGroupNode_result deepCopy() { + return new createResourceGroupNode_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; - this.rgne = null; } @org.apache.thrift.annotation.Nullable @@ -27385,7 +26102,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public removeResourceGroupNode_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public createResourceGroupNode_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -27410,7 +26127,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public removeResourceGroupNode_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public createResourceGroupNode_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -27430,31 +26147,6 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException getRgne() { - return this.rgne; - } - - public removeResourceGroupNode_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { - this.rgne = rgne; - return this; - } - - public void unsetRgne() { - this.rgne = null; - } - - /** Returns true if field rgne is set (has been assigned a value) and false otherwise */ - public boolean isSetRgne() { - return this.rgne != null; - } - - public void setRgneIsSet(boolean value) { - if (!value) { - this.rgne = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -27474,14 +26166,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case RGNE: - if (value == null) { - unsetRgne(); - } else { - setRgne((org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException)value); - } - break; - } } @@ -27495,9 +26179,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case RGNE: - return getRgne(); - } throw new java.lang.IllegalStateException(); } @@ -27514,20 +26195,18 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); - case RGNE: - return isSetRgne(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeResourceGroupNode_result) - return this.equals((removeResourceGroupNode_result)that); + if (that instanceof createResourceGroupNode_result) + return this.equals((createResourceGroupNode_result)that); return false; } - public boolean equals(removeResourceGroupNode_result that) { + public boolean equals(createResourceGroupNode_result that) { if (that == null) return false; if (this == that) @@ -27551,15 +26230,6 @@ public boolean equals(removeResourceGroupNode_result that) { return false; } - boolean this_present_rgne = true && this.isSetRgne(); - boolean that_present_rgne = true && that.isSetRgne(); - if (this_present_rgne || that_present_rgne) { - if (!(this_present_rgne && that_present_rgne)) - return false; - if (!this.rgne.equals(that.rgne)) - return false; - } - return true; } @@ -27575,15 +26245,11 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetRgne()) ? 131071 : 524287); - if (isSetRgne()) - hashCode = hashCode * 8191 + rgne.hashCode(); - return hashCode; } @Override - public int compareTo(removeResourceGroupNode_result other) { + public int compareTo(createResourceGroupNode_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -27610,16 +26276,6 @@ public int compareTo(removeResourceGroupNode_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetRgne(), other.isSetRgne()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetRgne()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rgne, other.rgne); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -27640,7 +26296,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupNode_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("createResourceGroupNode_result("); boolean first = true; sb.append("sec:"); @@ -27658,14 +26314,6 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; - if (!first) sb.append(", "); - sb.append("rgne:"); - if (this.rgne == null) { - sb.append("null"); - } else { - sb.append(this.rgne); - } - first = false; sb.append(")"); return sb.toString(); } @@ -27691,17 +26339,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeResourceGroupNode_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class createResourceGroupNode_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupNode_resultStandardScheme getScheme() { - return new removeResourceGroupNode_resultStandardScheme(); + public createResourceGroupNode_resultStandardScheme getScheme() { + return new createResourceGroupNode_resultStandardScheme(); } } - private static class removeResourceGroupNode_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class createResourceGroupNode_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -27729,15 +26377,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // RGNE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); - struct.rgne.read(iprot); - struct.setRgneIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -27750,7 +26389,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -27764,28 +26403,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.rgne != null) { - oprot.writeFieldBegin(RGNE_FIELD_DESC); - struct.rgne.write(oprot); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class removeResourceGroupNode_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class createResourceGroupNode_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupNode_resultTupleScheme getScheme() { - return new removeResourceGroupNode_resultTupleScheme(); + public createResourceGroupNode_resultTupleScheme getScheme() { + return new createResourceGroupNode_resultTupleScheme(); } } - private static class removeResourceGroupNode_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class createResourceGroupNode_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -27794,25 +26428,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroup if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetRgne()) { - optionals.set(2); - } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 2); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetRgne()) { - struct.rgne.write(oprot); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, createResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -27823,11 +26451,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupN struct.tnase.read(iprot); struct.setTnaseIsSet(true); } - if (incoming.get(2)) { - struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); - struct.rgne.read(iprot); - struct.setRgneIsSet(true); - } } } @@ -27837,31 +26460,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setResourceGroupProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setResourceGroupProperty_args"); + public static class removeResourceGroupNode_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupNode_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setResourceGroupProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setResourceGroupProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupNode_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupNode_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required - public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), - RESOURCE_GROUP((short)3, "resourceGroup"), - PROPERTY((short)4, "property"), - VALUE((short)5, "value"); + RESOURCE_GROUP((short)3, "resourceGroup"); private static final java.util.Map byName = new java.util.HashMap(); @@ -27883,10 +26500,6 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // RESOURCE_GROUP return RESOURCE_GROUP; - case 4: // PROPERTY - return PROPERTY; - case 5: // VALUE - return VALUE; default: return null; } @@ -27939,36 +26552,28 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setResourceGroupProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupNode_args.class, metaDataMap); } - public setResourceGroupProperty_args() { + public removeResourceGroupNode_args() { } - public setResourceGroupProperty_args( + public removeResourceGroupNode_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, - java.lang.String resourceGroup, - java.lang.String property, - java.lang.String value) + java.lang.String resourceGroup) { this(); this.tinfo = tinfo; this.credentials = credentials; this.resourceGroup = resourceGroup; - this.property = property; - this.value = value; } /** * Performs a deep copy on other. */ - public setResourceGroupProperty_args(setResourceGroupProperty_args other) { + public removeResourceGroupNode_args(removeResourceGroupNode_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -27978,17 +26583,11 @@ public setResourceGroupProperty_args(setResourceGroupProperty_args other) { if (other.isSetResourceGroup()) { this.resourceGroup = other.resourceGroup; } - if (other.isSetProperty()) { - this.property = other.property; - } - if (other.isSetValue()) { - this.value = other.value; - } } @Override - public setResourceGroupProperty_args deepCopy() { - return new setResourceGroupProperty_args(this); + public removeResourceGroupNode_args deepCopy() { + return new removeResourceGroupNode_args(this); } @Override @@ -27996,8 +26595,6 @@ public void clear() { this.tinfo = null; this.credentials = null; this.resourceGroup = null; - this.property = null; - this.value = null; } @org.apache.thrift.annotation.Nullable @@ -28005,7 +26602,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public setResourceGroupProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public removeResourceGroupNode_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -28030,7 +26627,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public setResourceGroupProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public removeResourceGroupNode_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -28055,7 +26652,7 @@ public java.lang.String getResourceGroup() { return this.resourceGroup; } - public setResourceGroupProperty_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + public removeResourceGroupNode_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { this.resourceGroup = resourceGroup; return this; } @@ -28075,56 +26672,6 @@ public void setResourceGroupIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; - } - - public setResourceGroupProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; - return this; - } - - public void unsetProperty() { - this.property = null; - } - - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; - } - - public void setPropertyIsSet(boolean value) { - if (!value) { - this.property = null; - } - } - - @org.apache.thrift.annotation.Nullable - public java.lang.String getValue() { - return this.value; - } - - public setResourceGroupProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { - this.value = value; - return this; - } - - public void unsetValue() { - this.value = null; - } - - /** Returns true if field value is set (has been assigned a value) and false otherwise */ - public boolean isSetValue() { - return this.value != null; - } - - public void setValueIsSet(boolean value) { - if (!value) { - this.value = null; - } - } - @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -28152,22 +26699,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: - if (value == null) { - unsetProperty(); - } else { - setProperty((java.lang.String)value); - } - break; - - case VALUE: - if (value == null) { - unsetValue(); - } else { - setValue((java.lang.String)value); - } - break; - } } @@ -28184,12 +26715,6 @@ public java.lang.Object getFieldValue(_Fields field) { case RESOURCE_GROUP: return getResourceGroup(); - case PROPERTY: - return getProperty(); - - case VALUE: - return getValue(); - } throw new java.lang.IllegalStateException(); } @@ -28208,22 +26733,18 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case RESOURCE_GROUP: return isSetResourceGroup(); - case PROPERTY: - return isSetProperty(); - case VALUE: - return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof setResourceGroupProperty_args) - return this.equals((setResourceGroupProperty_args)that); + if (that instanceof removeResourceGroupNode_args) + return this.equals((removeResourceGroupNode_args)that); return false; } - public boolean equals(setResourceGroupProperty_args that) { + public boolean equals(removeResourceGroupNode_args that) { if (that == null) return false; if (this == that) @@ -28256,24 +26777,6 @@ public boolean equals(setResourceGroupProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) - return false; - if (!this.property.equals(that.property)) - return false; - } - - boolean this_present_value = true && this.isSetValue(); - boolean that_present_value = true && that.isSetValue(); - if (this_present_value || that_present_value) { - if (!(this_present_value && that_present_value)) - return false; - if (!this.value.equals(that.value)) - return false; - } - return true; } @@ -28293,19 +26796,11 @@ public int hashCode() { if (isSetResourceGroup()) hashCode = hashCode * 8191 + resourceGroup.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); - - hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); - if (isSetValue()) - hashCode = hashCode * 8191 + value.hashCode(); - return hashCode; } @Override - public int compareTo(setResourceGroupProperty_args other) { + public int compareTo(removeResourceGroupNode_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -28342,26 +26837,6 @@ public int compareTo(setResourceGroupProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); - if (lastComparison != 0) { - return lastComparison; - } - } return 0; } @@ -28383,7 +26858,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setResourceGroupProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupNode_args("); boolean first = true; sb.append("tinfo:"); @@ -28409,22 +26884,6 @@ public java.lang.String toString() { sb.append(this.resourceGroup); } first = false; - if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { - sb.append("null"); - } else { - sb.append(this.property); - } - first = false; - if (!first) sb.append(", "); - sb.append("value:"); - if (this.value == null) { - sb.append("null"); - } else { - sb.append(this.value); - } - first = false; sb.append(")"); return sb.toString(); } @@ -28456,17 +26915,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setResourceGroupProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupNode_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setResourceGroupProperty_argsStandardScheme getScheme() { - return new setResourceGroupProperty_argsStandardScheme(); + public removeResourceGroupNode_argsStandardScheme getScheme() { + return new removeResourceGroupNode_argsStandardScheme(); } } - private static class setResourceGroupProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeResourceGroupNode_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -28502,22 +26961,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PROPERTY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // VALUE - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -28530,7 +26973,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupPro } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -28549,33 +26992,23 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupPr oprot.writeString(struct.resourceGroup); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); - oprot.writeFieldEnd(); - } - if (struct.value != null) { - oprot.writeFieldBegin(VALUE_FIELD_DESC); - oprot.writeString(struct.value); - oprot.writeFieldEnd(); - } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class setResourceGroupProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupNode_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setResourceGroupProperty_argsTupleScheme getScheme() { - return new setResourceGroupProperty_argsTupleScheme(); + public removeResourceGroupNode_argsTupleScheme getScheme() { + return new removeResourceGroupNode_argsTupleScheme(); } } - private static class setResourceGroupProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeResourceGroupNode_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -28587,13 +27020,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupPro if (struct.isSetResourceGroup()) { optionals.set(2); } - if (struct.isSetProperty()) { - optionals.set(3); - } - if (struct.isSetValue()) { - optionals.set(4); - } - oprot.writeBitSet(optionals, 5); + oprot.writeBitSet(optionals, 3); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } @@ -28603,18 +27030,12 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupPro if (struct.isSetResourceGroup()) { oprot.writeString(struct.resourceGroup); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); - } - if (struct.isSetValue()) { - oprot.writeString(struct.value); - } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -28629,14 +27050,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProp struct.resourceGroup = iprot.readString(); struct.setResourceGroupIsSet(true); } - if (incoming.get(3)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); - } - if (incoming.get(4)) { - struct.value = iprot.readString(); - struct.setValueIsSet(true); - } } } @@ -28646,28 +27059,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class setResourceGroupProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setResourceGroupProperty_result"); + public static class removeResourceGroupNode_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupNode_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setResourceGroupProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setResourceGroupProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupNode_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupNode_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TNASE((short)2, "tnase"), - TPE((short)3, "tpe"), - RGNE((short)4, "rgne"); + RGNE((short)3, "rgne"); private static final java.util.Map byName = new java.util.HashMap(); @@ -28687,9 +27097,7 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // TPE - return TPE; - case 4: // RGNE + case 3: // RGNE return RGNE; default: return null; @@ -28741,58 +27149,50 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); tmpMap.put(_Fields.RGNE, new org.apache.thrift.meta_data.FieldMetaData("rgne", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setResourceGroupProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupNode_result.class, metaDataMap); } - public setResourceGroupProperty_result() { + public removeResourceGroupNode_result() { } - public setResourceGroupProperty_result( + public removeResourceGroupNode_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - ThriftPropertyException tpe, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this(); this.sec = sec; this.tnase = tnase; - this.tpe = tpe; this.rgne = rgne; } /** * Performs a deep copy on other. */ - public setResourceGroupProperty_result(setResourceGroupProperty_result other) { + public removeResourceGroupNode_result(removeResourceGroupNode_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTpe()) { - this.tpe = new ThriftPropertyException(other.tpe); - } if (other.isSetRgne()) { this.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(other.rgne); } } @Override - public setResourceGroupProperty_result deepCopy() { - return new setResourceGroupProperty_result(this); + public removeResourceGroupNode_result deepCopy() { + return new removeResourceGroupNode_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; - this.tpe = null; this.rgne = null; } @@ -28801,7 +27201,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public setResourceGroupProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public removeResourceGroupNode_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -28826,7 +27226,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public setResourceGroupProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public removeResourceGroupNode_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -28846,37 +27246,12 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public ThriftPropertyException getTpe() { - return this.tpe; - } - - public setResourceGroupProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { - this.tpe = tpe; - return this; - } - - public void unsetTpe() { - this.tpe = null; - } - - /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ - public boolean isSetTpe() { - return this.tpe != null; - } - - public void setTpeIsSet(boolean value) { - if (!value) { - this.tpe = null; - } - } - @org.apache.thrift.annotation.Nullable public org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException getRgne() { return this.rgne; } - public setResourceGroupProperty_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { + public removeResourceGroupNode_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this.rgne = rgne; return this; } @@ -28915,14 +27290,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TPE: - if (value == null) { - unsetTpe(); - } else { - setTpe((ThriftPropertyException)value); - } - break; - case RGNE: if (value == null) { unsetRgne(); @@ -28944,9 +27311,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TPE: - return getTpe(); - case RGNE: return getRgne(); @@ -28966,8 +27330,6 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); - case TPE: - return isSetTpe(); case RGNE: return isSetRgne(); } @@ -28976,12 +27338,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof setResourceGroupProperty_result) - return this.equals((setResourceGroupProperty_result)that); + if (that instanceof removeResourceGroupNode_result) + return this.equals((removeResourceGroupNode_result)that); return false; } - public boolean equals(setResourceGroupProperty_result that) { + public boolean equals(removeResourceGroupNode_result that) { if (that == null) return false; if (this == that) @@ -29005,15 +27367,6 @@ public boolean equals(setResourceGroupProperty_result that) { return false; } - boolean this_present_tpe = true && this.isSetTpe(); - boolean that_present_tpe = true && that.isSetTpe(); - if (this_present_tpe || that_present_tpe) { - if (!(this_present_tpe && that_present_tpe)) - return false; - if (!this.tpe.equals(that.tpe)) - return false; - } - boolean this_present_rgne = true && this.isSetRgne(); boolean that_present_rgne = true && that.isSetRgne(); if (this_present_rgne || that_present_rgne) { @@ -29038,10 +27391,6 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); - if (isSetTpe()) - hashCode = hashCode * 8191 + tpe.hashCode(); - hashCode = hashCode * 8191 + ((isSetRgne()) ? 131071 : 524287); if (isSetRgne()) hashCode = hashCode * 8191 + rgne.hashCode(); @@ -29050,7 +27399,7 @@ public int hashCode() { } @Override - public int compareTo(setResourceGroupProperty_result other) { + public int compareTo(removeResourceGroupNode_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -29077,16 +27426,6 @@ public int compareTo(setResourceGroupProperty_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTpe()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = java.lang.Boolean.compare(isSetRgne(), other.isSetRgne()); if (lastComparison != 0) { return lastComparison; @@ -29117,7 +27456,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("setResourceGroupProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupNode_result("); boolean first = true; sb.append("sec:"); @@ -29136,14 +27475,6 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tpe:"); - if (this.tpe == null) { - sb.append("null"); - } else { - sb.append(this.tpe); - } - first = false; - if (!first) sb.append(", "); sb.append("rgne:"); if (this.rgne == null) { sb.append("null"); @@ -29176,17 +27507,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class setResourceGroupProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupNode_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setResourceGroupProperty_resultStandardScheme getScheme() { - return new setResourceGroupProperty_resultStandardScheme(); + public removeResourceGroupNode_resultStandardScheme getScheme() { + return new removeResourceGroupNode_resultStandardScheme(); } } - private static class setResourceGroupProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeResourceGroupNode_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -29214,16 +27545,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupPro org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TPE - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // RGNE + case 3: // RGNE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); @@ -29244,7 +27566,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupPro } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -29258,11 +27580,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupPr struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tpe != null) { - oprot.writeFieldBegin(TPE_FIELD_DESC); - struct.tpe.write(oprot); - oprot.writeFieldEnd(); - } if (struct.rgne != null) { oprot.writeFieldBegin(RGNE_FIELD_DESC); struct.rgne.write(oprot); @@ -29274,17 +27591,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupPr } - private static class setResourceGroupProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupNode_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public setResourceGroupProperty_resultTupleScheme getScheme() { - return new setResourceGroupProperty_resultTupleScheme(); + public removeResourceGroupNode_resultTupleScheme getScheme() { + return new removeResourceGroupNode_resultTupleScheme(); } } - private static class setResourceGroupProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeResourceGroupNode_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -29293,31 +27610,25 @@ public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupPro if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetTpe()) { - optionals.set(2); - } if (struct.isSetRgne()) { - optionals.set(3); + optionals.set(2); } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTpe()) { - struct.tpe.write(oprot); - } if (struct.isSetRgne()) { struct.rgne.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupNode_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -29329,11 +27640,6 @@ public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProp struct.setTnaseIsSet(true); } if (incoming.get(2)) { - struct.tpe = new ThriftPropertyException(); - struct.tpe.read(iprot); - struct.setTpeIsSet(true); - } - if (incoming.get(3)) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); struct.setRgneIsSet(true); @@ -29347,28 +27653,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyResourceGroupProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyResourceGroupProperties_args"); + public static class setResourceGroupProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setResourceGroupProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyResourceGroupProperties_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyResourceGroupProperties_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setResourceGroupProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setResourceGroupProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable java.lang.String value; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), RESOURCE_GROUP((short)3, "resourceGroup"), - V_PROPERTIES((short)4, "vProperties"); + PROPERTY((short)4, "property"), + VALUE((short)5, "value"); private static final java.util.Map byName = new java.util.HashMap(); @@ -29390,8 +27699,10 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // RESOURCE_GROUP return RESOURCE_GROUP; - case 4: // V_PROPERTIES - return V_PROPERTIES; + case 4: // PROPERTY + return PROPERTY; + case 5: // VALUE + return VALUE; default: return null; } @@ -29444,32 +27755,36 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyResourceGroupProperties_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setResourceGroupProperty_args.class, metaDataMap); } - public modifyResourceGroupProperties_args() { + public setResourceGroupProperty_args() { } - public modifyResourceGroupProperties_args( + public setResourceGroupProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, - org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) + java.lang.String property, + java.lang.String value) { this(); this.tinfo = tinfo; this.credentials = credentials; this.resourceGroup = resourceGroup; - this.vProperties = vProperties; + this.property = property; + this.value = value; } /** * Performs a deep copy on other. */ - public modifyResourceGroupProperties_args(modifyResourceGroupProperties_args other) { + public setResourceGroupProperty_args(setResourceGroupProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -29479,14 +27794,17 @@ public modifyResourceGroupProperties_args(modifyResourceGroupProperties_args oth if (other.isSetResourceGroup()) { this.resourceGroup = other.resourceGroup; } - if (other.isSetVProperties()) { - this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); + if (other.isSetProperty()) { + this.property = other.property; + } + if (other.isSetValue()) { + this.value = other.value; } } @Override - public modifyResourceGroupProperties_args deepCopy() { - return new modifyResourceGroupProperties_args(this); + public setResourceGroupProperty_args deepCopy() { + return new setResourceGroupProperty_args(this); } @Override @@ -29494,7 +27812,8 @@ public void clear() { this.tinfo = null; this.credentials = null; this.resourceGroup = null; - this.vProperties = null; + this.property = null; + this.value = null; } @org.apache.thrift.annotation.Nullable @@ -29502,7 +27821,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public modifyResourceGroupProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public setResourceGroupProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -29527,7 +27846,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public modifyResourceGroupProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public setResourceGroupProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -29552,7 +27871,7 @@ public java.lang.String getResourceGroup() { return this.resourceGroup; } - public modifyResourceGroupProperties_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + public setResourceGroupProperty_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { this.resourceGroup = resourceGroup; return this; } @@ -29573,27 +27892,52 @@ public void setResourceGroupIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { - return this.vProperties; + public java.lang.String getProperty() { + return this.property; } - public modifyResourceGroupProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { - this.vProperties = vProperties; + public setResourceGroupProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; return this; } - public void unsetVProperties() { - this.vProperties = null; + public void unsetProperty() { + this.property = null; } - /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ - public boolean isSetVProperties() { - return this.vProperties != null; + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; } - public void setVPropertiesIsSet(boolean value) { + public void setPropertyIsSet(boolean value) { if (!value) { - this.vProperties = null; + this.property = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getValue() { + return this.value; + } + + public setResourceGroupProperty_args setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) { + this.value = value; + return this; + } + + public void unsetValue() { + this.value = null; + } + + /** Returns true if field value is set (has been assigned a value) and false otherwise */ + public boolean isSetValue() { + return this.value != null; + } + + public void setValueIsSet(boolean value) { + if (!value) { + this.value = null; } } @@ -29624,11 +27968,19 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case V_PROPERTIES: + case PROPERTY: if (value == null) { - unsetVProperties(); + unsetProperty(); } else { - setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); + setProperty((java.lang.String)value); + } + break; + + case VALUE: + if (value == null) { + unsetValue(); + } else { + setValue((java.lang.String)value); } break; @@ -29648,8 +28000,11 @@ public java.lang.Object getFieldValue(_Fields field) { case RESOURCE_GROUP: return getResourceGroup(); - case V_PROPERTIES: - return getVProperties(); + case PROPERTY: + return getProperty(); + + case VALUE: + return getValue(); } throw new java.lang.IllegalStateException(); @@ -29669,20 +28024,22 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case RESOURCE_GROUP: return isSetResourceGroup(); - case V_PROPERTIES: - return isSetVProperties(); + case PROPERTY: + return isSetProperty(); + case VALUE: + return isSetValue(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyResourceGroupProperties_args) - return this.equals((modifyResourceGroupProperties_args)that); + if (that instanceof setResourceGroupProperty_args) + return this.equals((setResourceGroupProperty_args)that); return false; } - public boolean equals(modifyResourceGroupProperties_args that) { + public boolean equals(setResourceGroupProperty_args that) { if (that == null) return false; if (this == that) @@ -29715,12 +28072,21 @@ public boolean equals(modifyResourceGroupProperties_args that) { return false; } - boolean this_present_vProperties = true && this.isSetVProperties(); - boolean that_present_vProperties = true && that.isSetVProperties(); - if (this_present_vProperties || that_present_vProperties) { - if (!(this_present_vProperties && that_present_vProperties)) + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) return false; - if (!this.vProperties.equals(that.vProperties)) + if (!this.property.equals(that.property)) + return false; + } + + boolean this_present_value = true && this.isSetValue(); + boolean that_present_value = true && that.isSetValue(); + if (this_present_value || that_present_value) { + if (!(this_present_value && that_present_value)) + return false; + if (!this.value.equals(that.value)) return false; } @@ -29743,15 +28109,19 @@ public int hashCode() { if (isSetResourceGroup()) hashCode = hashCode * 8191 + resourceGroup.hashCode(); - hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); - if (isSetVProperties()) - hashCode = hashCode * 8191 + vProperties.hashCode(); + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); + + hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287); + if (isSetValue()) + hashCode = hashCode * 8191 + value.hashCode(); return hashCode; } @Override - public int compareTo(modifyResourceGroupProperties_args other) { + public int compareTo(setResourceGroupProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -29788,12 +28158,22 @@ public int compareTo(modifyResourceGroupProperties_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); if (lastComparison != 0) { return lastComparison; } - if (isSetVProperties()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetValue()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } @@ -29819,7 +28199,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyResourceGroupProperties_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setResourceGroupProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -29846,11 +28226,19 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("vProperties:"); - if (this.vProperties == null) { + sb.append("property:"); + if (this.property == null) { sb.append("null"); } else { - sb.append(this.vProperties); + sb.append(this.property); + } + first = false; + if (!first) sb.append(", "); + sb.append("value:"); + if (this.value == null) { + sb.append("null"); + } else { + sb.append(this.value); } first = false; sb.append(")"); @@ -29866,9 +28254,6 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } - if (vProperties != null) { - vProperties.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -29887,17 +28272,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyResourceGroupProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setResourceGroupProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyResourceGroupProperties_argsStandardScheme getScheme() { - return new modifyResourceGroupProperties_argsStandardScheme(); + public setResourceGroupProperty_argsStandardScheme getScheme() { + return new setResourceGroupProperty_argsStandardScheme(); } } - private static class modifyResourceGroupProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setResourceGroupProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -29933,11 +28318,18 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // V_PROPERTIES - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + case 4: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // VALUE + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -29954,7 +28346,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -29973,9 +28365,14 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGrou oprot.writeString(struct.resourceGroup); oprot.writeFieldEnd(); } - if (struct.vProperties != null) { - oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); - struct.vProperties.write(oprot); + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); + oprot.writeFieldEnd(); + } + if (struct.value != null) { + oprot.writeFieldBegin(VALUE_FIELD_DESC); + oprot.writeString(struct.value); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -29984,17 +28381,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGrou } - private static class modifyResourceGroupProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setResourceGroupProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyResourceGroupProperties_argsTupleScheme getScheme() { - return new modifyResourceGroupProperties_argsTupleScheme(); + public setResourceGroupProperty_argsTupleScheme getScheme() { + return new setResourceGroupProperty_argsTupleScheme(); } } - private static class modifyResourceGroupProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setResourceGroupProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -30006,10 +28403,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroup if (struct.isSetResourceGroup()) { optionals.set(2); } - if (struct.isSetVProperties()) { + if (struct.isSetProperty()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetValue()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } @@ -30019,15 +28419,18 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroup if (struct.isSetResourceGroup()) { oprot.writeString(struct.resourceGroup); } - if (struct.isSetVProperties()) { - struct.vProperties.write(oprot); + if (struct.isSetProperty()) { + oprot.writeString(struct.property); + } + if (struct.isSetValue()) { + oprot.writeString(struct.value); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(4); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -30043,9 +28446,12 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupP struct.setResourceGroupIsSet(true); } if (incoming.get(3)) { - struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); - struct.vProperties.read(iprot); - struct.setVPropertiesIsSet(true); + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } + if (incoming.get(4)) { + struct.value = iprot.readString(); + struct.setValueIsSet(true); } } } @@ -30056,21 +28462,19 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class modifyResourceGroupProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyResourceGroupProperties_result"); + public static class setResourceGroupProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setResourceGroupProperty_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyResourceGroupProperties_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyResourceGroupProperties_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setResourceGroupProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setResourceGroupProperty_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required - public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne; // required @@ -30078,9 +28482,8 @@ public static class modifyResourceGroupProperties_result implements org.apache.t public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TNASE((short)2, "tnase"), - TCME((short)3, "tcme"), - TPE((short)4, "tpe"), - RGNE((short)5, "rgne"); + TPE((short)3, "tpe"), + RGNE((short)4, "rgne"); private static final java.util.Map byName = new java.util.HashMap(); @@ -30100,11 +28503,9 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // TCME - return TCME; - case 4: // TPE + case 3: // TPE return TPE; - case 5: // RGNE + case 4: // RGNE return RGNE; default: return null; @@ -30156,30 +28557,26 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); - tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); tmpMap.put(_Fields.RGNE, new org.apache.thrift.meta_data.FieldMetaData("rgne", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyResourceGroupProperties_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setResourceGroupProperty_result.class, metaDataMap); } - public modifyResourceGroupProperties_result() { + public setResourceGroupProperty_result() { } - public modifyResourceGroupProperties_result( + public setResourceGroupProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, - org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, ThriftPropertyException tpe, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this(); this.sec = sec; this.tnase = tnase; - this.tcme = tcme; this.tpe = tpe; this.rgne = rgne; } @@ -30187,16 +28584,13 @@ public modifyResourceGroupProperties_result( /** * Performs a deep copy on other. */ - public modifyResourceGroupProperties_result(modifyResourceGroupProperties_result other) { + public setResourceGroupProperty_result(setResourceGroupProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } - if (other.isSetTcme()) { - this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); - } if (other.isSetTpe()) { this.tpe = new ThriftPropertyException(other.tpe); } @@ -30206,15 +28600,14 @@ public modifyResourceGroupProperties_result(modifyResourceGroupProperties_result } @Override - public modifyResourceGroupProperties_result deepCopy() { - return new modifyResourceGroupProperties_result(this); + public setResourceGroupProperty_result deepCopy() { + return new setResourceGroupProperty_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; - this.tcme = null; this.tpe = null; this.rgne = null; } @@ -30224,7 +28617,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public modifyResourceGroupProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public setResourceGroupProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -30249,7 +28642,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public modifyResourceGroupProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public setResourceGroupProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -30269,37 +28662,12 @@ public void setTnaseIsSet(boolean value) { } } - @org.apache.thrift.annotation.Nullable - public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { - return this.tcme; - } - - public modifyResourceGroupProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { - this.tcme = tcme; - return this; - } - - public void unsetTcme() { - this.tcme = null; - } - - /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ - public boolean isSetTcme() { - return this.tcme != null; - } - - public void setTcmeIsSet(boolean value) { - if (!value) { - this.tcme = null; - } - } - @org.apache.thrift.annotation.Nullable public ThriftPropertyException getTpe() { return this.tpe; } - public modifyResourceGroupProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + public setResourceGroupProperty_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { this.tpe = tpe; return this; } @@ -30324,7 +28692,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsEx return this.rgne; } - public modifyResourceGroupProperties_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { + public setResourceGroupProperty_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this.rgne = rgne; return this; } @@ -30363,14 +28731,6 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case TCME: - if (value == null) { - unsetTcme(); - } else { - setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); - } - break; - case TPE: if (value == null) { unsetTpe(); @@ -30400,9 +28760,6 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); - case TCME: - return getTcme(); - case TPE: return getTpe(); @@ -30425,8 +28782,6 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); - case TCME: - return isSetTcme(); case TPE: return isSetTpe(); case RGNE: @@ -30437,12 +28792,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof modifyResourceGroupProperties_result) - return this.equals((modifyResourceGroupProperties_result)that); + if (that instanceof setResourceGroupProperty_result) + return this.equals((setResourceGroupProperty_result)that); return false; } - public boolean equals(modifyResourceGroupProperties_result that) { + public boolean equals(setResourceGroupProperty_result that) { if (that == null) return false; if (this == that) @@ -30466,15 +28821,6 @@ public boolean equals(modifyResourceGroupProperties_result that) { return false; } - boolean this_present_tcme = true && this.isSetTcme(); - boolean that_present_tcme = true && that.isSetTcme(); - if (this_present_tcme || that_present_tcme) { - if (!(this_present_tcme && that_present_tcme)) - return false; - if (!this.tcme.equals(that.tcme)) - return false; - } - boolean this_present_tpe = true && this.isSetTpe(); boolean that_present_tpe = true && that.isSetTpe(); if (this_present_tpe || that_present_tpe) { @@ -30508,10 +28854,6 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); - hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); - if (isSetTcme()) - hashCode = hashCode * 8191 + tcme.hashCode(); - hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); if (isSetTpe()) hashCode = hashCode * 8191 + tpe.hashCode(); @@ -30524,7 +28866,7 @@ public int hashCode() { } @Override - public int compareTo(modifyResourceGroupProperties_result other) { + public int compareTo(setResourceGroupProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -30551,16 +28893,6 @@ public int compareTo(modifyResourceGroupProperties_result other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTcme()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); if (lastComparison != 0) { return lastComparison; @@ -30601,7 +28933,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyResourceGroupProperties_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("setResourceGroupProperty_result("); boolean first = true; sb.append("sec:"); @@ -30620,14 +28952,6 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("tcme:"); - if (this.tcme == null) { - sb.append("null"); - } else { - sb.append(this.tcme); - } - first = false; - if (!first) sb.append(", "); sb.append("tpe:"); if (this.tpe == null) { sb.append("null"); @@ -30668,17 +28992,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class modifyResourceGroupProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setResourceGroupProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyResourceGroupProperties_resultStandardScheme getScheme() { - return new modifyResourceGroupProperties_resultStandardScheme(); + public setResourceGroupProperty_resultStandardScheme getScheme() { + return new setResourceGroupProperty_resultStandardScheme(); } } - private static class modifyResourceGroupProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class setResourceGroupProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -30706,16 +29030,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TCME - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // TPE + case 3: // TPE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); @@ -30724,7 +29039,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // RGNE + case 4: // RGNE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); @@ -30745,7 +29060,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -30759,11 +29074,6 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGrou struct.tnase.write(oprot); oprot.writeFieldEnd(); } - if (struct.tcme != null) { - oprot.writeFieldBegin(TCME_FIELD_DESC); - struct.tcme.write(oprot); - oprot.writeFieldEnd(); - } if (struct.tpe != null) { oprot.writeFieldBegin(TPE_FIELD_DESC); struct.tpe.write(oprot); @@ -30780,17 +29090,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGrou } - private static class modifyResourceGroupProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class setResourceGroupProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public modifyResourceGroupProperties_resultTupleScheme getScheme() { - return new modifyResourceGroupProperties_resultTupleScheme(); + public setResourceGroupProperty_resultTupleScheme getScheme() { + return new setResourceGroupProperty_resultTupleScheme(); } } - private static class modifyResourceGroupProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class setResourceGroupProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -30799,25 +29109,19 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroup if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetTcme()) { - optionals.set(2); - } if (struct.isSetTpe()) { - optionals.set(3); + optionals.set(2); } if (struct.isSetRgne()) { - optionals.set(4); + optionals.set(3); } - oprot.writeBitSet(optionals, 5); + oprot.writeBitSet(optionals, 4); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } - if (struct.isSetTcme()) { - struct.tcme.write(oprot); - } if (struct.isSetTpe()) { struct.tpe.write(oprot); } @@ -30827,9 +29131,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroup } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, setResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(5); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -30841,16 +29145,11 @@ public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupP struct.setTnaseIsSet(true); } if (incoming.get(2)) { - struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); - struct.tcme.read(iprot); - struct.setTcmeIsSet(true); - } - if (incoming.get(3)) { struct.tpe = new ThriftPropertyException(); struct.tpe.read(iprot); struct.setTpeIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(3)) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); struct.setRgneIsSet(true); @@ -30864,28 +29163,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeResourceGroupProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupProperty_args"); + public static class modifyResourceGroupProperties_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyResourceGroupProperties_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField V_PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("vProperties", org.apache.thrift.protocol.TType.STRUCT, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupProperty_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupProperty_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyResourceGroupProperties_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyResourceGroupProperties_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required - public @org.apache.thrift.annotation.Nullable java.lang.String property; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), RESOURCE_GROUP((short)3, "resourceGroup"), - PROPERTY((short)4, "property"); + V_PROPERTIES((short)4, "vProperties"); private static final java.util.Map byName = new java.util.HashMap(); @@ -30907,8 +29206,8 @@ public static _Fields findByThriftId(int fieldId) { return CREDENTIALS; case 3: // RESOURCE_GROUP return RESOURCE_GROUP; - case 4: // PROPERTY - return PROPERTY; + case 4: // V_PROPERTIES + return V_PROPERTIES; default: return null; } @@ -30961,32 +29260,32 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); - tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.V_PROPERTIES, new org.apache.thrift.meta_data.FieldMetaData("vProperties", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupProperty_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyResourceGroupProperties_args.class, metaDataMap); } - public removeResourceGroupProperty_args() { + public modifyResourceGroupProperties_args() { } - public removeResourceGroupProperty_args( + public modifyResourceGroupProperties_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String resourceGroup, - java.lang.String property) + org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { this(); this.tinfo = tinfo; this.credentials = credentials; this.resourceGroup = resourceGroup; - this.property = property; + this.vProperties = vProperties; } /** * Performs a deep copy on other. */ - public removeResourceGroupProperty_args(removeResourceGroupProperty_args other) { + public modifyResourceGroupProperties_args(modifyResourceGroupProperties_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } @@ -30996,14 +29295,14 @@ public removeResourceGroupProperty_args(removeResourceGroupProperty_args other) if (other.isSetResourceGroup()) { this.resourceGroup = other.resourceGroup; } - if (other.isSetProperty()) { - this.property = other.property; + if (other.isSetVProperties()) { + this.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(other.vProperties); } } @Override - public removeResourceGroupProperty_args deepCopy() { - return new removeResourceGroupProperty_args(this); + public modifyResourceGroupProperties_args deepCopy() { + return new modifyResourceGroupProperties_args(this); } @Override @@ -31011,7 +29310,7 @@ public void clear() { this.tinfo = null; this.credentials = null; this.resourceGroup = null; - this.property = null; + this.vProperties = null; } @org.apache.thrift.annotation.Nullable @@ -31019,7 +29318,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public removeResourceGroupProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public modifyResourceGroupProperties_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -31044,7 +29343,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public removeResourceGroupProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public modifyResourceGroupProperties_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -31069,7 +29368,7 @@ public java.lang.String getResourceGroup() { return this.resourceGroup; } - public removeResourceGroupProperty_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + public modifyResourceGroupProperties_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { this.resourceGroup = resourceGroup; return this; } @@ -31090,27 +29389,27 @@ public void setResourceGroupIsSet(boolean value) { } @org.apache.thrift.annotation.Nullable - public java.lang.String getProperty() { - return this.property; + public org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties getVProperties() { + return this.vProperties; } - public removeResourceGroupProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { - this.property = property; + public modifyResourceGroupProperties_args setVProperties(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) { + this.vProperties = vProperties; return this; } - public void unsetProperty() { - this.property = null; + public void unsetVProperties() { + this.vProperties = null; } - /** Returns true if field property is set (has been assigned a value) and false otherwise */ - public boolean isSetProperty() { - return this.property != null; + /** Returns true if field vProperties is set (has been assigned a value) and false otherwise */ + public boolean isSetVProperties() { + return this.vProperties != null; } - public void setPropertyIsSet(boolean value) { + public void setVPropertiesIsSet(boolean value) { if (!value) { - this.property = null; + this.vProperties = null; } } @@ -31141,11 +29440,11 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; - case PROPERTY: + case V_PROPERTIES: if (value == null) { - unsetProperty(); + unsetVProperties(); } else { - setProperty((java.lang.String)value); + setVProperties((org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties)value); } break; @@ -31165,8 +29464,8 @@ public java.lang.Object getFieldValue(_Fields field) { case RESOURCE_GROUP: return getResourceGroup(); - case PROPERTY: - return getProperty(); + case V_PROPERTIES: + return getVProperties(); } throw new java.lang.IllegalStateException(); @@ -31186,20 +29485,20 @@ public boolean isSet(_Fields field) { return isSetCredentials(); case RESOURCE_GROUP: return isSetResourceGroup(); - case PROPERTY: - return isSetProperty(); + case V_PROPERTIES: + return isSetVProperties(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeResourceGroupProperty_args) - return this.equals((removeResourceGroupProperty_args)that); + if (that instanceof modifyResourceGroupProperties_args) + return this.equals((modifyResourceGroupProperties_args)that); return false; } - public boolean equals(removeResourceGroupProperty_args that) { + public boolean equals(modifyResourceGroupProperties_args that) { if (that == null) return false; if (this == that) @@ -31232,12 +29531,12 @@ public boolean equals(removeResourceGroupProperty_args that) { return false; } - boolean this_present_property = true && this.isSetProperty(); - boolean that_present_property = true && that.isSetProperty(); - if (this_present_property || that_present_property) { - if (!(this_present_property && that_present_property)) + boolean this_present_vProperties = true && this.isSetVProperties(); + boolean that_present_vProperties = true && that.isSetVProperties(); + if (this_present_vProperties || that_present_vProperties) { + if (!(this_present_vProperties && that_present_vProperties)) return false; - if (!this.property.equals(that.property)) + if (!this.vProperties.equals(that.vProperties)) return false; } @@ -31260,15 +29559,15 @@ public int hashCode() { if (isSetResourceGroup()) hashCode = hashCode * 8191 + resourceGroup.hashCode(); - hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); - if (isSetProperty()) - hashCode = hashCode * 8191 + property.hashCode(); + hashCode = hashCode * 8191 + ((isSetVProperties()) ? 131071 : 524287); + if (isSetVProperties()) + hashCode = hashCode * 8191 + vProperties.hashCode(); return hashCode; } @Override - public int compareTo(removeResourceGroupProperty_args other) { + public int compareTo(modifyResourceGroupProperties_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -31305,12 +29604,12 @@ public int compareTo(removeResourceGroupProperty_args other) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + lastComparison = java.lang.Boolean.compare(isSetVProperties(), other.isSetVProperties()); if (lastComparison != 0) { return lastComparison; } - if (isSetProperty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (isSetVProperties()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vProperties, other.vProperties); if (lastComparison != 0) { return lastComparison; } @@ -31336,7 +29635,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupProperty_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyResourceGroupProperties_args("); boolean first = true; sb.append("tinfo:"); @@ -31363,11 +29662,11 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); - sb.append("property:"); - if (this.property == null) { + sb.append("vProperties:"); + if (this.vProperties == null) { sb.append("null"); } else { - sb.append(this.property); + sb.append(this.vProperties); } first = false; sb.append(")"); @@ -31383,6 +29682,9 @@ public void validate() throws org.apache.thrift.TException { if (credentials != null) { credentials.validate(); } + if (vProperties != null) { + vProperties.validate(); + } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -31401,17 +29703,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeResourceGroupProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyResourceGroupProperties_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupProperty_argsStandardScheme getScheme() { - return new removeResourceGroupProperty_argsStandardScheme(); + public modifyResourceGroupProperties_argsStandardScheme getScheme() { + return new modifyResourceGroupProperties_argsStandardScheme(); } } - private static class removeResourceGroupProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyResourceGroupProperties_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -31447,10 +29749,11 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PROPERTY - if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + case 4: // V_PROPERTIES + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -31467,7 +29770,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -31486,9 +29789,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou oprot.writeString(struct.resourceGroup); oprot.writeFieldEnd(); } - if (struct.property != null) { - oprot.writeFieldBegin(PROPERTY_FIELD_DESC); - oprot.writeString(struct.property); + if (struct.vProperties != null) { + oprot.writeFieldBegin(V_PROPERTIES_FIELD_DESC); + struct.vProperties.write(oprot); oprot.writeFieldEnd(); } oprot.writeFieldStop(); @@ -31497,17 +29800,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou } - private static class removeResourceGroupProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyResourceGroupProperties_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupProperty_argsTupleScheme getScheme() { - return new removeResourceGroupProperty_argsTupleScheme(); + public modifyResourceGroupProperties_argsTupleScheme getScheme() { + return new modifyResourceGroupProperties_argsTupleScheme(); } } - private static class removeResourceGroupProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyResourceGroupProperties_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -31519,7 +29822,7 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroup if (struct.isSetResourceGroup()) { optionals.set(2); } - if (struct.isSetProperty()) { + if (struct.isSetVProperties()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -31532,13 +29835,13 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroup if (struct.isSetResourceGroup()) { oprot.writeString(struct.resourceGroup); } - if (struct.isSetProperty()) { - oprot.writeString(struct.property); + if (struct.isSetVProperties()) { + struct.vProperties.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { @@ -31556,8 +29859,9 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupP struct.setResourceGroupIsSet(true); } if (incoming.get(3)) { - struct.property = iprot.readString(); - struct.setPropertyIsSet(true); + struct.vProperties = new org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties(); + struct.vProperties.read(iprot); + struct.setVPropertiesIsSet(true); } } } @@ -31568,25 +29872,31 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class removeResourceGroupProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupProperty_result"); + public static class modifyResourceGroupProperties_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("modifyResourceGroupProperties_result"); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); - private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField TCME_FIELD_DESC = new org.apache.thrift.protocol.TField("tcme", org.apache.thrift.protocol.TType.STRUCT, (short)3); + private static final org.apache.thrift.protocol.TField TPE_FIELD_DESC = new org.apache.thrift.protocol.TField("tpe", org.apache.thrift.protocol.TType.STRUCT, (short)4); + private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)5); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupProperty_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupProperty_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new modifyResourceGroupProperties_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyResourceGroupProperties_resultTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme; // required + public @org.apache.thrift.annotation.Nullable ThriftPropertyException tpe; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), TNASE((short)2, "tnase"), - RGNE((short)3, "rgne"); + TCME((short)3, "tcme"), + TPE((short)4, "tpe"), + RGNE((short)5, "rgne"); private static final java.util.Map byName = new java.util.HashMap(); @@ -31606,7 +29916,11 @@ public static _Fields findByThriftId(int fieldId) { return SEC; case 2: // TNASE return TNASE; - case 3: // RGNE + case 3: // TCME + return TCME; + case 4: // TPE + return TPE; + case 5: // RGNE return RGNE; default: return null; @@ -31658,50 +29972,66 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); + tmpMap.put(_Fields.TCME, new org.apache.thrift.meta_data.FieldMetaData("tcme", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException.class))); + tmpMap.put(_Fields.TPE, new org.apache.thrift.meta_data.FieldMetaData("tpe", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ThriftPropertyException.class))); tmpMap.put(_Fields.RGNE, new org.apache.thrift.meta_data.FieldMetaData("rgne", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupProperty_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(modifyResourceGroupProperties_result.class, metaDataMap); } - public removeResourceGroupProperty_result() { + public modifyResourceGroupProperties_result() { } - public removeResourceGroupProperty_result( + public modifyResourceGroupProperties_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, + org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme, + ThriftPropertyException tpe, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this(); this.sec = sec; this.tnase = tnase; + this.tcme = tcme; + this.tpe = tpe; this.rgne = rgne; } /** * Performs a deep copy on other. */ - public removeResourceGroupProperty_result(removeResourceGroupProperty_result other) { + public modifyResourceGroupProperties_result(modifyResourceGroupProperties_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } + if (other.isSetTcme()) { + this.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(other.tcme); + } + if (other.isSetTpe()) { + this.tpe = new ThriftPropertyException(other.tpe); + } if (other.isSetRgne()) { this.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(other.rgne); } } @Override - public removeResourceGroupProperty_result deepCopy() { - return new removeResourceGroupProperty_result(this); + public modifyResourceGroupProperties_result deepCopy() { + return new modifyResourceGroupProperties_result(this); } @Override public void clear() { this.sec = null; this.tnase = null; + this.tcme = null; + this.tpe = null; this.rgne = null; } @@ -31710,7 +30040,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public removeResourceGroupProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public modifyResourceGroupProperties_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -31735,7 +30065,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public removeResourceGroupProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public modifyResourceGroupProperties_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -31755,12 +30085,62 @@ public void setTnaseIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException getTcme() { + return this.tcme; + } + + public modifyResourceGroupProperties_result setTcme(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) { + this.tcme = tcme; + return this; + } + + public void unsetTcme() { + this.tcme = null; + } + + /** Returns true if field tcme is set (has been assigned a value) and false otherwise */ + public boolean isSetTcme() { + return this.tcme != null; + } + + public void setTcmeIsSet(boolean value) { + if (!value) { + this.tcme = null; + } + } + + @org.apache.thrift.annotation.Nullable + public ThriftPropertyException getTpe() { + return this.tpe; + } + + public modifyResourceGroupProperties_result setTpe(@org.apache.thrift.annotation.Nullable ThriftPropertyException tpe) { + this.tpe = tpe; + return this; + } + + public void unsetTpe() { + this.tpe = null; + } + + /** Returns true if field tpe is set (has been assigned a value) and false otherwise */ + public boolean isSetTpe() { + return this.tpe != null; + } + + public void setTpeIsSet(boolean value) { + if (!value) { + this.tpe = null; + } + } + @org.apache.thrift.annotation.Nullable public org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException getRgne() { return this.rgne; } - public removeResourceGroupProperty_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { + public modifyResourceGroupProperties_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this.rgne = rgne; return this; } @@ -31799,6 +30179,22 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case TCME: + if (value == null) { + unsetTcme(); + } else { + setTcme((org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException)value); + } + break; + + case TPE: + if (value == null) { + unsetTpe(); + } else { + setTpe((ThriftPropertyException)value); + } + break; + case RGNE: if (value == null) { unsetRgne(); @@ -31820,6 +30216,12 @@ public java.lang.Object getFieldValue(_Fields field) { case TNASE: return getTnase(); + case TCME: + return getTcme(); + + case TPE: + return getTpe(); + case RGNE: return getRgne(); @@ -31839,6 +30241,10 @@ public boolean isSet(_Fields field) { return isSetSec(); case TNASE: return isSetTnase(); + case TCME: + return isSetTcme(); + case TPE: + return isSetTpe(); case RGNE: return isSetRgne(); } @@ -31847,12 +30253,12 @@ public boolean isSet(_Fields field) { @Override public boolean equals(java.lang.Object that) { - if (that instanceof removeResourceGroupProperty_result) - return this.equals((removeResourceGroupProperty_result)that); + if (that instanceof modifyResourceGroupProperties_result) + return this.equals((modifyResourceGroupProperties_result)that); return false; } - public boolean equals(removeResourceGroupProperty_result that) { + public boolean equals(modifyResourceGroupProperties_result that) { if (that == null) return false; if (this == that) @@ -31876,6 +30282,24 @@ public boolean equals(removeResourceGroupProperty_result that) { return false; } + boolean this_present_tcme = true && this.isSetTcme(); + boolean that_present_tcme = true && that.isSetTcme(); + if (this_present_tcme || that_present_tcme) { + if (!(this_present_tcme && that_present_tcme)) + return false; + if (!this.tcme.equals(that.tcme)) + return false; + } + + boolean this_present_tpe = true && this.isSetTpe(); + boolean that_present_tpe = true && that.isSetTpe(); + if (this_present_tpe || that_present_tpe) { + if (!(this_present_tpe && that_present_tpe)) + return false; + if (!this.tpe.equals(that.tpe)) + return false; + } + boolean this_present_rgne = true && this.isSetRgne(); boolean that_present_rgne = true && that.isSetRgne(); if (this_present_rgne || that_present_rgne) { @@ -31900,6 +30324,14 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); + hashCode = hashCode * 8191 + ((isSetTcme()) ? 131071 : 524287); + if (isSetTcme()) + hashCode = hashCode * 8191 + tcme.hashCode(); + + hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287); + if (isSetTpe()) + hashCode = hashCode * 8191 + tpe.hashCode(); + hashCode = hashCode * 8191 + ((isSetRgne()) ? 131071 : 524287); if (isSetRgne()) hashCode = hashCode * 8191 + rgne.hashCode(); @@ -31908,7 +30340,7 @@ public int hashCode() { } @Override - public int compareTo(removeResourceGroupProperty_result other) { + public int compareTo(modifyResourceGroupProperties_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -31935,6 +30367,26 @@ public int compareTo(removeResourceGroupProperty_result other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetTcme(), other.isSetTcme()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTcme()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tcme, other.tcme); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetTpe(), other.isSetTpe()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTpe()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tpe, other.tpe); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = java.lang.Boolean.compare(isSetRgne(), other.isSetRgne()); if (lastComparison != 0) { return lastComparison; @@ -31965,7 +30417,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupProperty_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("modifyResourceGroupProperties_result("); boolean first = true; sb.append("sec:"); @@ -31984,6 +30436,22 @@ public java.lang.String toString() { } first = false; if (!first) sb.append(", "); + sb.append("tcme:"); + if (this.tcme == null) { + sb.append("null"); + } else { + sb.append(this.tcme); + } + first = false; + if (!first) sb.append(", "); + sb.append("tpe:"); + if (this.tpe == null) { + sb.append("null"); + } else { + sb.append(this.tpe); + } + first = false; + if (!first) sb.append(", "); sb.append("rgne:"); if (this.rgne == null) { sb.append("null"); @@ -32016,17 +30484,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class removeResourceGroupProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyResourceGroupProperties_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupProperty_resultStandardScheme getScheme() { - return new removeResourceGroupProperty_resultStandardScheme(); + public modifyResourceGroupProperties_resultStandardScheme getScheme() { + return new modifyResourceGroupProperties_resultStandardScheme(); } } - private static class removeResourceGroupProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class modifyResourceGroupProperties_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -32054,7 +30522,25 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // RGNE + case 3: // TCME + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // TPE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // RGNE if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); @@ -32075,7 +30561,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroup } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -32089,6 +30575,16 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou struct.tnase.write(oprot); oprot.writeFieldEnd(); } + if (struct.tcme != null) { + oprot.writeFieldBegin(TCME_FIELD_DESC); + struct.tcme.write(oprot); + oprot.writeFieldEnd(); + } + if (struct.tpe != null) { + oprot.writeFieldBegin(TPE_FIELD_DESC); + struct.tpe.write(oprot); + oprot.writeFieldEnd(); + } if (struct.rgne != null) { oprot.writeFieldBegin(RGNE_FIELD_DESC); struct.rgne.write(oprot); @@ -32100,17 +30596,17 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGrou } - private static class removeResourceGroupProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class modifyResourceGroupProperties_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public removeResourceGroupProperty_resultTupleScheme getScheme() { - return new removeResourceGroupProperty_resultTupleScheme(); + public modifyResourceGroupProperties_resultTupleScheme getScheme() { + return new modifyResourceGroupProperties_resultTupleScheme(); } } - private static class removeResourceGroupProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class modifyResourceGroupProperties_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetSec()) { @@ -32119,25 +30615,37 @@ public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroup if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetRgne()) { + if (struct.isSetTcme()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetTpe()) { + optionals.set(3); + } + if (struct.isSetRgne()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } + if (struct.isSetTcme()) { + struct.tcme.write(oprot); + } + if (struct.isSetTpe()) { + struct.tpe.write(oprot); + } if (struct.isSetRgne()) { struct.rgne.write(oprot); } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, modifyResourceGroupProperties_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(3); + java.util.BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); @@ -32149,6 +30657,16 @@ public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupP struct.setTnaseIsSet(true); } if (incoming.get(2)) { + struct.tcme = new org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException(); + struct.tcme.read(iprot); + struct.setTcmeIsSet(true); + } + if (incoming.get(3)) { + struct.tpe = new ThriftPropertyException(); + struct.tpe.read(iprot); + struct.setTpeIsSet(true); + } + if (incoming.get(4)) { struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); struct.rgne.read(iprot); struct.setRgneIsSet(true); @@ -32162,22 +30680,28 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class getManagerStats_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getManagerStats_args"); + public static class removeResourceGroupProperty_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupProperty_args"); private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField RESOURCE_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceGroup", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PROPERTY_FIELD_DESC = new org.apache.thrift.protocol.TField("property", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerStats_argsStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerStats_argsTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupProperty_argsStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupProperty_argsTupleSchemeFactory(); public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials; // required + public @org.apache.thrift.annotation.Nullable java.lang.String resourceGroup; // required + public @org.apache.thrift.annotation.Nullable java.lang.String property; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), - CREDENTIALS((short)2, "credentials"); + CREDENTIALS((short)2, "credentials"), + RESOURCE_GROUP((short)3, "resourceGroup"), + PROPERTY((short)4, "property"); private static final java.util.Map byName = new java.util.HashMap(); @@ -32197,6 +30721,10 @@ public static _Fields findByThriftId(int fieldId) { return TINFO; case 2: // CREDENTIALS return CREDENTIALS; + case 3: // RESOURCE_GROUP + return RESOURCE_GROUP; + case 4: // PROPERTY + return PROPERTY; default: return null; } @@ -32247,43 +30775,59 @@ public java.lang.String getFieldName() { new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.TInfo.class))); tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.securityImpl.thrift.TCredentials.class))); + tmpMap.put(_Fields.RESOURCE_GROUP, new org.apache.thrift.meta_data.FieldMetaData("resourceGroup", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PROPERTY, new org.apache.thrift.meta_data.FieldMetaData("property", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getManagerStats_args.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupProperty_args.class, metaDataMap); } - public getManagerStats_args() { + public removeResourceGroupProperty_args() { } - public getManagerStats_args( + public removeResourceGroupProperty_args( org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, - org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) + org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, + java.lang.String resourceGroup, + java.lang.String property) { this(); this.tinfo = tinfo; this.credentials = credentials; + this.resourceGroup = resourceGroup; + this.property = property; } /** * Performs a deep copy on other. */ - public getManagerStats_args(getManagerStats_args other) { + public removeResourceGroupProperty_args(removeResourceGroupProperty_args other) { if (other.isSetTinfo()) { this.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(other.tinfo); } if (other.isSetCredentials()) { this.credentials = new org.apache.accumulo.core.securityImpl.thrift.TCredentials(other.credentials); } + if (other.isSetResourceGroup()) { + this.resourceGroup = other.resourceGroup; + } + if (other.isSetProperty()) { + this.property = other.property; + } } @Override - public getManagerStats_args deepCopy() { - return new getManagerStats_args(this); + public removeResourceGroupProperty_args deepCopy() { + return new removeResourceGroupProperty_args(this); } @Override public void clear() { this.tinfo = null; this.credentials = null; + this.resourceGroup = null; + this.property = null; } @org.apache.thrift.annotation.Nullable @@ -32291,7 +30835,7 @@ public org.apache.accumulo.core.clientImpl.thrift.TInfo getTinfo() { return this.tinfo; } - public getManagerStats_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { + public removeResourceGroupProperty_args setTinfo(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo) { this.tinfo = tinfo; return this; } @@ -32316,7 +30860,7 @@ public org.apache.accumulo.core.securityImpl.thrift.TCredentials getCredentials( return this.credentials; } - public getManagerStats_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { + public removeResourceGroupProperty_args setCredentials(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials) { this.credentials = credentials; return this; } @@ -32336,6 +30880,56 @@ public void setCredentialsIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public java.lang.String getResourceGroup() { + return this.resourceGroup; + } + + public removeResourceGroupProperty_args setResourceGroup(@org.apache.thrift.annotation.Nullable java.lang.String resourceGroup) { + this.resourceGroup = resourceGroup; + return this; + } + + public void unsetResourceGroup() { + this.resourceGroup = null; + } + + /** Returns true if field resourceGroup is set (has been assigned a value) and false otherwise */ + public boolean isSetResourceGroup() { + return this.resourceGroup != null; + } + + public void setResourceGroupIsSet(boolean value) { + if (!value) { + this.resourceGroup = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getProperty() { + return this.property; + } + + public removeResourceGroupProperty_args setProperty(@org.apache.thrift.annotation.Nullable java.lang.String property) { + this.property = property; + return this; + } + + public void unsetProperty() { + this.property = null; + } + + /** Returns true if field property is set (has been assigned a value) and false otherwise */ + public boolean isSetProperty() { + return this.property != null; + } + + public void setPropertyIsSet(boolean value) { + if (!value) { + this.property = null; + } + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { @@ -32355,6 +30949,22 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case RESOURCE_GROUP: + if (value == null) { + unsetResourceGroup(); + } else { + setResourceGroup((java.lang.String)value); + } + break; + + case PROPERTY: + if (value == null) { + unsetProperty(); + } else { + setProperty((java.lang.String)value); + } + break; + } } @@ -32368,6 +30978,12 @@ public java.lang.Object getFieldValue(_Fields field) { case CREDENTIALS: return getCredentials(); + case RESOURCE_GROUP: + return getResourceGroup(); + + case PROPERTY: + return getProperty(); + } throw new java.lang.IllegalStateException(); } @@ -32384,18 +31000,22 @@ public boolean isSet(_Fields field) { return isSetTinfo(); case CREDENTIALS: return isSetCredentials(); + case RESOURCE_GROUP: + return isSetResourceGroup(); + case PROPERTY: + return isSetProperty(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof getManagerStats_args) - return this.equals((getManagerStats_args)that); + if (that instanceof removeResourceGroupProperty_args) + return this.equals((removeResourceGroupProperty_args)that); return false; } - public boolean equals(getManagerStats_args that) { + public boolean equals(removeResourceGroupProperty_args that) { if (that == null) return false; if (this == that) @@ -32419,6 +31039,24 @@ public boolean equals(getManagerStats_args that) { return false; } + boolean this_present_resourceGroup = true && this.isSetResourceGroup(); + boolean that_present_resourceGroup = true && that.isSetResourceGroup(); + if (this_present_resourceGroup || that_present_resourceGroup) { + if (!(this_present_resourceGroup && that_present_resourceGroup)) + return false; + if (!this.resourceGroup.equals(that.resourceGroup)) + return false; + } + + boolean this_present_property = true && this.isSetProperty(); + boolean that_present_property = true && that.isSetProperty(); + if (this_present_property || that_present_property) { + if (!(this_present_property && that_present_property)) + return false; + if (!this.property.equals(that.property)) + return false; + } + return true; } @@ -32434,11 +31072,19 @@ public int hashCode() { if (isSetCredentials()) hashCode = hashCode * 8191 + credentials.hashCode(); + hashCode = hashCode * 8191 + ((isSetResourceGroup()) ? 131071 : 524287); + if (isSetResourceGroup()) + hashCode = hashCode * 8191 + resourceGroup.hashCode(); + + hashCode = hashCode * 8191 + ((isSetProperty()) ? 131071 : 524287); + if (isSetProperty()) + hashCode = hashCode * 8191 + property.hashCode(); + return hashCode; } @Override - public int compareTo(getManagerStats_args other) { + public int compareTo(removeResourceGroupProperty_args other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } @@ -32465,6 +31111,26 @@ public int compareTo(getManagerStats_args other) { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetResourceGroup(), other.isSetResourceGroup()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetResourceGroup()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceGroup, other.resourceGroup); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetProperty(), other.isSetProperty()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetProperty()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.property, other.property); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -32486,7 +31152,7 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getManagerStats_args("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupProperty_args("); boolean first = true; sb.append("tinfo:"); @@ -32504,6 +31170,22 @@ public java.lang.String toString() { sb.append(this.credentials); } first = false; + if (!first) sb.append(", "); + sb.append("resourceGroup:"); + if (this.resourceGroup == null) { + sb.append("null"); + } else { + sb.append(this.resourceGroup); + } + first = false; + if (!first) sb.append(", "); + sb.append("property:"); + if (this.property == null) { + sb.append("null"); + } else { + sb.append(this.property); + } + first = false; sb.append(")"); return sb.toString(); } @@ -32535,17 +31217,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class getManagerStats_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupProperty_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public getManagerStats_argsStandardScheme getScheme() { - return new getManagerStats_argsStandardScheme(); + public removeResourceGroupProperty_argsStandardScheme getScheme() { + return new removeResourceGroupProperty_argsStandardScheme(); } } - private static class getManagerStats_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeResourceGroupProperty_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -32573,6 +31255,22 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_arg org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // RESOURCE_GROUP + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.resourceGroup = iprot.readString(); + struct.setResourceGroupIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PROPERTY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -32585,7 +31283,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_arg } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -32599,23 +31297,33 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_ar struct.credentials.write(oprot); oprot.writeFieldEnd(); } + if (struct.resourceGroup != null) { + oprot.writeFieldBegin(RESOURCE_GROUP_FIELD_DESC); + oprot.writeString(struct.resourceGroup); + oprot.writeFieldEnd(); + } + if (struct.property != null) { + oprot.writeFieldBegin(PROPERTY_FIELD_DESC); + oprot.writeString(struct.property); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class getManagerStats_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupProperty_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public getManagerStats_argsTupleScheme getScheme() { - return new getManagerStats_argsTupleScheme(); + public removeResourceGroupProperty_argsTupleScheme getScheme() { + return new removeResourceGroupProperty_argsTupleScheme(); } } - private static class getManagerStats_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeResourceGroupProperty_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getManagerStats_args struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTinfo()) { @@ -32624,19 +31332,31 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getManagerStats_arg if (struct.isSetCredentials()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetResourceGroup()) { + optionals.set(2); + } + if (struct.isSetProperty()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetTinfo()) { struct.tinfo.write(oprot); } if (struct.isSetCredentials()) { struct.credentials.write(oprot); } + if (struct.isSetResourceGroup()) { + oprot.writeString(struct.resourceGroup); + } + if (struct.isSetProperty()) { + oprot.writeString(struct.property); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getManagerStats_args struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.tinfo = new org.apache.accumulo.core.clientImpl.thrift.TInfo(); struct.tinfo.read(iprot); @@ -32647,6 +31367,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getManagerStats_args struct.credentials.read(iprot); struct.setCredentialsIsSet(true); } + if (incoming.get(2)) { + struct.resourceGroup = iprot.readString(); + struct.setResourceGroupIsSet(true); + } + if (incoming.get(3)) { + struct.property = iprot.readString(); + struct.setPropertyIsSet(true); + } } } @@ -32656,25 +31384,25 @@ private static S scheme(org.apache. } @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) - public static class getManagerStats_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getManagerStats_result"); + public static class removeResourceGroupProperty_result implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeResourceGroupProperty_result"); - private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0); private static final org.apache.thrift.protocol.TField SEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sec", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final org.apache.thrift.protocol.TField TNASE_FIELD_DESC = new org.apache.thrift.protocol.TField("tnase", org.apache.thrift.protocol.TType.STRUCT, (short)2); + private static final org.apache.thrift.protocol.TField RGNE_FIELD_DESC = new org.apache.thrift.protocol.TField("rgne", org.apache.thrift.protocol.TType.STRUCT, (short)3); - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getManagerStats_resultStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getManagerStats_resultTupleSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new removeResourceGroupProperty_resultStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new removeResourceGroupProperty_resultTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable ManagerMonitorInfo success; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec; // required public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase; // required + public @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - SUCCESS((short)0, "success"), SEC((short)1, "sec"), - TNASE((short)2, "tnase"); + TNASE((short)2, "tnase"), + RGNE((short)3, "rgne"); private static final java.util.Map byName = new java.util.HashMap(); @@ -32690,12 +31418,12 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 0: // SUCCESS - return SUCCESS; case 1: // SEC return SEC; case 2: // TNASE return TNASE; + case 3: // RGNE + return RGNE; default: return null; } @@ -32742,80 +31470,55 @@ public java.lang.String getFieldName() { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ManagerMonitorInfo.class))); tmpMap.put(_Fields.SEC, new org.apache.thrift.meta_data.FieldMetaData("sec", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException.class))); tmpMap.put(_Fields.TNASE, new org.apache.thrift.meta_data.FieldMetaData("tnase", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException.class))); + tmpMap.put(_Fields.RGNE, new org.apache.thrift.meta_data.FieldMetaData("rgne", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getManagerStats_result.class, metaDataMap); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeResourceGroupProperty_result.class, metaDataMap); } - public getManagerStats_result() { + public removeResourceGroupProperty_result() { } - public getManagerStats_result( - ManagerMonitorInfo success, + public removeResourceGroupProperty_result( org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec, - org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) + org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase, + org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { this(); - this.success = success; this.sec = sec; this.tnase = tnase; + this.rgne = rgne; } /** * Performs a deep copy on other. */ - public getManagerStats_result(getManagerStats_result other) { - if (other.isSetSuccess()) { - this.success = new ManagerMonitorInfo(other.success); - } + public removeResourceGroupProperty_result(removeResourceGroupProperty_result other) { if (other.isSetSec()) { this.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(other.sec); } if (other.isSetTnase()) { this.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(other.tnase); } + if (other.isSetRgne()) { + this.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(other.rgne); + } } @Override - public getManagerStats_result deepCopy() { - return new getManagerStats_result(this); + public removeResourceGroupProperty_result deepCopy() { + return new removeResourceGroupProperty_result(this); } @Override public void clear() { - this.success = null; this.sec = null; this.tnase = null; - } - - @org.apache.thrift.annotation.Nullable - public ManagerMonitorInfo getSuccess() { - return this.success; - } - - public getManagerStats_result setSuccess(@org.apache.thrift.annotation.Nullable ManagerMonitorInfo success) { - this.success = success; - return this; - } - - public void unsetSuccess() { - this.success = null; - } - - /** Returns true if field success is set (has been assigned a value) and false otherwise */ - public boolean isSetSuccess() { - return this.success != null; - } - - public void setSuccessIsSet(boolean value) { - if (!value) { - this.success = null; - } + this.rgne = null; } @org.apache.thrift.annotation.Nullable @@ -32823,7 +31526,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException getSec return this.sec; } - public getManagerStats_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { + public removeResourceGroupProperty_result setSec(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException sec) { this.sec = sec; return this; } @@ -32848,7 +31551,7 @@ public org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceExceptio return this.tnase; } - public getManagerStats_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { + public removeResourceGroupProperty_result setTnase(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) { this.tnase = tnase; return this; } @@ -32868,17 +31571,34 @@ public void setTnaseIsSet(boolean value) { } } + @org.apache.thrift.annotation.Nullable + public org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException getRgne() { + return this.rgne; + } + + public removeResourceGroupProperty_result setRgne(@org.apache.thrift.annotation.Nullable org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException rgne) { + this.rgne = rgne; + return this; + } + + public void unsetRgne() { + this.rgne = null; + } + + /** Returns true if field rgne is set (has been assigned a value) and false otherwise */ + public boolean isSetRgne() { + return this.rgne != null; + } + + public void setRgneIsSet(boolean value) { + if (!value) { + this.rgne = null; + } + } + @Override public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { - case SUCCESS: - if (value == null) { - unsetSuccess(); - } else { - setSuccess((ManagerMonitorInfo)value); - } - break; - case SEC: if (value == null) { unsetSec(); @@ -32895,6 +31615,14 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable } break; + case RGNE: + if (value == null) { + unsetRgne(); + } else { + setRgne((org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException)value); + } + break; + } } @@ -32902,15 +31630,15 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable @Override public java.lang.Object getFieldValue(_Fields field) { switch (field) { - case SUCCESS: - return getSuccess(); - case SEC: return getSec(); case TNASE: return getTnase(); + case RGNE: + return getRgne(); + } throw new java.lang.IllegalStateException(); } @@ -32923,38 +31651,29 @@ public boolean isSet(_Fields field) { } switch (field) { - case SUCCESS: - return isSetSuccess(); case SEC: return isSetSec(); case TNASE: return isSetTnase(); + case RGNE: + return isSetRgne(); } throw new java.lang.IllegalStateException(); } @Override public boolean equals(java.lang.Object that) { - if (that instanceof getManagerStats_result) - return this.equals((getManagerStats_result)that); + if (that instanceof removeResourceGroupProperty_result) + return this.equals((removeResourceGroupProperty_result)that); return false; } - public boolean equals(getManagerStats_result that) { + public boolean equals(removeResourceGroupProperty_result that) { if (that == null) return false; if (this == that) return true; - boolean this_present_success = true && this.isSetSuccess(); - boolean that_present_success = true && that.isSetSuccess(); - if (this_present_success || that_present_success) { - if (!(this_present_success && that_present_success)) - return false; - if (!this.success.equals(that.success)) - return false; - } - boolean this_present_sec = true && this.isSetSec(); boolean that_present_sec = true && that.isSetSec(); if (this_present_sec || that_present_sec) { @@ -32973,6 +31692,15 @@ public boolean equals(getManagerStats_result that) { return false; } + boolean this_present_rgne = true && this.isSetRgne(); + boolean that_present_rgne = true && that.isSetRgne(); + if (this_present_rgne || that_present_rgne) { + if (!(this_present_rgne && that_present_rgne)) + return false; + if (!this.rgne.equals(that.rgne)) + return false; + } + return true; } @@ -32980,10 +31708,6 @@ public boolean equals(getManagerStats_result that) { public int hashCode() { int hashCode = 1; - hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287); - if (isSetSuccess()) - hashCode = hashCode * 8191 + success.hashCode(); - hashCode = hashCode * 8191 + ((isSetSec()) ? 131071 : 524287); if (isSetSec()) hashCode = hashCode * 8191 + sec.hashCode(); @@ -32992,43 +31716,47 @@ public int hashCode() { if (isSetTnase()) hashCode = hashCode * 8191 + tnase.hashCode(); + hashCode = hashCode * 8191 + ((isSetRgne()) ? 131071 : 524287); + if (isSetRgne()) + hashCode = hashCode * 8191 + rgne.hashCode(); + return hashCode; } @Override - public int compareTo(getManagerStats_result other) { + public int compareTo(removeResourceGroupProperty_result other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec()); if (lastComparison != 0) { return lastComparison; } - if (isSetSuccess()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success); + if (isSetSec()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, other.sec); if (lastComparison != 0) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetSec(), other.isSetSec()); + lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase()); if (lastComparison != 0) { return lastComparison; } - if (isSetSec()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sec, other.sec); + if (isSetTnase()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tnase, other.tnase); if (lastComparison != 0) { return lastComparison; } } - lastComparison = java.lang.Boolean.compare(isSetTnase(), other.isSetTnase()); + lastComparison = java.lang.Boolean.compare(isSetRgne(), other.isSetRgne()); if (lastComparison != 0) { return lastComparison; } - if (isSetTnase()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tnase, other.tnase); + if (isSetRgne()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rgne, other.rgne); if (lastComparison != 0) { return lastComparison; } @@ -33053,17 +31781,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache. @Override public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("getManagerStats_result("); + java.lang.StringBuilder sb = new java.lang.StringBuilder("removeResourceGroupProperty_result("); boolean first = true; - sb.append("success:"); - if (this.success == null) { - sb.append("null"); - } else { - sb.append(this.success); - } - first = false; - if (!first) sb.append(", "); sb.append("sec:"); if (this.sec == null) { sb.append("null"); @@ -33079,6 +31799,14 @@ public java.lang.String toString() { sb.append(this.tnase); } first = false; + if (!first) sb.append(", "); + sb.append("rgne:"); + if (this.rgne == null) { + sb.append("null"); + } else { + sb.append(this.rgne); + } + first = false; sb.append(")"); return sb.toString(); } @@ -33086,9 +31814,6 @@ public java.lang.String toString() { public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity - if (success != null) { - success.validate(); - } } private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { @@ -33107,17 +31832,17 @@ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException } } - private static class getManagerStats_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupProperty_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public getManagerStats_resultStandardScheme getScheme() { - return new getManagerStats_resultStandardScheme(); + public removeResourceGroupProperty_resultStandardScheme getScheme() { + return new removeResourceGroupProperty_resultStandardScheme(); } } - private static class getManagerStats_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { + private static class removeResourceGroupProperty_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme { @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol iprot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; iprot.readStructBegin(); while (true) @@ -33127,15 +31852,6 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_res break; } switch (schemeField.id) { - case 0: // SUCCESS - if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { - struct.success = new ManagerMonitorInfo(); - struct.success.read(iprot); - struct.setSuccessIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; case 1: // SEC if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); @@ -33154,6 +31870,15 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_res org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // RGNE + if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { + struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); + struct.rgne.read(iprot); + struct.setRgneIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -33166,15 +31891,10 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getManagerStats_res } @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol oprot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.success != null) { - oprot.writeFieldBegin(SUCCESS_FIELD_DESC); - struct.success.write(oprot); - oprot.writeFieldEnd(); - } if (struct.sec != null) { oprot.writeFieldBegin(SEC_FIELD_DESC); struct.sec.write(oprot); @@ -33185,65 +31905,70 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getManagerStats_re struct.tnase.write(oprot); oprot.writeFieldEnd(); } + if (struct.rgne != null) { + oprot.writeFieldBegin(RGNE_FIELD_DESC); + struct.rgne.write(oprot); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } } - private static class getManagerStats_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { + private static class removeResourceGroupProperty_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { @Override - public getManagerStats_resultTupleScheme getScheme() { - return new getManagerStats_resultTupleScheme(); + public removeResourceGroupProperty_resultTupleScheme getScheme() { + return new removeResourceGroupProperty_resultTupleScheme(); } } - private static class getManagerStats_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { + private static class removeResourceGroupProperty_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, getManagerStats_result struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetSuccess()) { + if (struct.isSetSec()) { optionals.set(0); } - if (struct.isSetSec()) { + if (struct.isSetTnase()) { optionals.set(1); } - if (struct.isSetTnase()) { + if (struct.isSetRgne()) { optionals.set(2); } oprot.writeBitSet(optionals, 3); - if (struct.isSetSuccess()) { - struct.success.write(oprot); - } if (struct.isSetSec()) { struct.sec.write(oprot); } if (struct.isSetTnase()) { struct.tnase.write(oprot); } + if (struct.isSetRgne()) { + struct.rgne.write(oprot); + } } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, getManagerStats_result struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, removeResourceGroupProperty_result struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { - struct.success = new ManagerMonitorInfo(); - struct.success.read(iprot); - struct.setSuccessIsSet(true); - } - if (incoming.get(1)) { struct.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException(); struct.sec.read(iprot); struct.setSecIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(1)) { struct.tnase = new org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException(); struct.tnase.read(iprot); struct.setTnaseIsSet(true); } + if (incoming.get(2)) { + struct.rgne = new org.apache.accumulo.core.clientImpl.thrift.ThriftResourceGroupNotExistsException(); + struct.rgne.read(iprot); + struct.setRgneIsSet(true); + } } } @@ -35830,13 +34555,13 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, getActiveTservers_r case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list96 = iprot.readListBegin(); - struct.success = new java.util.ArrayList(_list96.size); - @org.apache.thrift.annotation.Nullable java.lang.String _elem97; - for (int _i98 = 0; _i98 < _list96.size; ++_i98) + org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list52.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem53; + for (int _i54 = 0; _i54 < _list52.size; ++_i54) { - _elem97 = iprot.readString(); - struct.success.add(_elem97); + _elem53 = iprot.readString(); + struct.success.add(_elem53); } iprot.readListEnd(); } @@ -35883,9 +34608,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, getActiveTservers_ oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size())); - for (java.lang.String _iter99 : struct.success) + for (java.lang.String _iter55 : struct.success) { - oprot.writeString(_iter99); + oprot.writeString(_iter55); } oprot.writeListEnd(); } @@ -35933,9 +34658,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, getActiveTservers_r if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (java.lang.String _iter100 : struct.success) + for (java.lang.String _iter56 : struct.success) { - oprot.writeString(_iter100); + oprot.writeString(_iter56); } } } @@ -35953,13 +34678,13 @@ public void read(org.apache.thrift.protocol.TProtocol prot, getActiveTservers_re java.util.BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list101 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); - struct.success = new java.util.ArrayList(_list101.size); - @org.apache.thrift.annotation.Nullable java.lang.String _elem102; - for (int _i103 = 0; _i103 < _list101.size; ++_i103) + org.apache.thrift.protocol.TList _list57 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING); + struct.success = new java.util.ArrayList(_list57.size); + @org.apache.thrift.annotation.Nullable java.lang.String _elem58; + for (int _i59 = 0; _i59 < _list57.size; ++_i59) { - _elem102 = iprot.readString(); - struct.success.add(_elem102); + _elem58 = iprot.readString(); + struct.success.add(_elem58); } } struct.setSuccessIsSet(true); @@ -37791,14 +36516,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, requestTabletHostin case 4: // EXTENTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list104 = iprot.readListBegin(); - struct.extents = new java.util.ArrayList(_list104.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem105; - for (int _i106 = 0; _i106 < _list104.size; ++_i106) + org.apache.thrift.protocol.TList _list60 = iprot.readListBegin(); + struct.extents = new java.util.ArrayList(_list60.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem61; + for (int _i62 = 0; _i62 < _list60.size; ++_i62) { - _elem105 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _elem105.read(iprot); - struct.extents.add(_elem105); + _elem61 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _elem61.read(iprot); + struct.extents.add(_elem61); } iprot.readListEnd(); } @@ -37842,9 +36567,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, requestTabletHosti oprot.writeFieldBegin(EXTENTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.extents.size())); - for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter107 : struct.extents) + for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter63 : struct.extents) { - _iter107.write(oprot); + _iter63.write(oprot); } oprot.writeListEnd(); } @@ -37894,9 +36619,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, requestTabletHostin if (struct.isSetExtents()) { { oprot.writeI32(struct.extents.size()); - for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter108 : struct.extents) + for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter64 : struct.extents) { - _iter108.write(oprot); + _iter64.write(oprot); } } } @@ -37922,14 +36647,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, requestTabletHosting } if (incoming.get(3)) { { - org.apache.thrift.protocol.TList _list109 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.extents = new java.util.ArrayList(_list109.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem110; - for (int _i111 = 0; _i111 < _list109.size; ++_i111) + org.apache.thrift.protocol.TList _list65 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.extents = new java.util.ArrayList(_list65.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem66; + for (int _i67 = 0; _i67 < _list65.size; ++_i67) { - _elem110 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _elem110.read(iprot); - struct.extents.add(_elem110); + _elem66 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _elem66.read(iprot); + struct.extents.add(_elem66); } } struct.setExtentsIsSet(true); @@ -39148,17 +37873,17 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, updateTabletMergeab case 4: // SPLITS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map112 = iprot.readMapBegin(); - struct.splits = new java.util.HashMap(2*_map112.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key113; - @org.apache.thrift.annotation.Nullable TTabletMergeability _val114; - for (int _i115 = 0; _i115 < _map112.size; ++_i115) + org.apache.thrift.protocol.TMap _map68 = iprot.readMapBegin(); + struct.splits = new java.util.HashMap(2*_map68.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key69; + @org.apache.thrift.annotation.Nullable TTabletMergeability _val70; + for (int _i71 = 0; _i71 < _map68.size; ++_i71) { - _key113 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _key113.read(iprot); - _val114 = new TTabletMergeability(); - _val114.read(iprot); - struct.splits.put(_key113, _val114); + _key69 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _key69.read(iprot); + _val70 = new TTabletMergeability(); + _val70.read(iprot); + struct.splits.put(_key69, _val70); } iprot.readMapEnd(); } @@ -39202,10 +37927,10 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, updateTabletMergea oprot.writeFieldBegin(SPLITS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT, struct.splits.size())); - for (java.util.Map.Entry _iter116 : struct.splits.entrySet()) + for (java.util.Map.Entry _iter72 : struct.splits.entrySet()) { - _iter116.getKey().write(oprot); - _iter116.getValue().write(oprot); + _iter72.getKey().write(oprot); + _iter72.getValue().write(oprot); } oprot.writeMapEnd(); } @@ -39255,10 +37980,10 @@ public void write(org.apache.thrift.protocol.TProtocol prot, updateTabletMergeab if (struct.isSetSplits()) { { oprot.writeI32(struct.splits.size()); - for (java.util.Map.Entry _iter117 : struct.splits.entrySet()) + for (java.util.Map.Entry _iter73 : struct.splits.entrySet()) { - _iter117.getKey().write(oprot); - _iter117.getValue().write(oprot); + _iter73.getKey().write(oprot); + _iter73.getValue().write(oprot); } } } @@ -39284,17 +38009,17 @@ public void read(org.apache.thrift.protocol.TProtocol prot, updateTabletMergeabi } if (incoming.get(3)) { { - org.apache.thrift.protocol.TMap _map118 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT); - struct.splits = new java.util.HashMap(2*_map118.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key119; - @org.apache.thrift.annotation.Nullable TTabletMergeability _val120; - for (int _i121 = 0; _i121 < _map118.size; ++_i121) + org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRUCT); + struct.splits = new java.util.HashMap(2*_map74.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _key75; + @org.apache.thrift.annotation.Nullable TTabletMergeability _val76; + for (int _i77 = 0; _i77 < _map74.size; ++_i77) { - _key119 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _key119.read(iprot); - _val120 = new TTabletMergeability(); - _val120.read(iprot); - struct.splits.put(_key119, _val120); + _key75 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _key75.read(iprot); + _val76 = new TTabletMergeability(); + _val76.read(iprot); + struct.splits.put(_key75, _val76); } } struct.setSplitsIsSet(true); @@ -39882,14 +38607,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, updateTabletMergeab case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list122 = iprot.readListBegin(); - struct.success = new java.util.ArrayList(_list122.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem123; - for (int _i124 = 0; _i124 < _list122.size; ++_i124) + org.apache.thrift.protocol.TList _list78 = iprot.readListBegin(); + struct.success = new java.util.ArrayList(_list78.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem79; + for (int _i80 = 0; _i80 < _list78.size; ++_i80) { - _elem123 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _elem123.read(iprot); - struct.success.add(_elem123); + _elem79 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _elem79.read(iprot); + struct.success.add(_elem79); } iprot.readListEnd(); } @@ -39945,9 +38670,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, updateTabletMergea oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter125 : struct.success) + for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter81 : struct.success) { - _iter125.write(oprot); + _iter81.write(oprot); } oprot.writeListEnd(); } @@ -40003,9 +38728,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, updateTabletMergeab if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter126 : struct.success) + for (org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _iter82 : struct.success) { - _iter126.write(oprot); + _iter82.write(oprot); } } } @@ -40026,14 +38751,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, updateTabletMergeabi java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list127 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.success = new java.util.ArrayList(_list127.size); - @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem128; - for (int _i129 = 0; _i129 < _list127.size; ++_i129) + org.apache.thrift.protocol.TList _list83 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.success = new java.util.ArrayList(_list83.size); + @org.apache.thrift.annotation.Nullable org.apache.accumulo.core.dataImpl.thrift.TKeyExtent _elem84; + for (int _i85 = 0; _i85 < _list83.size; ++_i85) { - _elem128 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); - _elem128.read(iprot); - struct.success.add(_elem128); + _elem84 = new org.apache.accumulo.core.dataImpl.thrift.TKeyExtent(); + _elem84.read(iprot); + struct.success.add(_elem84); } } struct.setSuccessIsSet(true); @@ -41662,14 +40387,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, processEvents_args case 3: // EVENTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list130 = iprot.readListBegin(); - struct.events = new java.util.ArrayList(_list130.size); - @org.apache.thrift.annotation.Nullable TEvent _elem131; - for (int _i132 = 0; _i132 < _list130.size; ++_i132) + org.apache.thrift.protocol.TList _list86 = iprot.readListBegin(); + struct.events = new java.util.ArrayList(_list86.size); + @org.apache.thrift.annotation.Nullable TEvent _elem87; + for (int _i88 = 0; _i88 < _list86.size; ++_i88) { - _elem131 = new TEvent(); - _elem131.read(iprot); - struct.events.add(_elem131); + _elem87 = new TEvent(); + _elem87.read(iprot); + struct.events.add(_elem87); } iprot.readListEnd(); } @@ -41708,9 +40433,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, processEvents_args oprot.writeFieldBegin(EVENTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.events.size())); - for (TEvent _iter133 : struct.events) + for (TEvent _iter89 : struct.events) { - _iter133.write(oprot); + _iter89.write(oprot); } oprot.writeListEnd(); } @@ -41754,9 +40479,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, processEvents_args if (struct.isSetEvents()) { { oprot.writeI32(struct.events.size()); - for (TEvent _iter134 : struct.events) + for (TEvent _iter90 : struct.events) { - _iter134.write(oprot); + _iter90.write(oprot); } } } @@ -41778,14 +40503,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, processEvents_args s } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list135 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.events = new java.util.ArrayList(_list135.size); - @org.apache.thrift.annotation.Nullable TEvent _elem136; - for (int _i137 = 0; _i137 < _list135.size; ++_i137) + org.apache.thrift.protocol.TList _list91 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.events = new java.util.ArrayList(_list91.size); + @org.apache.thrift.annotation.Nullable TEvent _elem92; + for (int _i93 = 0; _i93 < _list91.size; ++_i93) { - _elem136 = new TEvent(); - _elem136.read(iprot); - struct.events.add(_elem136); + _elem92 = new TEvent(); + _elem92.read(iprot); + struct.events.add(_elem92); } } struct.setEventsIsSet(true); diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java deleted file mode 100644 index 9c91aaf58ec..00000000000 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ManagerMonitorInfo.java +++ /dev/null @@ -1,1445 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Autogenerated by Thrift Compiler (0.17.0) - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - * @generated - */ -package org.apache.accumulo.core.manager.thrift; - -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -public class ManagerMonitorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { - private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ManagerMonitorInfo"); - - private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1); - private static final org.apache.thrift.protocol.TField T_SERVER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tServerInfo", org.apache.thrift.protocol.TType.LIST, (short)2); - private static final org.apache.thrift.protocol.TField BAD_TSERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("badTServers", org.apache.thrift.protocol.TType.MAP, (short)3); - private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)4); - private static final org.apache.thrift.protocol.TField GOAL_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("goalState", org.apache.thrift.protocol.TType.I32, (short)5); - private static final org.apache.thrift.protocol.TField UNASSIGNED_TABLETS_FIELD_DESC = new org.apache.thrift.protocol.TField("unassignedTablets", org.apache.thrift.protocol.TType.I32, (short)6); - private static final org.apache.thrift.protocol.TField SERVERS_SHUTTING_DOWN_FIELD_DESC = new org.apache.thrift.protocol.TField("serversShuttingDown", org.apache.thrift.protocol.TType.SET, (short)7); - private static final org.apache.thrift.protocol.TField DEAD_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadTabletServers", org.apache.thrift.protocol.TType.LIST, (short)8); - - private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ManagerMonitorInfoStandardSchemeFactory(); - private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ManagerMonitorInfoTupleSchemeFactory(); - - public @org.apache.thrift.annotation.Nullable java.util.Map tableMap; // required - public @org.apache.thrift.annotation.Nullable java.util.List tServerInfo; // required - public @org.apache.thrift.annotation.Nullable java.util.Map badTServers; // required - /** - * - * @see ManagerState - */ - public @org.apache.thrift.annotation.Nullable ManagerState state; // required - /** - * - * @see ManagerGoalState - */ - public @org.apache.thrift.annotation.Nullable ManagerGoalState goalState; // required - public int unassignedTablets; // required - public @org.apache.thrift.annotation.Nullable java.util.Set serversShuttingDown; // required - public @org.apache.thrift.annotation.Nullable java.util.List deadTabletServers; // required - - /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - public enum _Fields implements org.apache.thrift.TFieldIdEnum { - TABLE_MAP((short)1, "tableMap"), - T_SERVER_INFO((short)2, "tServerInfo"), - BAD_TSERVERS((short)3, "badTServers"), - /** - * - * @see ManagerState - */ - STATE((short)4, "state"), - /** - * - * @see ManagerGoalState - */ - GOAL_STATE((short)5, "goalState"), - UNASSIGNED_TABLETS((short)6, "unassignedTablets"), - SERVERS_SHUTTING_DOWN((short)7, "serversShuttingDown"), - DEAD_TABLET_SERVERS((short)8, "deadTabletServers"); - - private static final java.util.Map byName = new java.util.HashMap(); - - static { - for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { - byName.put(field.getFieldName(), field); - } - } - - /** - * Find the _Fields constant that matches fieldId, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByThriftId(int fieldId) { - switch(fieldId) { - case 1: // TABLE_MAP - return TABLE_MAP; - case 2: // T_SERVER_INFO - return T_SERVER_INFO; - case 3: // BAD_TSERVERS - return BAD_TSERVERS; - case 4: // STATE - return STATE; - case 5: // GOAL_STATE - return GOAL_STATE; - case 6: // UNASSIGNED_TABLETS - return UNASSIGNED_TABLETS; - case 7: // SERVERS_SHUTTING_DOWN - return SERVERS_SHUTTING_DOWN; - case 8: // DEAD_TABLET_SERVERS - return DEAD_TABLET_SERVERS; - default: - return null; - } - } - - /** - * Find the _Fields constant that matches fieldId, throwing an exception - * if it is not found. - */ - public static _Fields findByThriftIdOrThrow(int fieldId) { - _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); - return fields; - } - - /** - * Find the _Fields constant that matches name, or null if its not found. - */ - @org.apache.thrift.annotation.Nullable - public static _Fields findByName(java.lang.String name) { - return byName.get(name); - } - - private final short _thriftId; - private final java.lang.String _fieldName; - - _Fields(short thriftId, java.lang.String fieldName) { - _thriftId = thriftId; - _fieldName = fieldName; - } - - @Override - public short getThriftFieldId() { - return _thriftId; - } - - @Override - public java.lang.String getFieldName() { - return _fieldName; - } - } - - // isset id assignments - private static final int __UNASSIGNEDTABLETS_ISSET_ID = 0; - private byte __isset_bitfield = 0; - public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; - static { - java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TABLE_MAP, new org.apache.thrift.meta_data.FieldMetaData("tableMap", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TableInfo.class)))); - tmpMap.put(_Fields.T_SERVER_INFO, new org.apache.thrift.meta_data.FieldMetaData("tServerInfo", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TabletServerStatus.class)))); - tmpMap.put(_Fields.BAD_TSERVERS, new org.apache.thrift.meta_data.FieldMetaData("badTServers", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)))); - tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerState.class))); - tmpMap.put(_Fields.GOAL_STATE, new org.apache.thrift.meta_data.FieldMetaData("goalState", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ManagerGoalState.class))); - tmpMap.put(_Fields.UNASSIGNED_TABLETS, new org.apache.thrift.meta_data.FieldMetaData("unassignedTablets", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.SERVERS_SHUTTING_DOWN, new org.apache.thrift.meta_data.FieldMetaData("serversShuttingDown", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.DEAD_TABLET_SERVERS, new org.apache.thrift.meta_data.FieldMetaData("deadTabletServers", org.apache.thrift.TFieldRequirementType.DEFAULT, - new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, - new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DeadServer.class)))); - metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); - org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ManagerMonitorInfo.class, metaDataMap); - } - - public ManagerMonitorInfo() { - } - - public ManagerMonitorInfo( - java.util.Map tableMap, - java.util.List tServerInfo, - java.util.Map badTServers, - ManagerState state, - ManagerGoalState goalState, - int unassignedTablets, - java.util.Set serversShuttingDown, - java.util.List deadTabletServers) - { - this(); - this.tableMap = tableMap; - this.tServerInfo = tServerInfo; - this.badTServers = badTServers; - this.state = state; - this.goalState = goalState; - this.unassignedTablets = unassignedTablets; - setUnassignedTabletsIsSet(true); - this.serversShuttingDown = serversShuttingDown; - this.deadTabletServers = deadTabletServers; - } - - /** - * Performs a deep copy on other. - */ - public ManagerMonitorInfo(ManagerMonitorInfo other) { - __isset_bitfield = other.__isset_bitfield; - if (other.isSetTableMap()) { - java.util.Map __this__tableMap = new java.util.HashMap(other.tableMap.size()); - for (java.util.Map.Entry other_element : other.tableMap.entrySet()) { - - java.lang.String other_element_key = other_element.getKey(); - TableInfo other_element_value = other_element.getValue(); - - java.lang.String __this__tableMap_copy_key = other_element_key; - - TableInfo __this__tableMap_copy_value = new TableInfo(other_element_value); - - __this__tableMap.put(__this__tableMap_copy_key, __this__tableMap_copy_value); - } - this.tableMap = __this__tableMap; - } - if (other.isSetTServerInfo()) { - java.util.List __this__tServerInfo = new java.util.ArrayList(other.tServerInfo.size()); - for (TabletServerStatus other_element : other.tServerInfo) { - __this__tServerInfo.add(new TabletServerStatus(other_element)); - } - this.tServerInfo = __this__tServerInfo; - } - if (other.isSetBadTServers()) { - java.util.Map __this__badTServers = new java.util.HashMap(other.badTServers); - this.badTServers = __this__badTServers; - } - if (other.isSetState()) { - this.state = other.state; - } - if (other.isSetGoalState()) { - this.goalState = other.goalState; - } - this.unassignedTablets = other.unassignedTablets; - if (other.isSetServersShuttingDown()) { - java.util.Set __this__serversShuttingDown = new java.util.HashSet(other.serversShuttingDown); - this.serversShuttingDown = __this__serversShuttingDown; - } - if (other.isSetDeadTabletServers()) { - java.util.List __this__deadTabletServers = new java.util.ArrayList(other.deadTabletServers.size()); - for (DeadServer other_element : other.deadTabletServers) { - __this__deadTabletServers.add(new DeadServer(other_element)); - } - this.deadTabletServers = __this__deadTabletServers; - } - } - - @Override - public ManagerMonitorInfo deepCopy() { - return new ManagerMonitorInfo(this); - } - - @Override - public void clear() { - this.tableMap = null; - this.tServerInfo = null; - this.badTServers = null; - this.state = null; - this.goalState = null; - setUnassignedTabletsIsSet(false); - this.unassignedTablets = 0; - this.serversShuttingDown = null; - this.deadTabletServers = null; - } - - public int getTableMapSize() { - return (this.tableMap == null) ? 0 : this.tableMap.size(); - } - - public void putToTableMap(java.lang.String key, TableInfo val) { - if (this.tableMap == null) { - this.tableMap = new java.util.HashMap(); - } - this.tableMap.put(key, val); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Map getTableMap() { - return this.tableMap; - } - - public ManagerMonitorInfo setTableMap(@org.apache.thrift.annotation.Nullable java.util.Map tableMap) { - this.tableMap = tableMap; - return this; - } - - public void unsetTableMap() { - this.tableMap = null; - } - - /** Returns true if field tableMap is set (has been assigned a value) and false otherwise */ - public boolean isSetTableMap() { - return this.tableMap != null; - } - - public void setTableMapIsSet(boolean value) { - if (!value) { - this.tableMap = null; - } - } - - public int getTServerInfoSize() { - return (this.tServerInfo == null) ? 0 : this.tServerInfo.size(); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Iterator getTServerInfoIterator() { - return (this.tServerInfo == null) ? null : this.tServerInfo.iterator(); - } - - public void addToTServerInfo(TabletServerStatus elem) { - if (this.tServerInfo == null) { - this.tServerInfo = new java.util.ArrayList(); - } - this.tServerInfo.add(elem); - } - - @org.apache.thrift.annotation.Nullable - public java.util.List getTServerInfo() { - return this.tServerInfo; - } - - public ManagerMonitorInfo setTServerInfo(@org.apache.thrift.annotation.Nullable java.util.List tServerInfo) { - this.tServerInfo = tServerInfo; - return this; - } - - public void unsetTServerInfo() { - this.tServerInfo = null; - } - - /** Returns true if field tServerInfo is set (has been assigned a value) and false otherwise */ - public boolean isSetTServerInfo() { - return this.tServerInfo != null; - } - - public void setTServerInfoIsSet(boolean value) { - if (!value) { - this.tServerInfo = null; - } - } - - public int getBadTServersSize() { - return (this.badTServers == null) ? 0 : this.badTServers.size(); - } - - public void putToBadTServers(java.lang.String key, byte val) { - if (this.badTServers == null) { - this.badTServers = new java.util.HashMap(); - } - this.badTServers.put(key, val); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Map getBadTServers() { - return this.badTServers; - } - - public ManagerMonitorInfo setBadTServers(@org.apache.thrift.annotation.Nullable java.util.Map badTServers) { - this.badTServers = badTServers; - return this; - } - - public void unsetBadTServers() { - this.badTServers = null; - } - - /** Returns true if field badTServers is set (has been assigned a value) and false otherwise */ - public boolean isSetBadTServers() { - return this.badTServers != null; - } - - public void setBadTServersIsSet(boolean value) { - if (!value) { - this.badTServers = null; - } - } - - /** - * - * @see ManagerState - */ - @org.apache.thrift.annotation.Nullable - public ManagerState getState() { - return this.state; - } - - /** - * - * @see ManagerState - */ - public ManagerMonitorInfo setState(@org.apache.thrift.annotation.Nullable ManagerState state) { - this.state = state; - return this; - } - - public void unsetState() { - this.state = null; - } - - /** Returns true if field state is set (has been assigned a value) and false otherwise */ - public boolean isSetState() { - return this.state != null; - } - - public void setStateIsSet(boolean value) { - if (!value) { - this.state = null; - } - } - - /** - * - * @see ManagerGoalState - */ - @org.apache.thrift.annotation.Nullable - public ManagerGoalState getGoalState() { - return this.goalState; - } - - /** - * - * @see ManagerGoalState - */ - public ManagerMonitorInfo setGoalState(@org.apache.thrift.annotation.Nullable ManagerGoalState goalState) { - this.goalState = goalState; - return this; - } - - public void unsetGoalState() { - this.goalState = null; - } - - /** Returns true if field goalState is set (has been assigned a value) and false otherwise */ - public boolean isSetGoalState() { - return this.goalState != null; - } - - public void setGoalStateIsSet(boolean value) { - if (!value) { - this.goalState = null; - } - } - - public int getUnassignedTablets() { - return this.unassignedTablets; - } - - public ManagerMonitorInfo setUnassignedTablets(int unassignedTablets) { - this.unassignedTablets = unassignedTablets; - setUnassignedTabletsIsSet(true); - return this; - } - - public void unsetUnassignedTablets() { - __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UNASSIGNEDTABLETS_ISSET_ID); - } - - /** Returns true if field unassignedTablets is set (has been assigned a value) and false otherwise */ - public boolean isSetUnassignedTablets() { - return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UNASSIGNEDTABLETS_ISSET_ID); - } - - public void setUnassignedTabletsIsSet(boolean value) { - __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UNASSIGNEDTABLETS_ISSET_ID, value); - } - - public int getServersShuttingDownSize() { - return (this.serversShuttingDown == null) ? 0 : this.serversShuttingDown.size(); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Iterator getServersShuttingDownIterator() { - return (this.serversShuttingDown == null) ? null : this.serversShuttingDown.iterator(); - } - - public void addToServersShuttingDown(java.lang.String elem) { - if (this.serversShuttingDown == null) { - this.serversShuttingDown = new java.util.HashSet(); - } - this.serversShuttingDown.add(elem); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Set getServersShuttingDown() { - return this.serversShuttingDown; - } - - public ManagerMonitorInfo setServersShuttingDown(@org.apache.thrift.annotation.Nullable java.util.Set serversShuttingDown) { - this.serversShuttingDown = serversShuttingDown; - return this; - } - - public void unsetServersShuttingDown() { - this.serversShuttingDown = null; - } - - /** Returns true if field serversShuttingDown is set (has been assigned a value) and false otherwise */ - public boolean isSetServersShuttingDown() { - return this.serversShuttingDown != null; - } - - public void setServersShuttingDownIsSet(boolean value) { - if (!value) { - this.serversShuttingDown = null; - } - } - - public int getDeadTabletServersSize() { - return (this.deadTabletServers == null) ? 0 : this.deadTabletServers.size(); - } - - @org.apache.thrift.annotation.Nullable - public java.util.Iterator getDeadTabletServersIterator() { - return (this.deadTabletServers == null) ? null : this.deadTabletServers.iterator(); - } - - public void addToDeadTabletServers(DeadServer elem) { - if (this.deadTabletServers == null) { - this.deadTabletServers = new java.util.ArrayList(); - } - this.deadTabletServers.add(elem); - } - - @org.apache.thrift.annotation.Nullable - public java.util.List getDeadTabletServers() { - return this.deadTabletServers; - } - - public ManagerMonitorInfo setDeadTabletServers(@org.apache.thrift.annotation.Nullable java.util.List deadTabletServers) { - this.deadTabletServers = deadTabletServers; - return this; - } - - public void unsetDeadTabletServers() { - this.deadTabletServers = null; - } - - /** Returns true if field deadTabletServers is set (has been assigned a value) and false otherwise */ - public boolean isSetDeadTabletServers() { - return this.deadTabletServers != null; - } - - public void setDeadTabletServersIsSet(boolean value) { - if (!value) { - this.deadTabletServers = null; - } - } - - @Override - public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { - switch (field) { - case TABLE_MAP: - if (value == null) { - unsetTableMap(); - } else { - setTableMap((java.util.Map)value); - } - break; - - case T_SERVER_INFO: - if (value == null) { - unsetTServerInfo(); - } else { - setTServerInfo((java.util.List)value); - } - break; - - case BAD_TSERVERS: - if (value == null) { - unsetBadTServers(); - } else { - setBadTServers((java.util.Map)value); - } - break; - - case STATE: - if (value == null) { - unsetState(); - } else { - setState((ManagerState)value); - } - break; - - case GOAL_STATE: - if (value == null) { - unsetGoalState(); - } else { - setGoalState((ManagerGoalState)value); - } - break; - - case UNASSIGNED_TABLETS: - if (value == null) { - unsetUnassignedTablets(); - } else { - setUnassignedTablets((java.lang.Integer)value); - } - break; - - case SERVERS_SHUTTING_DOWN: - if (value == null) { - unsetServersShuttingDown(); - } else { - setServersShuttingDown((java.util.Set)value); - } - break; - - case DEAD_TABLET_SERVERS: - if (value == null) { - unsetDeadTabletServers(); - } else { - setDeadTabletServers((java.util.List)value); - } - break; - - } - } - - @org.apache.thrift.annotation.Nullable - @Override - public java.lang.Object getFieldValue(_Fields field) { - switch (field) { - case TABLE_MAP: - return getTableMap(); - - case T_SERVER_INFO: - return getTServerInfo(); - - case BAD_TSERVERS: - return getBadTServers(); - - case STATE: - return getState(); - - case GOAL_STATE: - return getGoalState(); - - case UNASSIGNED_TABLETS: - return getUnassignedTablets(); - - case SERVERS_SHUTTING_DOWN: - return getServersShuttingDown(); - - case DEAD_TABLET_SERVERS: - return getDeadTabletServers(); - - } - throw new java.lang.IllegalStateException(); - } - - /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ - @Override - public boolean isSet(_Fields field) { - if (field == null) { - throw new java.lang.IllegalArgumentException(); - } - - switch (field) { - case TABLE_MAP: - return isSetTableMap(); - case T_SERVER_INFO: - return isSetTServerInfo(); - case BAD_TSERVERS: - return isSetBadTServers(); - case STATE: - return isSetState(); - case GOAL_STATE: - return isSetGoalState(); - case UNASSIGNED_TABLETS: - return isSetUnassignedTablets(); - case SERVERS_SHUTTING_DOWN: - return isSetServersShuttingDown(); - case DEAD_TABLET_SERVERS: - return isSetDeadTabletServers(); - } - throw new java.lang.IllegalStateException(); - } - - @Override - public boolean equals(java.lang.Object that) { - if (that instanceof ManagerMonitorInfo) - return this.equals((ManagerMonitorInfo)that); - return false; - } - - public boolean equals(ManagerMonitorInfo that) { - if (that == null) - return false; - if (this == that) - return true; - - boolean this_present_tableMap = true && this.isSetTableMap(); - boolean that_present_tableMap = true && that.isSetTableMap(); - if (this_present_tableMap || that_present_tableMap) { - if (!(this_present_tableMap && that_present_tableMap)) - return false; - if (!this.tableMap.equals(that.tableMap)) - return false; - } - - boolean this_present_tServerInfo = true && this.isSetTServerInfo(); - boolean that_present_tServerInfo = true && that.isSetTServerInfo(); - if (this_present_tServerInfo || that_present_tServerInfo) { - if (!(this_present_tServerInfo && that_present_tServerInfo)) - return false; - if (!this.tServerInfo.equals(that.tServerInfo)) - return false; - } - - boolean this_present_badTServers = true && this.isSetBadTServers(); - boolean that_present_badTServers = true && that.isSetBadTServers(); - if (this_present_badTServers || that_present_badTServers) { - if (!(this_present_badTServers && that_present_badTServers)) - return false; - if (!this.badTServers.equals(that.badTServers)) - return false; - } - - boolean this_present_state = true && this.isSetState(); - boolean that_present_state = true && that.isSetState(); - if (this_present_state || that_present_state) { - if (!(this_present_state && that_present_state)) - return false; - if (!this.state.equals(that.state)) - return false; - } - - boolean this_present_goalState = true && this.isSetGoalState(); - boolean that_present_goalState = true && that.isSetGoalState(); - if (this_present_goalState || that_present_goalState) { - if (!(this_present_goalState && that_present_goalState)) - return false; - if (!this.goalState.equals(that.goalState)) - return false; - } - - boolean this_present_unassignedTablets = true; - boolean that_present_unassignedTablets = true; - if (this_present_unassignedTablets || that_present_unassignedTablets) { - if (!(this_present_unassignedTablets && that_present_unassignedTablets)) - return false; - if (this.unassignedTablets != that.unassignedTablets) - return false; - } - - boolean this_present_serversShuttingDown = true && this.isSetServersShuttingDown(); - boolean that_present_serversShuttingDown = true && that.isSetServersShuttingDown(); - if (this_present_serversShuttingDown || that_present_serversShuttingDown) { - if (!(this_present_serversShuttingDown && that_present_serversShuttingDown)) - return false; - if (!this.serversShuttingDown.equals(that.serversShuttingDown)) - return false; - } - - boolean this_present_deadTabletServers = true && this.isSetDeadTabletServers(); - boolean that_present_deadTabletServers = true && that.isSetDeadTabletServers(); - if (this_present_deadTabletServers || that_present_deadTabletServers) { - if (!(this_present_deadTabletServers && that_present_deadTabletServers)) - return false; - if (!this.deadTabletServers.equals(that.deadTabletServers)) - return false; - } - - return true; - } - - @Override - public int hashCode() { - int hashCode = 1; - - hashCode = hashCode * 8191 + ((isSetTableMap()) ? 131071 : 524287); - if (isSetTableMap()) - hashCode = hashCode * 8191 + tableMap.hashCode(); - - hashCode = hashCode * 8191 + ((isSetTServerInfo()) ? 131071 : 524287); - if (isSetTServerInfo()) - hashCode = hashCode * 8191 + tServerInfo.hashCode(); - - hashCode = hashCode * 8191 + ((isSetBadTServers()) ? 131071 : 524287); - if (isSetBadTServers()) - hashCode = hashCode * 8191 + badTServers.hashCode(); - - hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287); - if (isSetState()) - hashCode = hashCode * 8191 + state.getValue(); - - hashCode = hashCode * 8191 + ((isSetGoalState()) ? 131071 : 524287); - if (isSetGoalState()) - hashCode = hashCode * 8191 + goalState.getValue(); - - hashCode = hashCode * 8191 + unassignedTablets; - - hashCode = hashCode * 8191 + ((isSetServersShuttingDown()) ? 131071 : 524287); - if (isSetServersShuttingDown()) - hashCode = hashCode * 8191 + serversShuttingDown.hashCode(); - - hashCode = hashCode * 8191 + ((isSetDeadTabletServers()) ? 131071 : 524287); - if (isSetDeadTabletServers()) - hashCode = hashCode * 8191 + deadTabletServers.hashCode(); - - return hashCode; - } - - @Override - public int compareTo(ManagerMonitorInfo other) { - if (!getClass().equals(other.getClass())) { - return getClass().getName().compareTo(other.getClass().getName()); - } - - int lastComparison = 0; - - lastComparison = java.lang.Boolean.compare(isSetTableMap(), other.isSetTableMap()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTableMap()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableMap, other.tableMap); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetTServerInfo(), other.isSetTServerInfo()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTServerInfo()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tServerInfo, other.tServerInfo); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetBadTServers(), other.isSetBadTServers()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetBadTServers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.badTServers, other.badTServers); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, other.state); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetGoalState(), other.isSetGoalState()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetGoalState()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.goalState, other.goalState); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetUnassignedTablets(), other.isSetUnassignedTablets()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetUnassignedTablets()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unassignedTablets, other.unassignedTablets); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetServersShuttingDown(), other.isSetServersShuttingDown()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetServersShuttingDown()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serversShuttingDown, other.serversShuttingDown); - if (lastComparison != 0) { - return lastComparison; - } - } - lastComparison = java.lang.Boolean.compare(isSetDeadTabletServers(), other.isSetDeadTabletServers()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetDeadTabletServers()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadTabletServers, other.deadTabletServers); - if (lastComparison != 0) { - return lastComparison; - } - } - return 0; - } - - @org.apache.thrift.annotation.Nullable - @Override - public _Fields fieldForId(int fieldId) { - return _Fields.findByThriftId(fieldId); - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - scheme(iprot).read(iprot, this); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - scheme(oprot).write(oprot, this); - } - - @Override - public java.lang.String toString() { - java.lang.StringBuilder sb = new java.lang.StringBuilder("ManagerMonitorInfo("); - boolean first = true; - - sb.append("tableMap:"); - if (this.tableMap == null) { - sb.append("null"); - } else { - sb.append(this.tableMap); - } - first = false; - if (!first) sb.append(", "); - sb.append("tServerInfo:"); - if (this.tServerInfo == null) { - sb.append("null"); - } else { - sb.append(this.tServerInfo); - } - first = false; - if (!first) sb.append(", "); - sb.append("badTServers:"); - if (this.badTServers == null) { - sb.append("null"); - } else { - sb.append(this.badTServers); - } - first = false; - if (!first) sb.append(", "); - sb.append("state:"); - if (this.state == null) { - sb.append("null"); - } else { - sb.append(this.state); - } - first = false; - if (!first) sb.append(", "); - sb.append("goalState:"); - if (this.goalState == null) { - sb.append("null"); - } else { - sb.append(this.goalState); - } - first = false; - if (!first) sb.append(", "); - sb.append("unassignedTablets:"); - sb.append(this.unassignedTablets); - first = false; - if (!first) sb.append(", "); - sb.append("serversShuttingDown:"); - if (this.serversShuttingDown == null) { - sb.append("null"); - } else { - sb.append(this.serversShuttingDown); - } - first = false; - if (!first) sb.append(", "); - sb.append("deadTabletServers:"); - if (this.deadTabletServers == null) { - sb.append("null"); - } else { - sb.append(this.deadTabletServers); - } - first = false; - sb.append(")"); - return sb.toString(); - } - - public void validate() throws org.apache.thrift.TException { - // check for required fields - // check for sub-struct validity - } - - private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException { - try { - write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { - try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; - read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); - } catch (org.apache.thrift.TException te) { - throw new java.io.IOException(te); - } - } - - private static class ManagerMonitorInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public ManagerMonitorInfoStandardScheme getScheme() { - return new ManagerMonitorInfoStandardScheme(); - } - } - - private static class ManagerMonitorInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme { - - @Override - public void read(org.apache.thrift.protocol.TProtocol iprot, ManagerMonitorInfo struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TField schemeField; - iprot.readStructBegin(); - while (true) - { - schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { - break; - } - switch (schemeField.id) { - case 1: // TABLE_MAP - if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { - { - org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(); - struct.tableMap = new java.util.HashMap(2*_map26.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key27; - @org.apache.thrift.annotation.Nullable TableInfo _val28; - for (int _i29 = 0; _i29 < _map26.size; ++_i29) - { - _key27 = iprot.readString(); - _val28 = new TableInfo(); - _val28.read(iprot); - struct.tableMap.put(_key27, _val28); - } - iprot.readMapEnd(); - } - struct.setTableMapIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // T_SERVER_INFO - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list30 = iprot.readListBegin(); - struct.tServerInfo = new java.util.ArrayList(_list30.size); - @org.apache.thrift.annotation.Nullable TabletServerStatus _elem31; - for (int _i32 = 0; _i32 < _list30.size; ++_i32) - { - _elem31 = new TabletServerStatus(); - _elem31.read(iprot); - struct.tServerInfo.add(_elem31); - } - iprot.readListEnd(); - } - struct.setTServerInfoIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // BAD_TSERVERS - if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { - { - org.apache.thrift.protocol.TMap _map33 = iprot.readMapBegin(); - struct.badTServers = new java.util.HashMap(2*_map33.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key34; - byte _val35; - for (int _i36 = 0; _i36 < _map33.size; ++_i36) - { - _key34 = iprot.readString(); - _val35 = iprot.readByte(); - struct.badTServers.put(_key34, _val35); - } - iprot.readMapEnd(); - } - struct.setBadTServersIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // STATE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = org.apache.accumulo.core.manager.thrift.ManagerState.findByValue(iprot.readI32()); - struct.setStateIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // GOAL_STATE - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.goalState = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); - struct.setGoalStateIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 6: // UNASSIGNED_TABLETS - if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.unassignedTablets = iprot.readI32(); - struct.setUnassignedTabletsIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 7: // SERVERS_SHUTTING_DOWN - if (schemeField.type == org.apache.thrift.protocol.TType.SET) { - { - org.apache.thrift.protocol.TSet _set37 = iprot.readSetBegin(); - struct.serversShuttingDown = new java.util.HashSet(2*_set37.size); - @org.apache.thrift.annotation.Nullable java.lang.String _elem38; - for (int _i39 = 0; _i39 < _set37.size; ++_i39) - { - _elem38 = iprot.readString(); - struct.serversShuttingDown.add(_elem38); - } - iprot.readSetEnd(); - } - struct.setServersShuttingDownIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 8: // DEAD_TABLET_SERVERS - if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { - { - org.apache.thrift.protocol.TList _list40 = iprot.readListBegin(); - struct.deadTabletServers = new java.util.ArrayList(_list40.size); - @org.apache.thrift.annotation.Nullable DeadServer _elem41; - for (int _i42 = 0; _i42 < _list40.size; ++_i42) - { - _elem41 = new DeadServer(); - _elem41.read(iprot); - struct.deadTabletServers.add(_elem41); - } - iprot.readListEnd(); - } - struct.setDeadTabletServersIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - default: - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - - // check for required fields of primitive type, which can't be checked in the validate method - struct.validate(); - } - - @Override - public void write(org.apache.thrift.protocol.TProtocol oprot, ManagerMonitorInfo struct) throws org.apache.thrift.TException { - struct.validate(); - - oprot.writeStructBegin(STRUCT_DESC); - if (struct.tableMap != null) { - oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC); - { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.tableMap.size())); - for (java.util.Map.Entry _iter43 : struct.tableMap.entrySet()) - { - oprot.writeString(_iter43.getKey()); - _iter43.getValue().write(oprot); - } - oprot.writeMapEnd(); - } - oprot.writeFieldEnd(); - } - if (struct.tServerInfo != null) { - oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.tServerInfo.size())); - for (TabletServerStatus _iter44 : struct.tServerInfo) - { - _iter44.write(oprot); - } - oprot.writeListEnd(); - } - oprot.writeFieldEnd(); - } - if (struct.badTServers != null) { - oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC); - { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, struct.badTServers.size())); - for (java.util.Map.Entry _iter45 : struct.badTServers.entrySet()) - { - oprot.writeString(_iter45.getKey()); - oprot.writeByte(_iter45.getValue()); - } - oprot.writeMapEnd(); - } - oprot.writeFieldEnd(); - } - if (struct.state != null) { - oprot.writeFieldBegin(STATE_FIELD_DESC); - oprot.writeI32(struct.state.getValue()); - oprot.writeFieldEnd(); - } - if (struct.goalState != null) { - oprot.writeFieldBegin(GOAL_STATE_FIELD_DESC); - oprot.writeI32(struct.goalState.getValue()); - oprot.writeFieldEnd(); - } - oprot.writeFieldBegin(UNASSIGNED_TABLETS_FIELD_DESC); - oprot.writeI32(struct.unassignedTablets); - oprot.writeFieldEnd(); - if (struct.serversShuttingDown != null) { - oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC); - { - oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.serversShuttingDown.size())); - for (java.lang.String _iter46 : struct.serversShuttingDown) - { - oprot.writeString(_iter46); - } - oprot.writeSetEnd(); - } - oprot.writeFieldEnd(); - } - if (struct.deadTabletServers != null) { - oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC); - { - oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.deadTabletServers.size())); - for (DeadServer _iter47 : struct.deadTabletServers) - { - _iter47.write(oprot); - } - oprot.writeListEnd(); - } - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - } - - private static class ManagerMonitorInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { - @Override - public ManagerMonitorInfoTupleScheme getScheme() { - return new ManagerMonitorInfoTupleScheme(); - } - } - - private static class ManagerMonitorInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme { - - @Override - public void write(org.apache.thrift.protocol.TProtocol prot, ManagerMonitorInfo struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetTableMap()) { - optionals.set(0); - } - if (struct.isSetTServerInfo()) { - optionals.set(1); - } - if (struct.isSetBadTServers()) { - optionals.set(2); - } - if (struct.isSetState()) { - optionals.set(3); - } - if (struct.isSetGoalState()) { - optionals.set(4); - } - if (struct.isSetUnassignedTablets()) { - optionals.set(5); - } - if (struct.isSetServersShuttingDown()) { - optionals.set(6); - } - if (struct.isSetDeadTabletServers()) { - optionals.set(7); - } - oprot.writeBitSet(optionals, 8); - if (struct.isSetTableMap()) { - { - oprot.writeI32(struct.tableMap.size()); - for (java.util.Map.Entry _iter48 : struct.tableMap.entrySet()) - { - oprot.writeString(_iter48.getKey()); - _iter48.getValue().write(oprot); - } - } - } - if (struct.isSetTServerInfo()) { - { - oprot.writeI32(struct.tServerInfo.size()); - for (TabletServerStatus _iter49 : struct.tServerInfo) - { - _iter49.write(oprot); - } - } - } - if (struct.isSetBadTServers()) { - { - oprot.writeI32(struct.badTServers.size()); - for (java.util.Map.Entry _iter50 : struct.badTServers.entrySet()) - { - oprot.writeString(_iter50.getKey()); - oprot.writeByte(_iter50.getValue()); - } - } - } - if (struct.isSetState()) { - oprot.writeI32(struct.state.getValue()); - } - if (struct.isSetGoalState()) { - oprot.writeI32(struct.goalState.getValue()); - } - if (struct.isSetUnassignedTablets()) { - oprot.writeI32(struct.unassignedTablets); - } - if (struct.isSetServersShuttingDown()) { - { - oprot.writeI32(struct.serversShuttingDown.size()); - for (java.lang.String _iter51 : struct.serversShuttingDown) - { - oprot.writeString(_iter51); - } - } - } - if (struct.isSetDeadTabletServers()) { - { - oprot.writeI32(struct.deadTabletServers.size()); - for (DeadServer _iter52 : struct.deadTabletServers) - { - _iter52.write(oprot); - } - } - } - } - - @Override - public void read(org.apache.thrift.protocol.TProtocol prot, ManagerMonitorInfo struct) throws org.apache.thrift.TException { - org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(8); - if (incoming.get(0)) { - { - org.apache.thrift.protocol.TMap _map53 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); - struct.tableMap = new java.util.HashMap(2*_map53.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key54; - @org.apache.thrift.annotation.Nullable TableInfo _val55; - for (int _i56 = 0; _i56 < _map53.size; ++_i56) - { - _key54 = iprot.readString(); - _val55 = new TableInfo(); - _val55.read(iprot); - struct.tableMap.put(_key54, _val55); - } - } - struct.setTableMapIsSet(true); - } - if (incoming.get(1)) { - { - org.apache.thrift.protocol.TList _list57 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.tServerInfo = new java.util.ArrayList(_list57.size); - @org.apache.thrift.annotation.Nullable TabletServerStatus _elem58; - for (int _i59 = 0; _i59 < _list57.size; ++_i59) - { - _elem58 = new TabletServerStatus(); - _elem58.read(iprot); - struct.tServerInfo.add(_elem58); - } - } - struct.setTServerInfoIsSet(true); - } - if (incoming.get(2)) { - { - org.apache.thrift.protocol.TMap _map60 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE); - struct.badTServers = new java.util.HashMap(2*_map60.size); - @org.apache.thrift.annotation.Nullable java.lang.String _key61; - byte _val62; - for (int _i63 = 0; _i63 < _map60.size; ++_i63) - { - _key61 = iprot.readString(); - _val62 = iprot.readByte(); - struct.badTServers.put(_key61, _val62); - } - } - struct.setBadTServersIsSet(true); - } - if (incoming.get(3)) { - struct.state = org.apache.accumulo.core.manager.thrift.ManagerState.findByValue(iprot.readI32()); - struct.setStateIsSet(true); - } - if (incoming.get(4)) { - struct.goalState = org.apache.accumulo.core.manager.thrift.ManagerGoalState.findByValue(iprot.readI32()); - struct.setGoalStateIsSet(true); - } - if (incoming.get(5)) { - struct.unassignedTablets = iprot.readI32(); - struct.setUnassignedTabletsIsSet(true); - } - if (incoming.get(6)) { - { - org.apache.thrift.protocol.TSet _set64 = iprot.readSetBegin(org.apache.thrift.protocol.TType.STRING); - struct.serversShuttingDown = new java.util.HashSet(2*_set64.size); - @org.apache.thrift.annotation.Nullable java.lang.String _elem65; - for (int _i66 = 0; _i66 < _set64.size; ++_i66) - { - _elem65 = iprot.readString(); - struct.serversShuttingDown.add(_elem65); - } - } - struct.setServersShuttingDownIsSet(true); - } - if (incoming.get(7)) { - { - org.apache.thrift.protocol.TList _list67 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.deadTabletServers = new java.util.ArrayList(_list67.size); - @org.apache.thrift.annotation.Nullable DeadServer _elem68; - for (int _i69 = 0; _i69 < _list67.size; ++_i69) - { - _elem68 = new DeadServer(); - _elem68.read(iprot); - struct.deadTabletServers.add(_elem68); - } - } - struct.setDeadTabletServersIsSet(true); - } - } - } - - private static S scheme(org.apache.thrift.protocol.TProtocol proto) { - return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); - } - private static void unusedMethod() {} -} - diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFatePartitions.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFatePartitions.java index 477b52ad855..754bbe60297 100644 --- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFatePartitions.java +++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFatePartitions.java @@ -441,14 +441,14 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, TFatePartitions str case 2: // PARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list70 = iprot.readListBegin(); - struct.partitions = new java.util.ArrayList(_list70.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem71; - for (int _i72 = 0; _i72 < _list70.size; ++_i72) + org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); + struct.partitions = new java.util.ArrayList(_list26.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem27; + for (int _i28 = 0; _i28 < _list26.size; ++_i28) { - _elem71 = new TFatePartition(); - _elem71.read(iprot); - struct.partitions.add(_elem71); + _elem27 = new TFatePartition(); + _elem27.read(iprot); + struct.partitions.add(_elem27); } iprot.readListEnd(); } @@ -480,9 +480,9 @@ public void write(org.apache.thrift.protocol.TProtocol oprot, TFatePartitions st oprot.writeFieldBegin(PARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitions.size())); - for (TFatePartition _iter73 : struct.partitions) + for (TFatePartition _iter29 : struct.partitions) { - _iter73.write(oprot); + _iter29.write(oprot); } oprot.writeListEnd(); } @@ -520,9 +520,9 @@ public void write(org.apache.thrift.protocol.TProtocol prot, TFatePartitions str if (struct.isSetPartitions()) { { oprot.writeI32(struct.partitions.size()); - for (TFatePartition _iter74 : struct.partitions) + for (TFatePartition _iter30 : struct.partitions) { - _iter74.write(oprot); + _iter30.write(oprot); } } } @@ -538,14 +538,14 @@ public void read(org.apache.thrift.protocol.TProtocol prot, TFatePartitions stru } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list75 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); - struct.partitions = new java.util.ArrayList(_list75.size); - @org.apache.thrift.annotation.Nullable TFatePartition _elem76; - for (int _i77 = 0; _i77 < _list75.size; ++_i77) + org.apache.thrift.protocol.TList _list31 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT); + struct.partitions = new java.util.ArrayList(_list31.size); + @org.apache.thrift.annotation.Nullable TFatePartition _elem32; + for (int _i33 = 0; _i33 < _list31.size; ++_i33) { - _elem76 = new TFatePartition(); - _elem76.read(iprot); - struct.partitions.add(_elem76); + _elem32 = new TFatePartition(); + _elem32.read(iprot); + struct.partitions.add(_elem32); } } struct.setPartitionsIsSet(true); diff --git a/core/src/main/thrift/manager.thrift b/core/src/main/thrift/manager.thrift index 7b9cbfd87aa..ba5b306df55 100644 --- a/core/src/main/thrift/manager.thrift +++ b/core/src/main/thrift/manager.thrift @@ -23,13 +23,6 @@ include "data.thrift" include "security.thrift" include "client.thrift" -struct DeadServer { - 1:string server - 2:i64 lastStatus - 3:string status - 4:string resourceGroup -} - struct TabletSplit { 1:data.TKeyExtent oldTablet 2:list newTablets @@ -131,17 +124,6 @@ struct TabletServerStatus { 18:i64 responseTime } -struct ManagerMonitorInfo { - 1:map tableMap - 2:list tServerInfo - 3:map badTServers - 4:ManagerState state - 5:ManagerGoalState goalState - 6:i32 unassignedTablets - 7:set serversShuttingDown - 8:list deadTabletServers -} - enum TFateInstanceType { META USER @@ -451,16 +433,6 @@ service ManagerClientService { 3:client.ThriftResourceGroupNotExistsException rgne ) - - // system monitoring methods - ManagerMonitorInfo getManagerStats( - 1:client.TInfo tinfo - 2:security.TCredentials credentials - ) throws ( - 1:client.ThriftSecurityException sec - 2:client.ThriftNotActiveServiceException tnase - ) - void waitForBalance( 1:client.TInfo tinfo ) throws ( diff --git a/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java b/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java index c4043e5fb4e..bb296f36f1f 100644 --- a/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java +++ b/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java @@ -19,7 +19,6 @@ package org.apache.accumulo.core.lock; import static org.apache.accumulo.core.Constants.ZCOMPACTORS; -import static org.apache.accumulo.core.Constants.ZDEADTSERVERS; import static org.apache.accumulo.core.Constants.ZGC_LOCK; import static org.apache.accumulo.core.Constants.ZMANAGER_LOCK; import static org.apache.accumulo.core.Constants.ZMINI_LOCK; @@ -122,15 +121,6 @@ public void testPathGeneration() { assertEquals(ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME, slp.toString()); - assertThrows(NullPointerException.class, () -> paths.createDeadTabletServerPath(null, null)); - assertThrows(NullPointerException.class, - () -> paths.createDeadTabletServerPath(TEST_RESOURCE_GROUP, null)); - slp = paths.createDeadTabletServerPath(TEST_RESOURCE_GROUP, hp); - assertEquals(HOSTNAME, slp.getServer()); - assertEquals(TEST_RESOURCE_GROUP, slp.getResourceGroup()); - assertEquals(ZDEADTSERVERS, slp.getType()); - assertEquals(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp.toString()); - assertThrows(NullPointerException.class, () -> paths.createScanServerPath(null, null)); assertThrows(NullPointerException.class, () -> paths.createScanServerPath(TEST_RESOURCE_GROUP, null)); @@ -699,122 +689,6 @@ public void testGetTabletServers() { assertEquals(0, results.size()); } - @Test - public void testGetDeadTabletServersNone() { - expect(zc.getChildren(ZDEADTSERVERS)).andReturn(List.of()).anyTimes(); - replay(zc); - - assertThrows(NullPointerException.class, () -> paths.getDeadTabletServer(null, null, false)); - assertThrows(NullPointerException.class, () -> paths - .getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), null, false)); - assertTrue(paths.getDeadTabletServer(ResourceGroupPredicate.ANY, AddressSelector.all(), false) - .isEmpty()); - assertTrue(paths.getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), - AddressSelector.all(), false).isEmpty()); - assertTrue(paths.getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), - AddressSelector.exact(hp), false).isEmpty()); - } - - @Test - public void testGetDeadTabletServers() { - UUID uuid = UUID.randomUUID(); - String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001"; - String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002"; - var sld1 = new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP); - var sld2 = - new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, ResourceGroupId.DEFAULT); - - expect(zc.getChildren(ZDEADTSERVERS)) - .andReturn(List.of(TEST_RESOURCE_GROUP.canonical(), ResourceGroupId.DEFAULT.canonical())) - .anyTimes(); - expect(zc.getChildren(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical())) - .andReturn(List.of(HOSTNAME)).anyTimes(); - expect(zc.getChildren(ZDEADTSERVERS + "/" + ResourceGroupId.DEFAULT.canonical())) - .andReturn(List.of(HOSTNAME)).anyTimes(); - expect(zc.getChildren(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME)) - .andReturn(List.of(svcLock1, svcLock2)).anyTimes(); - expect(zc.get(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME)) - .andReturn(new byte[0]).anyTimes(); - expect( - zc.getChildren(ZDEADTSERVERS + "/" + ResourceGroupId.DEFAULT.canonical() + "/" + HOSTNAME)) - .andReturn(List.of(svcLock1, svcLock2)).anyTimes(); - expect(zc.get(EasyMock.eq( - ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME + "/" + svcLock1), - EasyMock.isA(ZcStat.class))).andReturn(sld1.serialize()).anyTimes(); - expect(zc.get(EasyMock.eq(ZDEADTSERVERS + "/" + ResourceGroupId.DEFAULT.canonical() + "/" - + HOSTNAME + "/" + svcLock1), EasyMock.isA(ZcStat.class))).andReturn(sld2.serialize()) - .anyTimes(); - - expect(zc.get(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/localhost:1234")) - .andReturn(null).anyTimes(); - replay(zc); - - // query for all - Set results = - paths.getDeadTabletServer(ResourceGroupPredicate.ANY, AddressSelector.all(), false); - assertEquals(2, results.size()); - Iterator iter = results.iterator(); - var slp1 = iter.next(); - assertEquals(HOSTNAME, slp1.getServer()); - assertEquals(ZDEADTSERVERS, slp1.getType()); - if (slp1.getResourceGroup().equals(TEST_RESOURCE_GROUP)) { - assertEquals(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME, - slp1.toString()); - } else if (slp1.getResourceGroup().equals(ResourceGroupId.DEFAULT)) { - assertEquals(ZDEADTSERVERS + "/" + ResourceGroupId.DEFAULT.canonical() + "/" + HOSTNAME, - slp1.toString()); - } else { - fail("wrong resource group"); - } - var slp2 = iter.next(); - assertEquals(HOSTNAME, slp2.getServer()); - assertEquals(ZDEADTSERVERS, slp2.getType()); - if (slp2.getResourceGroup().equals(TEST_RESOURCE_GROUP)) { - assertEquals(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME, - slp2.toString()); - } else if (slp2.getResourceGroup().equals(ResourceGroupId.DEFAULT)) { - assertEquals(ZDEADTSERVERS + "/" + ResourceGroupId.DEFAULT.canonical() + "/" + HOSTNAME, - slp2.toString()); - } else { - fail("wrong resource group"); - } - - // query for all in non-existent resource group - results = paths.getDeadTabletServer( - ResourceGroupPredicate.exact(ResourceGroupId.of("FAKE_RESOURCE_GROUP")), - AddressSelector.all(), false); - assertEquals(0, results.size()); - - // query for all in test resource group - results = paths.getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), - AddressSelector.all(), false); - assertEquals(1, results.size()); - iter = results.iterator(); - slp1 = iter.next(); - assertEquals(HOSTNAME, slp1.getServer()); - assertEquals(ZDEADTSERVERS, slp1.getType()); - assertEquals(TEST_RESOURCE_GROUP, slp1.getResourceGroup()); - assertEquals(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME, - slp1.toString()); - - // query for a specific server - results = paths.getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), - AddressSelector.exact(hp), false); - assertEquals(1, results.size()); - iter = results.iterator(); - slp1 = iter.next(); - assertEquals(HOSTNAME, slp1.getServer()); - assertEquals(ZDEADTSERVERS, slp1.getType()); - assertEquals(TEST_RESOURCE_GROUP, slp1.getResourceGroup()); - assertEquals(ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP.canonical() + "/" + HOSTNAME, - slp1.toString()); - - // query for a wrong server - results = paths.getDeadTabletServer(ResourceGroupPredicate.exact(TEST_RESOURCE_GROUP), - AddressSelector.exact(HostAndPort.fromString("localhost:1234")), false); - assertEquals(0, results.size()); - } - @Test public void testTableLocksPath() { replay(zc); diff --git a/minicluster/pom.xml b/minicluster/pom.xml index f8c86b0e2f1..87a4c0c964d 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -91,10 +91,6 @@ hadoop-client-minicluster true - - org.apache.thrift - libthrift - org.apache.zookeeper zookeeper diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java index 197661a7b35..3bad1f894c1 100644 --- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java @@ -63,8 +63,6 @@ import org.apache.accumulo.cluster.AccumuloCluster; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.core.client.AccumuloException; -import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.clientImpl.ClientContext; @@ -89,12 +87,9 @@ import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.spi.common.ServiceEnvironment; import org.apache.accumulo.core.spi.compaction.CompactionPlanner; import org.apache.accumulo.core.spi.compaction.CompactionServiceId; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.core.util.ConfigurationImpl; import org.apache.accumulo.core.util.CountDownTimer; import org.apache.accumulo.core.util.Pair; @@ -1182,22 +1177,6 @@ public int stopProcessWithTimeout(final Process proc, long timeout, TimeUnit uni return future.get(timeout, unit); } - /** - * Get programmatic interface to information available in a normal monitor. XXX the returned - * structure won't contain information about the metadata table until there is data in it. e.g. if - * you want to see the metadata table you should create a table. - * - * @since 1.6.1 - */ - public ManagerMonitorInfo getManagerMonitorInfo() - throws AccumuloException, AccumuloSecurityException { - try (AccumuloClient c = Accumulo.newClient().from(clientProperties.get()).build()) { - ClientContext context = (ClientContext) c; - return ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds())); - } - } - public MiniDFSCluster getMiniDfs() { return this.miniDFS.get(); } diff --git a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java index ffd41f37ab7..306bab85444 100644 --- a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java +++ b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java @@ -18,24 +18,17 @@ */ package org.apache.accumulo.miniclusterImpl; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.nio.file.Path; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import java.util.Map; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.ManagerState; -import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.minicluster.ServerType; import org.junit.jupiter.api.AfterAll; @@ -59,7 +52,6 @@ public class MiniAccumuloClusterImplTest { private static final int NUM_TSERVERS = 2; private static String TEST_TABLE = "test"; - private static String testTableID; @BeforeAll public static void setupMiniCluster() throws Exception { @@ -73,7 +65,6 @@ public static void setupMiniCluster() throws Exception { AccumuloClient client = accumulo.createAccumuloClient("root", new PasswordToken("superSecret")); TableOperations tableops = client.tableOperations(); tableops.create(TEST_TABLE); - testTableID = tableops.tableIdMap().get(TEST_TABLE); Scanner s = client.createScanner(TEST_TABLE, Authorizations.EMPTY); Iterators.size(s.iterator()); @@ -98,42 +89,6 @@ public void testAccurateProcessListReturned() throws Exception { } } - @Test - @Timeout(60) - public void saneMonitorInfo() throws Exception { - ManagerMonitorInfo stats; - // Expecting default AccumuloTables + TEST_TABLE - int expectedNumTables = SystemTables.values().length + 1; - while (true) { - stats = accumulo.getManagerMonitorInfo(); - if (stats.tableMap.size() < expectedNumTables) { - continue; - } - - if (null != stats.tServerInfo && stats.tServerInfo.size() == NUM_TSERVERS) { - break; - } - } - List validStates = Arrays.asList(ManagerState.values()); - List validGoals = Arrays.asList(ManagerGoalState.values()); - assertTrue(validStates.contains(stats.state), "manager state should be valid."); - assertTrue(validGoals.contains(stats.goalState), - "manager goal state should be in " + validGoals + ". is " + stats.goalState); - assertNotNull(stats.tableMap, "should have a table map."); - assertTrue(stats.tableMap.containsKey(SystemTables.ROOT.tableId().canonical()), - "root table should exist in " + stats.tableMap.keySet()); - assertTrue(stats.tableMap.containsKey(SystemTables.METADATA.tableId().canonical()), - "meta table should exist in " + stats.tableMap.keySet()); - assertTrue(stats.tableMap.containsKey(SystemTables.FATE.tableId().canonical()), - "fate table should exist in " + stats.tableMap.keySet()); - assertTrue(stats.tableMap.containsKey(SystemTables.SCAN_REF.tableId().canonical()), - "scan ref table should exist in " + stats.tableMap.keySet()); - assertTrue(stats.tableMap.containsKey(testTableID), - "our test table should exist in " + stats.tableMap.keySet()); - assertNotNull(stats.tServerInfo, "there should be tservers."); - assertEquals(NUM_TSERVERS, stats.tServerInfo.size()); - } - @AfterAll public static void tearDownMiniCluster() throws Exception { accumulo.stop(); diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java deleted file mode 100644 index 03e2a74c88d..00000000000 --- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.server.manager.state; - -import static java.nio.charset.StandardCharsets.UTF_8; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import org.apache.accumulo.core.Constants; -import org.apache.accumulo.core.data.ResourceGroupId; -import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter; -import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy; -import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy; -import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector; -import org.apache.accumulo.core.lock.ServiceLockPaths.ResourceGroupPredicate; -import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath; -import org.apache.accumulo.core.manager.thrift.DeadServer; -import org.apache.accumulo.server.ServerContext; -import org.apache.zookeeper.KeeperException.NoNodeException; -import org.apache.zookeeper.data.Stat; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.net.HostAndPort; - -public class DeadServerList { - - private static final Logger log = LoggerFactory.getLogger(DeadServerList.class); - - // ELASTICITY_TODO See if we can get the ResourceGroup from the Monitor - // and replace the "UNKNOWN" value with the ResourceGroup - private static final ResourceGroupId RESOURCE_GROUP = ResourceGroupId.of("UNKNOWN"); - private final ServerContext ctx; - private final ZooReaderWriter zoo; - private static final String path = Constants.ZDEADTSERVERS + "/" + RESOURCE_GROUP.canonical(); - - public DeadServerList(ServerContext context) { - this.ctx = context; - this.zoo = context.getZooSession().asReaderWriter(); - try { - zoo.mkdirs(path); - } catch (Exception ex) { - log.error("Unable to make parent directories of " + path, ex); - } - - } - - public List getList() { - List result = new ArrayList<>(); - try { - Set deadServers = ctx.getServerPaths() - .getDeadTabletServer(ResourceGroupPredicate.ANY, AddressSelector.all(), false); - for (ServiceLockPath path : deadServers) { - Stat stat = new Stat(); - byte[] data; - try { - data = zoo.getData(path.toString(), stat); - } catch (NoNodeException nne) { - // Another thread or process can delete child while this loop is running. - // We ignore this error since it's harmless if we miss the deleted server - // in the dead server list. - continue; - } - DeadServer server = new DeadServer(path.getServer(), stat.getMtime(), - new String(data, UTF_8), path.getResourceGroup().canonical()); - result.add(server); - } - } catch (Exception ex) { - log.error("{}", ex.getMessage(), ex); - } - return result; - } - - public void delete(String server) { - try { - zoo.recursiveDelete(ctx.getServerPaths() - .createDeadTabletServerPath(RESOURCE_GROUP, HostAndPort.fromString(server)).toString(), - NodeMissingPolicy.SKIP); - } catch (Exception ex) { - log.error("delete failed with exception", ex); - } - } - - public void post(String server, String cause) { - try { - zoo.putPersistentData(ctx.getServerPaths() - .createDeadTabletServerPath(RESOURCE_GROUP, HostAndPort.fromString(server)).toString(), - cause.getBytes(UTF_8), NodeExistsPolicy.SKIP); - } catch (Exception ex) { - log.error("post failed with exception", ex); - } - } -} diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java deleted file mode 100644 index 412debf9ec5..00000000000 --- a/server/base/src/main/java/org/apache/accumulo/server/util/TableInfoUtil.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.server.util; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.accumulo.core.manager.thrift.Compacting; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; - -public class TableInfoUtil { - - public static void add(TableInfo total, TableInfo more) { - if (total.minors == null) { - total.minors = new Compacting(); - } - if (total.scans == null) { - total.scans = new Compacting(); - } - if (more.minors != null) { - total.minors.running += more.minors.running; - total.minors.queued += more.minors.queued; - } - if (more.scans != null) { - total.scans.running += more.scans.running; - total.scans.queued += more.scans.queued; - } - total.onlineTablets += more.onlineTablets; - total.recs += more.recs; - total.recsInMemory += more.recsInMemory; - total.tablets += more.tablets; - total.ingestRate += more.ingestRate; - total.ingestByteRate += more.ingestByteRate; - total.queryRate += more.queryRate; - total.queryByteRate += more.queryByteRate; - total.scanRate += more.scanRate; - } - - public static TableInfo summarizeTableStats(TabletServerStatus status) { - TableInfo summary = new TableInfo(); - summary.minors = new Compacting(); - summary.scans = new Compacting(); - for (TableInfo rates : status.tableMap.values()) { - TableInfoUtil.add(summary, rates); - } - return summary; - } - - public static Map summarizeTableStats(ManagerMonitorInfo mmi) { - Map compactingByTable = new HashMap<>(); - if (mmi != null && mmi.tServerInfo != null) { - for (TabletServerStatus status : mmi.tServerInfo) { - if (status != null && status.tableMap != null) { - for (String table : status.tableMap.keySet()) { - Double holdTime = compactingByTable.get(table); - compactingByTable.put(table, - Math.max(holdTime == null ? 0. : holdTime, status.holdTime)); - } - } - } - } - return compactingByTable; - } - -} diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java index 659e2a42141..cc5cc9154df 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java @@ -99,9 +99,7 @@ import org.apache.accumulo.core.manager.thrift.FateService; import org.apache.accumulo.core.manager.thrift.ManagerClientService; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; import org.apache.accumulo.core.manager.thrift.ManagerState; -import org.apache.accumulo.core.manager.thrift.TableInfo; import org.apache.accumulo.core.manager.thrift.TabletServerStatus; import org.apache.accumulo.core.metadata.SystemTables; import org.apache.accumulo.core.metadata.TServerInstance; @@ -138,8 +136,6 @@ import org.apache.accumulo.server.manager.LiveTServerSet; import org.apache.accumulo.server.manager.LiveTServerSet.LiveTServersSnapshot; import org.apache.accumulo.server.manager.LiveTServerSet.TServerConnection; -import org.apache.accumulo.server.manager.state.DeadServerList; -import org.apache.accumulo.server.manager.state.TabletServerState; import org.apache.accumulo.server.manager.state.TabletStateStore; import org.apache.accumulo.server.rpc.PrimaryManagerThriftServiceWrapper; import org.apache.accumulo.server.rpc.TServerUtils; @@ -148,7 +144,6 @@ import org.apache.accumulo.server.security.delegation.ZooAuthenticationKeyDistributor; import org.apache.accumulo.server.tables.TableManager; import org.apache.accumulo.server.util.ScanServerMetadataEntries; -import org.apache.accumulo.server.util.TableInfoUtil; import org.apache.thrift.TException; import org.apache.thrift.transport.TTransportException; import org.apache.zookeeper.KeeperException; @@ -1538,12 +1533,8 @@ public void update(LiveTServerSet current, Set deleted, // if we have deleted or added tservers, then adjust our dead server list if (!deleted.isEmpty() || !added.isEmpty()) { - DeadServerList obit = new DeadServerList(getContext()); if (!added.isEmpty()) { log.info("New servers: {}", added); - for (TServerInstance up : added) { - obit.delete(up.getHostPort()); - } } if (!deleted.isEmpty()) { @@ -1554,9 +1545,6 @@ public void update(LiveTServerSet current, Set deleted, if (serversToShutdown.contains(dead)) { cause = "clean shutdown"; // maybe an incorrect assumption } - if (!getManagerGoalState().equals(ManagerGoalState.CLEAN_STOP)) { - obit.post(dead.getHostPort(), cause); - } } Set unexpected = new HashSet<>(deleted); @@ -1637,36 +1625,6 @@ public void assignedTablet(KeyExtent extent) { } } - public ManagerMonitorInfo getManagerMonitorInfo() { - final ManagerMonitorInfo result = new ManagerMonitorInfo(); - - result.tServerInfo = new ArrayList<>(); - result.tableMap = new HashMap<>(); - for (Entry serverEntry : getTserverStatus().status - .entrySet()) { - final TabletServerStatus status = serverEntry.getValue(); - result.tServerInfo.add(status); - for (Entry entry : status.tableMap.entrySet()) { - TableInfoUtil.add(result.tableMap.computeIfAbsent(entry.getKey(), k -> new TableInfo()), - entry.getValue()); - } - } - result.badTServers = new HashMap<>(); - synchronized (badServers) { - for (TServerInstance bad : badServers.keySet()) { - result.badTServers.put(bad.getHostPort(), TabletServerState.UNRESPONSIVE.getId()); - } - } - result.state = getManagerState(); - result.goalState = getManagerGoalState(); - result.unassignedTablets = displayUnassigned(); - result.serversShuttingDown = - shutdownServers().stream().map(TServerInstance::getHostPort).collect(Collectors.toSet()); - DeadServerList obit = new DeadServerList(getContext()); - result.deadTabletServers = obit.getList(); - return result; - } - /** * Can delegation tokens be generated for users */ diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java index d88a94516d6..3784311ab19 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java @@ -70,7 +70,6 @@ import org.apache.accumulo.core.manager.state.tables.TableState; import org.apache.accumulo.core.manager.thrift.ManagerClientService; import org.apache.accumulo.core.manager.thrift.ManagerGoalState; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; import org.apache.accumulo.core.manager.thrift.ManagerState; import org.apache.accumulo.core.manager.thrift.TEvent; import org.apache.accumulo.core.manager.thrift.TTabletMergeability; @@ -247,11 +246,6 @@ private NamespaceId getNamespaceIdFromTableId(TableOperation tableOp, TableId ta return namespaceId; } - @Override - public ManagerMonitorInfo getManagerStats(TInfo info, TCredentials credentials) { - return manager.getManagerMonitorInfo(); - } - @Override public void removeTableProperty(TInfo info, TCredentials credentials, String tableName, String property) diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java index 6858ce5e929..1350669997f 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java @@ -18,7 +18,6 @@ */ package org.apache.accumulo.manager.tserverOps; -import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.accumulo.core.util.LazySingletons.GSON; import static org.apache.accumulo.manager.tserverOps.BeginTserverShutdown.createPath; @@ -26,7 +25,6 @@ import org.apache.accumulo.core.fate.FateId; import org.apache.accumulo.core.fate.Repo; import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter; -import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.core.lock.ServiceLock; import org.apache.accumulo.core.manager.thrift.TabletServerStatus; import org.apache.accumulo.core.metadata.TServerInstance; @@ -113,10 +111,6 @@ public Repo call(FateId fateId, FateEnv env) throws Exception { var path = env.getContext().getServerPaths().createTabletServerPath(resourceGroup, hostAndPort); ServiceLock.deleteLock(zoo, path); - path = - env.getContext().getServerPaths().createDeadTabletServerPath(resourceGroup, hostAndPort); - zoo.putPersistentData(path.toString(), "forced down".getBytes(UTF_8), - NodeExistsPolicy.OVERWRITE); } else { String path = createPath(hostAndPort, serverSession); env.getContext().getZooSession().asReaderWriter().delete(path); diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java index f88a9d59c4d..d13ca3c016d 100644 --- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java +++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java @@ -198,6 +198,7 @@ public static String getRowPrefix() { } private static final Logger LOG = LoggerFactory.getLogger(Upgrader11to12.class); + private static final String ZDEADTSERVERS = Constants.ZDEAD + "/tservers"; private static final String ZPROBLEMS = "/problems"; private static final String ZTRACERS = "/tracers"; private static final String ZTABLE_COMPACT_ID = "/compact-id"; @@ -474,6 +475,7 @@ private void removeUnusedZKNodes(ServerContext context) { zrw.recursiveDelete(ZCOORDINATOR, ZooUtil.NodeMissingPolicy.SKIP); zrw.recursiveDelete("/" + BULK_ARBITRATOR_TYPE, ZooUtil.NodeMissingPolicy.SKIP); + zrw.recursiveDelete(ZDEADTSERVERS, ZooUtil.NodeMissingPolicy.SKIP); final String ZTABLE_COMPACT_ID = "/compact-id"; final String ZTABLE_COMPACT_CANCEL_ID = "/compact-cancel-id"; @@ -578,7 +580,7 @@ private void validateEmptyZKWorkerServerPaths(ServerContext context) { // should be started first before any other process. final ZooReader zr = context.getZooSession().asReader(); for (String serverPath : new String[] {Constants.ZCOMPACTORS, Constants.ZSSERVERS, - Constants.ZTSERVERS, Constants.ZDEADTSERVERS}) { + Constants.ZTSERVERS, ZDEADTSERVERS}) { try { List children = zr.getChildren(serverPath); for (String child : children) { diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java index 9e53765c026..dc5516438c4 100644 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java +++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java @@ -20,28 +20,13 @@ import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly; import static java.nio.charset.StandardCharsets.UTF_8; -import static java.util.concurrent.TimeUnit.MINUTES; -import static org.apache.accumulo.core.client.admin.servers.ServerId.Type.SCAN_SERVER; -import static org.apache.accumulo.core.client.admin.servers.ServerId.Type.TABLET_SERVER; import java.net.InetAddress; import java.net.URI; import java.net.UnknownHostException; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; import java.util.UUID; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Supplier; import jakarta.inject.Singleton; @@ -53,30 +38,15 @@ import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter; import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy; import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy; -import org.apache.accumulo.core.gc.thrift.GCMonitorService; -import org.apache.accumulo.core.gc.thrift.GCStatus; import org.apache.accumulo.core.lock.ServiceLock; import org.apache.accumulo.core.lock.ServiceLockData; import org.apache.accumulo.core.lock.ServiceLockData.ThriftService; import org.apache.accumulo.core.lock.ServiceLockSupport.HAServiceLockWatcher; -import org.apache.accumulo.core.manager.thrift.ManagerClientService; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; import org.apache.accumulo.core.metrics.MetricsInfo; -import org.apache.accumulo.core.rpc.ThriftUtil; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.tabletscan.thrift.ActiveScan; -import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService; -import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction; -import org.apache.accumulo.core.tabletserver.thrift.TabletServerClientService.Client; -import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.core.util.Pair; import org.apache.accumulo.core.util.threads.Threads; import org.apache.accumulo.monitor.next.InformationFetcher; import org.apache.accumulo.server.AbstractServer; import org.apache.accumulo.server.ServerContext; -import org.apache.accumulo.server.util.TableInfoUtil; import org.apache.zookeeper.KeeperException; import org.eclipse.jetty.ee10.servlet.ResourceServlet; import org.eclipse.jetty.ee10.servlet.ServletHolder; @@ -94,7 +64,6 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -import com.google.common.base.Suppliers; import com.google.common.net.HostAndPort; /** @@ -103,9 +72,6 @@ public class Monitor extends AbstractServer implements Connection.Listener { private static final Logger log = LoggerFactory.getLogger(Monitor.class); - private static final int REFRESH_TIME = 5; - - private final long START_TIME; public static void main(String[] args) throws Exception { AbstractServer.startServer(new Monitor(new ServerOpts(), args), log); @@ -113,235 +79,18 @@ public static void main(String[] args) throws Exception { Monitor(ServerOpts opts, String[] args) { super(ServerId.Type.MONITOR, opts, ServerContext::new, args); - START_TIME = System.currentTimeMillis(); this.connStats = new ConnectionStatistics(); this.fetcher = new InformationFetcher(getContext(), connStats::getConnections); } private final ConnectionStatistics connStats; private final InformationFetcher fetcher; - private final AtomicLong lastRecalc = new AtomicLong(0L); - private double totalIngestRate = 0.0; - private double totalQueryRate = 0.0; - private double totalScanRate = 0.0; - private long totalEntries = 0L; - private int totalTabletCount = 0; - private long totalHoldTime = 0; - private long totalLookups = 0; - private int totalTables = 0; - - private EventCounter lookupRateTracker = new EventCounter(); - private EventCounter indexCacheHitTracker = new EventCounter(); - private EventCounter indexCacheRequestTracker = new EventCounter(); - private EventCounter dataCacheHitTracker = new EventCounter(); - private EventCounter dataCacheRequestTracker = new EventCounter(); - - private final AtomicBoolean fetching = new AtomicBoolean(false); - private ManagerMonitorInfo mmi; - private GCStatus gcStatus; - private volatile Optional coordinatorHost = Optional.empty(); private EmbeddedWebServer server; private int livePort = 0; private ServiceLock monitorLock; - private static class EventCounter { - - Map> prevSamples = new HashMap<>(); - Map> samples = new HashMap<>(); - Set serversUpdated = new HashSet<>(); - - synchronized void startingUpdates() { - serversUpdated.clear(); - } - - synchronized void updateTabletServer(String name, long sampleTime, long numEvents) { - Pair newSample = new Pair<>(sampleTime, numEvents); - Pair lastSample = samples.get(name); - - if (lastSample == null || !lastSample.equals(newSample)) { - samples.put(name, newSample); - if (lastSample != null) { - prevSamples.put(name, lastSample); - } - } - serversUpdated.add(name); - } - - synchronized void finishedUpdating() { - // remove any tablet servers not updated - samples.keySet().retainAll(serversUpdated); - prevSamples.keySet().retainAll(serversUpdated); - } - - synchronized double calculateRate() { - double totalRate = 0; - - for (Entry> entry : prevSamples.entrySet()) { - Pair prevSample = entry.getValue(); - Pair sample = samples.get(entry.getKey()); - - totalRate += (sample.getSecond() - prevSample.getSecond()) - / ((sample.getFirst() - prevSample.getFirst()) / (double) 1000); - } - - return totalRate; - } - - } - - public void fetchData() { - ServerContext context = getContext(); - double totalIngestRate = 0.; - double totalQueryRate = 0.; - double totalScanRate = 0.; - long totalEntries = 0; - int totalTabletCount = 0; - long totalHoldTime = 0; - long totalLookups = 0; - boolean retry = true; - - // only recalc every so often - long currentTime = System.currentTimeMillis(); - if (currentTime - lastRecalc.get() < REFRESH_TIME * 1000) { - return; - } - - // try to begin fetching; return if unsuccessful (because another thread is already fetching) - if (!fetching.compareAndSet(false, true)) { - return; - } - // DO NOT ADD CODE HERE that could throw an exception before we enter the try block - // Otherwise, we'll never release the lock by unsetting 'fetching' in the finally block - try { - while (retry) { - ManagerClientService.Client client = null; - try { - client = ThriftClientTypes.MANAGER.getConnection(context); - if (client != null) { - mmi = client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds()); - retry = false; - // Now that Manager is up, set the coordinator host - Set managers = context.instanceOperations().getServers(ServerId.Type.MANAGER); - if (managers == null || managers.isEmpty()) { - throw new IllegalStateException( - "io.getServers returned nothing for Manager, but it's up."); - } - ServerId manager = managers.iterator().next(); - Optional nextCoordinatorHost = - Optional.of(HostAndPort.fromString(manager.toHostPortString())); - if (coordinatorHost.isEmpty() - || !coordinatorHost.orElseThrow().equals(nextCoordinatorHost.orElseThrow())) { - coordinatorHost = nextCoordinatorHost; - } - } else { - mmi = null; - log.error("Unable to get info from Manager"); - } - gcStatus = fetchGcStatus(); - - } catch (Exception e) { - mmi = null; - log.info("Error fetching stats: ", e); - } finally { - if (client != null) { - ThriftUtil.close(client, context); - } - } - if (mmi == null) { - sleepUninterruptibly(1, TimeUnit.SECONDS); - } - } - - if (mmi != null) { - - lookupRateTracker.startingUpdates(); - indexCacheHitTracker.startingUpdates(); - indexCacheRequestTracker.startingUpdates(); - dataCacheHitTracker.startingUpdates(); - dataCacheRequestTracker.startingUpdates(); - - for (TabletServerStatus server : mmi.tServerInfo) { - TableInfo summary = TableInfoUtil.summarizeTableStats(server); - totalIngestRate += summary.ingestRate; - totalQueryRate += summary.queryRate; - totalScanRate += summary.scanRate; - totalEntries += summary.recs; - totalHoldTime += server.holdTime; - totalLookups += server.lookups; - lookupRateTracker.updateTabletServer(server.name, server.lastContact, server.lookups); - indexCacheHitTracker.updateTabletServer(server.name, server.lastContact, - server.indexCacheHits); - indexCacheRequestTracker.updateTabletServer(server.name, server.lastContact, - server.indexCacheRequest); - dataCacheHitTracker.updateTabletServer(server.name, server.lastContact, - server.dataCacheHits); - dataCacheRequestTracker.updateTabletServer(server.name, server.lastContact, - server.dataCacheRequest); - } - - lookupRateTracker.finishedUpdating(); - indexCacheHitTracker.finishedUpdating(); - indexCacheRequestTracker.finishedUpdating(); - dataCacheHitTracker.finishedUpdating(); - dataCacheRequestTracker.finishedUpdating(); - - int totalTables = 0; - for (TableInfo tInfo : mmi.tableMap.values()) { - totalTabletCount += tInfo.tablets; - totalTables++; - } - this.totalIngestRate = totalIngestRate; - this.totalTables = totalTables; - this.totalQueryRate = totalQueryRate; - this.totalScanRate = totalScanRate; - this.totalEntries = totalEntries; - this.totalTabletCount = totalTabletCount; - this.totalHoldTime = totalHoldTime; - this.totalLookups = totalLookups; - - } - - } finally { - lastRecalc.set(currentTime); - // stop fetching; log an error if this thread wasn't already fetching - if (!fetching.compareAndSet(true, false)) { - throw new AssertionError("Not supposed to happen; somebody broke this code"); - } - } - } - - private GCStatus fetchGcStatus() { - ServerContext context = getContext(); - GCStatus result = null; - HostAndPort address = null; - try { - // Read the gc location from its lock - ZooReaderWriter zk = context.getZooSession().asReaderWriter(); - var path = context.getServerPaths().createGarbageCollectorPath(); - List locks = ServiceLock.validateAndSort(path, zk.getChildren(path.toString())); - if (locks != null && !locks.isEmpty()) { - address = ServiceLockData.parse(zk.getData(path + "/" + locks.get(0))) - .map(sld -> sld.getAddress(ThriftService.GC)).orElse(null); - if (address == null) { - log.warn("Unable to contact the garbage collector (no address)"); - return null; - } - GCMonitorService.Client client = - ThriftUtil.getClient(ThriftClientTypes.GC, address, context); - try { - result = client.getStatus(TraceUtil.traceInfo(), context.rpcCreds()); - } finally { - ThriftUtil.returnClient(client, context); - } - } - } catch (Exception ex) { - log.warn("Unable to contact the garbage collector at {}", address, ex); - } - return result; - } - @Override public void run() { ServerContext context = getContext(); @@ -355,7 +104,6 @@ public void run() { log.debug("Trying monitor on port {}", port); server = new EmbeddedWebServer(this, port); server.addServlet(getResourcesServlet(), "/resources/*"); - server.addServlet(getRestServlet(), "/rest/*"); server.addServlet(getRestV2Servlet(), "/rest-v2/*"); server.addServlet(getViewServlet(), "/*"); server.start(); @@ -419,17 +167,6 @@ public void run() { log.error("Unable to advertise monitor HTTP address in zookeeper", ex); } - // need to regularly fetch data so plot data is updated - Threads.createCriticalThread("Data fetcher", () -> { - while (true) { - try { - fetchData(); - } catch (Exception e) { - log.warn("{}", e.getMessage(), e); - } - sleepUninterruptibly(333, TimeUnit.MILLISECONDS); - } - }).start(); Threads.createCriticalThread("Metric Fetcher Thread", fetcher).start(); while (!isShutdownRequested()) { @@ -488,14 +225,6 @@ private ServletHolder getViewServlet() { return new ServletHolder(new ServletContainer(rc)); } - private ServletHolder getRestServlet() { - final ResourceConfig rc = new ResourceConfig().packages("org.apache.accumulo.monitor.rest") - .register(new MonitorFactory(this)) - .register(new LoggingFeature(java.util.logging.Logger.getLogger(this.getClass().getName()))) - .register(JacksonFeature.class); - return new ServletHolder(new ServletContainer(rc)); - } - private ServletHolder getRestV2Servlet() { final ResourceConfig rc = new ResourceConfig().packages("org.apache.accumulo.monitor.next") .register(new MonitorFactory(this)) @@ -504,123 +233,6 @@ private ServletHolder getRestV2Servlet() { return new ServletHolder(new ServletContainer(rc)); } - public static class ScanStats { - public final long scanCount; - public final Long oldestScan; - public final long fetched; - - ScanStats(List active) { - this.scanCount = active.size(); - long oldest = -1; - for (ActiveScan scan : active) { - oldest = Math.max(oldest, scan.age); - } - this.oldestScan = oldest < 0 ? null : oldest; - // use clock time for date friendly display - this.fetched = System.currentTimeMillis(); - } - } - - public static class CompactionStats { - public final long count; - public final Long oldest; - public final long fetched; - - CompactionStats(List active) { - this.count = active.size(); - long oldest = -1; - for (ActiveCompaction a : active) { - oldest = Math.max(oldest, a.age); - } - this.oldest = oldest < 0 ? null : oldest; - // use clock time for date friendly display - this.fetched = System.currentTimeMillis(); - } - } - - private final long expirationTimeMinutes = 1; - - // Use Suppliers.memoizeWithExpiration() to cache the results of expensive fetch operations. This - // avoids unnecessary repeated fetches within the expiration period and ensures that multiple - // requests around the same time use the same cached data. - private final Supplier> tserverScansSupplier = - Suppliers.memoizeWithExpiration(this::fetchTServerScans, expirationTimeMinutes, MINUTES); - - private final Supplier> sserverScansSupplier = - Suppliers.memoizeWithExpiration(this::fetchSServerScans, expirationTimeMinutes, MINUTES); - - private final Supplier> compactionsSupplier = - Suppliers.memoizeWithExpiration(this::fetchCompactions, expirationTimeMinutes, MINUTES); - - /** - * @return active tablet server scans. Values are cached and refresh after - * {@link #expirationTimeMinutes}. - */ - public Map getScans() { - return tserverScansSupplier.get(); - } - - /** - * @return active scan server scans. Values are cached and refresh after - * {@link #expirationTimeMinutes}. - */ - public Map getScanServerScans() { - return sserverScansSupplier.get(); - } - - /** - * @return active compactions. Values are cached and refresh after {@link #expirationTimeMinutes}. - */ - public Map getCompactions() { - return compactionsSupplier.get(); - } - - private Map fetchScans(Collection servers) { - ServerContext context = getContext(); - Map scans = new HashMap<>(); - for (ServerId server : servers) { - final HostAndPort parsedServer = HostAndPort.fromString(server.toHostPortString()); - TabletScanClientService.Client client = null; - try { - client = ThriftUtil.getClient(ThriftClientTypes.TABLET_SCAN, parsedServer, context); - List activeScans = client.getActiveScans(null, context.rpcCreds()); - scans.put(parsedServer, new ScanStats(activeScans)); - } catch (Exception ex) { - log.error("Failed to get active scans from {}", server, ex); - } finally { - ThriftUtil.returnClient(client, context); - } - } - return Collections.unmodifiableMap(scans); - } - - private Map fetchTServerScans() { - return fetchScans(getContext().instanceOperations().getServers(TABLET_SERVER)); - } - - private Map fetchSServerScans() { - return fetchScans(getContext().instanceOperations().getServers(SCAN_SERVER)); - } - - private Map fetchCompactions() { - ServerContext context = getContext(); - Map allCompactions = new HashMap<>(); - for (ServerId server : context.instanceOperations().getServers(TABLET_SERVER)) { - final HostAndPort parsedServer = HostAndPort.fromString(server.toHostPortString()); - Client tserver = null; - try { - tserver = ThriftUtil.getClient(ThriftClientTypes.TABLET_SERVER, parsedServer, context); - var compacts = tserver.getActiveCompactions(null, context.rpcCreds()); - allCompactions.put(parsedServer, new CompactionStats(compacts)); - } catch (Exception ex) { - log.debug("Failed to get active compactions from {}", server, ex); - } finally { - ThriftUtil.returnClient(tserver, context); - } - } - return Collections.unmodifiableMap(allCompactions); - } - /** * Get the monitor lock in ZooKeeper */ @@ -687,62 +299,6 @@ private void getMonitorLock(HostAndPort monitorLocation) log.info("Got Monitor lock."); } - public ManagerMonitorInfo getMmi() { - return mmi; - } - - public int getTotalTables() { - return totalTables; - } - - public int getTotalTabletCount() { - return totalTabletCount; - } - - public long getTotalEntries() { - return totalEntries; - } - - public double getTotalIngestRate() { - return totalIngestRate; - } - - public double getTotalQueryRate() { - return totalQueryRate; - } - - public double getTotalScanRate() { - return totalScanRate; - } - - public long getTotalHoldTime() { - return totalHoldTime; - } - - public GCStatus getGcStatus() { - return gcStatus; - } - - public long getTotalLookups() { - return totalLookups; - } - - public long getStartTime() { - return START_TIME; - } - - public double getLookupRate() { - return lookupRateTracker.calculateRate(); - } - - public Optional getCoordinatorHost() { - return coordinatorHost; - } - - public int getLivePort() { - return livePort; - } - @Override public ServiceLock getLock() { return monitorLock; diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java deleted file mode 100644 index f468819df3e..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/SummaryInformation.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest; - -import java.util.ArrayList; -import java.util.List; - -import jakarta.xml.bind.annotation.XmlRootElement; - -import org.apache.accumulo.monitor.rest.tables.TableInformationList; -import org.apache.accumulo.monitor.rest.tservers.TabletServer; - -/** - * Generate summary of Monitor - * - * @since 2.0.0 - */ -@XmlRootElement(name = "stats") -public class SummaryInformation { - - // Variable names become JSON keys - public List servers; - - public TableInformationList tables; - - // do not remove - public SummaryInformation() {} - - /** - * Stores Monitor information as XML or JSON - * - * @param size Number of tservers - * @param tablesList Table list - */ - public SummaryInformation(int size, TableInformationList tablesList) { - this.servers = new ArrayList<>(size); - - this.tables = tablesList; - } - - /** - * Adds a new tablet - * - * @param tablet Tablet to add - */ - public void addTabletServer(TabletServer tablet) { - servers.add(tablet); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java deleted file mode 100644 index cb52c0174c3..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/XMLResource.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest; - -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response.Status; - -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.monitor.rest.tables.TablesResource; -import org.apache.accumulo.monitor.rest.tservers.TabletServer; - -/** - * Responsible for generating a JSON and XML summary of the Monitor - * - * @since 2.0.0 - */ -@Path("/") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class XMLResource { - - @Inject - private Monitor monitor; - - /** - * Generates summary of the Monitor - * - * @return SummaryInformation object - */ - public SummaryInformation getInformation() { - - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - throw new WebApplicationException(Status.INTERNAL_SERVER_ERROR); - } - - // Add Monitor information - SummaryInformation xml = - new SummaryInformation(mmi.tServerInfo.size(), TablesResource.getTables(monitor)); - - // Add tserver information - for (TabletServerStatus status : mmi.tServerInfo) { - xml.addTabletServer(new TabletServer(monitor, status)); - } - - return xml; - } - - @GET - @Path("xml") - @Produces(MediaType.APPLICATION_XML) - public SummaryInformation getXMLInformation() { - return getInformation(); - } - - @GET - @Path("json") - @Produces(MediaType.APPLICATION_JSON) - public SummaryInformation getJSONInformation() { - return getInformation(); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionInfo.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionInfo.java deleted file mode 100644 index f222bc42ed1..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionInfo.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.compactions; - -import org.apache.accumulo.monitor.Monitor; - -import com.google.common.net.HostAndPort; - -/** - * Generates a compaction info JSON object - * - * @since 2.1.0 - */ -public class CompactionInfo { - - // Variable names become JSON keys - public String server; - - public long fetched; - public long count; - public Long oldest; - - public CompactionInfo() {} - - /** - * Stores new compaction information - */ - public CompactionInfo(HostAndPort address, Monitor.CompactionStats stats) { - this.server = address.toString(); - this.fetched = stats.fetched; - this.count = stats.count; - this.oldest = stats.oldest; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/Compactions.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/Compactions.java deleted file mode 100644 index 1b766176325..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/Compactions.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.compactions; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a new list of compactions as a JSON object - * - * @since 2.1.0 - */ -public class Compactions { - - // Variable names become JSON keys - public List compactions = new ArrayList<>(); - - /** - * Adds a new compactionInfo to the list - * - * @param compactionInfo Compaction info to add - */ - public void addCompaction(CompactionInfo compactionInfo) { - compactions.add(compactionInfo); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java deleted file mode 100644 index b96f9f774d7..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/compactions/CompactionsResource.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.compactions; - -import java.util.Map; - -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.monitor.Monitor; - -import com.google.common.net.HostAndPort; - -/** - * Generate a new Compaction list JSON object - * - * @since 2.1.0 - */ -@Path("/compactions") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class CompactionsResource { - - @Inject - private Monitor monitor; - - /** - * Generates a new JSON object with compaction information - * - * @return JSON object - */ - @GET - public Compactions getActiveCompactions() { - Compactions compactions = new Compactions(); - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return compactions; - } - - Map entry = monitor.getCompactions(); - - entry.forEach((k, v) -> compactions.addCompaction(new CompactionInfo(k, v))); - - return compactions; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java deleted file mode 100644 index 988cb83751a..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorResource.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.gc; - -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.monitor.Monitor; - -/** - * GarbageCollector metrics - * - * @since 2.0.0 - */ -@Path("/gc") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class GarbageCollectorResource { - - @Inject - private Monitor monitor; - - /** - * Returns the garbage collector status - * - * @return garbage collector status - */ - @GET - public GarbageCollectorStatus getStatus() { - return new GarbageCollectorStatus(monitor.getGcStatus()); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStats.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStats.java deleted file mode 100644 index 5ee7f3d2156..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStats.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.gc; - -import org.apache.accumulo.core.gc.thrift.GcCycleStats; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Metrics about one type of garbage collection - * - * @since 2.1.0 - */ -public class GarbageCollectorStats { - private static final Logger log = LoggerFactory.getLogger(GarbageCollectorStats.class); - - // Variable names become JSON key - public final String type; - public final long started; - public final long finished; - public final long candidates; - public final long inUse; - public final long deleted; - public final long errors; - public final long duration; - - /** - * Creates a new garbage collector cycle - * - * @param thriftStats used to find cycle information - */ - public GarbageCollectorStats(String type, GcCycleStats thriftStats) { - log.info("Creating {} stats using thriftStats = {}", type, thriftStats); - this.type = type; - this.started = thriftStats.started; - this.finished = thriftStats.finished; - this.candidates = thriftStats.candidates; - this.inUse = thriftStats.inUse; - this.deleted = thriftStats.deleted; - this.errors = thriftStats.errors; - this.duration = thriftStats.finished - thriftStats.started; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java deleted file mode 100644 index baa061f5639..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/gc/GarbageCollectorStatus.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.gc; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.accumulo.core.gc.thrift.GCStatus; - -/** - * Responsible for grouping files and wals into a JSON object - * - * @since 2.0.0 - */ -public class GarbageCollectorStatus { - - // variable names become JSON key - public List stats = new ArrayList<>(); - - /** - * Groups gc status into files and wals - * - * @param status garbage collector status - */ - public GarbageCollectorStatus(GCStatus status) { - if (status != null) { - stats.add(new GarbageCollectorStats("Current GC", status.current)); - stats.add(new GarbageCollectorStats("Last GC", status.last)); - stats.add(new GarbageCollectorStats("Current WAL", status.currentLog)); - stats.add(new GarbageCollectorStats("Last WAL", status.lastLog)); - } - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java deleted file mode 100644 index 08515e4a193..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/logs/DeadLoggerInformation.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.logs; - -import jakarta.xml.bind.annotation.XmlAttribute; - -/** - * Stores dead logger information - * - * @since 2.0.0 - */ -public class DeadLoggerInformation { - - // Variable names become JSON keys - @XmlAttribute - public String server; - - @XmlAttribute - public long lastStatus; - - @XmlAttribute - public String status; - - public DeadLoggerInformation() {} - - /** - * Stores a new dead logger information - * - * @param server dead logger location - * @param lastStatus previous status of the dead logger - * @param status status of the dead logger - */ - public DeadLoggerInformation(String server, long lastStatus, String status) { - this.server = server; - this.lastStatus = lastStatus; - this.status = status; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java deleted file mode 100644 index 9fe5bc8ea83..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScanInformation.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.scans; - -import org.apache.accumulo.monitor.Monitor; - -/** - * Generates a scan JSON object - * - * @since 2.0.0 - */ -public class ScanInformation { - - // Variable names become JSON keys - public String server; - - public long fetched; - public long scanCount; - public Long oldestScan; - - public ScanInformation() {} - - /** - * Stores new scan information - */ - public ScanInformation(String tserverName, Monitor.ScanStats stats) { - this.server = tserverName; - this.fetched = stats.fetched; - this.scanCount = stats.scanCount; - this.oldestScan = stats.oldestScan; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java deleted file mode 100644 index b0ab2a3b309..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/Scans.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.scans; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a new scan list as a JSON object - * - * @since 2.0.0 - */ -public class Scans { - - // Variable names become JSON keys - public List scans = new ArrayList<>(); - - /** - * Adds a new scan to the list - * - * @param scan Scan object to add - */ - public void addScan(ScanInformation scan) { - scans.add(scan); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java deleted file mode 100644 index 5ff0f456a25..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/scans/ScansResource.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.scans; - -import java.util.Map; - -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.monitor.Monitor.ScanStats; - -import com.google.common.net.HostAndPort; - -/** - * Generate a new Scan list JSON object - * - * @since 2.0.0 - */ -@Path("/scans") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class ScansResource { - - @Inject - private Monitor monitor; - - /** - * Generates a new JSON object with scan information - * - * @return Scan JSON object - */ - @GET - public Scans getActiveScans() throws Exception { - Scans scans = new Scans(); - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return scans; - } - - Map entry = monitor.getScans(); - - // Adds new scans to the array for tservers known to the Manager - for (TabletServerStatus tserverInfo : mmi.getTServerInfo()) { - ScanStats stats = entry.get(HostAndPort.fromString(tserverInfo.name)); - if (stats != null) { - scans.addScan(new ScanInformation(tserverInfo.name, stats)); - } - } - // Add all ScanServer entries, the Manager is not aware of the ScanServers - monitor.getScanServerScans().forEach((k, v) -> { - scans.addScan(new ScanInformation(k.toString(), v)); - }); - return scans; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java deleted file mode 100644 index 24c7cb69c3e..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/statistics/StatisticsResource.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.statistics; - -import jakarta.inject.Inject; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.core.gc.thrift.GCStatus; -import org.apache.accumulo.monitor.Monitor; - -/** - * Generates a list of statistics as a JSON object - * - * @since 2.0.0 - */ -@Path("/statistics") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class StatisticsResource { - - @Inject - private Monitor monitor; - - /** - * Generates the total lookup rate - * - * @return Lookup rate - */ - @GET - @Path("lookupRate") - public double getLookupRate() { - return monitor.getLookupRate(); - } - - /** - * Generates the total number of tables - * - * @return Total number of tables - */ - @GET - @Path("totalTables") - public int getTotalTables() { - return monitor.getTotalTables(); - } - - /** - * Generates the total tablet count - * - * @return Total tablet count - */ - @GET - @Path("totalTabletCount") - public int getTotalTabletCount() { - return monitor.getTotalTabletCount(); - } - - /** - * Generates the total entries - * - * @return Total number of entries - */ - @GET - @Path("totalEntries") - public long getTotalEntries() { - return monitor.getTotalEntries(); - } - - /** - * Generates the total ingest rate - * - * @return Total number of ingest rate - */ - @GET - @Path("totalIngestRate") - public double getTotalIngestRate() { - return monitor.getTotalIngestRate(); - } - - /** - * Generates the total query rate - * - * @return Total number of query rate - */ - @GET - @Path("totalQueryRate") - public double getTotalQueryRate() { - return monitor.getTotalQueryRate(); - } - - /** - * Generates the total scan rate - * - * @return Total number of scan rate - */ - @GET - @Path("totalScanRate") - public double getTotalScanRate() { - return monitor.getTotalScanRate(); - } - - /** - * Generates the total hold time - * - * @return Total hold time - */ - @GET - @Path("totalHoldTime") - public long getTotalHoldTime() { - return monitor.getTotalHoldTime(); - } - - /** - * Generates the garbage collector status - * - * @return GC status - */ - @GET - @Path("gcStatus") - public GCStatus getGcStatus() { - return monitor.getGcStatus(); - } - - /** - * Generates the total lookups - * - * @return Total number of lookups - */ - @GET - @Path("totalLookups") - public long getTotalLookups() { - return monitor.getTotalLookups(); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java deleted file mode 100644 index 639f3370bd7..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsList.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -/** - * Generates a list of compactions as a JSON object - * - * @since 2.0.0 - */ -public class CompactionsList { - - // Variable names become JSON keys - public Integer running = null; - public Integer queued = null; - - public CompactionsList() {} - - /** - * Generate a compaction list - * - * @param running Number of running compactions - * @param queued Number of queued compactions - */ - public CompactionsList(Integer running, Integer queued) { - this.running = running; - this.queued = queued; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java deleted file mode 100644 index a89a37d4ff0..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/CompactionsTypes.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -/** - * Generates a list of compactions based on type - * - * @since 2.0.0 - */ -public class CompactionsTypes { - - // Variable names become JSON objects - public CompactionsList scans = new CompactionsList(); - public CompactionsList minor = new CompactionsList(); - - public CompactionsTypes() {} - - /** - * Create a new compaction list based on types - * - * @param scans Scan compaction list - * @param minor Minor compaction list - */ - public CompactionsTypes(CompactionsList scans, CompactionsList minor) { - this.scans = scans; - this.minor = minor; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java deleted file mode 100644 index 115ec526144..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformation.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer; - -/** - * Generates table information as a JSON object - * - * @since 2.0.0 - */ -public class TableInformation { - private final String ZERO_COMBO = "0(0)"; - - // Variable names become JSON keys - public String tablename; - - @XmlJavaTypeAdapter(JaxbAbstractIdSerializer.class) - public TableId tableId; - - public String tableState; - - public int tablets; - public int onlineTablets; - public long recs; - public long recsInMemory; - - public double ingestRate; - public double ingestByteRate; - public double query; - public double queryByteRate; - - public CompactionsList minorCompactions; - // running compactions with queued in parenthesis - public String minorCombo; - public CompactionsList scans; - // running scans with queued in parenthesis - public String scansCombo; - - public int queuedMinorCompactions; - public int runningMinorCompactions; - public int queuedScans; - public int runningScans; - - public double entriesRead; - public double entriesReturned; - - public Double holdTime; - - public int offlineTablets; - - public TableInformation() {} - - /** - * Generate a table with just the state - * - * @param tableName Table name to create - * @param tableId Table ID to create - * @param tableState State of the table - */ - public TableInformation(String tableName, TableId tableId, String tableState) { - this.tablename = tableName; - this.tableId = tableId; - this.tableState = tableState; - this.tablets = 0; - this.offlineTablets = 0; - this.onlineTablets = 0; - this.recs = 0; - this.recsInMemory = 0; - this.ingestRate = 0; - this.ingestByteRate = 0; - this.query = 0; - this.queryByteRate = 0; - this.entriesRead = 0; - this.entriesReturned = 0; - this.holdTime = 0.0; - this.minorCompactions = new CompactionsList(0, 0); - this.minorCombo = ZERO_COMBO; - this.scans = new CompactionsList(0, 0); - this.scansCombo = ZERO_COMBO; - } - - /** - * Generate table based on the thrift table info - * - * @param tableName Name of the table to create - * @param tableId ID of the table to create - * @param info Thift table info - * @param holdTime Hold time for the table - * @param tableState State of the table - */ - public TableInformation(String tableName, TableId tableId, TableInfo info, Double holdTime, - String tableState) { - this.tablename = tableName; - this.tableId = tableId; - - this.tablets = info.tablets; - this.offlineTablets = info.tablets - info.onlineTablets; - this.onlineTablets = info.onlineTablets; - - this.recs = info.recs; - this.recsInMemory = info.recsInMemory; - - this.ingestRate = cleanNumber(info.getIngestRate()); - this.ingestByteRate = cleanNumber(info.getIngestByteRate()); - - this.query = cleanNumber(info.getQueryRate()); - this.queryByteRate = cleanNumber(info.getQueryByteRate()); - - this.entriesRead = cleanNumber(info.scanRate); - this.entriesReturned = cleanNumber(info.queryRate); - - this.holdTime = holdTime; - - if (info.scans != null) { - this.queuedScans = info.scans.queued; - this.runningScans = info.scans.running; - this.scansCombo = info.scans.running + "(" + info.scans.queued + ")"; - } else { - this.queuedScans = 0; - this.runningScans = 0; - this.scansCombo = ZERO_COMBO; - } - - if (info.minors != null) { - this.queuedMinorCompactions = info.minors.queued; - this.runningMinorCompactions = info.minors.running; - this.minorCombo = info.minors.running + "(" + info.minors.queued + ")"; - } else { - this.queuedMinorCompactions = 0; - this.runningMinorCompactions = 0; - this.minorCombo = ZERO_COMBO; - } - - this.minorCompactions = new CompactionsList(runningMinorCompactions, queuedMinorCompactions); - this.scans = new CompactionsList(runningScans, queuedScans); - - this.tableState = tableState; - } - - /** - * Return zero for fractions. Partial numbers don't make sense in metrics. - */ - private double cleanNumber(double dirtyNumber) { - return dirtyNumber < 1 ? 0 : dirtyNumber; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java deleted file mode 100644 index ecd4075d5a0..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableInformationList.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a list with table information - * - * @since 2.0.0 - */ -public class TableInformationList { - - // Variable names become JSON keys - public List table = new ArrayList<>(); - - /** - * Adds a new table to the list - * - * @param table Table information to add - */ - public void addTable(TableInformation table) { - this.table.add(table); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java deleted file mode 100644 index 750d7020358..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TableNamespace.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a list of tables grouped by namespace - * - * @since 2.0.0 - */ -public class TableNamespace { - - // Variable names become JSON keys - public String namespace; - public List table = new ArrayList<>(); - - /** - * Creates a new namespace group with an empty list - * - * @param name Namespace for the group - */ - public TableNamespace(String name) { - namespace = name; - } - - /** - * Add a new table to the list - * - * @param table Table to add - */ - public void addTable(TableInformation table) { - this.table.add(table); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java deleted file mode 100644 index 6b14d444805..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesList.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a list of tables as a JSON object - * - * @since 2.0.0 - */ -public class TablesList { - - // Variable names become JSON keys - public List tables = new ArrayList<>(); - - /** - * Add a table to the list - * - * @param table Table to add - */ - public void addTable(TableNamespace table) { - tables.add(table); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java deleted file mode 100644 index 3121b65715d..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tables/TablesResource.java +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tables; - -import static org.apache.accumulo.monitor.util.ParameterValidator.ALPHA_NUM_REGEX_TABLE_ID; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.TreeSet; - -import jakarta.inject.Inject; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.core.manager.state.tables.TableState; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.core.metadata.RootTable; -import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.core.metadata.schema.Ample; -import org.apache.accumulo.core.metadata.schema.TabletMetadata; -import org.apache.accumulo.core.metadata.schema.TabletsMetadata; -import org.apache.accumulo.core.metadata.schema.filters.HasCurrentFilter; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.monitor.rest.tservers.TabletServer; -import org.apache.accumulo.monitor.rest.tservers.TabletServers; -import org.apache.accumulo.server.tables.TableManager; -import org.apache.accumulo.server.util.TableInfoUtil; - -/** - * Generates a tables list from the Monitor as a JSON object - * - * @since 2.0.0 - */ -@Path("/tables") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class TablesResource { - /** - * A {@code String} constant representing Table ID to find participating tservers, used in path - * parameter. - */ - private static final String TABLEID_PARAM_KEY = "tableId"; - - @Inject - private Monitor monitor; - - private static final TabletServerStatus NO_STATUS = new TabletServerStatus(); - - /** - * Generates a list of all the tables - * - * @return list with all tables - */ - @GET - public TableInformationList getTables() { - return getTables(monitor); - } - - public static TableInformationList getTables(Monitor monitor) { - TableInformationList tableList = new TableInformationList(); - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return tableList; - } - SortedMap tableStats = new TreeMap<>(); - - if (mmi.tableMap != null) { - for (Map.Entry te : mmi.tableMap.entrySet()) { - tableStats.put(TableId.of(te.getKey()), te.getValue()); - } - } - - Map compactingByTable = TableInfoUtil.summarizeTableStats(mmi); - TableManager tableManager = monitor.getContext().getTableManager(); - - // Add tables to the list - monitor.getContext().createQualifiedTableNameToIdMap().forEach((tableName, tableId) -> { - TableInfo tableInfo = tableStats.get(tableId); - TableState tableState = tableManager.getTableState(tableId); - - if (tableInfo != null && tableState != TableState.OFFLINE) { - Double holdTime = compactingByTable.get(tableId.canonical()); - if (holdTime == null) { - holdTime = 0.; - } - - tableList.addTable( - new TableInformation(tableName, tableId, tableInfo, holdTime, tableState.name())); - } else { - tableList.addTable(new TableInformation(tableName, tableId, tableState.name())); - } - }); - return tableList; - } - - /** - * Generates a list of participating tservers for a table - * - * @param tableIdStr Table ID to find participating tservers - * @return List of participating tservers - */ - @Path("{" + TABLEID_PARAM_KEY + "}") - @GET - public TabletServers - getParticipatingTabletServers(@PathParam(TABLEID_PARAM_KEY) @NotNull @Pattern( - regexp = ALPHA_NUM_REGEX_TABLE_ID) String tableIdStr) { - TableId tableId = TableId.of(tableIdStr); - ManagerMonitorInfo mmi = monitor.getMmi(); - // fail fast if unable to get monitor info - if (mmi == null) { - return new TabletServers(); - } - - TabletServers tabletServers = new TabletServers(mmi.tServerInfo.size()); - - if (tableIdStr.isBlank()) { - return tabletServers; - } - - TreeSet locs = new TreeSet<>(); - if (SystemTables.ROOT.tableId().equals(tableId)) { - var rootLoc = monitor.getContext().getAmple().readTablet(RootTable.EXTENT).getLocation(); - if (rootLoc != null && rootLoc.getType() == TabletMetadata.LocationType.CURRENT) { - locs.add(rootLoc.getHostPort()); - } - } else { - var level = Ample.DataLevel.of(tableId); - try (TabletsMetadata tablets = monitor.getContext().getAmple().readTablets().forLevel(level) - .filter(new HasCurrentFilter()).build()) { - - for (TabletMetadata tm : tablets) { - try { - locs.add(tm.getLocation().getHostPort()); - } catch (Exception ex) { - return tabletServers; - } - } - } - } - - List tservers = new ArrayList<>(); - for (TabletServerStatus tss : mmi.tServerInfo) { - try { - if (tss.name != null && locs.contains(tss.name)) { - tservers.add(tss); - } - } catch (Exception ex) { - return tabletServers; - } - } - - // Adds tservers to the list - for (TabletServerStatus status : tservers) { - if (status == null) { - status = NO_STATUS; - } - TableInfo summary = status.tableMap.get(tableId.canonical()); - if (summary == null) { - continue; - } - - TabletServer tabletServerInfo = new TabletServer(); - tabletServerInfo.server.updateTabletServerInfo(monitor, status, summary); - - tabletServers.addTablet(tabletServerInfo); - } - - return tabletServers; - } - -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java deleted file mode 100644 index 735acaf7bdd..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/trace/RecoveryStatusInformation.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.trace; - -import org.apache.accumulo.core.manager.thrift.RecoveryStatus; - -/** - * Generates a recovery status - * - * @since 2.0.0 - */ -public class RecoveryStatusInformation { - - // Variable names become JSON keys - public String name; - public Integer runtime; - public Double progress; - - public RecoveryStatusInformation() {} - - /** - * Stores recovery information - * - * @param name Name of the table - * @param runtime Runtime of the recovery - * @param progress Progress of the recovery - */ - public RecoveryStatusInformation(String name, Integer runtime, Double progress) { - this.name = name; - this.runtime = runtime; - this.progress = progress; - } - - /** - * Stores recovery information - * - * @param recovery Recovery status to obtain name, runtime, and progress - */ - public RecoveryStatusInformation(RecoveryStatus recovery) { - this.name = recovery.name; - this.runtime = recovery.runtime; - this.progress = recovery.progress; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java deleted file mode 100644 index d774d68d3c5..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/AllTimeTabletResults.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -/** - * Generates a tablets all time results - * - * @since 2.0.0 - */ -public class AllTimeTabletResults { - - // Variable names become JSON keys - public String operation; - public int success; - public int failure; - public Double queueStdDev; - public Double avgQueueTime; - public Double avgTime; - public double timeSpent; - public double stdDev; - - public AllTimeTabletResults() {} - - /** - * Stores all time results of a tablet - * - * @param operation Type of operation - * @param success Number of successes - * @param failure Number of failures - * @param avgQueueTime Average queue time - * @param queueStdDev Standard deviation of queue - * @param avgTime Average time - * @param stdDev Standard deviation - * @param timeSpent Time spent in operation - */ - public AllTimeTabletResults(String operation, int success, int failure, Double avgQueueTime, - Double queueStdDev, Double avgTime, double stdDev, double timeSpent) { - this.operation = operation; - this.success = success; - this.failure = failure; - this.avgQueueTime = avgQueueTime; - this.avgTime = avgTime; - this.queueStdDev = queueStdDev; - this.stdDev = stdDev; - this.timeSpent = timeSpent; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java deleted file mode 100644 index 25a9c0a0beb..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentOperations.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.monitor.util.JaxbAbstractIdSerializer; - -/** - * Generates the current operations for the tablet - * - * @since 2.0.0 - */ -public class CurrentOperations { - - // Variable names become JSON keys - public String name; - public String tablet; - - @XmlJavaTypeAdapter(JaxbAbstractIdSerializer.class) - public TableId tableID; - - public long entries; - public double ingest; - public double query; - public Double minorStdDev; - public Double minorAvgES; - public Double minorAvg; - - public CurrentOperations() {} - - /** - * Stores the current operations of the tablet - * - * @param name Table name - * @param tableId Table ID - * @param tablet Tablet string - * @param entries Number of entries - * @param ingest Number of ingest - * @param query Number of queries - * @param minorAvg Minor compaction average - * @param minorStdDev Minor compaction standard deviation - * @param minorAvgES Minor compaction average ES - */ - public CurrentOperations(String name, TableId tableId, String tablet, long entries, double ingest, - double query, Double minorAvg, Double minorStdDev, Double minorAvgES) { - this.name = name; - this.tableID = tableId; - this.tablet = tablet; - this.entries = entries; - this.ingest = ingest; - this.query = query; - this.minorStdDev = minorStdDev; - this.minorAvgES = minorAvgES; - this.minorAvg = minorAvg; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java deleted file mode 100644 index 67430a7e4c0..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/CurrentTabletResults.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -/** - * Generates the current results of the tablet - * - * @since 2.0.0 - */ -public class CurrentTabletResults { - - // Variable names become JSON keys - public Double currentMinorAvg; - public Double currentMinorStdDev; - - public CurrentTabletResults() {} - - /** - * Stores new current results for the tablet - * - * @param currentMinorAvg minor compaction average - * @param currentMinorStdDev minor compaction standard deviation - */ - public CurrentTabletResults(Double currentMinorAvg, Double currentMinorStdDev) { - this.currentMinorAvg = currentMinorAvg; - this.currentMinorStdDev = currentMinorStdDev; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java deleted file mode 100644 index 7b4d4af22ba..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStat.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -/** - * Stores the server stats - * - * @since 2.0.0 - */ -public class ServerStat { - - // Variable names become JSON keys - public int max; - public boolean adjustMax; - public float significance; - public String description; - public String name; - public boolean derived; - - public ServerStat() {} - - public ServerStat(int max, boolean adjustMax, float significance, String description, - String name) { - this.max = max; - this.adjustMax = adjustMax; - this.significance = significance; - this.description = description; - this.derived = false; - this.name = name; - } - - public ServerStat(int max, boolean adjustMax, float significance, String description, - boolean derived, String name) { - this.max = max; - this.adjustMax = adjustMax; - this.significance = significance; - this.description = description; - this.derived = derived; - this.name = name; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java deleted file mode 100644 index 50e2b794d94..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/ServerStats.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import java.util.ArrayList; -import java.util.List; - -/** - * Stores maximum and minimum numbers for server stats in a list - * - * @since 2.0.0 - */ -public class ServerStats { - - // Variable names become JSON keys - public List serverStats = new ArrayList<>(); - - /** - * Adds a new stat to the list - * - * @param stat Stat to add - */ - public void addStats(ServerStat stat) { - serverStats.add(stat); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java deleted file mode 100644 index 5383eb38970..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.monitor.Monitor; - -/** - * To use for XML Resource - * - * @since 2.0.0 - */ -public class TabletServer { - - // Variable names become JSON keys - public final TabletServerInformation server; - - public TabletServer() { - server = new TabletServerInformation(); - } - - public TabletServer(TabletServerInformation server) { - this.server = server; - } - - public TabletServer(Monitor monitor, TabletServerStatus status) { - server = new TabletServerInformation(monitor, status); - } - -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java deleted file mode 100644 index 11fca7a4eb2..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerDetailInformation.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -/** - * Generates tserver detail as JSON object - * - * @since 2.0.0 - */ -public class TabletServerDetailInformation { - - // Variable names become JSON keys - public int hostedTablets; - public int minors; - public long entries; - - public TabletServerDetailInformation() {} - - /** - * Store new tserver details - * - * @param hostedTablets Number of hosted tablets - * @param entries Number of entries - * @param minors Number of minor compactions - */ - public TabletServerDetailInformation(int hostedTablets, long entries, int minors) { - this.hostedTablets = hostedTablets; - this.entries = entries; - this.minors = minors; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java deleted file mode 100644 index 684517fb32b..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformation.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import java.util.ArrayList; -import java.util.List; - -import jakarta.xml.bind.annotation.XmlAttribute; - -import org.apache.accumulo.core.manager.thrift.RecoveryStatus; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.monitor.rest.tables.CompactionsList; -import org.apache.accumulo.monitor.rest.tables.CompactionsTypes; -import org.apache.accumulo.monitor.rest.trace.RecoveryStatusInformation; -import org.apache.accumulo.server.util.TableInfoUtil; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -/** - * Generates tserver information - * - * @since 2.0.0 - */ -@SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", - justification = "public member variables only referenced from tests, class used for serialization") -public class TabletServerInformation { - - // Variable names become JSON keys - @XmlAttribute(name = "id") - public String server; - - public String hostname; - public long lastContact; - public long responseTime; - public double osload; - public String version; - - public CompactionsTypes compactions; - - public int tablets; - public double ingest; - public double query; - public double ingestMB; - public double queryMB; - public Integer scans; // For backwards compatibility, has same information as scansRunning - public Double scansessions; - public Double scanssessions; // For backwards compatibility - public long holdtime; - - // New variables - - public String ip; - public Integer scansRunning; - public Integer scansQueued; - // combo string with running value and number queued in parenthesis - public String minorCombo; - public String scansCombo; - public Integer minorRunning; - public Integer minorQueued; - - private CompactionsList scansCompacting; // if scans is removed, change scansCompacting to scans - private CompactionsList minor; - public long entries; - public long lookups; - public long indexCacheHits; - public long indexCacheRequests; - public long dataCacheHits; - public long dataCacheRequests; - public double indexCacheHitRate; - public double dataCacheHitRate; - public List logRecoveries; - - public TabletServerInformation() {} - - /** - * Generate tserver information from thrift status - * - * @param thriftStatus Thrift status to obtain information - */ - public TabletServerInformation(Monitor monitor, TabletServerStatus thriftStatus) { - TableInfo summary = TableInfoUtil.summarizeTableStats(thriftStatus); - updateTabletServerInfo(monitor, thriftStatus, summary); - } - - /** - * Generate tserver information from thrift status and table summary - * - * @param thriftStatus Thrift status to obtain information - * @param summary Table info summary - */ - public void updateTabletServerInfo(Monitor monitor, TabletServerStatus thriftStatus, - TableInfo summary) { - - long now = System.currentTimeMillis(); - - this.server = this.ip = this.hostname = thriftStatus.name; - this.tablets = summary.tablets; - this.lastContact = now - thriftStatus.lastContact; - this.responseTime = thriftStatus.responseTime; - this.entries = summary.recs; - this.ingest = cleanNumber(summary.ingestRate); - this.query = cleanNumber(summary.queryRate); - - this.holdtime = thriftStatus.holdTime; - - this.scansRunning = summary.scans != null ? summary.scans.running : 0; - this.scansQueued = summary.scans != null ? summary.scans.queued : 0; - this.scansCombo = scansRunning + "(" + scansQueued + ")"; - - this.scans = this.scansRunning; - - this.scansCompacting = new CompactionsList(this.scansRunning, this.scansQueued); - - this.minorRunning = summary.minors != null ? summary.minors.running : 0; - this.minorQueued = summary.minors != null ? summary.minors.queued : 0; - this.minorCombo = minorRunning + "(" + minorQueued + ")"; - - this.minor = new CompactionsList(this.minorRunning, this.minorQueued); - - this.compactions = new CompactionsTypes(scansCompacting, minor); - - this.osload = thriftStatus.osLoad; - this.version = thriftStatus.version; - this.lookups = thriftStatus.lookups; - - this.dataCacheHits = thriftStatus.dataCacheHits; - this.dataCacheRequests = thriftStatus.dataCacheRequest; - this.indexCacheHits = thriftStatus.indexCacheHits; - this.indexCacheRequests = thriftStatus.indexCacheRequest; - - this.indexCacheHitRate = this.indexCacheHits / (double) Math.max(this.indexCacheRequests, 1); - this.dataCacheHitRate = this.dataCacheHits / (double) Math.max(this.dataCacheRequests, 1); - - this.ingestMB = cleanNumber(summary.ingestByteRate); - this.queryMB = cleanNumber(summary.queryByteRate); - - this.scansessions = monitor.getLookupRate(); - this.scanssessions = this.scansessions; // For backwards compatibility - - this.logRecoveries = new ArrayList<>(thriftStatus.logSorts.size()); - for (RecoveryStatus recovery : thriftStatus.logSorts) { - logRecoveries.add(new RecoveryStatusInformation(recovery)); - } - } - - /** - * Return zero for fractions. Partial numbers don't make sense in metrics. - */ - private double cleanNumber(double dirtyNumber) { - return dirtyNumber < 1 ? 0 : dirtyNumber; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java deleted file mode 100644 index 963a4a1329a..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerRecoveryInformation.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -/** - * Generates a tserver recovery information - * - * @since 2.0.0 - */ -public class TabletServerRecoveryInformation { - - // Variable names become JSON keys - public String server = ""; - public String log = ""; - public int time = 0; - public double progress = 0d; - - public TabletServerRecoveryInformation() {} - - /** - * Stores a tserver recovery - * - * @param server Name of the tserver - * @param log Log of the tserver - * @param time Recovery runtime - * @param progress Recovery progress - */ - public TabletServerRecoveryInformation(String server, String log, int time, double progress) { - this.server = server; - this.log = log; - this.time = time; - this.progress = progress; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java deleted file mode 100644 index c96cd611c37..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerResource.java +++ /dev/null @@ -1,304 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import static org.apache.accumulo.monitor.util.ParameterValidator.HOSTNAME_PORT_REGEX; - -import java.lang.management.ManagementFactory; -import java.util.ArrayList; -import java.util.List; - -import jakarta.inject.Inject; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Pattern; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; - -import org.apache.accumulo.core.clientImpl.ClientContext; -import org.apache.accumulo.core.data.TableId; -import org.apache.accumulo.core.dataImpl.KeyExtent; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.RecoveryStatus; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.core.rpc.ThriftUtil; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.tabletserver.thrift.ActionStats; -import org.apache.accumulo.core.tabletserver.thrift.TabletServerClientService; -import org.apache.accumulo.core.tabletserver.thrift.TabletStats; -import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.core.util.AddressUtil; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.server.manager.state.DeadServerList; -import org.apache.accumulo.server.util.ActionStatsUpdator; - -import com.google.common.net.HostAndPort; - -/** - * Generates tserver lists as JSON objects - * - * @since 2.0.0 - */ -@Path("/tservers") -@Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) -public class TabletServerResource { - - @Inject - private Monitor monitor; - - // Variable names become JSON keys - private TabletStats total; - private TabletStats historical; - - /** - * Generates tserver summary - * - * @return tserver summary - */ - @GET - public TabletServers getTserverSummary() { - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return new TabletServers(); - } - - TabletServers tserverInfo = new TabletServers(mmi.tServerInfo.size()); - for (TabletServerStatus status : mmi.tServerInfo) { - tserverInfo.addTablet(new TabletServer(monitor, status)); - } - - return tserverInfo; - } - - /** - * REST call to clear dead servers from list - * - * @param server Dead server to clear - */ - @POST - @Consumes(MediaType.TEXT_PLAIN) - public void clearDeadServer( - @QueryParam("server") @NotNull @Pattern(regexp = HOSTNAME_PORT_REGEX) String server) { - DeadServerList obit = new DeadServerList(monitor.getContext()); - obit.delete(server); - } - - /** - * Generates a recovery tserver list - * - * @return Recovery tserver list - */ - @Path("recovery") - @GET - public TabletServersRecovery getTserverRecovery() { - TabletServersRecovery recoveryList = new TabletServersRecovery(); - - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return new TabletServersRecovery(); - } - - for (TabletServerStatus server : mmi.tServerInfo) { - if (server.logSorts != null) { - for (RecoveryStatus recovery : server.logSorts) { - String serv = AddressUtil.parseAddress(server.name).getHost(); - String log = recovery.name; - int time = recovery.runtime; - double progress = recovery.progress; - - recoveryList.addRecovery(new TabletServerRecoveryInformation(serv, log, time, progress)); - } - } - } - - return recoveryList; - } - - /** - * Generates details for the selected tserver - * - * @param tserverAddress TServer name - * @return TServer details - */ - @Path("{address}") - @GET - public TabletServerSummary getTserverDetails( - @PathParam("address") @NotNull @Pattern(regexp = HOSTNAME_PORT_REGEX) String tserverAddress) - throws Exception { - ManagerMonitorInfo mmi = monitor.getMmi(); - if (mmi == null) { - return new TabletServerSummary(); - } - - boolean tserverExists = false; - for (TabletServerStatus ts : mmi.getTServerInfo()) { - if (tserverAddress.equals(ts.getName())) { - tserverExists = true; - break; - } - } - - if (!tserverExists) { - return null; - } - - double minorStdDev = 0; - double minorQueueStdDev = 0; - double currentMinorAvg = 0; - double currentMinorStdDev = 0; - total = new TabletStats(null, new ActionStats(), 0, 0, 0); - HostAndPort address = HostAndPort.fromString(tserverAddress); - historical = new TabletStats(null, new ActionStats(), 0, 0, 0); - List tsStats = new ArrayList<>(); - - try { - ClientContext context = monitor.getContext(); - TabletServerClientService.Client client = - ThriftUtil.getClient(ThriftClientTypes.TABLET_SERVER, address, context); - try { - for (String tableId : mmi.tableMap.keySet()) { - tsStats.addAll(client.getTabletStats(TraceUtil.traceInfo(), context.rpcCreds(), tableId)); - } - historical = client.getHistoricalStats(TraceUtil.traceInfo(), context.rpcCreds()); - } finally { - ThriftUtil.returnClient(client, context); - } - } catch (Exception e) { - return null; - } - - List currentOps = doCurrentOperations(tsStats); - - if (total.minors.num != 0) { - currentMinorAvg = (long) (total.minors.elapsed / total.minors.num); - } - if (total.minors.elapsed != 0 && total.minors.num != 0) { - currentMinorStdDev = stddev(total.minors.elapsed, total.minors.num, total.minors.sumDev); - } - - ActionStatsUpdator.update(total.minors, historical.minors); - - minorStdDev = stddev(total.minors.elapsed, total.minors.num, total.minors.sumDev); - minorQueueStdDev = stddev(total.minors.queueTime, total.minors.num, total.minors.queueSumDev); - - TabletServerDetailInformation details = doDetails(tsStats.size()); - - List allTime = doAllTimeResults(minorQueueStdDev, minorStdDev); - - CurrentTabletResults currentRes = doCurrentTabletResults(currentMinorAvg, currentMinorStdDev); - - return new TabletServerSummary(details, allTime, currentRes, currentOps); - } - - /** - * Generates the server stats - * - * @return Server stat list - */ - @Path("serverStats") - @GET - public ServerStats getServerStats() { - - final int concurrentScans = monitor.getContext().getConfiguration().getScanExecutors(false) - .stream().mapToInt(sec -> sec.maxThreads).sum(); - - ServerStats stats = new ServerStats(); - - stats.addStats( - new ServerStat(ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(), true, - 100, "OS Load", "osload")); - stats.addStats(new ServerStat(1000, true, 1, "Ingest Entries", "ingest")); - stats.addStats(new ServerStat(10000, true, 1, "Scan Entries", "query")); - stats.addStats(new ServerStat(10, true, 10, "Ingest MB", "ingestMB")); - stats.addStats(new ServerStat(5, true, 10, "Scan MB", "queryMB")); - stats.addStats(new ServerStat(concurrentScans * 2, false, 1, "Running Scans", "scans")); - stats.addStats(new ServerStat(50, true, 10, "Scan Sessions", "scansessions")); - stats.addStats(new ServerStat(60000, false, 1, "Hold Time", "holdtime")); - stats.addStats(new ServerStat(1, false, 100, "Overall Avg", true, "allavg")); - stats.addStats(new ServerStat(1, false, 100, "Overall Max", true, "allmax")); - - return stats; - } - - private TabletServerDetailInformation doDetails(int numTablets) { - - return new TabletServerDetailInformation(numTablets, total.numEntries, total.minors.status); - } - - private List doAllTimeResults(double minorQueueStdDev, double minorStdDev) { - - List allTime = new ArrayList<>(); - - // Minor Compaction Operation - allTime.add(new AllTimeTabletResults("Minor Compaction", total.minors.num, - total.minors.fail, - total.minors.num != 0 ? (total.minors.queueTime / total.minors.num) : null, - minorQueueStdDev, total.minors.num != 0 ? (total.minors.elapsed / total.minors.num) : null, - minorStdDev, total.minors.elapsed)); - - return allTime; - } - - private CurrentTabletResults doCurrentTabletResults(double currentMinorAvg, - double currentMinorStdDev) { - - return new CurrentTabletResults(currentMinorAvg, currentMinorStdDev); - } - - private List doCurrentOperations(List tsStats) throws Exception { - - List currentOperations = new ArrayList<>(); - - for (TabletStats info : tsStats) { - if (info.extent == null) { - historical = info; - continue; - } - total.numEntries += info.numEntries; - ActionStatsUpdator.update(total.minors, info.minors); - - KeyExtent extent = KeyExtent.fromThrift(info.extent); - TableId tableId = extent.tableId(); - String displayExtent = String.format("[%s]", extent.obscured()); - - String tableName = monitor.getContext().getPrintableTableInfoFromId(tableId); - - currentOperations.add( - new CurrentOperations(tableName, tableId, displayExtent, info.numEntries, info.ingestRate, - info.queryRate, info.minors.num != 0 ? info.minors.elapsed / info.minors.num : null, - stddev(info.minors.elapsed, info.minors.num, info.minors.sumDev), - info.minors.elapsed != 0 ? info.minors.count / info.minors.elapsed : null)); - } - - return currentOperations; - } - - private static double stddev(double elapsed, double num, double sumDev) { - if (num != 0) { - double average = elapsed / num; - return Math.sqrt((sumDev / num) - (average * average)); - } - return 0; - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java deleted file mode 100644 index 00e68bf9bcd..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServerSummary.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import java.util.List; - -/** - * Generates a summary for the tserver - * - * @since 2.0.0 - */ -public class TabletServerSummary { - - // Variable names become json keys - public TabletServerDetailInformation details; - public List allTimeTabletResults; - public CurrentTabletResults currentTabletOperationResults; - public List currentOperations; - - public TabletServerSummary() {} - - /** - * Generates tserver information - * - * @param details TServer details - * @param allTimeResults TServer all time results - * @param currentResults TServer current results - * @param currentOperations TServer current operations - */ - public TabletServerSummary(TabletServerDetailInformation details, - List allTimeResults, CurrentTabletResults currentResults, - List currentOperations) { - this.details = details; - this.allTimeTabletResults = allTimeResults; - this.currentTabletOperationResults = currentResults; - this.currentOperations = currentOperations; - } - - /** - * Adds new current operations for the tserver - * - * @param currentOperations Current Operation to add - */ - public void addcurrentOperations(CurrentOperations currentOperations) { - this.currentOperations.add(currentOperations); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java deleted file mode 100644 index 231ca61e513..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServers.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import java.util.ArrayList; -import java.util.List; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - -/** - * Generates a list of servers, bad servers, and dead servers - * - * @since 2.0.0 - */ -@SuppressFBWarnings(value = "PA_PUBLIC_PRIMITIVE_ATTRIBUTE", - justification = "class used for serialization") -public class TabletServers { - - // Variable names become JSON keys - public List servers = new ArrayList<>(); - - public TabletServers() {} - - public TabletServers(int size) { - servers = new ArrayList<>(size); - } - - /** - * Adds new tservers to the list - * - * @param tablet New tserver - */ - public void addTablet(TabletServer tablet) { - servers.add(tablet.server); - } -} diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java deleted file mode 100644 index 5237f6a4172..00000000000 --- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/tservers/TabletServersRecovery.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import java.util.ArrayList; -import java.util.List; - -/** - * Generates a list of tservers recoveries - * - * @since 2.0.0 - */ -public class TabletServersRecovery { - - // Variable names become JSON keys - public List recoveryList = new ArrayList<>(); - - /** - * Adds a new tserver recovery to the list - * - * @param tabletServerRecovery TServer recovery to add - */ - public void addRecovery(TabletServerRecoveryInformation tabletServerRecovery) { - this.recoveryList.add(tabletServerRecovery); - } - -} diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js index d28a46c75a8..972f3522530 100644 --- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js +++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/functions.js @@ -19,11 +19,11 @@ "use strict"; // Suffixes for quantity -var QUANTITY_SUFFIX = ['', 'K', 'M', 'B', 'T', 'e15', 'e18', 'e21']; +const QUANTITY_SUFFIX = ['', 'K', 'M', 'B', 'T', 'e15', 'e18', 'e21']; // Suffixes for size -var SIZE_SUFFIX = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB']; -const REST_V2_PREFIX = contextPath + 'rest-v2'; +const SIZE_SUFFIX = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB']; +const REST_V2_PREFIX = contextPath + 'rest-v2'; const COMPACTOR_SERVER_PROCESS_VIEW = 'compactorsView'; const COORDINATOR_QUEUE_PROCESS_VIEW = 'coordinatorQueueView'; const GC_SERVER_PROCESS_VIEW = 'gcSummaryView'; @@ -34,7 +34,6 @@ const MANAGER_FATE_SERVER_PROCESS_VIEW = 'managersFateView'; const MANAGER_COMPACTION_SERVER_PROCESS_VIEW = 'managersCompactionView'; const SCAN_SERVER_PROCESS_VIEW = 'sserversView'; const TABLET_SERVER_PROCESS_VIEW = 'tserversView'; -var STATUS_REQUEST = null; const RUNNING_COMPACTIONS_BY_TABLE = 'runningCompactionsByTable'; const RUNNING_COMPACTIONS_BY_GROUP = 'runningCompactionsByGroup'; const AUTO_REFRESH_KEY = 'auto-refresh'; @@ -47,6 +46,8 @@ const INSTANCE_OVERVIEW = 'instanceOverview'; const SCANS = 'scans'; const LAST_UPDATE = 'lastUpdate'; +var STATUS_REQUEST = null; + // Override Length Menu options for dataTables if ($.fn && $.fn.dataTable) { $.extend(true, $.fn.dataTable.defaults, { @@ -421,95 +422,6 @@ function doLoggedPostCall(call, callback, shouldSanitize) { }); } -///// REST Calls ///////////// - -/** - * REST GET call for the namespaces, stores it on a global variable - */ -function getNamespaces() { - return getJSONForTable(contextPath + 'rest/tables/namespaces', 'NAMESPACES'); -} - -/** - * REST GET call for the tables, stores it on a sessionStorage variable - */ -function getTables() { - return getJSONForTable(contextPath + 'rest/tables', 'tables'); -} - -/** - * REST GET call for the tables on each namespace, - * stores it on a sessionStorage variable - * - * @param {array} namespaces Array holding the selected namespaces - */ -function getNamespaceTables(namespaces) { - - // Creates a JSON object to store the tables - var namespaceList = ""; - - /* - * If the namespace array include *, get all tables, otherwise, - * get tables from specific namespaces - */ - if (namespaces.indexOf('*') !== -1) { - return getTables(); - } - // Convert the list to a string for the REST call - namespaceList = namespaces.toString(); - - return getJSONForTable(contextPath + 'rest/tables/namespaces/' + namespaceList, 'tables'); -} - -/** - * REST POST call to clear a specific dead server - * - * @param {string} server Dead Server ID - */ -function clearDeadServers(server) { - doLoggedPostCall(contextPath + 'rest/tservers?server=' + server, null, false); -} - -/** - * REST GET call for the tservers, stores it on a sessionStorage variable - */ -function getTServers() { - return getJSONForTable(contextPath + 'rest/tservers', 'tservers'); -} - -/** - * REST GET call for the tservers, stores it on a sessionStorage variable - * - * @param {string} server Server ID - */ -function getTServer(server) { - return getJSONForTable(contextPath + 'rest/tservers/' + server, 'server'); -} - -/** - * REST GET call for the scans, stores it on a sessionStorage variable - */ -function getScans() { - return getJSONForTable(REST_V2_PREFIX + '/scans', SCANS); -} - -/** - * REST GET call for the server stats, stores it on a sessionStorage variable - */ -function getServerStats() { - return getJSONForTable(contextPath + 'rest/tservers/serverStats', 'serverStats'); -} - -/** - * REST GET call for the participating tablet servers, - * stores it on a sessionStorage variable - * - * @param {string} table Table ID - */ -function getTableServers(tableID) { - return getJSONForTable(contextPath + 'rest/tables/' + tableID, 'tableServers'); -} - /* * Jquery call to clear all data from cells of a table */ @@ -520,7 +432,14 @@ function clearAllTableCells(tableId) { }); } -// NEW REST CALLS +///// REST Calls ///////////// + +/** + * REST GET call for the scans, stores it on a sessionStorage variable + */ +function getScans() { + return getJSONForTable(REST_V2_PREFIX + '/scans', SCANS); +} /** * REST GET call for /problems, diff --git a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java b/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java deleted file mode 100644 index c20c53214c8..00000000000 --- a/server/monitor/src/test/java/org/apache/accumulo/monitor/rest/tservers/TabletServerInformationTest.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.monitor.rest.tservers; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Collections; - -import org.apache.accumulo.core.manager.thrift.Compacting; -import org.apache.accumulo.core.manager.thrift.RecoveryStatus; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.monitor.Monitor; -import org.apache.accumulo.monitor.rest.tables.CompactionsTypes; -import org.apache.accumulo.monitor.rest.trace.RecoveryStatusInformation; -import org.easymock.EasyMock; -import org.junit.jupiter.api.Test; - -public class TabletServerInformationTest { - - @Test - public void testFromThrift() { - TabletServerStatus ts = new TabletServerStatus(); - ts.setDataCacheHits(11); - ts.setDataCacheRequest(22); - ts.setFlushs(33); - ts.setHoldTime(44); - ts.setIndexCacheHits(55); - ts.setIndexCacheRequest(66); - ts.setLastContact(77); - RecoveryStatus recoveries = new RecoveryStatus(); - recoveries.setName("testRecovery"); - recoveries.setProgress(0.42); - recoveries.setRuntime(4); - ts.setLogSorts(Collections.singletonList(recoveries)); - ts.setLookups(88); - ts.setName("tServerTestName:1234"); - ts.setOsLoad(1.23); - ts.setResponseTime(99); - ts.setSyncs(101); - TableInfo tableInfo = new TableInfo(); - tableInfo.tablets = 202; - tableInfo.ingestRate = 2.34; - tableInfo.queryRate = 3.45; - tableInfo.ingestByteRate = 4.56; - tableInfo.queryByteRate = 5.67; - tableInfo.scans = new Compacting(301, 401); - tableInfo.recs = 502; - tableInfo.minors = new Compacting(701, 801); - ts.setTableMap(Collections.singletonMap("tableId0", tableInfo)); - ts.setVersion("testVersion"); - - Monitor monitor = EasyMock.createMock(Monitor.class); - - TabletServerInformation tsi = new TabletServerInformation(monitor, ts); - - assertEquals("tServerTestName:1234", tsi.server); - assertEquals("tServerTestName:1234", tsi.hostname); - // can only get within a small distance of time, since it is computed from "now" at time of - // object creation - assertTrue(Math.abs((System.currentTimeMillis() - 77) - tsi.lastContact) < 500); - assertEquals(99, tsi.responseTime); - assertEquals(1.23, tsi.osload, 0.001); - assertEquals("testVersion", tsi.version); - CompactionsTypes compactions = tsi.compactions; - assertEquals(701, compactions.minor.running.intValue()); - assertEquals(801, compactions.minor.queued.intValue()); - assertEquals(301, compactions.scans.running.intValue()); - assertEquals(401, compactions.scans.queued.intValue()); - assertEquals(202, tsi.tablets); - assertEquals(2.34, tsi.ingest, 0.001); - assertEquals(3.45, tsi.query, 0.001); - assertEquals(4.56, tsi.ingestMB, 0.001); - assertEquals(5.67, tsi.queryMB, 0.001); - assertEquals(301, tsi.scans.intValue()); - assertEquals(0.0, tsi.scansessions, 0.001); // can't test here; this comes from - // ManagerMonitorInfo - assertEquals(tsi.scansessions, tsi.scanssessions, 0.001); - assertEquals(44, tsi.holdtime); - assertEquals("tServerTestName:1234", tsi.ip); - assertEquals(502, tsi.entries); - assertEquals(88, tsi.lookups); - assertEquals(55, tsi.indexCacheHits); - assertEquals(66, tsi.indexCacheRequests); - assertEquals(11, tsi.dataCacheHits); - assertEquals(22, tsi.dataCacheRequests); - assertEquals(55 / 66.0, tsi.indexCacheHitRate, 0.001); - assertEquals(11 / 22.0, tsi.dataCacheHitRate, 0.001); - RecoveryStatusInformation rec = tsi.logRecoveries.get(0); - assertEquals("testRecovery", rec.name); - assertEquals(0.42, rec.progress, 0.001); - assertEquals(4, rec.runtime.intValue()); - } - -} diff --git a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java index 26e74f958d5..c8a53ebad9c 100644 --- a/test/src/main/java/org/apache/accumulo/test/BalanceIT.java +++ b/test/src/main/java/org/apache/accumulo/test/BalanceIT.java @@ -141,7 +141,7 @@ public void testBalanceMetadata() throws Exception { } } - static Map countLocations(AccumuloClient client, String tableName) + public static Map countLocations(AccumuloClient client, String tableName) throws Exception { var ctx = ((ClientContext) client); var ample = ctx.getAmple(); @@ -150,7 +150,7 @@ static Map countLocations(AccumuloClient client, String tableNam Map locCounts = new HashMap<>(); for (var tabletMeta : tabletsMeta) { var loc = tabletMeta.getLocation(); - locCounts.merge(loc == null ? " none" : loc.toString(), 1, Integer::sum); + locCounts.merge(loc == null ? "none" : loc.toString(), 1, Integer::sum); } return locCounts; } diff --git a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java index 0a03ed272c8..8deb58a6a41 100644 --- a/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java +++ b/test/src/main/java/org/apache/accumulo/test/CountNameNodeOpsBulkIT.java @@ -37,6 +37,7 @@ import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.NewTableConfiguration; +import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.data.Key; @@ -44,7 +45,6 @@ import org.apache.accumulo.core.file.FileOperations; import org.apache.accumulo.core.file.FileSKVWriter; import org.apache.accumulo.core.file.rfile.RFile; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; import org.apache.accumulo.core.metadata.UnreferencedTabletFile; import org.apache.accumulo.core.spi.crypto.NoCryptoServiceFactory; import org.apache.accumulo.minicluster.ServerType; @@ -113,8 +113,7 @@ public void compareOldNewBulkImportTest() throws Exception { var ntc = new NewTableConfiguration().setProperties(props).withSplits(splits); c.tableOperations().create(tableName, ntc); - ManagerMonitorInfo stats = getCluster().getManagerMonitorInfo(); - assertEquals(1, stats.tServerInfo.size()); + assertEquals(1, c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size()); log.info("Creating lots of bulk import files"); final FileSystem fs = getCluster().getFileSystem(); diff --git a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java index 36e0faaec12..f008472b291 100644 --- a/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java +++ b/test/src/main/java/org/apache/accumulo/test/DetectDeadTabletServersIT.java @@ -18,21 +18,16 @@ */ package org.apache.accumulo.test; -import static java.util.concurrent.TimeUnit.SECONDS; import static org.apache.accumulo.minicluster.ServerType.TABLET_SERVER; -import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.Scanner; -import org.apache.accumulo.core.clientImpl.ClientContext; +import org.apache.accumulo.core.client.admin.servers.ServerId; import org.apache.accumulo.core.conf.ClientProperty; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.functional.ConfigurableMacBase; import org.apache.accumulo.test.util.Wait; @@ -55,33 +50,15 @@ public void test() throws Exception { c.createScanner(SystemTables.METADATA.tableName(), Authorizations.EMPTY)) { scanner.forEach((k, v) -> {}); } - ManagerMonitorInfo stats = getStats(c); - assertEquals(2, stats.tServerInfo.size()); - assertEquals(0, stats.badTServers.size()); - assertEquals(0, stats.deadTabletServers.size()); + Wait.waitFor( + () -> c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 2); + log.info("Killing a tablet server"); getCluster().killProcess(TABLET_SERVER, getCluster().getProcesses().get(TABLET_SERVER).iterator().next()); - Wait.waitFor(() -> getStats(c).tServerInfo.size() != 2, SECONDS.toMillis(60), 500); - - stats = getStats(c); - assertEquals(1, stats.tServerInfo.size()); - assertEquals(1, stats.badTServers.size() + stats.deadTabletServers.size()); - - Wait.waitFor(() -> !getStats(c).deadTabletServers.isEmpty(), SECONDS.toMillis(60), 500); - - stats = getStats(c); - assertEquals(1, stats.tServerInfo.size()); - assertEquals(0, stats.badTServers.size()); - assertEquals(1, stats.deadTabletServers.size()); + Wait.waitFor( + () -> c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1); } } - - private ManagerMonitorInfo getStats(AccumuloClient c) throws Exception { - final ClientContext context = (ClientContext) c; - return ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds())); - } - } diff --git a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java b/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java deleted file mode 100644 index 17482ab2914..00000000000 --- a/test/src/main/java/org/apache/accumulo/test/GetManagerStats.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.accumulo.test; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map.Entry; - -import org.apache.accumulo.core.conf.SiteConfiguration; -import org.apache.accumulo.core.manager.thrift.DeadServer; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.RecoveryStatus; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.trace.TraceUtil; -import org.apache.accumulo.server.ServerContext; -import org.apache.accumulo.server.util.TableInfoUtil; - -public class GetManagerStats { - public static void main(String[] args) throws Exception { - ManagerMonitorInfo stats = null; - var context = new ServerContext(SiteConfiguration.auto()); - stats = ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds())); - out(0, "State: " + stats.state.name()); - out(0, "Goal State: " + stats.goalState.name()); - if (stats.serversShuttingDown != null && !stats.serversShuttingDown.isEmpty()) { - out(0, "Servers to shutdown"); - for (String server : stats.serversShuttingDown) { - out(1, "%s", server); - } - } - out(0, "Unassigned tablets: %d", stats.unassignedTablets); - if (stats.badTServers != null && !stats.badTServers.isEmpty()) { - out(0, "Bad servers"); - - for (Entry entry : stats.badTServers.entrySet()) { - out(1, "%s: %d", entry.getKey(), (int) entry.getValue()); - } - } - out(0, "Dead tablet servers count: %s", stats.deadTabletServers.size()); - for (DeadServer dead : stats.deadTabletServers) { - out(1, "Dead tablet server: %s", dead.server); - out(2, "Last report: %s", new SimpleDateFormat().format(new Date(dead.lastStatus))); - out(2, "Cause: %s", dead.status); - } - if (stats.tableMap != null && !stats.tableMap.isEmpty()) { - out(0, "Tables"); - for (Entry entry : stats.tableMap.entrySet()) { - TableInfo v = entry.getValue(); - out(1, "%s", entry.getKey()); - out(2, "Records: %d", v.recs); - out(2, "Records in Memory: %d", v.recsInMemory); - out(2, "Tablets: %d", v.tablets); - out(2, "Online Tablets: %d", v.onlineTablets); - out(2, "Ingest Rate: %.2f", v.ingestRate); - out(2, "Query Rate: %.2f", v.queryRate); - } - } - if (stats.tServerInfo != null && !stats.tServerInfo.isEmpty()) { - out(0, "Tablet Servers"); - long now = System.currentTimeMillis(); - for (TabletServerStatus server : stats.tServerInfo) { - TableInfo summary = TableInfoUtil.summarizeTableStats(server); - out(1, "Name: %s", server.name); - out(2, "Ingest: %.2f", summary.ingestRate); - out(2, "Last Contact: %s", server.lastContact); - out(2, "OS Load Average: %.2f", server.osLoad); - out(2, "Queries: %.2f", summary.queryRate); - out(2, "Time Difference: %.1f", ((now - server.lastContact) / 1000.)); - out(2, "Total Records: %d", summary.recs); - out(2, "Lookups: %d", server.lookups); - if (server.holdTime > 0) { - out(2, "Hold Time: %d", server.holdTime); - } - if (server.tableMap != null && !server.tableMap.isEmpty()) { - out(2, "Tables"); - for (Entry status : server.tableMap.entrySet()) { - TableInfo info = status.getValue(); - out(3, "Table: %s", status.getKey()); - out(4, "Tablets: %d", info.onlineTablets); - out(4, "Records: %d", info.recs); - out(4, "Records in Memory: %d", info.recsInMemory); - out(4, "Ingest: %.2f", info.ingestRate); - out(4, "Queries: %.2f", info.queryRate); - out(4, "Minor Compacting: %d", info.minors == null ? 0 : info.minors.running); - out(4, "Queued for Minor Compaction: %d", info.minors == null ? 0 : info.minors.queued); - } - } - out(2, "Recoveries: %d", server.logSorts.size()); - for (RecoveryStatus sort : server.logSorts) { - out(3, "File: %s", sort.name); - out(3, "Progress: %.2f%%", sort.progress * 100); - out(3, "Time running: %s", sort.runtime / 1000.); - } - } - } - } - - private static void out(int indent, String fmtString, Object... args) { - for (int i = 0; i < indent; i++) { - System.out.print(" "); - } - System.out.printf(fmtString + "%n", args); - } - -} diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java index f6688cd5678..30c03500b9c 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceAfterCommsFailureIT.java @@ -19,6 +19,7 @@ package org.apache.accumulo.test.functional; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.lang.reflect.Field; @@ -26,22 +27,18 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; -import org.apache.accumulo.core.clientImpl.ClientContext; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; import org.apache.accumulo.core.security.Authorizations; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.accumulo.miniclusterImpl.ProcessReference; +import org.apache.accumulo.test.BalanceIT; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.Test; @@ -99,14 +96,13 @@ public void test() throws Exception { } private void checkBalance(AccumuloClient c) throws Exception { - ClientContext context = (ClientContext) c; - ManagerMonitorInfo stats = null; - int unassignedTablets = 1; + Map tableLocations = null; + long unassignedTablets = 1; for (int i = 0; unassignedTablets > 0 && i < 10; i++) { - stats = ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds())); - unassignedTablets = stats.getUnassignedTablets(); + tableLocations = BalanceIT.countLocations(c, "test"); + unassignedTablets = + tableLocations.entrySet().stream().filter(e -> e.getKey().equals("none")).count(); if (unassignedTablets > 0) { log.info("Found {} unassigned tablets, sleeping 3 seconds for tablet assignment", unassignedTablets); @@ -115,21 +111,16 @@ private void checkBalance(AccumuloClient c) throws Exception { } assertEquals(0, unassignedTablets, "Unassigned tablets were not assigned within 30 seconds"); + assertNotNull(tableLocations); + assertTrue(tableLocations.size() > 1, "Expected to have at least two TabletServers"); - List counts = new ArrayList<>(); - for (TabletServerStatus server : stats.tServerInfo) { - int count = 0; - for (TableInfo table : server.tableMap.values()) { - count += table.onlineTablets; - } - counts.add(count); - } - assertTrue(counts.size() > 1, "Expected to have at least two TabletServers"); - for (int i = 1; i < counts.size(); i++) { - int diff = Math.abs(counts.get(0) - counts.get(i)); - assertTrue(diff <= counts.size(), - "Expected difference in tablets to be less than or equal to " + counts.size() - + " but was " + diff + ". Counts " + counts); + List values = new ArrayList<>(); + values.addAll(tableLocations.values()); + for (int i = 1; i < values.size(); i++) { + int diff = Math.abs(values.get(0) - values.get(i)); + assertTrue(diff <= tableLocations.size(), + "Expected difference in tablets to be less than or equal to " + tableLocations.size() + + " but was " + diff + ". Counts " + tableLocations); } } } diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java index 83d7faaa108..3b6670ffd37 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/BalanceInPresenceOfOfflineTableIT.java @@ -21,9 +21,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.SortedSet; import java.util.TreeSet; @@ -37,20 +38,14 @@ import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TabletAvailability; import org.apache.accumulo.core.client.admin.servers.ServerId; -import org.apache.accumulo.core.clientImpl.ClientContext; -import org.apache.accumulo.core.clientImpl.Credentials; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.harness.AccumuloClusterHarness; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.BalanceIT; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.VerifyIngest; import org.apache.accumulo.test.VerifyIngest.VerifyParams; import org.apache.accumulo.test.util.Wait; -import org.apache.commons.lang3.math.NumberUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.junit.jupiter.api.AfterEach; @@ -147,22 +142,22 @@ public void test() throws Exception { long currentWait = 1_000; boolean balancingWorked = false; - Credentials creds = new Credentials(getAdminPrincipal(), getAdminToken()); while (!balancingWorked && (System.currentTimeMillis() - startTime) < ((5 * 60 + 15) * 1000)) { Thread.sleep(currentWait); currentWait = Math.min(currentWait * 2, 30_000); log.debug("fetch the list of tablets assigned to each tserver."); - ManagerMonitorInfo stats = ThriftClientTypes.MANAGER.execute((ClientContext) accumuloClient, - client -> client.getManagerStats(TraceUtil.traceInfo(), - creds.toThrift(accumuloClient.instanceOperations().getInstanceId()))); - - if (stats.getTServerInfoSize() < 2) { + if (accumuloClient.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() < 2) { log.debug("we need >= 2 servers. sleeping for {}ms", currentWait); continue; } - if (stats.getUnassignedTablets() != 0) { + + Map tableLocations = BalanceIT.countLocations(accumuloClient, TEST_TABLE); + + long unassignedTablets = + tableLocations.entrySet().stream().filter(e -> e.getKey().equals("none")).count(); + if (unassignedTablets != 0) { log.debug("We shouldn't have unassigned tablets. sleeping for {}ms", currentWait); continue; } @@ -172,24 +167,25 @@ public void test() throws Exception { continue; } - long[] tabletsPerServer = new long[stats.getTServerInfoSize()]; - Arrays.fill(tabletsPerServer, 0L); - for (int i = 0; i < stats.getTServerInfoSize(); i++) { - for (Map.Entry entry : stats.getTServerInfo().get(i).getTableMap() - .entrySet()) { - tabletsPerServer[i] += entry.getValue().getTablets(); - log.debug("Tablets per server {} {} {} {}", stats.getTServerInfo().get(i).getName(), i, - entry.getKey(), entry.getValue().getTablets()); - } + HashMap serversWithTablets = tableLocations.entrySet().stream() + .filter(e -> !e.getKey().equals("none")).filter(e -> e.getValue() > 0).collect( + HashMap::new, (m, e) -> m.put(e.getKey(), e.getValue()), (m1, m2) -> { + for (Entry e2 : m2.entrySet()) { + m1.merge(e2.getKey(), e2.getValue(), (left, right) -> left + right); + } + }); + + if (serversWithTablets.isEmpty()) { + continue; } - if (tabletsPerServer[0] <= 10) { + if (serversWithTablets.values().iterator().next() <= 10) { log.debug("We should have > 10 tablets. sleeping for {}ms tabletsPerServer:{}", currentWait, - List.of(tabletsPerServer)); + List.of(serversWithTablets)); continue; } - long min = NumberUtils.min(tabletsPerServer); - long max = NumberUtils.max(tabletsPerServer); + Integer min = serversWithTablets.values().stream().min(Long::compare).orElseThrow(); + Integer max = serversWithTablets.values().stream().max(Long::compare).orElseThrow(); log.debug("Min={}, Max={}", min, max); if ((min / ((double) max)) < 0.5) { log.debug( diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java index 387bc9db7a2..d1b7afd2495 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataMaxFilesIT.java @@ -21,7 +21,6 @@ import static java.util.concurrent.TimeUnit.SECONDS; import java.time.Duration; -import java.util.Map.Entry; import java.util.SortedSet; import java.util.TreeSet; @@ -29,14 +28,9 @@ import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TabletAvailability; -import org.apache.accumulo.core.clientImpl.ClientContext; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; +import org.apache.accumulo.core.data.TableId; import org.apache.accumulo.core.metadata.SystemTables; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.RawLocalFileSystem; @@ -79,21 +73,14 @@ public void test() throws Exception { c.tableOperations().flush(SystemTables.ROOT.tableName(), null, null, true); } + TableId tid0 = TableId.of(c.tableOperations().tableIdMap().get("table0")); + TableId tid1 = TableId.of(c.tableOperations().tableIdMap().get("table1")); + while (true) { - ClientContext context = (ClientContext) c; - ManagerMonitorInfo stats = ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), context.rpcCreds())); - int tablets = 0; - for (TabletServerStatus tserver : stats.tServerInfo) { - for (Entry entry : tserver.tableMap.entrySet()) { - if (entry.getKey().startsWith("!") || entry.getKey().startsWith("+")) { - continue; - } - tablets += entry.getValue().onlineTablets; - } - } - log.info("Online tablets " + tablets); - if (tablets == 2002) { + long hostedTabletCount = ManagerAssignmentIT.countTabletsWithLocation(c, tid0) + + ManagerAssignmentIT.countTabletsWithLocation(c, tid1); + log.info("Online tablets " + hostedTabletCount); + if (hostedTabletCount == 2002) { break; } Thread.sleep(SECONDS.toMillis(1)); diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java index 65b11013e81..2233923efa9 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java @@ -22,27 +22,24 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; +import java.util.stream.Stream; import org.apache.accumulo.core.client.Accumulo; import org.apache.accumulo.core.client.AccumuloClient; import org.apache.accumulo.core.client.admin.NewTableConfiguration; import org.apache.accumulo.core.client.admin.TabletAvailability; import org.apache.accumulo.core.client.admin.servers.ServerId; -import org.apache.accumulo.core.client.security.tokens.PasswordToken; -import org.apache.accumulo.core.clientImpl.ClientContext; -import org.apache.accumulo.core.clientImpl.Credentials; import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo; -import org.apache.accumulo.core.manager.thrift.TableInfo; -import org.apache.accumulo.core.manager.thrift.TabletServerStatus; -import org.apache.accumulo.core.rpc.clients.ThriftClientTypes; -import org.apache.accumulo.core.trace.TraceUtil; import org.apache.accumulo.minicluster.MemoryUnit; import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl; +import org.apache.accumulo.test.BalanceIT; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.test.util.Wait; import org.apache.hadoop.conf.Configuration; @@ -79,16 +76,15 @@ public void simpleBalancerFairness() throws Exception { params.rows = 5000; TestIngest.ingest(c, params); c.tableOperations().flush(ingestTable, null, null, false); - Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD)); - - ClientContext context = (ClientContext) c; // wait for tablet assignment Wait.waitFor(() -> { - ManagerMonitorInfo stats = ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), - creds.toThrift(c.instanceOperations().getInstanceId()))); - int unassignedTablets = stats.getUnassignedTablets(); + Map ingestTableLocations = BalanceIT.countLocations(c, ingestTable); + Map unusedTableLocations = BalanceIT.countLocations(c, unusedTable); + long unassignedTablets = Stream + .concat(ingestTableLocations.entrySet().stream(), + unusedTableLocations.entrySet().stream()) + .filter(e -> e.getKey().equals("none")).count(); if (unassignedTablets > 0) { log.info("Found {} unassigned tablets, sleeping 3 seconds for tablet assignment", unassignedTablets); @@ -100,28 +96,30 @@ public void simpleBalancerFairness() throws Exception { // wait for tablets to be balanced Wait.waitFor(() -> { - ManagerMonitorInfo stats = ThriftClientTypes.MANAGER.execute(context, - client -> client.getManagerStats(TraceUtil.traceInfo(), - creds.toThrift(c.instanceOperations().getInstanceId()))); - - List counts = new ArrayList<>(); - for (TabletServerStatus server : stats.tServerInfo) { - int count = 0; - for (TableInfo table : server.tableMap.values()) { - count += table.onlineTablets; - } - counts.add(count); - } - assertTrue(counts.size() >= 2, - "Expected at least 2 tservers to have tablets, but found " + counts); + Map ingestTableLocations = BalanceIT.countLocations(c, ingestTable); + Map unusedTableLocations = BalanceIT.countLocations(c, unusedTable); + HashMap serversWithTablets = Stream + .concat(ingestTableLocations.entrySet().stream(), + unusedTableLocations.entrySet().stream()) + .filter(e -> !e.getKey().equals("none")).filter(e -> e.getValue() > 0) + .collect(HashMap::new, (m, e) -> m.put(e.getKey(), e.getValue()), + (m1, m2) -> { + for (Entry e2 : m2.entrySet()) { + m1.merge(e2.getKey(), e2.getValue(), (left, right) -> left + right); + } + }); + assertTrue(serversWithTablets.size() >= 2, + "Expected at least 2 tservers to have tablets, but found " + serversWithTablets.size()); - for (int i = 1; i < counts.size(); i++) { - int diff = Math.abs(counts.get(0) - counts.get(i)); - log.info(" Counts: {}", counts); + List values = new ArrayList<>(); + values.addAll(serversWithTablets.values()); + for (int i = 1; i < values.size(); i++) { + int diff = Math.abs(values.get(0) - values.get(i)); + log.info(" Counts: {}", values); if (diff > tservers.size()) { log.info( "Difference in tablets between tservers is greater than expected. Counts: {} tsevers:{}", - counts, tservers.size()); + values, tservers.size()); return false; } }