Repository: carbondata Updated Branches: refs/heads/master a7ac65648 -> 33b825d7f
[CARBONDATA-2545] Fix some spell error in CarbonData Change Inerface to Interface This closes #2346 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/33b825d7 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/33b825d7 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/33b825d7 Branch: refs/heads/master Commit: 33b825d7fe686fc1985501f2208724aeabc99d9f Parents: a7ac656 Author: xubo245 <[email protected]> Authored: Mon May 28 11:47:27 2018 +0800 Committer: Jacky Li <[email protected]> Committed: Mon May 28 17:16:05 2018 +0800 ---------------------------------------------------------------------- .../datastore/impl/DefaultFileTypeProvider.java | 2 +- .../core/datastore/impl/FileFactory.java | 14 ++++----- .../core/datastore/impl/FileTypeInerface.java | 32 -------------------- .../core/datastore/impl/FileTypeInterface.java | 32 ++++++++++++++++++++ 4 files changed, 40 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/33b825d7/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java index b58a473..f54e9af 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/DefaultFileTypeProvider.java @@ -26,7 +26,7 @@ import org.apache.carbondata.core.datastore.filesystem.ViewFSCarbonFile; import org.apache.hadoop.conf.Configuration; -public class DefaultFileTypeProvider implements FileTypeInerface { +public class DefaultFileTypeProvider implements FileTypeInterface { public FileReader getFileHolder(FileFactory.FileType fileType) { switch (fileType) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/33b825d7/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java index 1529649..5c46bcf 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java @@ -50,9 +50,9 @@ public final class FileFactory { configuration.addResource(new Path("../core-default.xml")); } - private static FileTypeInerface fileFileTypeInerface = new DefaultFileTypeProvider(); - public static void setFileTypeInerface(FileTypeInerface fileTypeInerface) { - fileFileTypeInerface = fileTypeInerface; + private static FileTypeInterface fileFileTypeInterface = new DefaultFileTypeProvider(); + public static void setFileTypeInterface(FileTypeInterface fileTypeInterface) { + fileFileTypeInterface = fileTypeInterface; } private FileFactory() { @@ -63,7 +63,7 @@ public final class FileFactory { } public static FileReader getFileHolder(FileType fileType) { - return fileFileTypeInerface.getFileHolder(fileType); + return fileFileTypeInterface.getFileHolder(fileType); } public static FileType getFileType(String path) { @@ -83,14 +83,14 @@ public final class FileFactory { } public static CarbonFile getCarbonFile(String path) { - return fileFileTypeInerface.getCarbonFile(path, getFileType(path)); + return fileFileTypeInterface.getCarbonFile(path, getFileType(path)); } public static CarbonFile getCarbonFile(String path, FileType fileType) { - return fileFileTypeInerface.getCarbonFile(path, fileType); + return fileFileTypeInterface.getCarbonFile(path, fileType); } public static CarbonFile getCarbonFile(String path, FileType fileType, Configuration hadoopConf) { - return fileFileTypeInerface.getCarbonFile(path, fileType, hadoopConf); + return fileFileTypeInterface.getCarbonFile(path, fileType, hadoopConf); } public static DataInputStream getDataInputStream(String path, FileType fileType) http://git-wip-us.apache.org/repos/asf/carbondata/blob/33b825d7/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInerface.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInerface.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInerface.java deleted file mode 100644 index 413261c..0000000 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInerface.java +++ /dev/null @@ -1,32 +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.carbondata.core.datastore.impl; - -import org.apache.carbondata.core.datastore.FileReader; -import org.apache.carbondata.core.datastore.filesystem.CarbonFile; - -import org.apache.hadoop.conf.Configuration; - -public interface FileTypeInerface { - - FileReader getFileHolder(FileFactory.FileType fileType); - CarbonFile getCarbonFile(String path, FileFactory.FileType fileType); - CarbonFile getCarbonFile(String path, FileFactory.FileType fileType, Configuration configuration); - -} - http://git-wip-us.apache.org/repos/asf/carbondata/blob/33b825d7/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInterface.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInterface.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInterface.java new file mode 100644 index 0000000..84da148 --- /dev/null +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileTypeInterface.java @@ -0,0 +1,32 @@ +/* + * 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.carbondata.core.datastore.impl; + +import org.apache.carbondata.core.datastore.FileReader; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; + +import org.apache.hadoop.conf.Configuration; + +public interface FileTypeInterface { + + FileReader getFileHolder(FileFactory.FileType fileType); + CarbonFile getCarbonFile(String path, FileFactory.FileType fileType); + CarbonFile getCarbonFile(String path, FileFactory.FileType fileType, Configuration configuration); + +} +
