HADOOP-11818 Minor improvements for erasurecode classes. Contributed by Rakesh R
This commit is contained in:
parent
c4a0d88366
commit
971bd5e885
|
@ -40,3 +40,5 @@
|
||||||
|
|
||||||
HADOOP-11645. Erasure Codec API covering the essential aspects for an erasure code
|
HADOOP-11645. Erasure Codec API covering the essential aspects for an erasure code
|
||||||
( Kai Zheng via vinayakumarb )
|
( Kai Zheng via vinayakumarb )
|
||||||
|
|
||||||
|
HADOOP-11818. Minor improvements for erasurecode classes. (Rakesh R via Kai Zheng)
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
*/
|
*/
|
||||||
package org.apache.hadoop.io.erasurecode;
|
package org.apache.hadoop.io.erasurecode;
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.slf4j.Logger;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.fs.CommonConfigurationKeys;
|
import org.apache.hadoop.fs.CommonConfigurationKeys;
|
||||||
import org.w3c.dom.*;
|
import org.w3c.dom.*;
|
||||||
|
@ -36,7 +36,7 @@ import java.util.*;
|
||||||
* A EC schema loading utility that loads predefined EC schemas from XML file
|
* A EC schema loading utility that loads predefined EC schemas from XML file
|
||||||
*/
|
*/
|
||||||
public class SchemaLoader {
|
public class SchemaLoader {
|
||||||
private static final Log LOG = LogFactory.getLog(SchemaLoader.class.getName());
|
private static final Logger LOG = LoggerFactory.getLogger(SchemaLoader.class.getName());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load predefined ec schemas from configuration file. This file is
|
* Load predefined ec schemas from configuration file. This file is
|
||||||
|
@ -63,7 +63,7 @@ public class SchemaLoader {
|
||||||
private List<ECSchema> loadSchema(File schemaFile)
|
private List<ECSchema> loadSchema(File schemaFile)
|
||||||
throws ParserConfigurationException, IOException, SAXException {
|
throws ParserConfigurationException, IOException, SAXException {
|
||||||
|
|
||||||
LOG.info("Loading predefined EC schema file " + schemaFile);
|
LOG.info("Loading predefined EC schema file {}", schemaFile);
|
||||||
|
|
||||||
// Read and parse the schema file.
|
// Read and parse the schema file.
|
||||||
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
||||||
|
@ -87,7 +87,7 @@ public class SchemaLoader {
|
||||||
ECSchema schema = loadSchema(element);
|
ECSchema schema = loadSchema(element);
|
||||||
schemas.add(schema);
|
schemas.add(schema);
|
||||||
} else {
|
} else {
|
||||||
LOG.warn("Bad element in EC schema configuration file: " +
|
LOG.warn("Bad element in EC schema configuration file: {}",
|
||||||
element.getTagName());
|
element.getTagName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ public class SchemaLoader {
|
||||||
URL url = Thread.currentThread().getContextClassLoader()
|
URL url = Thread.currentThread().getContextClassLoader()
|
||||||
.getResource(schemaFilePath);
|
.getResource(schemaFilePath);
|
||||||
if (url == null) {
|
if (url == null) {
|
||||||
LOG.warn(schemaFilePath + " not found on the classpath.");
|
LOG.warn("{} not found on the classpath.", schemaFilePath);
|
||||||
schemaFile = null;
|
schemaFile = null;
|
||||||
} else if (! url.getProtocol().equalsIgnoreCase("file")) {
|
} else if (! url.getProtocol().equalsIgnoreCase("file")) {
|
||||||
throw new RuntimeException(
|
throw new RuntimeException(
|
||||||
|
|
|
@ -1,3 +1,20 @@
|
||||||
|
/**
|
||||||
|
* 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.io.erasurecode.coder;
|
package org.apache.hadoop.io.erasurecode.coder;
|
||||||
|
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
|
@ -11,7 +28,7 @@ import org.apache.hadoop.io.erasurecode.rawcoder.XORRawDecoder;
|
||||||
/**
|
/**
|
||||||
* Reed-Solomon erasure decoder that decodes a block group.
|
* Reed-Solomon erasure decoder that decodes a block group.
|
||||||
*
|
*
|
||||||
* It implements {@link ErasureDecoder}.
|
* It implements {@link ErasureCoder}.
|
||||||
*/
|
*/
|
||||||
public class RSErasureDecoder extends AbstractErasureDecoder {
|
public class RSErasureDecoder extends AbstractErasureDecoder {
|
||||||
private RawErasureDecoder rsRawDecoder;
|
private RawErasureDecoder rsRawDecoder;
|
||||||
|
|
|
@ -1,3 +1,20 @@
|
||||||
|
/**
|
||||||
|
* 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.io.erasurecode.coder;
|
package org.apache.hadoop.io.erasurecode.coder;
|
||||||
|
|
||||||
import org.apache.hadoop.fs.CommonConfigurationKeys;
|
import org.apache.hadoop.fs.CommonConfigurationKeys;
|
||||||
|
@ -9,7 +26,7 @@ import org.apache.hadoop.io.erasurecode.rawcoder.RawErasureEncoder;
|
||||||
/**
|
/**
|
||||||
* Reed-Solomon erasure encoder that encodes a block group.
|
* Reed-Solomon erasure encoder that encodes a block group.
|
||||||
*
|
*
|
||||||
* It implements {@link ErasureEncoder}.
|
* It implements {@link ErasureCoder}.
|
||||||
*/
|
*/
|
||||||
public class RSErasureEncoder extends AbstractErasureEncoder {
|
public class RSErasureEncoder extends AbstractErasureEncoder {
|
||||||
private RawErasureEncoder rawEncoder;
|
private RawErasureEncoder rawEncoder;
|
||||||
|
|
|
@ -25,7 +25,7 @@ import org.apache.hadoop.io.erasurecode.rawcoder.XORRawDecoder;
|
||||||
/**
|
/**
|
||||||
* Xor erasure decoder that decodes a block group.
|
* Xor erasure decoder that decodes a block group.
|
||||||
*
|
*
|
||||||
* It implements {@link ErasureDecoder}.
|
* It implements {@link ErasureCoder}.
|
||||||
*/
|
*/
|
||||||
public class XORErasureDecoder extends AbstractErasureDecoder {
|
public class XORErasureDecoder extends AbstractErasureDecoder {
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,20 @@
|
||||||
|
/**
|
||||||
|
* 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.io.erasurecode.rawcoder.util;
|
package org.apache.hadoop.io.erasurecode.rawcoder.util;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue