You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2023/02/02 12:12:08 UTC
[accumulo] branch 2.1 updated: Added logic to validate property value against their types (#3177)
This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new 39fbd1b63e Added logic to validate property value against their types (#3177)
39fbd1b63e is described below
commit 39fbd1b63ec83ff789c56b0778edeeaff96ee347
Author: Daniel Roberts <dd...@gmail.com>
AuthorDate: Thu Feb 2 07:12:01 2023 -0500
Added logic to validate property value against their types (#3177)
Refactor the `isTablePropertyValid` method to be more generic.
This change moves the `isValidTablePropertyKey` method calls out
from the `isTablePropertyValid` method and to the calling locations.
This allows for the `isTablePropertyValid` method to be renamed to
`isValidProperty`. Moving that method allowed for error messages to
accurately describe an invalid table property error and an invalid
value error. Added 'throws' to method signatures in partial attempt
to improve error visibilities. Adds new `ThriftPropertyException` to
allow for the `IllegalArgumentException` runtime exception to be
caught and displayed to the client.
Closes #3177
---
.../org/apache/accumulo/core/conf/Property.java | 12 +-
.../core/manager/thrift/ManagerClientService.java | 660 +++++++++++++++++++--
.../manager/thrift/ThriftPropertyException.java | 616 +++++++++++++++++++
core/src/main/thrift/manager.thrift | 11 +
.../apache/accumulo/core/conf/PropertyTest.java | 74 ++-
.../org/apache/accumulo/server/util/PropUtil.java | 16 +-
.../accumulo/server/util/SystemPropUtil.java | 18 +-
.../accumulo/manager/FateServiceHandler.java | 25 +-
.../manager/ManagerClientServiceHandler.java | 38 +-
.../org/apache/accumulo/tserver/log/LogSorter.java | 2 +-
.../org/apache/accumulo/test/NamespacesIT.java | 12 +
.../apache/accumulo/test/TableOperationsIT.java | 11 +
.../accumulo/test/conf/PropStoreConfigIT.java | 43 ++
.../org/apache/accumulo/test/shell/ShellIT.java | 87 +++
14 files changed, 1549 insertions(+), 76 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 0f982073b0..d7cc2748a8 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -1712,16 +1712,20 @@ public enum Property {
/**
* Checks if the given property and value are valid. A property is valid if the property key is
- * valid see {@link #isValidTablePropertyKey} and that the value is a valid format for the type
- * see {@link PropertyType#isValidFormat}.
+ * valid see {@link #isValidPropertyKey} and that the value is a valid format for the type see
+ * {@link PropertyType#isValidFormat}.
*
* @param key property key
* @param value property value
* @return true if key is valid (recognized, or has a recognized prefix)
*/
- public static boolean isTablePropertyValid(final String key, final String value) {
+ public static boolean isValidProperty(final String key, final String value) {
Property p = getPropertyByKey(key);
- return (p == null || p.getType().isValidFormat(value)) && isValidTablePropertyKey(key);
+ if (p == null) {
+ // If a key doesn't exist yet, then check if it follows a valid prefix
+ return validPrefixes.stream().anyMatch(key::startsWith);
+ }
+ return (isValidPropertyKey(key) && p.getType().isValidFormat(value));
}
/**
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 93f4a63249..5e17421edd 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
@@ -33,13 +33,13 @@ public class ManagerClientService {
public void waitForFlush(org.apache.accumulo.core.trace.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) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, o [...]
- public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apac [...]
- public void modifyTableProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, or [...]
+ public void modifyTableProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, or [...]
public void removeTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
- public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache. [...]
public void modifyNamespaceProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.a [...]
@@ -51,9 +51,9 @@ public class ManagerClientService {
public void shutdownTabletServer(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tabletServer, boolean force) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
- public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException;
- public void modifySystemProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TEx [...]
+ public void modifySystemProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyExcepti [...]
public void removeSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
@@ -213,7 +213,7 @@ public class ManagerClientService {
}
@Override
- public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apac [...]
{
send_setTableProperty(tinfo, credentials, tableName, property, value);
recv_setTableProperty();
@@ -230,7 +230,7 @@ public class ManagerClientService {
sendBase("setTableProperty", args);
}
- public void recv_setTableProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void recv_setTableProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException
{
setTableProperty_result result = new setTableProperty_result();
receiveBase(result, "setTableProperty");
@@ -243,11 +243,14 @@ public class ManagerClientService {
if (result.tnase != null) {
throw result.tnase;
}
+ if (result.tpe != null) {
+ throw result.tpe;
+ }
return;
}
@Override
- public void modifyTableProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, or [...]
+ public void modifyTableProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String tableName, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, or [...]
{
send_modifyTableProperties(tinfo, credentials, tableName, vProperties);
recv_modifyTableProperties();
@@ -263,7 +266,7 @@ public class ManagerClientService {
sendBase("modifyTableProperties", args);
}
- public void recv_modifyTableProperties() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TException
+ public void recv_modifyTableProperties() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyException, org.apache.thrift.TException
{
modifyTableProperties_result result = new modifyTableProperties_result();
receiveBase(result, "modifyTableProperties");
@@ -279,6 +282,9 @@ public class ManagerClientService {
if (result.tcme != null) {
throw result.tcme;
}
+ if (result.tpe != null) {
+ throw result.tpe;
+ }
return;
}
@@ -316,7 +322,7 @@ public class ManagerClientService {
}
@Override
- public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void setNamespaceProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String ns, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache. [...]
{
send_setNamespaceProperty(tinfo, credentials, ns, property, value);
recv_setNamespaceProperty();
@@ -333,7 +339,7 @@ public class ManagerClientService {
sendBase("setNamespaceProperty", args);
}
- public void recv_setNamespaceProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void recv_setNamespaceProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException
{
setNamespaceProperty_result result = new setNamespaceProperty_result();
receiveBase(result, "setNamespaceProperty");
@@ -346,6 +352,9 @@ public class ManagerClientService {
if (result.tnase != null) {
throw result.tnase;
}
+ if (result.tpe != null) {
+ throw result.tpe;
+ }
return;
}
@@ -507,7 +516,7 @@ public class ManagerClientService {
}
@Override
- public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void setSystemProperty(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, java.lang.String property, java.lang.String value) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException
{
send_setSystemProperty(tinfo, credentials, property, value);
recv_setSystemProperty();
@@ -523,7 +532,7 @@ public class ManagerClientService {
sendBase("setSystemProperty", args);
}
- public void recv_setSystemProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+ public void recv_setSystemProperty() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException
{
setSystemProperty_result result = new setSystemProperty_result();
receiveBase(result, "setSystemProperty");
@@ -533,11 +542,14 @@ public class ManagerClientService {
if (result.tnase != null) {
throw result.tnase;
}
+ if (result.tpe != null) {
+ throw result.tpe;
+ }
return;
}
@Override
- public void modifySystemProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TException
+ public void modifySystemProperties(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, org.apache.accumulo.core.clientImpl.thrift.TVersionedProperties vProperties) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyExcepti [...]
{
send_modifySystemProperties(tinfo, credentials, vProperties);
recv_modifySystemProperties();
@@ -552,7 +564,7 @@ public class ManagerClientService {
sendBase("modifySystemProperties", args);
}
- public void recv_modifySystemProperties() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TException
+ public void recv_modifySystemProperties() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyException, org.apache.thrift.TException
{
modifySystemProperties_result result = new modifySystemProperties_result();
receiveBase(result, "modifySystemProperties");
@@ -565,6 +577,9 @@ public class ManagerClientService {
if (result.tcme != null) {
throw result.tcme;
}
+ if (result.tpe != null) {
+ throw result.tpe;
+ }
return;
}
@@ -929,7 +944,7 @@ public class ManagerClientService {
}
@Override
- public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
+ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
@@ -974,7 +989,7 @@ public class ManagerClientService {
}
@Override
- public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TException {
+ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
@@ -1067,7 +1082,7 @@ public class ManagerClientService {
}
@Override
- public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
+ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
@@ -1331,7 +1346,7 @@ public class ManagerClientService {
}
@Override
- public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException {
+ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, ThriftPropertyException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
@@ -1373,7 +1388,7 @@ public class ManagerClientService {
}
@Override
- public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, org.apache.thrift.TException {
+ public Void getResult() throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException, ThriftPropertyException, org.apache.thrift.TException {
if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
throw new java.lang.IllegalStateException("Method call not finished!");
}
@@ -1855,6 +1870,8 @@ public class ManagerClientService {
result.tope = tope;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
result.tnase = tnase;
+ } catch (ThriftPropertyException tpe) {
+ result.tpe = tpe;
}
return result;
}
@@ -1893,6 +1910,8 @@ public class ManagerClientService {
result.tnase = tnase;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
result.tcme = tcme;
+ } catch (ThriftPropertyException tpe) {
+ result.tpe = tpe;
}
return result;
}
@@ -1965,6 +1984,8 @@ public class ManagerClientService {
result.tope = tope;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
result.tnase = tnase;
+ } catch (ThriftPropertyException tpe) {
+ result.tpe = tpe;
}
return result;
}
@@ -2175,6 +2196,8 @@ public class ManagerClientService {
result.sec = sec;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException tnase) {
result.tnase = tnase;
+ } catch (ThriftPropertyException tpe) {
+ result.tpe = tpe;
}
return result;
}
@@ -2211,6 +2234,8 @@ public class ManagerClientService {
result.tnase = tnase;
} catch (org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme) {
result.tcme = tcme;
+ } catch (ThriftPropertyException tpe) {
+ result.tpe = tpe;
}
return result;
}
@@ -2710,6 +2735,10 @@ public class ManagerClientService {
result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
result.setTnaseIsSet(true);
msg = result;
+ } else if (e instanceof ThriftPropertyException) {
+ result.tpe = (ThriftPropertyException) e;
+ result.setTpeIsSet(true);
+ msg = result;
} else if (e instanceof org.apache.thrift.transport.TTransportException) {
_LOGGER.error("TTransportException inside handler", e);
fb.close();
@@ -2792,6 +2821,10 @@ public class ManagerClientService {
result.tcme = (org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException) e;
result.setTcmeIsSet(true);
msg = result;
+ } else if (e instanceof ThriftPropertyException) {
+ result.tpe = (ThriftPropertyException) e;
+ result.setTpeIsSet(true);
+ msg = result;
} else if (e instanceof org.apache.thrift.transport.TTransportException) {
_LOGGER.error("TTransportException inside handler", e);
fb.close();
@@ -2948,6 +2981,10 @@ public class ManagerClientService {
result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
result.setTnaseIsSet(true);
msg = result;
+ } else if (e instanceof ThriftPropertyException) {
+ result.tpe = (ThriftPropertyException) e;
+ result.setTpeIsSet(true);
+ msg = result;
} else if (e instanceof org.apache.thrift.transport.TTransportException) {
_LOGGER.error("TTransportException inside handler", e);
fb.close();
@@ -3404,6 +3441,10 @@ public class ManagerClientService {
result.tnase = (org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException) e;
result.setTnaseIsSet(true);
msg = result;
+ } else if (e instanceof ThriftPropertyException) {
+ result.tpe = (ThriftPropertyException) e;
+ result.setTpeIsSet(true);
+ msg = result;
} else if (e instanceof org.apache.thrift.transport.TTransportException) {
_LOGGER.error("TTransportException inside handler", e);
fb.close();
@@ -3482,6 +3523,10 @@ public class ManagerClientService {
result.tcme = (org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException) e;
result.setTcmeIsSet(true);
msg = result;
+ } else if (e instanceof ThriftPropertyException) {
+ result.tpe = (ThriftPropertyException) e;
+ result.setTpeIsSet(true);
+ msg = result;
} else if (e instanceof org.apache.thrift.transport.TTransportException) {
_LOGGER.error("TTransportException inside handler", e);
fb.close();
@@ -7775,6 +7820,7 @@ public class ManagerClientService {
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();
@@ -7782,12 +7828,14 @@ public class ManagerClientService {
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");
+ TNASE((short)3, "tnase"),
+ TPE((short)4, "tpe");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -7809,6 +7857,8 @@ public class ManagerClientService {
return TOPE;
case 3: // TNASE
return TNASE;
+ case 4: // TPE
+ return TPE;
default:
return null;
}
@@ -7861,6 +7911,8 @@ public class ManagerClientService {
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);
}
@@ -7871,12 +7923,14 @@ public class ManagerClientService {
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.ThriftNotActiveServiceException tnase,
+ ThriftPropertyException tpe)
{
this();
this.sec = sec;
this.tope = tope;
this.tnase = tnase;
+ this.tpe = tpe;
}
/**
@@ -7892,6 +7946,9 @@ public class ManagerClientService {
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
@@ -7904,6 +7961,7 @@ public class ManagerClientService {
this.sec = null;
this.tope = null;
this.tnase = null;
+ this.tpe = null;
}
@org.apache.thrift.annotation.Nullable
@@ -7981,6 +8039,31 @@ public class ManagerClientService {
}
}
+ @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) {
@@ -8008,6 +8091,14 @@ public class ManagerClientService {
}
break;
+ case TPE:
+ if (value == null) {
+ unsetTpe();
+ } else {
+ setTpe((ThriftPropertyException)value);
+ }
+ break;
+
}
}
@@ -8024,6 +8115,9 @@ public class ManagerClientService {
case TNASE:
return getTnase();
+ case TPE:
+ return getTpe();
+
}
throw new java.lang.IllegalStateException();
}
@@ -8042,6 +8136,8 @@ public class ManagerClientService {
return isSetTope();
case TNASE:
return isSetTnase();
+ case TPE:
+ return isSetTpe();
}
throw new java.lang.IllegalStateException();
}
@@ -8086,6 +8182,15 @@ public class ManagerClientService {
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;
}
@@ -8105,6 +8210,10 @@ public class ManagerClientService {
if (isSetTnase())
hashCode = hashCode * 8191 + tnase.hashCode();
+ hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+ if (isSetTpe())
+ hashCode = hashCode * 8191 + tpe.hashCode();
+
return hashCode;
}
@@ -8146,6 +8255,16 @@ public class ManagerClientService {
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;
}
@@ -8192,6 +8311,14 @@ public class ManagerClientService {
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();
}
@@ -8264,6 +8391,15 @@ public class ManagerClientService {
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);
}
@@ -8295,6 +8431,11 @@ public class ManagerClientService {
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();
}
@@ -8323,7 +8464,10 @@ public class ManagerClientService {
if (struct.isSetTnase()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetTpe()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetSec()) {
struct.sec.write(oprot);
}
@@ -8333,12 +8477,15 @@ public class ManagerClientService {
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 {
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.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
struct.sec.read(iprot);
@@ -8354,6 +8501,11 @@ public class ManagerClientService {
struct.tnase.read(iprot);
struct.setTnaseIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.tpe = new ThriftPropertyException();
+ struct.tpe.read(iprot);
+ struct.setTpeIsSet(true);
+ }
}
}
@@ -9079,6 +9231,7 @@ public class ManagerClientService {
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 modifyTableProperties_resultStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifyTableProperties_resultTupleSchemeFactory();
@@ -9087,13 +9240,15 @@ public class ManagerClientService {
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"),
- TCME((short)4, "tcme");
+ TCME((short)4, "tcme"),
+ TPE((short)5, "tpe");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -9117,6 +9272,8 @@ public class ManagerClientService {
return TNASE;
case 4: // TCME
return TCME;
+ case 5: // TPE
+ return TPE;
default:
return null;
}
@@ -9171,6 +9328,8 @@ public class ManagerClientService {
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);
}
@@ -9182,13 +9341,15 @@ public class ManagerClientService {
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)
+ 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;
}
/**
@@ -9207,6 +9368,9 @@ public class ManagerClientService {
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
@@ -9220,6 +9384,7 @@ public class ManagerClientService {
this.tope = null;
this.tnase = null;
this.tcme = null;
+ this.tpe = null;
}
@org.apache.thrift.annotation.Nullable
@@ -9322,6 +9487,31 @@ public class ManagerClientService {
}
}
+ @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) {
@@ -9357,6 +9547,14 @@ public class ManagerClientService {
}
break;
+ case TPE:
+ if (value == null) {
+ unsetTpe();
+ } else {
+ setTpe((ThriftPropertyException)value);
+ }
+ break;
+
}
}
@@ -9376,6 +9574,9 @@ public class ManagerClientService {
case TCME:
return getTcme();
+ case TPE:
+ return getTpe();
+
}
throw new java.lang.IllegalStateException();
}
@@ -9396,6 +9597,8 @@ public class ManagerClientService {
return isSetTnase();
case TCME:
return isSetTcme();
+ case TPE:
+ return isSetTpe();
}
throw new java.lang.IllegalStateException();
}
@@ -9449,6 +9652,15 @@ public class ManagerClientService {
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;
}
@@ -9472,6 +9684,10 @@ public class ManagerClientService {
if (isSetTcme())
hashCode = hashCode * 8191 + tcme.hashCode();
+ hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+ if (isSetTpe())
+ hashCode = hashCode * 8191 + tpe.hashCode();
+
return hashCode;
}
@@ -9523,6 +9739,16 @@ public class ManagerClientService {
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;
}
@@ -9577,6 +9803,14 @@ public class ManagerClientService {
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();
}
@@ -9658,6 +9892,15 @@ public class ManagerClientService {
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);
}
@@ -9694,6 +9937,11 @@ public class ManagerClientService {
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();
}
@@ -9725,7 +9973,10 @@ public class ManagerClientService {
if (struct.isSetTcme()) {
optionals.set(3);
}
- oprot.writeBitSet(optionals, 4);
+ if (struct.isSetTpe()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
if (struct.isSetSec()) {
struct.sec.write(oprot);
}
@@ -9738,12 +9989,15 @@ public class ManagerClientService {
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 {
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.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
struct.sec.read(iprot);
@@ -9764,6 +10018,11 @@ public class ManagerClientService {
struct.tcme.read(iprot);
struct.setTcmeIsSet(true);
}
+ if (incoming.get(4)) {
+ struct.tpe = new ThriftPropertyException();
+ struct.tpe.read(iprot);
+ struct.setTpeIsSet(true);
+ }
}
}
@@ -11886,6 +12145,7 @@ public class ManagerClientService {
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();
@@ -11893,12 +12153,14 @@ public class ManagerClientService {
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");
+ TNASE((short)3, "tnase"),
+ TPE((short)4, "tpe");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -11920,6 +12182,8 @@ public class ManagerClientService {
return TOPE;
case 3: // TNASE
return TNASE;
+ case 4: // TPE
+ return TPE;
default:
return null;
}
@@ -11972,6 +12236,8 @@ public class ManagerClientService {
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);
}
@@ -11982,12 +12248,14 @@ public class ManagerClientService {
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.ThriftNotActiveServiceException tnase,
+ ThriftPropertyException tpe)
{
this();
this.sec = sec;
this.tope = tope;
this.tnase = tnase;
+ this.tpe = tpe;
}
/**
@@ -12003,6 +12271,9 @@ public class ManagerClientService {
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
@@ -12015,6 +12286,7 @@ public class ManagerClientService {
this.sec = null;
this.tope = null;
this.tnase = null;
+ this.tpe = null;
}
@org.apache.thrift.annotation.Nullable
@@ -12092,6 +12364,31 @@ public class ManagerClientService {
}
}
+ @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) {
@@ -12119,6 +12416,14 @@ public class ManagerClientService {
}
break;
+ case TPE:
+ if (value == null) {
+ unsetTpe();
+ } else {
+ setTpe((ThriftPropertyException)value);
+ }
+ break;
+
}
}
@@ -12135,6 +12440,9 @@ public class ManagerClientService {
case TNASE:
return getTnase();
+ case TPE:
+ return getTpe();
+
}
throw new java.lang.IllegalStateException();
}
@@ -12153,6 +12461,8 @@ public class ManagerClientService {
return isSetTope();
case TNASE:
return isSetTnase();
+ case TPE:
+ return isSetTpe();
}
throw new java.lang.IllegalStateException();
}
@@ -12197,6 +12507,15 @@ public class ManagerClientService {
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;
}
@@ -12216,6 +12535,10 @@ public class ManagerClientService {
if (isSetTnase())
hashCode = hashCode * 8191 + tnase.hashCode();
+ hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+ if (isSetTpe())
+ hashCode = hashCode * 8191 + tpe.hashCode();
+
return hashCode;
}
@@ -12257,6 +12580,16 @@ public class ManagerClientService {
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;
}
@@ -12303,6 +12636,14 @@ public class ManagerClientService {
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();
}
@@ -12375,6 +12716,15 @@ public class ManagerClientService {
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);
}
@@ -12406,6 +12756,11 @@ public class ManagerClientService {
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();
}
@@ -12434,7 +12789,10 @@ public class ManagerClientService {
if (struct.isSetTnase()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetTpe()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetSec()) {
struct.sec.write(oprot);
}
@@ -12444,12 +12802,15 @@ public class ManagerClientService {
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 {
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.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
struct.sec.read(iprot);
@@ -12465,6 +12826,11 @@ public class ManagerClientService {
struct.tnase.read(iprot);
struct.setTnaseIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.tpe = new ThriftPropertyException();
+ struct.tpe.read(iprot);
+ struct.setTpeIsSet(true);
+ }
}
}
@@ -19260,17 +19626,20 @@ public class ManagerClientService {
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();
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");
+ TNASE((short)2, "tnase"),
+ TPE((short)3, "tpe");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -19290,6 +19659,8 @@ public class ManagerClientService {
return SEC;
case 2: // TNASE
return TNASE;
+ case 3: // TPE
+ return TPE;
default:
return null;
}
@@ -19340,6 +19711,8 @@ public class ManagerClientService {
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);
}
@@ -19349,11 +19722,13 @@ public class ManagerClientService {
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.ThriftNotActiveServiceException tnase,
+ ThriftPropertyException tpe)
{
this();
this.sec = sec;
this.tnase = tnase;
+ this.tpe = tpe;
}
/**
@@ -19366,6 +19741,9 @@ public class ManagerClientService {
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
@@ -19377,6 +19755,7 @@ public class ManagerClientService {
public void clear() {
this.sec = null;
this.tnase = null;
+ this.tpe = null;
}
@org.apache.thrift.annotation.Nullable
@@ -19429,6 +19808,31 @@ public class ManagerClientService {
}
}
+ @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) {
@@ -19448,6 +19852,14 @@ public class ManagerClientService {
}
break;
+ case TPE:
+ if (value == null) {
+ unsetTpe();
+ } else {
+ setTpe((ThriftPropertyException)value);
+ }
+ break;
+
}
}
@@ -19461,6 +19873,9 @@ public class ManagerClientService {
case TNASE:
return getTnase();
+ case TPE:
+ return getTpe();
+
}
throw new java.lang.IllegalStateException();
}
@@ -19477,6 +19892,8 @@ public class ManagerClientService {
return isSetSec();
case TNASE:
return isSetTnase();
+ case TPE:
+ return isSetTpe();
}
throw new java.lang.IllegalStateException();
}
@@ -19512,6 +19929,15 @@ public class ManagerClientService {
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;
}
@@ -19527,6 +19953,10 @@ public class ManagerClientService {
if (isSetTnase())
hashCode = hashCode * 8191 + tnase.hashCode();
+ hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+ if (isSetTpe())
+ hashCode = hashCode * 8191 + tpe.hashCode();
+
return hashCode;
}
@@ -19558,6 +19988,16 @@ public class ManagerClientService {
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;
}
@@ -19596,6 +20036,14 @@ public class ManagerClientService {
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();
}
@@ -19659,6 +20107,15 @@ public class ManagerClientService {
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);
}
@@ -19685,6 +20142,11 @@ public class ManagerClientService {
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();
}
@@ -19710,19 +20172,25 @@ public class ManagerClientService {
if (struct.isSetTnase()) {
optionals.set(1);
}
- oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTpe()) {
+ optionals.set(2);
+ }
+ 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);
+ }
}
@Override
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(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);
@@ -19733,6 +20201,11 @@ public class ManagerClientService {
struct.tnase.read(iprot);
struct.setTnaseIsSet(true);
}
+ if (incoming.get(2)) {
+ struct.tpe = new ThriftPropertyException();
+ struct.tpe.read(iprot);
+ struct.setTpeIsSet(true);
+ }
}
}
@@ -20352,6 +20825,7 @@ public class ManagerClientService {
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 modifySystemProperties_resultStandardSchemeFactory();
private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new modifySystemProperties_resultTupleSchemeFactory();
@@ -20359,12 +20833,14 @@ public class ManagerClientService {
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");
+ TCME((short)3, "tcme"),
+ TPE((short)4, "tpe");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -20386,6 +20862,8 @@ public class ManagerClientService {
return TNASE;
case 3: // TCME
return TCME;
+ case 4: // TPE
+ return TPE;
default:
return null;
}
@@ -20438,6 +20916,8 @@ public class ManagerClientService {
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);
}
@@ -20448,12 +20928,14 @@ public class ManagerClientService {
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.ThriftConcurrentModificationException tcme)
+ org.apache.accumulo.core.clientImpl.thrift.ThriftConcurrentModificationException tcme,
+ ThriftPropertyException tpe)
{
this();
this.sec = sec;
this.tnase = tnase;
this.tcme = tcme;
+ this.tpe = tpe;
}
/**
@@ -20469,6 +20951,9 @@ public class ManagerClientService {
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
@@ -20481,6 +20966,7 @@ public class ManagerClientService {
this.sec = null;
this.tnase = null;
this.tcme = null;
+ this.tpe = null;
}
@org.apache.thrift.annotation.Nullable
@@ -20558,6 +21044,31 @@ public class ManagerClientService {
}
}
+ @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) {
@@ -20585,6 +21096,14 @@ public class ManagerClientService {
}
break;
+ case TPE:
+ if (value == null) {
+ unsetTpe();
+ } else {
+ setTpe((ThriftPropertyException)value);
+ }
+ break;
+
}
}
@@ -20601,6 +21120,9 @@ public class ManagerClientService {
case TCME:
return getTcme();
+ case TPE:
+ return getTpe();
+
}
throw new java.lang.IllegalStateException();
}
@@ -20619,6 +21141,8 @@ public class ManagerClientService {
return isSetTnase();
case TCME:
return isSetTcme();
+ case TPE:
+ return isSetTpe();
}
throw new java.lang.IllegalStateException();
}
@@ -20663,6 +21187,15 @@ public class ManagerClientService {
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;
}
@@ -20682,6 +21215,10 @@ public class ManagerClientService {
if (isSetTcme())
hashCode = hashCode * 8191 + tcme.hashCode();
+ hashCode = hashCode * 8191 + ((isSetTpe()) ? 131071 : 524287);
+ if (isSetTpe())
+ hashCode = hashCode * 8191 + tpe.hashCode();
+
return hashCode;
}
@@ -20723,6 +21260,16 @@ public class ManagerClientService {
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;
}
@@ -20769,6 +21316,14 @@ public class ManagerClientService {
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();
}
@@ -20841,6 +21396,15 @@ public class ManagerClientService {
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);
}
@@ -20872,6 +21436,11 @@ public class ManagerClientService {
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();
}
@@ -20900,7 +21469,10 @@ public class ManagerClientService {
if (struct.isSetTcme()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetTpe()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetSec()) {
struct.sec.write(oprot);
}
@@ -20910,12 +21482,15 @@ public class ManagerClientService {
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 {
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.sec = new org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException();
struct.sec.read(iprot);
@@ -20931,6 +21506,11 @@ public class ManagerClientService {
struct.tcme.read(iprot);
struct.setTcmeIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.tpe = new ThriftPropertyException();
+ struct.tpe.read(iprot);
+ struct.setTpeIsSet(true);
+ }
}
}
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
new file mode 100644
index 0000000000..9ce07396ca
--- /dev/null
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/ThriftPropertyException.java
@@ -0,0 +1,616 @@
+/*
+ * 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 ThriftPropertyException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ThriftPropertyException, ThriftPropertyException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftPropertyException> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftPropertyException");
+
+ 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)1);
+ 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)2);
+ private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)3);
+
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ThriftPropertyExceptionStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ThriftPropertyExceptionTupleSchemeFactory();
+
+ 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 description; // 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 {
+ PROPERTY((short)1, "property"),
+ VALUE((short)2, "value"),
+ DESCRIPTION((short)3, "description");
+
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+
+ 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: // PROPERTY
+ return PROPERTY;
+ case 2: // VALUE
+ return VALUE;
+ case 3: // DESCRIPTION
+ return DESCRIPTION;
+ 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.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.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", 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(ThriftPropertyException.class, metaDataMap);
+ }
+
+ public ThriftPropertyException() {
+ }
+
+ public ThriftPropertyException(
+ java.lang.String property,
+ java.lang.String value,
+ java.lang.String description)
+ {
+ this();
+ this.property = property;
+ this.value = value;
+ this.description = description;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public ThriftPropertyException(ThriftPropertyException other) {
+ if (other.isSetProperty()) {
+ this.property = other.property;
+ }
+ if (other.isSetValue()) {
+ this.value = other.value;
+ }
+ if (other.isSetDescription()) {
+ this.description = other.description;
+ }
+ }
+
+ @Override
+ public ThriftPropertyException deepCopy() {
+ return new ThriftPropertyException(this);
+ }
+
+ @Override
+ public void clear() {
+ this.property = null;
+ this.value = null;
+ this.description = null;
+ }
+
+ @org.apache.thrift.annotation.Nullable
+ public java.lang.String getProperty() {
+ return this.property;
+ }
+
+ public ThriftPropertyException 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 ThriftPropertyException 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;
+ }
+ }
+
+ @org.apache.thrift.annotation.Nullable
+ public java.lang.String getDescription() {
+ return this.description;
+ }
+
+ public ThriftPropertyException setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
+ this.description = description;
+ return this;
+ }
+
+ public void unsetDescription() {
+ this.description = null;
+ }
+
+ /** Returns true if field description is set (has been assigned a value) and false otherwise */
+ public boolean isSetDescription() {
+ return this.description != null;
+ }
+
+ public void setDescriptionIsSet(boolean value) {
+ if (!value) {
+ this.description = null;
+ }
+ }
+
+ @Override
+ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
+ switch (field) {
+ 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;
+
+ case DESCRIPTION:
+ if (value == null) {
+ unsetDescription();
+ } else {
+ setDescription((java.lang.String)value);
+ }
+ break;
+
+ }
+ }
+
+ @org.apache.thrift.annotation.Nullable
+ @Override
+ public java.lang.Object getFieldValue(_Fields field) {
+ switch (field) {
+ case PROPERTY:
+ return getProperty();
+
+ case VALUE:
+ return getValue();
+
+ case DESCRIPTION:
+ return getDescription();
+
+ }
+ 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 PROPERTY:
+ return isSetProperty();
+ case VALUE:
+ return isSetValue();
+ case DESCRIPTION:
+ return isSetDescription();
+ }
+ throw new java.lang.IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(java.lang.Object that) {
+ if (that instanceof ThriftPropertyException)
+ return this.equals((ThriftPropertyException)that);
+ return false;
+ }
+
+ public boolean equals(ThriftPropertyException that) {
+ if (that == null)
+ return false;
+ if (this == that)
+ return true;
+
+ 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;
+ }
+
+ boolean this_present_description = true && this.isSetDescription();
+ boolean that_present_description = true && that.isSetDescription();
+ if (this_present_description || that_present_description) {
+ if (!(this_present_description && that_present_description))
+ return false;
+ if (!this.description.equals(that.description))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hashCode = 1;
+
+ 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();
+
+ hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+ if (isSetDescription())
+ hashCode = hashCode * 8191 + description.hashCode();
+
+ return hashCode;
+ }
+
+ @Override
+ public int compareTo(ThriftPropertyException other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ 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;
+ }
+ }
+ lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetDescription()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
+ 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("ThriftPropertyException(");
+ boolean first = true;
+
+ 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;
+ if (!first) sb.append(", ");
+ sb.append("description:");
+ if (this.description == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.description);
+ }
+ 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 {
+ 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 ThriftPropertyExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ @Override
+ public ThriftPropertyExceptionStandardScheme getScheme() {
+ return new ThriftPropertyExceptionStandardScheme();
+ }
+ }
+
+ private static class ThriftPropertyExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<ThriftPropertyException> {
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol iprot, ThriftPropertyException 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: // 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 2: // 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;
+ case 3: // DESCRIPTION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.description = iprot.readString();
+ struct.setDescriptionIsSet(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, ThriftPropertyException struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ 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();
+ }
+ if (struct.description != null) {
+ oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
+ oprot.writeString(struct.description);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class ThriftPropertyExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+ @Override
+ public ThriftPropertyExceptionTupleScheme getScheme() {
+ return new ThriftPropertyExceptionTupleScheme();
+ }
+ }
+
+ private static class ThriftPropertyExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<ThriftPropertyException> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, ThriftPropertyException 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.isSetProperty()) {
+ optionals.set(0);
+ }
+ if (struct.isSetValue()) {
+ optionals.set(1);
+ }
+ if (struct.isSetDescription()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
+ if (struct.isSetProperty()) {
+ oprot.writeString(struct.property);
+ }
+ if (struct.isSetValue()) {
+ oprot.writeString(struct.value);
+ }
+ if (struct.isSetDescription()) {
+ oprot.writeString(struct.description);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, ThriftPropertyException 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.property = iprot.readString();
+ struct.setPropertyIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.value = iprot.readString();
+ struct.setValueIsSet(true);
+ }
+ if (incoming.get(2)) {
+ struct.description = iprot.readString();
+ struct.setDescriptionIsSet(true);
+ }
+ }
+ }
+
+ private static <S extends org.apache.thrift.scheme.IScheme> 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/manager.thrift b/core/src/main/thrift/manager.thrift
index 49b97f9922..b601bca684 100644
--- a/core/src/main/thrift/manager.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -36,6 +36,12 @@ struct TabletSplit {
2:list<data.TKeyExtent> newTablets
}
+exception ThriftPropertyException {
+ 1:string property
+ 2:string value
+ 3:string description
+}
+
exception RecoveryException {
1:string why
}
@@ -193,6 +199,7 @@ service ManagerClientService {
1:client.ThriftSecurityException sec
2:client.ThriftTableOperationException tope
3:client.ThriftNotActiveServiceException tnase
+ 4:ThriftPropertyException tpe
)
void modifyTableProperties(
@@ -205,6 +212,7 @@ service ManagerClientService {
2:client.ThriftTableOperationException tope
3:client.ThriftNotActiveServiceException tnase
4:client.ThriftConcurrentModificationException tcme
+ 5:ThriftPropertyException tpe
)
void removeTableProperty(
@@ -228,6 +236,7 @@ service ManagerClientService {
1:client.ThriftSecurityException sec
2:client.ThriftTableOperationException tope
3:client.ThriftNotActiveServiceException tnase
+ 4:ThriftPropertyException tpe
)
void modifyNamespaceProperties(
@@ -290,6 +299,7 @@ service ManagerClientService {
) throws (
1:client.ThriftSecurityException sec
2:client.ThriftNotActiveServiceException tnase
+ 3:ThriftPropertyException tpe
)
void modifySystemProperties(
@@ -300,6 +310,7 @@ service ManagerClientService {
1:client.ThriftSecurityException sec
2:client.ThriftNotActiveServiceException tnase
3:client.ThriftConcurrentModificationException tcme
+ 4:ThriftPropertyException tpe
)
void removeSystemProperty(
diff --git a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
index 479a87d429..593b4996ff 100644
--- a/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/conf/PropertyTest.java
@@ -34,11 +34,16 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Test the Property class
*/
public class PropertyTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(PropertyTest.class);
+
@Test
public void testProperties() {
HashSet<String> validPrefixes = new HashSet<>();
@@ -55,7 +60,7 @@ public class PropertyTest {
assertNull(prop.getDefaultValue(),
"PREFIX property " + prop.name() + " has unexpected non-null default value.");
} else {
- assertTrue(prop.getType().isValidFormat(prop.getDefaultValue()),
+ assertTrue(Property.isValidProperty(prop.getKey(), prop.getDefaultValue()),
"Property " + prop + " has invalid default value " + prop.getDefaultValue()
+ " for type " + prop.getType());
}
@@ -88,6 +93,7 @@ public class PropertyTest {
for (Property prop : Property.values()) {
if (prop.getType().equals(PropertyType.PORT)) {
int port = Integer.parseInt(prop.getDefaultValue());
+ assertTrue(Property.isValidProperty(prop.getKey(), Integer.toString(port)));
assertFalse(usedPorts.contains(port), "Port already in use: " + port);
usedPorts.add(port);
assertTrue(port > 1023 && port < 65536, "Port out of range of valid ports: " + port);
@@ -95,6 +101,72 @@ public class PropertyTest {
}
}
+ @Test
+ public void testPropertyValidation() {
+
+ for (Property property : Property.values()) {
+ PropertyType propertyType = property.getType();
+ String invalidValue, validValue = property.getDefaultValue();
+ LOG.debug("Testing property: {} with type: {}", property.getKey(), propertyType);
+
+ switch (propertyType) {
+ case URI:
+ case PATH:
+ case PREFIX:
+ case STRING:
+ // Skipping these values as they have default type of null
+ LOG.debug("Skipping property {} due to property type: \"{}\"", property.getKey(),
+ propertyType);
+ continue;
+ case TIMEDURATION:
+ invalidValue = "1h30min";
+ break;
+ case BYTES:
+ invalidValue = "1M500k";
+ break;
+ case MEMORY:
+ invalidValue = "1.5G";
+ break;
+ case HOSTLIST:
+ invalidValue = ":1000";
+ break;
+ case PORT:
+ invalidValue = "65539";
+ break;
+ case COUNT:
+ invalidValue = "-1";
+ break;
+ case FRACTION:
+ invalidValue = "10Percent";
+ break;
+ case ABSOLUTEPATH:
+ invalidValue = "~/foo";
+ break;
+ case CLASSNAME:
+ LOG.debug("CLASSNAME properties currently fail this test");
+ LOG.debug("Regex used for CLASSNAME property types may need to be modified");
+ continue;
+ case CLASSNAMELIST:
+ invalidValue = "String,Object;Thing";
+ break;
+ case DURABILITY:
+ invalidValue = "rinse";
+ break;
+ case GC_POST_ACTION:
+ invalidValue = "expand";
+ break;
+ case BOOLEAN:
+ invalidValue = "fooFalse";
+ break;
+ default:
+ LOG.debug("Property type: {} has no defined test case", propertyType);
+ invalidValue = "foo";
+ }
+ assertFalse(Property.isValidProperty(property.getKey(), invalidValue));
+ assertTrue(Property.isValidProperty(property.getKey(), validValue));
+ }
+ }
+
// This test verifies all "sensitive" properties are properly marked as sensitive
@Test
public void testSensitiveKeys() {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
index dd9dbe95ae..ae20ac67c4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
@@ -37,7 +37,7 @@ public final class PropUtil {
* @throws IllegalArgumentException if a provided property is not valid
*/
public static void setProperties(final ServerContext context, final PropStoreKey<?> propStoreKey,
- final Map<String,String> properties) {
+ final Map<String,String> properties) throws IllegalArgumentException {
PropUtil.validateProperties(context, propStoreKey, properties);
context.getPropStore().putAll(propStoreKey, properties);
}
@@ -48,16 +48,22 @@ public final class PropUtil {
}
public static void replaceProperties(final ServerContext context,
- final PropStoreKey<?> propStoreKey, final long version, final Map<String,String> properties) {
+ final PropStoreKey<?> propStoreKey, final long version, final Map<String,String> properties)
+ throws IllegalArgumentException {
PropUtil.validateProperties(context, propStoreKey, properties);
context.getPropStore().replaceAll(propStoreKey, version, properties);
}
protected static void validateProperties(final ServerContext context,
- final PropStoreKey<?> propStoreKey, final Map<String,String> properties) {
+ final PropStoreKey<?> propStoreKey, final Map<String,String> properties)
+ throws IllegalArgumentException {
for (Map.Entry<String,String> prop : properties.entrySet()) {
- if (!Property.isTablePropertyValid(prop.getKey(), prop.getValue())) {
- throw new IllegalArgumentException("Invalid property for : " + propStoreKey + " name: "
+ if (!Property.isValidProperty(prop.getKey(), prop.getValue())) {
+ String exceptionMessage = "Invalid property for : ";
+ if (!Property.isValidTablePropertyKey(prop.getKey())) {
+ exceptionMessage = "Invalid Table property for : ";
+ }
+ throw new IllegalArgumentException(exceptionMessage + propStoreKey + " name: "
+ prop.getKey() + ", value: " + prop.getValue());
}
}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
index a3ca71fbbb..46e37992cd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
@@ -34,13 +34,14 @@ public class SystemPropUtil {
private static final Logger log = LoggerFactory.getLogger(SystemPropUtil.class);
- public static void setSystemProperty(ServerContext context, String property, String value) {
+ public static void setSystemProperty(ServerContext context, String property, String value)
+ throws IllegalArgumentException {
context.getPropStore().putAll(SystemPropKey.of(context),
Map.of(validateSystemProperty(property, value), value));
}
public static void modifyProperties(ServerContext context, long version,
- Map<String,String> properties) {
+ Map<String,String> properties) throws IllegalArgumentException {
final Map<String,
String> checkedProperties = properties.entrySet().stream().collect(
Collectors.toMap(entry -> validateSystemProperty(entry.getKey(), entry.getValue()),
@@ -63,7 +64,8 @@ public class SystemPropUtil {
context.getPropStore().removeProperties(SystemPropKey.of(context), List.of(property));
}
- private static String validateSystemProperty(String property, final String value) {
+ private static String validateSystemProperty(String property, final String value)
+ throws IllegalArgumentException {
// Retrieve the replacement name for this property, if there is one.
// Do this before we check if the name is a valid zookeeper name.
final var original = property;
@@ -74,7 +76,13 @@ public class SystemPropUtil {
if (!Property.isValidZooPropertyKey(property)) {
IllegalArgumentException iae =
new IllegalArgumentException("Zookeeper property is not mutable: " + property);
- log.debug("Attempted to set zookeeper property. It is not mutable", iae);
+ log.error("Encountered error setting zookeeper property", iae);
+ throw iae;
+ }
+ if (!Property.isValidProperty(property, value)) {
+ IllegalArgumentException iae = new IllegalArgumentException(
+ "Property " + property + " with value: " + value + " is not valid");
+ log.error("Encountered error setting zookeeper property", iae);
throw iae;
}
@@ -92,7 +100,7 @@ public class SystemPropUtil {
&& !foundProp.getType().isValidFormat(value)))) {
IllegalArgumentException iae = new IllegalArgumentException(
"Ignoring property " + property + " it is either null or in an invalid format");
- log.debug("Attempted to set zookeeper property. Value is either null or invalid", iae);
+ log.error("Attempted to set zookeeper property. Value is either null or invalid", iae);
throw iae;
}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index d40ead4c14..f4d1257128 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@ -63,6 +63,7 @@ import org.apache.accumulo.core.data.TableId;
import org.apache.accumulo.core.fate.ReadOnlyTStore.TStatus;
import org.apache.accumulo.core.manager.thrift.FateOperation;
import org.apache.accumulo.core.manager.thrift.FateService;
+import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
import org.apache.accumulo.core.master.thrift.BulkImportState;
import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
import org.apache.accumulo.core.trace.thrift.TInfo;
@@ -114,7 +115,7 @@ class FateServiceHandler implements FateService.Iface {
@Override
public void executeFateOperation(TInfo tinfo, TCredentials c, long opid, FateOperation op,
List<ByteBuffer> arguments, Map<String,String> options, boolean autoCleanup)
- throws ThriftSecurityException, ThriftTableOperationException {
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
authenticate(c);
String goalMessage = op.toString() + " ";
@@ -214,10 +215,13 @@ class FateServiceHandler implements FateService.Iface {
}
for (Map.Entry<String,String> entry : options.entrySet()) {
- if (!Property.isTablePropertyValid(entry.getKey(), entry.getValue())) {
- throw new ThriftTableOperationException(null, tableName, tableOp,
- TableOperationExceptionType.OTHER,
- "Property or value not valid " + entry.getKey() + "=" + entry.getValue());
+ if (!Property.isValidProperty(entry.getKey(), entry.getValue())) {
+ String errorMessage = "Property or value not valid ";
+ if (!Property.isValidTablePropertyKey(entry.getKey())) {
+ errorMessage = "Invalid Table Property ";
+ }
+ throw new ThriftPropertyException(entry.getKey(), entry.getValue(),
+ errorMessage + entry.getKey() + "=" + entry.getValue());
}
}
@@ -313,10 +317,13 @@ class FateServiceHandler implements FateService.Iface {
continue;
}
- if (!Property.isTablePropertyValid(entry.getKey(), entry.getValue())) {
- throw new ThriftTableOperationException(null, tableName, tableOp,
- TableOperationExceptionType.OTHER,
- "Property or value not valid " + entry.getKey() + "=" + entry.getValue());
+ if (!Property.isValidProperty(entry.getKey(), entry.getValue())) {
+ String errorMessage = "Property or value not valid ";
+ if (!Property.isValidTablePropertyKey(entry.getKey())) {
+ errorMessage = "Invalid Table Property ";
+ }
+ throw new ThriftPropertyException(entry.getKey(), entry.getValue(),
+ errorMessage + entry.getKey() + "=" + entry.getValue());
}
propertiesToSet.put(entry.getKey(), entry.getValue());
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 00b577270d..c1ce939c9e 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
@@ -68,6 +68,7 @@ import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
import org.apache.accumulo.core.manager.thrift.ManagerState;
import org.apache.accumulo.core.manager.thrift.TabletLoadState;
import org.apache.accumulo.core.manager.thrift.TabletSplit;
+import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
import org.apache.accumulo.core.metadata.MetadataTable;
import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.metadata.TServerInstance;
@@ -245,19 +246,23 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
@Override
public void removeTableProperty(TInfo info, TCredentials credentials, String tableName,
- String property) throws ThriftSecurityException, ThriftTableOperationException {
+ String property)
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
alterTableProperty(credentials, tableName, property, null, TableOperation.REMOVE_PROPERTY);
}
@Override
public void setTableProperty(TInfo info, TCredentials credentials, String tableName,
- String property, String value) throws ThriftSecurityException, ThriftTableOperationException {
+ String property, String value)
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
alterTableProperty(credentials, tableName, property, value, TableOperation.SET_PROPERTY);
}
@Override
public void modifyTableProperties(TInfo tinfo, TCredentials credentials, String tableName,
- TVersionedProperties properties) throws TException {
+ TVersionedProperties properties)
+ throws ThriftSecurityException, ThriftTableOperationException,
+ ThriftConcurrentModificationException, ThriftPropertyException {
final TableId tableId = ClientServiceHandler.checkTableId(manager.getContext(), tableName,
TableOperation.SET_PROPERTY);
NamespaceId namespaceId = getNamespaceIdFromTableId(TableOperation.SET_PROPERTY, tableId);
@@ -282,6 +287,8 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
throw new ThriftTableOperationException(tableId.canonical(), tableName,
TableOperation.SET_PROPERTY, TableOperationExceptionType.OTHER,
"Error modifying table properties: tableId: " + tableId.canonical());
+ } catch (IllegalArgumentException iae) {
+ throw new ThriftPropertyException();
}
}
@@ -430,8 +437,8 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
SystemPropUtil.setSystemProperty(manager.getContext(), property, value);
updatePlugins(property);
} catch (IllegalArgumentException iae) {
- // throw the exception here so it is not caught and converted to a generic TException
- throw iae;
+ Manager.log.error("Problem setting invalid property", iae);
+ throw new ThriftPropertyException(property, value, "Property is invalid");
} catch (Exception e) {
Manager.log.error("Problem setting config property in zookeeper", e);
throw new TException(e.getMessage());
@@ -452,8 +459,8 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
updatePlugins(entry.getKey());
}
} catch (IllegalArgumentException iae) {
- // throw the exception here so it is not caught and converted to a generic TException
- throw iae;
+ Manager.log.error("Problem setting invalid property", iae);
+ throw new ThriftPropertyException("Modify properties", "failed", iae.getMessage());
} catch (ConcurrentModificationException cme) {
log.warn("Error modifying system properties, properties have changed", cme);
throw new ThriftConcurrentModificationException(cme.getMessage());
@@ -465,7 +472,8 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
@Override
public void setNamespaceProperty(TInfo tinfo, TCredentials credentials, String ns,
- String property, String value) throws ThriftSecurityException, ThriftTableOperationException {
+ String property, String value)
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
alterNamespaceProperty(credentials, ns, property, value, TableOperation.SET_PROPERTY);
}
@@ -494,18 +502,21 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
throw new ThriftTableOperationException(namespaceId.canonical(), ns,
TableOperation.SET_PROPERTY, TableOperationExceptionType.OTHER,
"Error modifying namespace properties");
+ } catch (IllegalArgumentException iae) {
+ throw new ThriftPropertyException("All properties", "failed", iae.getMessage());
}
}
@Override
public void removeNamespaceProperty(TInfo tinfo, TCredentials credentials, String ns,
- String property) throws ThriftSecurityException, ThriftTableOperationException {
+ String property)
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
alterNamespaceProperty(credentials, ns, property, null, TableOperation.REMOVE_PROPERTY);
}
private void alterNamespaceProperty(TCredentials c, String namespace, String property,
String value, TableOperation op)
- throws ThriftSecurityException, ThriftTableOperationException {
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
NamespaceId namespaceId =
ClientServiceHandler.checkNamespaceId(manager.getContext(), namespace, op);
@@ -529,11 +540,14 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
log.info("Error altering namespace property", ex);
throw new ThriftTableOperationException(namespaceId.canonical(), namespace, op,
TableOperationExceptionType.OTHER, "Problem altering namespace property");
+ } catch (IllegalArgumentException iae) {
+ throw new ThriftPropertyException(property, value, iae.getMessage());
}
}
private void alterTableProperty(TCredentials c, String tableName, String property, String value,
- TableOperation op) throws ThriftSecurityException, ThriftTableOperationException {
+ TableOperation op)
+ throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
final TableId tableId = ClientServiceHandler.checkTableId(manager.getContext(), tableName, op);
NamespaceId namespaceId = getNamespaceIdFromTableId(op, tableId);
if (!manager.security.canAlterTable(c, tableId, namespaceId)) {
@@ -557,6 +571,8 @@ public class ManagerClientServiceHandler implements ManagerClientService.Iface {
throw new ThriftTableOperationException(tableId.canonical(), tableName, op,
TableOperationExceptionType.OTHER, "Invalid table property, tried to set: tableId: "
+ tableId.canonical() + " to: " + property + "=" + value);
+ } catch (IllegalArgumentException iae) {
+ throw new ThriftPropertyException(property, value, iae.getMessage());
}
}
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
index 399607a851..9472eeaf5f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -249,7 +249,7 @@ public class LogSorter {
ConfigurationCopy copy = new ConfigurationCopy(conf);
props.forEach((prop, val) -> {
String tableProp = tablePrefix + prop;
- if (Property.isTablePropertyValid(tableProp, val)) {
+ if (Property.isValidProperty(tableProp, val) && Property.isValidTablePropertyKey(tableProp)) {
log.debug("Using property for writing sorted files: {}={}", tableProp, val);
copy.set(tableProp, val);
} else {
diff --git a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
index dc765c4dce..4cc8e0669d 100644
--- a/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/NamespacesIT.java
@@ -263,6 +263,18 @@ public class NamespacesIT extends SharedMiniClusterBase {
assertThrows(NamespaceNotEmptyException.class, () -> c.namespaceOperations().delete(namespace));
}
+ @Test
+ public void setProperties() throws Exception {
+ c.namespaceOperations().create(namespace);
+
+ Property prop = Property.TABLE_BLOOM_ENABLED;
+ c.namespaceOperations().setProperty(namespace, prop.getKey(), "true");
+ assertTrue(checkNamespaceHasProp(namespace, prop.getKey(), "true"));
+ assertThrows(AccumuloException.class,
+ () -> c.namespaceOperations().setProperty(namespace, prop.getKey(), "foo"));
+ assertFalse(checkNamespaceHasProp(namespace, prop.getKey(), "foo"));
+ }
+
@Test
public void verifyPropertyInheritance() throws Exception {
diff --git a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
index 3c7b7a7897..82bb5679b3 100644
--- a/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/TableOperationsIT.java
@@ -205,6 +205,17 @@ public class TableOperationsIT extends AccumuloClusterHarness {
assertFalse(tableOps.exists(t2));
}
+ @Test
+ public void createTableWithBadProperties()
+ throws AccumuloException, AccumuloSecurityException, TableExistsException {
+ TableOperations tableOps = accumuloClient.tableOperations();
+ String t0 = getUniqueNames(1)[0];
+ tableOps.create(t0);
+ assertTrue(tableOps.exists(t0));
+ assertThrows(AccumuloException.class,
+ () -> tableOps.setProperty(t0, Property.TABLE_BLOOM_ENABLED.getKey(), "foo"));
+ }
+
@Test
public void createMergeClonedTable() throws Exception {
String[] names = getUniqueNames(2);
diff --git a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
index 69e657a3be..1babbf24d5 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.Duration;
@@ -40,6 +41,7 @@ import java.util.function.Consumer;
import java.util.function.Supplier;
import org.apache.accumulo.core.client.Accumulo;
+import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.NamespaceId;
import org.apache.accumulo.core.data.TableId;
@@ -182,6 +184,47 @@ public class PropStoreConfigIT extends SharedMiniClusterBase {
}
}
+ @Test
+ public void setInvalidPropertiesTest() throws Exception {
+
+ try (var client = Accumulo.newClient().from(getClientProps()).build()) {
+ // Grab original default config
+ Map<String,String> config = client.instanceOperations().getSystemConfiguration();
+ Map<String,String> properties = getStoredConfiguration();
+
+ final String maxOpenFiles = config.get(Property.TSERV_SCAN_MAX_OPENFILES.getKey());
+
+ client.instanceOperations().modifyProperties(Map::clear);
+ assertTrue(Wait.waitFor(() -> getStoredConfiguration().size() == 0, 5000, 500));
+
+ // Properties should be empty to start
+ final int numProps = properties.size();
+
+ // Set properties in ZK
+ client.instanceOperations().modifyProperties(original -> {
+ original.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), maxOpenFiles);
+ });
+
+ // Verify system properties added
+ assertTrue(Wait.waitFor(() -> getStoredConfiguration().size() > numProps, 5000, 500));
+
+ // Verify properties updated
+ properties = getStoredConfiguration();
+ assertEquals(maxOpenFiles, properties.get(Property.TSERV_SCAN_MAX_OPENFILES.getKey()));
+
+ // Verify properties updated in config as well
+ config = client.instanceOperations().getSystemConfiguration();
+ assertEquals(maxOpenFiles, config.get(Property.TSERV_SCAN_MAX_OPENFILES.getKey()));
+
+ // Set invalid properties
+ assertThrows(AccumuloException.class,
+ () -> client.instanceOperations().modifyProperties(original -> {
+ original.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), "foo");
+ }));
+ assertEquals(maxOpenFiles, properties.get(Property.TSERV_SCAN_MAX_OPENFILES.getKey()));
+ }
+ }
+
/**
* Validate that property nodes have an ACL set to restrict world access.
*/
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
index 0356e21f23..ede0ed08c2 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java
@@ -37,6 +37,8 @@ import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.conf.PropertyType;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.shell.Shell;
import org.jline.reader.LineReader;
@@ -470,6 +472,91 @@ public class ShellIT extends SharedMiniClusterBase {
exec("deletetable t -f", true, "Table: [t] has been deleted");
}
+ @Test
+ void configTest() throws IOException {
+ Shell.log.debug("Starting config property type test -------------------------");
+
+ String testTable = "test";
+ exec("createtable " + testTable, true);
+
+ for (Property property : Property.values()) {
+ PropertyType propertyType = property.getType();
+ String invalidValue, validValue = property.getDefaultValue();
+
+ // Skip test if we can't set this property via shell
+ if (!Property.isValidZooPropertyKey(property.getKey())) {
+ Shell.log.debug("Property {} with type {} cannot be modified by shell", property.getKey(),
+ propertyType);
+ continue;
+ }
+
+ switch (propertyType) {
+ case PATH:
+ case PREFIX:
+ case STRING:
+ Shell.log.debug("Skipping " + propertyType + " Property Types");
+ continue;
+ case TIMEDURATION:
+ invalidValue = "1h30min";
+ break;
+ case BYTES:
+ invalidValue = "1M500k";
+ break;
+ case MEMORY:
+ invalidValue = "1.5G";
+ break;
+ case HOSTLIST:
+ invalidValue = ":1000";
+ break;
+ case PORT:
+ invalidValue = "65539";
+ break;
+ case COUNT:
+ invalidValue = "-1";
+ break;
+ case FRACTION:
+ invalidValue = "10Percent";
+ break;
+ case ABSOLUTEPATH:
+ invalidValue = "~/foo";
+ break;
+ case CLASSNAME:
+ Shell.log.debug("CLASSNAME properties currently fail this test");
+ Shell.log.debug("Regex used for CLASSNAME property types may need to be modified");
+ continue;
+ case CLASSNAMELIST:
+ invalidValue = "String,Object";
+ break;
+ case DURABILITY:
+ invalidValue = "rinse";
+ break;
+ case GC_POST_ACTION:
+ invalidValue = "expand";
+ break;
+ case BOOLEAN:
+ invalidValue = "fooFalse";
+ break;
+ case URI:
+ invalidValue = "12///\\{}:;123!";
+ break;
+ default:
+ Shell.log.debug("Property Type: " + propertyType + " has no defined test case");
+ invalidValue = "foo";
+ }
+ String setCommand = "config -s ";
+ if (Property.isValidTablePropertyKey(property.getKey())) {
+ setCommand = "config -t " + testTable + " -s ";
+ }
+ Shell.log.debug("Testing Property {} with Type {}", property.getKey(), propertyType);
+ Shell.log.debug("Invalid property value of \"{}\"", invalidValue);
+ exec(setCommand + property.getKey() + "=" + invalidValue, false,
+ "ThriftPropertyException(property:" + property.getKey() + ", value:" + invalidValue
+ + ", description:");
+ exec(setCommand + property.getKey() + "=" + validValue, true);
+ }
+ exec("deletetable " + testTable + " -f", true);
+ }
+
@Test
public void commentTest() throws IOException {
Shell.log.debug("Starting comment test --------------------------");