Pochatkin commented on code in PR #6625: URL: https://github.com/apache/ignite-3/pull/6625#discussion_r2377986440
########## modules/code-deployment/src/main/java/org/apache/ignite/internal/deployunit/DeployerProcessor.java: ########## @@ -0,0 +1,89 @@ +/* + * 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.ignite.internal.deployunit; + +import static java.nio.file.StandardCopyOption.ATOMIC_MOVE; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Map.Entry; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +/** + * Implementation of {@link DeploymentUnitProcessor} that deploys deployment unit content to the file system. + * + * <p>This processor extracts and deploys files from deployment units to a specified target directory. + * It handles both regular deployment units (containing individual files as input streams) and ZIP-based + * deployment units (containing compressed archives that need extraction). + * + * <p>The deployment process ensures atomic file operations by: + * <ul> + * <li>First copying files to temporary locations with a {@code .tmp} suffix</li> + * <li>Then atomically moving them to their final destinations</li> + * <li>Creating necessary parent directories as needed</li> + * </ul> + * + * <p>This approach prevents partial deployments and ensures that files are either fully deployed + * or not deployed at all, maintaining consistency during the deployment process. + * + * <p>Type parameters: + * <ul> + * <li>{@code Path} - the argument type representing the target deployment directory</li> + * </ul> + */ +public class DeployerProcessor implements DeploymentUnitProcessor<Path> { + /** Suffix used for temporary files during the deployment process. */ + private static final String TMP_SUFFIX = ".tmp"; + + @Override + public void processContent(DeploymentUnitImpl unit, Path unitFolder) throws IOException { + for (Entry<String, InputStream> e : unit.content().entrySet()) { + doDeploy(unitFolder, e.getKey(), e.getValue()); + } + } + + @Override + public void processContentWithUnzip(ZipDeploymentUnit unit, Path unitFolder) throws IOException { + ZipInputStream zis = unit.zis(); + Path zipUnitFolder = unitFolder; + ZipEntry ze; + while ((ze = zis.getNextEntry()) != null) { + Path entryPath = zipUnitFolder.resolve(ze.getName()); + + if (ze.isDirectory()) { + Files.createDirectories(entryPath); + } else { + Path unitFileFolder = entryPath.getParent(); + Files.createDirectories(unitFileFolder); Review Comment: Simplified ########## modules/rest/src/main/java/org/apache/ignite/internal/rest/deployment/InputStreamCollectorImpl.java: ########## @@ -0,0 +1,60 @@ +/* + * 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.ignite.internal.rest.deployment; + +import static org.apache.ignite.internal.util.IgniteUtils.closeAll; + +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; +import org.apache.ignite.internal.deployunit.DeploymentUnit; +import org.apache.ignite.internal.deployunit.DeploymentUnitImpl; + +/** + * Standard implementation of {@link InputStreamCollector} for collecting regular file content. + * + * <p>This implementation provides a straightforward approach to collecting input streams and + * converting them into a standard {@link DeploymentUnitImpl}. It maintains an internal map + * of filename-to-stream associations and creates deployment units containing regular + * (non-compressed) file content. + */ +public class InputStreamCollectorImpl implements InputStreamCollector { + /** + * Internal storage for collected input streams mapped by their filenames. + * The map maintains the association between logical file paths and their content streams. + */ + private final Map<String, InputStream> content = new HashMap<>(); + + /** {@inheritDoc} */ Review Comment: Done -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
