This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit cee7d426cd773331b34d3193e5f06575eecd7fb1 Merge: 6bd1534d88 bc1fe47799 Author: Christopher Tubbs <[email protected]> AuthorDate: Tue Aug 12 21:15:40 2025 -0400 Merge branch '2.1' .../core/iterators/user/VisibilityFilter.java | 2 +- pom.xml | 2 +- .../test/rpc/SimpleThriftServiceHandler.java | 5 + .../test/rpc/SimpleThriftServiceRunner.java | 62 +- .../apache/accumulo/test/rpc/ThriftBehaviorIT.java | 10 + test/src/main/resources/log4j2-test.properties | 14 +- .../test/rpc/thrift/SimpleThriftService.java | 801 +++++++++++++++++++++ test/src/main/thrift/test.thrift | 1 + 8 files changed, 888 insertions(+), 9 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java index 3116810704,b1614dbca3..a8ee7f8845 --- a/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java +++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/VisibilityFilter.java @@@ -77,7 -75,7 +77,7 @@@ public class VisibilityFilter extends F public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) { VisibilityFilter result = (VisibilityFilter) super.deepCopy(env); result.filterInvalid = this.filterInvalid; -- result.ve = this.ve; ++ result.accessEvaluator = this.accessEvaluator; result.cache = this.cache; return result; } diff --cc test/src/main/resources/log4j2-test.properties index 4d47413c40,9ffb22da16..3cd1751362 --- a/test/src/main/resources/log4j2-test.properties +++ b/test/src/main/resources/log4j2-test.properties @@@ -144,17 -154,10 +144,21 @@@ logger.39.level = trac logger.40.name = org.apache.accumulo.manager.tableOps.bulkVer2.LoadFiles logger.40.level = trace - logger.41.name = org.apache.accumulo.server.util.checkCommand.CheckRunner - logger.41.level = trace + # TSimpleServer is too noisy at DEBUG when clients disconnect; only used for ThriftBehaviorIT + logger.41.name = org.apache.thrift.server.TSimpleServer + logger.41.level = info - logger.42.name = org.apache.accumulo.tablet ++logger.42.name = org.apache.accumulo.server.util.checkCommand.CheckRunner +logger.42.level = trace + - logger.43.name = org.apache.accumulo.server.metadata ++logger.43.name = org.apache.accumulo.tablet +logger.43.level = trace + - logger.44.name = org.apache.accumulo.server.util.checkCommand.CheckRunner ++logger.44.name = org.apache.accumulo.server.metadata +logger.44.level = trace + ++logger.45.name = org.apache.accumulo.server.util.checkCommand.CheckRunner ++logger.45.level = trace ++ rootLogger.level = debug rootLogger.appenderRef.console.ref = STDOUT -
