This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch no-chop-merge in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit e76085787de5a362b262191992d68b36a7baa4e1 Merge: b7a1ad5186 46eca7af96 Author: Christopher L. Shannon (cshannon) <[email protected]> AuthorDate: Fri Jun 30 09:08:47 2023 -0400 Merge branch 'main' into no-chop-merge .github/ISSUE_TEMPLATE/post_vote_checklist.md | 3 +- .github/workflows/maven-full-its.yaml | 2 +- .github/workflows/maven.yaml | 6 +- .github/workflows/scripts.yaml | 12 +- README.md | 2 +- contrib/accumulo-logo.png | Bin 11427 -> 0 bytes contrib/javadoc11.patch | 91 ---------- contrib/scripts/check-tservers.py | 202 --------------------- core/pom.xml | 2 +- .../core/client/admin/NewTableConfiguration.java | 6 + .../core/clientImpl/TableOperationsImpl.java | 6 +- .../accumulo/core/clientImpl/ThriftScanner.java | 5 +- .../core/clientImpl/ThriftTransportPool.java | 7 +- .../org/apache/accumulo/core/conf/Property.java | 9 +- .../org/apache/accumulo/core/fate/ZooStore.java | 5 +- .../accumulo/core/fate/zookeeper/ZooCache.java | 5 +- .../accumulo/core/fate/zookeeper/ZooSession.java | 6 +- .../accumulo/core/file/BloomFilterLayer.java | 7 +- .../core/metadata/ScanServerRefTabletFile.java | 5 +- .../accumulo/core/metadata/StoredTabletFile.java | 3 +- .../accumulo/core/metadata/ValidationUtil.java | 23 ++- .../core/metadata/schema/MetadataSchema.java | 6 +- .../org/apache/accumulo/core/rpc/ThriftUtil.java | 6 +- .../spi/balancer/HostRegexTableLoadBalancer.java | 5 +- .../accumulo/core/spi/crypto/AESCryptoService.java | 10 +- .../accumulo/core/spi/fs/RandomVolumeChooser.java | 6 +- .../core/spi/fs/SpaceAwareVolumeChooser.java | 6 +- .../spi/scan/ConfigurableScanServerSelector.java | 7 +- .../apache/accumulo/core/util/LazySingletons.java | 6 + .../java/org/apache/accumulo/core/util/Retry.java | 5 +- .../accumulo/core/cli/PasswordConverterTest.java | 6 +- .../core/client/rfile/RFileClientTest.java | 6 +- .../bulk/ConcurrentKeyExtentCacheTest.java | 12 +- .../apache/accumulo/core/crypto/CryptoTest.java | 14 +- .../core/file/BloomFilterLayerLookupTest.java | 7 +- .../file/blockfile/cache/TestLruBlockCache.java | 7 +- .../core/file/rfile/MultiLevelIndexTest.java | 5 +- .../core/file/rfile/MultiThreadedRFileTest.java | 5 +- .../apache/accumulo/core/file/rfile/RFileTest.java | 28 ++- .../accumulo/core/file/rfile/RollingStatsTest.java | 17 +- .../file/streams/RateLimitedInputStreamTest.java | 8 +- .../file/streams/RateLimitedOutputStreamTest.java | 6 +- .../iterators/user/IndexedDocIteratorTest.java | 7 +- .../iterators/user/IntersectingIteratorTest.java | 7 +- .../core/iterators/user/TestCfCqSlice.java | 5 +- .../accumulo/core/metadata/ValidationUtilTest.java | 50 +++++ .../core/security/AuthenticationTokenTest.java | 6 +- .../core/spi/balancer/GroupBalancerTest.java | 14 +- .../scan/ConfigurableScanServerSelectorTest.java | 7 +- .../hadoopImpl/mapred/AccumuloRecordReader.java | 7 +- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 7 +- .../testcases/IsolatedDeepCopiesTestCase.java | 9 +- .../testcases/MultipleHasTopCalls.java | 9 +- .../iteratortest/testcases/ReSeekTestCase.java | 6 +- pom.xml | 175 +++++++----------- .../accumulo/server/fs/VolumeManagerImpl.java | 17 +- .../server/tablets/UniqueNameAllocator.java | 6 +- .../org/apache/accumulo/server/util/FileUtil.java | 7 +- .../apache/accumulo/server/util/RandomWriter.java | 8 +- .../server/zookeeper/DistributedWorkQueue.java | 7 +- .../conf/codec/VersionedPropEncryptCodec.java | 7 +- .../org/apache/accumulo/compactor/Compactor.java | 6 +- .../main/java/org/apache/accumulo/gc/GCRun.java | 8 +- .../java/org/apache/accumulo/manager/Manager.java | 8 +- .../accumulo/manager/TabletGroupWatcher.java | 11 +- server/monitor/pom.xml | 2 +- server/tserver/pom.xml | 2 +- .../org/apache/accumulo/tserver/TabletServer.java | 5 +- .../accumulo/tserver/session/SessionManager.java | 8 +- .../accumulo/tserver/tablet/MinorCompactor.java | 5 +- .../shell/commands/CreateTableCommand.java | 26 ++- .../accumulo/shell/commands/HiddenCommand.java | 5 +- {contrib => src/build}/ci/find-unapproved-chars.sh | 0 {contrib => src/build}/ci/find-unapproved-junit.sh | 0 {contrib => src/build}/ci/install-shfmt.sh | 0 {contrib => src/build}/ci/install-thrift.sh | 2 +- {contrib => src/build}/ci/it-matrix.sh | 0 {contrib => src/build}/ci/run-shellcheck.sh | 0 {contrib => src/build}/ci/run-shfmt.sh | 0 {contrib => src/build}/ci/run-thrift.sh | 0 .../build/eclipse-codestyle.xml | 0 {contrib => src/build}/license-header.txt | 0 src/site/site.xml | 44 ----- .../apache/accumulo/harness/AccumuloITBase.java | 4 +- .../accumulo/harness/SharedMiniClusterBase.java | 3 +- .../apache/accumulo/test/ChaoticLoadBalancer.java | 8 +- .../apache/accumulo/test/ConditionalWriterIT.java | 15 +- .../org/apache/accumulo/test/ImportExportIT.java | 5 +- .../apache/accumulo/test/MetaGetsReadersIT.java | 3 +- .../apache/accumulo/test/MultiTableRecoveryIT.java | 3 +- .../accumulo/test/TableConfigurationUpdateIT.java | 3 +- .../org/apache/accumulo/test/TestBinaryRows.java | 4 +- .../org/apache/accumulo/test/TotalQueuedIT.java | 5 +- .../accumulo/test/VerifySerialRecoveryIT.java | 3 +- .../test/compaction/CompactionExecutorIT.java | 6 +- .../test/compaction/CompactionRateLimitingIT.java | 7 +- .../accumulo/test/conf/PropStoreConfigIT.java | 5 +- .../accumulo/test/functional/BatchScanSplitIT.java | 4 +- .../test/functional/BatchWriterFlushIT.java | 3 +- .../accumulo/test/functional/BloomFilterIT.java | 4 +- .../accumulo/test/functional/CacheTestWriter.java | 14 +- .../accumulo/test/functional/CompactionIT.java | 5 +- .../test/functional/ConcurrentDeleteTableIT.java | 3 +- .../test/functional/CreateInitialSplitsIT.java | 3 +- .../accumulo/test/functional/FateStarvationIT.java | 6 +- .../test/functional/ManyWriteAheadLogsIT.java | 5 +- .../test/functional/MemoryConsumingIterator.java | 9 +- .../accumulo/test/functional/MonitorSslIT.java | 3 +- .../accumulo/test/functional/NativeMapIT.java | 10 +- .../accumulo/test/functional/ReadWriteIT.java | 3 +- .../apache/accumulo/test/functional/ScanIdIT.java | 3 +- .../apache/accumulo/test/functional/SummaryIT.java | 5 +- .../accumulo/test/functional/WALSunnyDayIT.java | 7 +- .../accumulo/test/functional/ZombieTServer.java | 4 +- .../accumulo/test/manager/SuspendedTabletsIT.java | 5 +- .../test/performance/scan/CollectTabletStats.java | 4 +- .../accumulo/test/shell/ShellCreateTableIT.java | 3 +- .../apache/accumulo/test/shell/ShellServerIT.java | 3 +- 118 files changed, 469 insertions(+), 789 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java index 4620c12760,614368ebcb..bcfb840087 --- a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java @@@ -18,9 -18,9 +18,10 @@@ */ package org.apache.accumulo.core.metadata; + import java.net.URI; import java.util.Objects; +import org.apache.accumulo.core.data.Range; import org.apache.accumulo.core.data.TableId; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; @@@ -45,9 -45,7 +46,9 @@@ public class StoredTabletFile extends A * the entry can be deleted. */ public StoredTabletFile(String metadataEntry) { - super(new Path(URI.create(metadataEntry))); + // TODO: Future version of metadataEntry will contains the path + // and the range so we will need to parse the string here - super(new Path(metadataEntry), new Range()); ++ super(new Path(URI.create(metadataEntry)), new Range()); this.metadataEntry = metadataEntry; this.referencedTabletFile = ReferencedTabletFile.of(getPath()); } diff --cc core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java index bae44ea4f0,041020d7bd..034a50ace6 --- a/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/rfile/RFileClientTest.java @@@ -76,11 -73,9 +76,9 @@@ import org.junit.jupiter.api.Test import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +@SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "path is set by test, not user") public class RFileClientTest { - private static final SecureRandom random = new SecureRandom(); - - @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "path is set by test, not user") private String createTmpTestFile() throws IOException { File dir = new File(System.getProperty("user.dir") + "/target/rfile-test"); assertTrue(dir.mkdirs() || dir.isDirectory()); diff --cc core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java index b669fb2417,0ea1bf2ee0..18c05488b1 --- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java @@@ -97,10 -103,8 +97,8 @@@ import com.google.common.primitives.Byt import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "paths not set by user input") -public class RFileTest { +public class RFileTest extends AbstractRFileTest { - private static final SecureRandom random = new SecureRandom(); - public static class SampleIE implements IteratorEnvironment { private SamplerConfiguration samplerConfig;
