Skip to content

add batch mode for persistent meta data, #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thmarx merged 1 commit into from
Dec 5, 2025
Merged

add batch mode for persistent meta data, #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 47 additions & 33 deletions cms-filesystem/src/main/java/com/condation/cms/filesystem/FileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ public class FileSystem implements ModuleFileSystem, DBFileSystem {
private MetaData metaData;

@Override
public Path hostBase () {
public Path hostBase() {
return hostBaseDirectory;
}

public <T> ContentQuery<T> query(final BiFunction<ContentNode, Integer, T> nodeMapper) {
return metaData.query(nodeMapper);
}
Expand Down Expand Up @@ -157,7 +157,7 @@ public List<ContentNode> listDirectories(final Path base, final String start) {

return listDirectories(folder);
}

public List<ContentNode> listDirectories(final String folder) {
List<ContentNode> nodes = new ArrayList<>();

Expand Down Expand Up @@ -204,6 +204,7 @@ public List<ContentNode> listContent(final Path base, final String start) {

return listContent(folder);
}

public List<ContentNode> listContent(final String folder) {
if ("".equals(folder)) {
return metaData.listChildren("");
Expand All @@ -220,13 +221,13 @@ public List<ContentNode> listSections(final Path contentFile) {

return listSections(filename, folder);
}

public List<ContentNode> listSections(final String filename, String folder) {
List<ContentNode> nodes = new ArrayList<>();

final Pattern isSectionOf = Constants.SECTION_OF_PATTERN.apply(filename);
final Pattern isNamedSectionOf = Constants.SECTION_NAMED_OF_PATTERN.apply(filename);

if ("".equals(folder)) {
metaData.getTree().values()
.stream()
Expand Down Expand Up @@ -260,6 +261,10 @@ public List<ContentNode> listSections(final String filename, String folder) {
}

private void addOrUpdateMetaData(Path file) {
addOrUpdateMetaData(file, false);
}

private void addOrUpdateMetaData(Path file, boolean batch) {
try {
if (!Files.exists(file)) {
return;
Expand All @@ -283,10 +288,10 @@ private void addOrUpdateMetaData(Path file) {
public void init() throws IOException {
init(MetaData.Type.MEMORY);
}

public void init(MetaData.Type metaDataType) throws IOException {
log.debug("init filesystem");

if (MetaData.Type.MEMORY.equals(metaDataType)) {
this.metaData = new MemoryMetaData();
} else {
Expand Down Expand Up @@ -331,7 +336,7 @@ public void onNext(FileEvent item) {
reInitFolder(contentBase);

fileWatcher.start();

eventBus.register(ReIndexContentMetaDataEvent.class, (event) -> {
try {
if (event.uri() == null) {
Expand All @@ -356,37 +361,46 @@ private void swapMetaData() throws IOException {

private void reInitFolder(final Path folder) throws IOException {

long before = System.currentTimeMillis();
Files.walkFileTree(folder, new FileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
var uri = PathUtil.toRelativePath(dir, contentBase);

metaData.createDirectory(uri);
return FileVisitResult.CONTINUE;
}
if (metaData instanceof PersistentMetaData pMetaData) {
pMetaData.startBatch();
}
try {
long before = System.currentTimeMillis();
Files.walkFileTree(folder, new FileVisitor<Path>() {
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
var uri = PathUtil.toRelativePath(dir, contentBase);

metaData.createDirectory(uri);
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
@Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {

addOrUpdateMetaData(file);
addOrUpdateMetaData(file);

return FileVisitResult.CONTINUE;
}
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
return FileVisitResult.CONTINUE;
}
@Override
public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
return FileVisitResult.CONTINUE;
}

@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
return FileVisitResult.CONTINUE;
}
});
@Override
public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
return FileVisitResult.CONTINUE;
}
});

long after = System.currentTimeMillis();
long after = System.currentTimeMillis();

log.debug("loading metadata took " + (after - before) + "ms");
log.debug("loading metadata took " + (after - before) + "ms");
} finally {
if (metaData instanceof PersistentMetaData pMetaData) {
pMetaData.stopBatch();
}
}
}
}
18 changes: 15 additions & 3 deletions ...ilesystem/src/main/java/com/condation/cms/filesystem/metadata/persistent/LuceneIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ public class LuceneIndex implements AutoCloseable {
private SearcherManager nrt_manager;
private NRTCachingDirectory nrt_index;

private boolean batchMode = false;

public void setBatchMode (boolean mode) {
batchMode = mode;
}

@Override
public void close() throws Exception {
if (nrt_manager != null) {
Expand All @@ -78,17 +84,23 @@ public void commit() throws IOException {

void add(Document document) throws IOException {
writer.addDocument(document);
commit();
if (!batchMode) {
commit();
}
}

void update(Term term, Document document) throws IOException {
writer.updateDocument(term, document);
commit();
if (!batchMode) {
commit();
}
}

void delete(Query query) throws IOException {
writer.deleteDocuments(query);
commit();
if (!batchMode) {
commit();
}
}

List<Document> query(Query query, Sort sort) throws IOException {
Expand Down
13 changes: 13 additions & 0 deletions ...em/src/main/java/com/condation/cms/filesystem/metadata/persistent/PersistentMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,19 @@ public void close() throws IOException {
}
}

public void startBatch () {
index.setBatchMode(true);
}

public void stopBatch () {
try {
index.setBatchMode(false);
index.commit();
} catch (IOException ex) {
log.error("error commiting index", ex);
}
}

@Override
public void addFile(String uri, Map<String, Object> data, LocalDate lastModified) {

Expand Down