Author: kturner
Date: Mon Jun 17 19:28:59 2013
New Revision: 1493896
URL: http://svn.apache.org/r1493896
Log:
ACCUMULO-1518 Patch from David M. Lyle that allows opening rfiles w/ multiple
dots in name.
Added:
accumulo/trunk/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
- copied unchanged from r1493894,
accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/file/FileOperationsTest.java
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
(props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
(props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1493894
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1493894
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1493894
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java?rev=1493896&r1=1493895&r2=1493896&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
Mon Jun 17 19:28:59 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();
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1493894
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1493894
Propchange:
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged
/accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1493894
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1493894
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1493894
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1493894
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1493894
