Author: kturner
Date: Mon Jun 17 19:24:45 2013
New Revision: 1493894
URL: http://svn.apache.org/r1493894
Log:
ACCUMULO-1518 Patch from David M. Lyle that allows opening rfiles w/ multiple
dots in name.
Added:
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
Modified:
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java?rev=1493894&r1=1493893&r2=1493894&view=diff
==============================================================================
---
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
(original)
+++
accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
Mon Jun 17 19:24:45 2013
@@ -44,14 +44,13 @@ class DispatchingFileFactory extends Fil
if (name.startsWith(Constants.MAPFILE_EXTENSION + "_")) {
return new MapFileOperations();
}
-
String[] sp = name.split("\\.");
- if (sp.length != 2) {
+ if (sp.length < 2) {
throw new IllegalArgumentException("File name " + name + " has no
extension");
}
- String extension = sp[1];
+ String extension = sp[sp.length - 1];
if (extension.equals(Constants.MAPFILE_EXTENSION) ||
extension.equals(Constants.MAPFILE_EXTENSION + "_tmp")) {
return new MapFileOperations();
Added:
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
URL:
http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java?rev=1493894&view=auto
==============================================================================
---
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
(added)
+++
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
Mon Jun 17 19:24:45 2013
@@ -0,0 +1,67 @@
+/*
+ * 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.accumulo.core.file;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.file.rfile.RFile;
+import org.apache.commons.io.FileUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.junit.Test;
+
+public class FileOperationsTest {
+
+ public FileOperationsTest() {}
+
+ /**
+ * Test for filenames with +1 dot
+ */
+ @Test
+ public void handlesFilenamesWithMoreThanOneDot() throws IOException {
+
+ Boolean caughtException = false;
+ FileSKVWriter writer = null;
+ String filename = "target/test.file." + RFile.EXTENSION;
+ File testFile = new File(filename);
+ if (testFile.exists()) {
+ FileUtils.forceDelete(testFile);
+ }
+ try {
+ FileOperations fileOperations = FileOperations.getInstance();
+ Configuration conf = new Configuration();
+ FileSystem fs = FileSystem.getLocal(conf);
+ AccumuloConfiguration acuconf =
AccumuloConfiguration.getDefaultConfiguration();
+ writer = fileOperations.openWriter(filename, fs, conf, acuconf);
+ writer.close();
+ } catch (Exception ex) {
+ caughtException = true;
+ } finally {
+ if (writer != null) {
+ writer.close();
+ }
+ FileUtils.forceDelete(testFile);
+ }
+
+ assertFalse("Should not throw with more than 1 dot in filename.",
caughtException);
+ }
+}
