vikramahuja1001 commented on a change in pull request #3917: URL: https://github.com/apache/carbondata/pull/3917#discussion_r512553372
########## File path: core/src/main/java/org/apache/carbondata/core/util/path/TrashUtil.java ########## @@ -0,0 +1,162 @@ +/* + * 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.carbondata.core.util.path; + +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; +import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.exception.CarbonFileException; +import org.apache.carbondata.core.util.CarbonUtil; + +import org.apache.commons.io.FileUtils; + +import org.apache.log4j.Logger; + +public final class TrashUtil { + + private static final Logger LOGGER = + LogServiceFactory.getLogService(CarbonUtil.class.getName()); + + /** + * The below method copies the complete a file to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashFolderByFile(String carbonTablePath, String pathOfFileToCopy, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + if (new File(pathOfFileToCopy).exists()) { + FileUtils.copyFileToDirectory(new File(pathOfFileToCopy), new File(trashFolderPath)); + LOGGER.info("File: " + pathOfFileToCopy + " successfully copied to the trash folder: " + + trashFolderPath); + } + } catch (IOException e) { + LOGGER.error("Unable to copy " + pathOfFileToCopy + " to the trash folder", e); + } + } + + /** + * The below method copies the complete segment folder to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashBySegment(CarbonFile path, String carbonTablePath, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + FileUtils.copyDirectory(new File(path.getAbsolutePath()), new File(trashFolderPath)); + LOGGER.info("Segment: " + path.getAbsolutePath() + " has been copied to the trash folder" + + " successfully"); + } catch (IOException e) { + LOGGER.error("Unable to create the trash folder and copy data to it", e); + } + } + + /** + * The below method deletes timestamp subdirectories in the trash folder which have expired as + * per the user defined expiration time + */ + public static void deleteAllDataFromTrashFolderByTimeStamp(String carbonTablePath, Long timeStamp) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // Deleting the timestamp based subdirectories in the trashfolder by the given timestamp. + if (FileFactory.isFileExist(pathOfTrashFolder)) { + try { + List<CarbonFile> carbonFileList = FileFactory.getFolderList(pathOfTrashFolder); + for (CarbonFile carbonFile : carbonFileList) { + String[] aB = carbonFile.getAbsolutePath().split(CarbonCommonConstants.FILE_SEPARATOR); Review comment: different names for partition tables and normal tables, changed the variable name though ########## File path: core/src/main/java/org/apache/carbondata/core/util/path/TrashUtil.java ########## @@ -0,0 +1,162 @@ +/* + * 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.carbondata.core.util.path; + +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; +import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.exception.CarbonFileException; +import org.apache.carbondata.core.util.CarbonUtil; + +import org.apache.commons.io.FileUtils; + +import org.apache.log4j.Logger; + +public final class TrashUtil { + + private static final Logger LOGGER = + LogServiceFactory.getLogService(CarbonUtil.class.getName()); + + /** + * The below method copies the complete a file to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashFolderByFile(String carbonTablePath, String pathOfFileToCopy, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + if (new File(pathOfFileToCopy).exists()) { + FileUtils.copyFileToDirectory(new File(pathOfFileToCopy), new File(trashFolderPath)); + LOGGER.info("File: " + pathOfFileToCopy + " successfully copied to the trash folder: " + + trashFolderPath); + } + } catch (IOException e) { + LOGGER.error("Unable to copy " + pathOfFileToCopy + " to the trash folder", e); + } + } + + /** + * The below method copies the complete segment folder to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashBySegment(CarbonFile path, String carbonTablePath, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + FileUtils.copyDirectory(new File(path.getAbsolutePath()), new File(trashFolderPath)); + LOGGER.info("Segment: " + path.getAbsolutePath() + " has been copied to the trash folder" + + " successfully"); + } catch (IOException e) { + LOGGER.error("Unable to create the trash folder and copy data to it", e); + } + } + + /** + * The below method deletes timestamp subdirectories in the trash folder which have expired as + * per the user defined expiration time + */ + public static void deleteAllDataFromTrashFolderByTimeStamp(String carbonTablePath, Long timeStamp) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // Deleting the timestamp based subdirectories in the trashfolder by the given timestamp. + if (FileFactory.isFileExist(pathOfTrashFolder)) { + try { + List<CarbonFile> carbonFileList = FileFactory.getFolderList(pathOfTrashFolder); + for (CarbonFile carbonFile : carbonFileList) { + String[] aB = carbonFile.getAbsolutePath().split(CarbonCommonConstants.FILE_SEPARATOR); + Long currentTime = Long.valueOf(new Timestamp(System.currentTimeMillis()).getTime()); + Long givenTime = Long.valueOf(aB[aB.length - 1]); + // If the timeStamp at which the timeStamp subdirectory has expired as per the user + // defined value, delete the complete timeStamp subdirectory + if (givenTime + timeStamp < currentTime) { + deleteDataFromTrashFolderByFile(carbonFile); + } Review comment: done ########## File path: core/src/main/java/org/apache/carbondata/core/util/path/TrashUtil.java ########## @@ -0,0 +1,162 @@ +/* + * 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.carbondata.core.util.path; + +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; +import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.exception.CarbonFileException; +import org.apache.carbondata.core.util.CarbonUtil; + +import org.apache.commons.io.FileUtils; + +import org.apache.log4j.Logger; + +public final class TrashUtil { + + private static final Logger LOGGER = + LogServiceFactory.getLogService(CarbonUtil.class.getName()); + + /** + * The below method copies the complete a file to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashFolderByFile(String carbonTablePath, String pathOfFileToCopy, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + if (new File(pathOfFileToCopy).exists()) { + FileUtils.copyFileToDirectory(new File(pathOfFileToCopy), new File(trashFolderPath)); + LOGGER.info("File: " + pathOfFileToCopy + " successfully copied to the trash folder: " + + trashFolderPath); + } + } catch (IOException e) { + LOGGER.error("Unable to copy " + pathOfFileToCopy + " to the trash folder", e); + } + } + + /** + * The below method copies the complete segment folder to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashBySegment(CarbonFile path, String carbonTablePath, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + FileUtils.copyDirectory(new File(path.getAbsolutePath()), new File(trashFolderPath)); + LOGGER.info("Segment: " + path.getAbsolutePath() + " has been copied to the trash folder" + + " successfully"); + } catch (IOException e) { + LOGGER.error("Unable to create the trash folder and copy data to it", e); + } + } + + /** + * The below method deletes timestamp subdirectories in the trash folder which have expired as + * per the user defined expiration time + */ + public static void deleteAllDataFromTrashFolderByTimeStamp(String carbonTablePath, Long timeStamp) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // Deleting the timestamp based subdirectories in the trashfolder by the given timestamp. + if (FileFactory.isFileExist(pathOfTrashFolder)) { + try { + List<CarbonFile> carbonFileList = FileFactory.getFolderList(pathOfTrashFolder); + for (CarbonFile carbonFile : carbonFileList) { + String[] aB = carbonFile.getAbsolutePath().split(CarbonCommonConstants.FILE_SEPARATOR); + Long currentTime = Long.valueOf(new Timestamp(System.currentTimeMillis()).getTime()); + Long givenTime = Long.valueOf(aB[aB.length - 1]); + // If the timeStamp at which the timeStamp subdirectory has expired as per the user + // defined value, delete the complete timeStamp subdirectory + if (givenTime + timeStamp < currentTime) { + deleteDataFromTrashFolderByFile(carbonFile); + } + } + } catch (IOException e) { + LOGGER.error("Error during deleting from trash folder", e); + } + } + } + + /** + * The below method deletes all the files and folders in the trash folder of a carbon table. + */ + public static void deleteAllDataFromTrashFolder(String carbonTablePath) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // if the trash folder exists delete the contents of the trash folder, if it does not exists + // create a trash folder Review comment: done ########## File path: core/src/main/java/org/apache/carbondata/core/util/path/TrashUtil.java ########## @@ -0,0 +1,162 @@ +/* + * 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.carbondata.core.util.path; + +import java.io.File; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.List; + +import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; +import org.apache.carbondata.core.datastore.impl.FileFactory; +import org.apache.carbondata.core.exception.CarbonFileException; +import org.apache.carbondata.core.util.CarbonUtil; + +import org.apache.commons.io.FileUtils; + +import org.apache.log4j.Logger; + +public final class TrashUtil { + + private static final Logger LOGGER = + LogServiceFactory.getLogService(CarbonUtil.class.getName()); + + /** + * The below method copies the complete a file to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashFolderByFile(String carbonTablePath, String pathOfFileToCopy, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + if (new File(pathOfFileToCopy).exists()) { + FileUtils.copyFileToDirectory(new File(pathOfFileToCopy), new File(trashFolderPath)); + LOGGER.info("File: " + pathOfFileToCopy + " successfully copied to the trash folder: " + + trashFolderPath); + } + } catch (IOException e) { + LOGGER.error("Unable to copy " + pathOfFileToCopy + " to the trash folder", e); + } + } + + /** + * The below method copies the complete segment folder to the trash folder. Provide necessary + * timestamp and the segment number in the suffixToAdd variable, so that the proper folder is + * created in the trash folder. + */ + public static void copyDataToTrashBySegment(CarbonFile path, String carbonTablePath, + String suffixToAdd) { + String trashFolderPath = CarbonTablePath.getTrashFolder(carbonTablePath) + + CarbonCommonConstants.FILE_SEPARATOR + suffixToAdd; + try { + FileUtils.copyDirectory(new File(path.getAbsolutePath()), new File(trashFolderPath)); + LOGGER.info("Segment: " + path.getAbsolutePath() + " has been copied to the trash folder" + + " successfully"); + } catch (IOException e) { + LOGGER.error("Unable to create the trash folder and copy data to it", e); + } + } + + /** + * The below method deletes timestamp subdirectories in the trash folder which have expired as + * per the user defined expiration time + */ + public static void deleteAllDataFromTrashFolderByTimeStamp(String carbonTablePath, Long timeStamp) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // Deleting the timestamp based subdirectories in the trashfolder by the given timestamp. + if (FileFactory.isFileExist(pathOfTrashFolder)) { + try { + List<CarbonFile> carbonFileList = FileFactory.getFolderList(pathOfTrashFolder); + for (CarbonFile carbonFile : carbonFileList) { + String[] aB = carbonFile.getAbsolutePath().split(CarbonCommonConstants.FILE_SEPARATOR); + Long currentTime = Long.valueOf(new Timestamp(System.currentTimeMillis()).getTime()); + Long givenTime = Long.valueOf(aB[aB.length - 1]); + // If the timeStamp at which the timeStamp subdirectory has expired as per the user + // defined value, delete the complete timeStamp subdirectory + if (givenTime + timeStamp < currentTime) { + deleteDataFromTrashFolderByFile(carbonFile); + } + } + } catch (IOException e) { + LOGGER.error("Error during deleting from trash folder", e); + } + } + } + + /** + * The below method deletes all the files and folders in the trash folder of a carbon table. + */ + public static void deleteAllDataFromTrashFolder(String carbonTablePath) + throws IOException { + String pathOfTrashFolder = CarbonTablePath.getTrashFolder(carbonTablePath); + // if the trash folder exists delete the contents of the trash folder, if it does not exists + // create a trash folder + if (FileFactory.isFileExist(pathOfTrashFolder)) { + try { + List<CarbonFile> carbonFileList = FileFactory.getFolderList(pathOfTrashFolder); + for (CarbonFile carbonFile : carbonFileList) { + deleteDataFromTrashFolderByFile(carbonFile); + } + } catch (IOException e) { + LOGGER.error("Error during deleting from trash folder", e); + } + } + } + + /** + * The below method deletes a specific file in the trash folder. + */ + private static void deleteDataFromTrashFolderByFile(CarbonFile carbonFile) { + try { + FileFactory.deleteAllCarbonFilesOfDir(carbonFile); 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
