mukul1987 commented on code in PR #3444: URL: https://github.com/apache/ozone/pull/3444#discussion_r881710462
########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java: ########## @@ -0,0 +1,560 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.om; + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.hdds.utils.db.TableIterator; +import org.apache.hadoop.hdds.utils.db.cache.CacheKey; +import org.apache.hadoop.hdds.utils.db.cache.CacheValue; +import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus; +import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils; +import org.apache.hadoop.ozone.om.helpers.OmKeyArgs; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.BucketLayout; +import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; +import org.apache.hadoop.ozone.om.helpers.WithParentObjectId; +import org.apache.hadoop.ozone.om.request.file.OMFileRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.Closeable; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.TreeMap; +import java.util.Map; +import java.util.TreeSet; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.NoSuchElementException; +import java.util.Collection; +import java.util.Collections; + + +import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK; + +/** + * Helper class for fetching List Status for a path. + */ +public class OzoneListStatusHelper { + + /** + * Interface to get the File Status. + */ + @FunctionalInterface + public interface GetFileStatusHelper { + OzoneFileStatus apply(OmKeyArgs args, String clientAddress, + boolean skipFileNotFoundError) throws IOException; + } + + private static final Logger LOG = + LoggerFactory.getLogger(OzoneListStatusHelper.class); + + private final OMMetadataManager metadataManager; + private final long scmBlockSize; + + private final GetFileStatusHelper getStatusHelper; + + OzoneListStatusHelper(OMMetadataManager metadataManager, long scmBlockSize, + GetFileStatusHelper func) { + this.metadataManager = metadataManager; + this.scmBlockSize = scmBlockSize; + this.getStatusHelper = func; + } + + public Collection<OzoneFileStatus> listStatusFSO(OmKeyArgs args, + boolean recursive, String startKey, long numEntries, + String clientAddress) + throws IOException { + Preconditions.checkArgument(!recursive); + Preconditions.checkNotNull(args, "Key args can not be null"); + + if (numEntries <= 0) { Review Comment: done ########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneListStatusHelper.java: ########## @@ -0,0 +1,560 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.ozone.om; + +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import org.apache.commons.lang3.StringUtils; +import org.apache.hadoop.hdds.utils.db.Table; +import org.apache.hadoop.hdds.utils.db.TableIterator; +import org.apache.hadoop.hdds.utils.db.cache.CacheKey; +import org.apache.hadoop.hdds.utils.db.cache.CacheValue; +import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus; +import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils; +import org.apache.hadoop.ozone.om.helpers.OmKeyArgs; +import org.apache.hadoop.ozone.om.helpers.OmBucketInfo; +import org.apache.hadoop.ozone.om.helpers.OmKeyInfo; +import org.apache.hadoop.ozone.om.helpers.BucketLayout; +import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; +import org.apache.hadoop.ozone.om.helpers.WithParentObjectId; +import org.apache.hadoop.ozone.om.request.file.OMFileRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.Closeable; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.TreeMap; +import java.util.Map; +import java.util.TreeSet; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.NoSuchElementException; +import java.util.Collection; +import java.util.Collections; + + +import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK; + +/** + * Helper class for fetching List Status for a path. + */ +public class OzoneListStatusHelper { + + /** + * Interface to get the File Status. + */ + @FunctionalInterface + public interface GetFileStatusHelper { + OzoneFileStatus apply(OmKeyArgs args, String clientAddress, + boolean skipFileNotFoundError) throws IOException; + } + + private static final Logger LOG = + LoggerFactory.getLogger(OzoneListStatusHelper.class); + + private final OMMetadataManager metadataManager; + private final long scmBlockSize; + + private final GetFileStatusHelper getStatusHelper; + + OzoneListStatusHelper(OMMetadataManager metadataManager, long scmBlockSize, + GetFileStatusHelper func) { + this.metadataManager = metadataManager; + this.scmBlockSize = scmBlockSize; + this.getStatusHelper = func; + } + + public Collection<OzoneFileStatus> listStatusFSO(OmKeyArgs args, + boolean recursive, String startKey, long numEntries, Review Comment: done ########## hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java: ########## @@ -1500,9 +1500,22 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive, if (numEntries <= 0) { return fileStatusList; } + + boolean useNewIterator = true; Review Comment: I want to do a simple cleanup patch where the old code can be removed easily. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
