This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 44f6e2b8334d18b8bbd8f977d819b6e48eccd612
Author: Joseph Witt <joew...@apache.org>
AuthorDate: Thu May 9 15:55:07 2024 -0700
NIFI-13205 Removed legacy Provenance Lucene integration test
This closes #8799
Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
.../nifi-persistent-provenance-repository/pom.xml | 18 ---
.../provenance/StartupAgainstOldLuceneIndexIT.java | 124 ---------------------
.../src/test/resources/lucene-4-prov-repo/0.prov | Bin 20634 -> 0 bytes
.../lucene-4-index-1554304717707/_0.fdt | 0
.../lucene-4-index-1554304717707/_0.fdx | 0
.../lucene-4-index-1554304717707/_1.fdt | 0
.../lucene-4-index-1554304717707/_1.fdx | 0
.../test/resources/lucene-4-prov-repo/toc/0.toc | Bin 18 -> 0 bytes
8 files changed, 142 deletions(-)
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
index 19515b4341..106594a94c 100644
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
+++
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/pom.xml
@@ -62,22 +62,4 @@
<scope>runtime</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
-
<exclude>src/test/resources/lucene-4-prov-repo/0.prov</exclude>
-
<exclude>src/test/resources/lucene-4-prov-repo/toc/0.toc</exclude>
-
<exclude>src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt</exclude>
-
<exclude>src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx</exclude>
-
<exclude>src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt</exclude>
-
<exclude>src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
deleted file mode 100644
index 8f4cf2fdb7..0000000000
---
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/java/org/apache/nifi/provenance/StartupAgainstOldLuceneIndexIT.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.provenance;
-
-import org.apache.nifi.authorization.Authorizer;
-import org.apache.nifi.events.EventReporter;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-import org.mockito.Mockito;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * This test is intended to ensure that we can properly startup even when
pointing to a Provenance
- * Repository that was created against the old Lucene.
- */
-@Timeout(value = 5)
-public class StartupAgainstOldLuceneIndexIT {
-
- @Test
- public void testStartup() throws IOException, InterruptedException {
- // Test startup with old lucene 4 index directory and no temp or
migrated directory.
- testStartup(false, false);
-
- // Test startup with old lucene 4 index directory and temp directory.
- testStartup(true, false);
-
- // Test startup with old lucene 4 index directory, temp directory, and
final migrated directory.
- testStartup(true, true);
- }
-
- private void testStartup(final boolean createTempDirectory, final boolean
createMigratedDirectory) throws IOException, InterruptedException {
- final File existingRepo = new
File("src/test/resources/lucene-4-prov-repo");
- final File tempDir = new File("target/" + UUID.randomUUID());
-
- copy(existingRepo, tempDir);
- final File oldIndexDir = new File(tempDir,
"lucene-4-index-1554304717707");
- assertTrue(oldIndexDir.exists());
-
- if (createTempDirectory) {
- final File tempIndexDir = new File(tempDir,
"temp-lucene-9-index-1554304717707");
- assertTrue(tempIndexDir.mkdirs());
-
- final File dummyFile = new File(tempIndexDir, "_0.fdt");
- try (final OutputStream fos = new FileOutputStream(dummyFile)) {
- fos.write("hello world".getBytes());
- }
- }
-
- if (createMigratedDirectory) {
- final File migratedDirectory = new File(tempDir,
"lucene-9-index-1554304717707");
- assertTrue(migratedDirectory.mkdirs());
-
- final File dummyFile = new File(migratedDirectory, "_0.fdt");
- try (final OutputStream fos = new FileOutputStream(dummyFile)) {
- fos.write("hello world".getBytes());
- }
- }
-
- final RepositoryConfiguration repoConfig = new
RepositoryConfiguration();
- repoConfig.addStorageDirectory("1", tempDir);
-
repoConfig.setSearchableFields(Arrays.asList(SearchableFields.FlowFileUUID,
SearchableFields.Filename, SearchableFields.EventTime,
SearchableFields.EventType));
-
- final WriteAheadProvenanceRepository writeAheadRepo = new
WriteAheadProvenanceRepository(repoConfig);
- final Authorizer authorizer = Mockito.mock(Authorizer.class);
- writeAheadRepo.initialize(EventReporter.NO_OP, authorizer,
Mockito.mock(ProvenanceAuthorizableFactory.class),
Mockito.mock(IdentifierLookup.class));
-
- final ProvenanceEventRecord event = TestUtil.createEvent();
- writeAheadRepo.registerEvents(Collections.singleton(event));
-
- while (oldIndexDir.exists()) {
- Thread.sleep(5L);
- }
-
- assertFalse(oldIndexDir.exists());
-
- final File newIndexDir = new File(tempDir,
"lucene-9-index-1554304717707");
- while (!newIndexDir.exists()) {
- Thread.sleep(5L);
- }
-
- assertTrue(newIndexDir.exists());
- }
-
-
- private void copy(final File from, final File to) throws IOException {
- if (from.isFile()) {
- Files.copy(from.toPath(), to.toPath());
- return;
- }
-
- to.mkdirs();
-
- final File[] children = from.listFiles();
- for (final File child : children) {
- final File destination = new File(to, child.getName());
- copy(child, destination);
- }
- }
-}
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/0.prov
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/0.prov
deleted file mode 100644
index 0d065ba34b..0000000000
Binary files
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/0.prov
and /dev/null differ
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_0.fdx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/lucene-4-index-1554304717707/_1.fdx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/toc/0.toc
b/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/toc/0.toc
deleted file mode 100644
index c976c8f143..0000000000
Binary files
a/nifi-extension-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/test/resources/lucene-4-prov-repo/toc/0.toc
and /dev/null differ
