You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ae...@apache.org on 2020/01/18 19:04:42 UTC
[hadoop-ozone] branch master updated: HDDS-2905. Remove unusued
BlockLocation protocol related classes (#460)
This is an automated email from the ASF dual-hosted git repository.
aengineer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 79aff8b HDDS-2905. Remove unusued BlockLocation protocol related classes (#460)
79aff8b is described below
commit 79aff8b62b0b239fe9d30bde1914d802ccca49ed
Author: Elek, Márton <el...@users.noreply.github.com>
AuthorDate: Sat Jan 18 20:04:33 2020 +0100
HDDS-2905. Remove unusued BlockLocation protocol related classes (#460)
---
.../hadoop/hdds/scm/protocol/LocatedContainer.java | 127 ---------------------
.../hadoop/hdds/scm/protocol/ScmLocatedBlock.java | 100 ----------------
2 files changed, 227 deletions(-)
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/LocatedContainer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/LocatedContainer.java
deleted file mode 100644
index 10a9b1b..0000000
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/LocatedContainer.java
+++ /dev/null
@@ -1,127 +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.hadoop.hdds.scm.protocol;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-
-import java.util.Set;
-
-/**
- * Holds the nodes that currently host the container for an object key hash.
- */
-@InterfaceAudience.Private
-public final class LocatedContainer {
- private final String key;
- private final String matchedKeyPrefix;
- private final String containerName;
- private final Set<DatanodeInfo> locations;
- private final DatanodeInfo leader;
-
- /**
- * Creates a LocatedContainer.
- *
- * @param key object key
- * @param matchedKeyPrefix prefix of key that was used to find the location
- * @param containerName container name
- * @param locations nodes that currently host the container
- * @param leader node that currently acts as pipeline leader
- */
- public LocatedContainer(String key, String matchedKeyPrefix,
- String containerName, Set<DatanodeInfo> locations, DatanodeInfo leader) {
- this.key = key;
- this.matchedKeyPrefix = matchedKeyPrefix;
- this.containerName = containerName;
- this.locations = locations;
- this.leader = leader;
- }
-
- /**
- * Returns the container name.
- *
- * @return container name
- */
- public String getContainerName() {
- return this.containerName;
- }
-
- /**
- * Returns the object key.
- *
- * @return object key
- */
- public String getKey() {
- return this.key;
- }
-
- /**
- * Returns the node that currently acts as pipeline leader.
- *
- * @return node that currently acts as pipeline leader
- */
- public DatanodeInfo getLeader() {
- return this.leader;
- }
-
- /**
- * Returns the nodes that currently host the container.
- *
- * @return {@code Set<DatanodeInfo>} nodes that currently host the container
- */
- public Set<DatanodeInfo> getLocations() {
- return this.locations;
- }
-
- /**
- * Returns the prefix of the key that was used to find the location.
- *
- * @return prefix of the key that was used to find the location
- */
- public String getMatchedKeyPrefix() {
- return this.matchedKeyPrefix;
- }
-
- @Override
- public boolean equals(Object otherObj) {
- if (otherObj == null) {
- return false;
- }
- if (!(otherObj instanceof LocatedContainer)) {
- return false;
- }
- LocatedContainer other = (LocatedContainer)otherObj;
- return this.key == null ? other.key == null : this.key.equals(other.key);
- }
-
- @Override
- public int hashCode() {
- return key.hashCode();
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName()
- + "{key=" + key
- + "; matchedKeyPrefix=" + matchedKeyPrefix
- + "; containerName=" + containerName
- + "; locations=" + locations
- + "; leader=" + leader
- + "}";
- }
-}
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmLocatedBlock.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmLocatedBlock.java
deleted file mode 100644
index 0d2ecf7..0000000
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/ScmLocatedBlock.java
+++ /dev/null
@@ -1,100 +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.hadoop.hdds.scm.protocol;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hdfs.protocol.DatanodeInfo;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Holds the nodes that currently host the block for a block key.
- */
-@InterfaceAudience.Private
-public final class ScmLocatedBlock {
- private final String key;
- private final List<DatanodeInfo> locations;
- private final DatanodeInfo leader;
-
- /**
- * Creates a ScmLocatedBlock.
- *
- * @param key object key
- * @param locations nodes that currently host the block
- * @param leader node that currently acts as pipeline leader
- */
- public ScmLocatedBlock(final String key, final List<DatanodeInfo> locations,
- final DatanodeInfo leader) {
- this.key = key;
- this.locations = locations;
- this.leader = leader;
- }
-
- /**
- * Returns the object key.
- *
- * @return object key
- */
- public String getKey() {
- return this.key;
- }
-
- /**
- * Returns the node that currently acts as pipeline leader.
- *
- * @return node that currently acts as pipeline leader
- */
- public DatanodeInfo getLeader() {
- return this.leader;
- }
-
- /**
- * Returns the nodes that currently host the block.
- *
- * @return {@literal List<DatanodeInfo>} nodes that currently host the block
- */
- public List<DatanodeInfo> getLocations() {
- return this.locations;
- }
-
- @Override
- public boolean equals(Object otherObj) {
- if (otherObj == null) {
- return false;
- }
- if (!(otherObj instanceof ScmLocatedBlock)) {
- return false;
- }
- ScmLocatedBlock other = (ScmLocatedBlock)otherObj;
- return this.key == null ? other.key == null : this.key.equals(other.key);
- }
-
- @Override
- public int hashCode() {
- return key.hashCode();
- }
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "{key=" + key + "; locations="
- + locations.stream().map(loc -> loc.toString()).collect(Collectors
- .joining(",")) + "; leader=" + leader + "}";
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org