[22/50] [abbrv] carbondata git commit: [CARBONDATA-2025] Unify all path construction through CarbonTablePath static method
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f06824e9/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
index 9799ac2..b7b5e43 100644
---
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
+++
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
@@ -22,16 +22,14 @@ import
org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.filesystem.CarbonFileFilter;
import org.apache.carbondata.core.datastore.impl.FileFactory;
-import org.apache.carbondata.core.metadata.CarbonTableIdentifier;
import org.apache.carbondata.core.metadata.ColumnarFormatVersion;
import org.apache.hadoop.fs.Path;
-
/**
* Helps to get Table content paths.
*/
-public class CarbonTablePath extends Path {
+public class CarbonTablePath {
private static final String METADATA_DIR = "Metadata";
private static final String DICTIONARY_EXT = ".dict";
@@ -54,19 +52,10 @@ public class CarbonTablePath extends Path {
private static final String STREAMING_LOG_DIR = "log";
private static final String STREAMING_CHECKPOINT_DIR = "checkpoint";
- private String tablePath;
- private CarbonTableIdentifier carbonTableIdentifier;
-
/**
- * structure CarbonTablePath object to manage table paths
- *
- * @param carbonTableIdentifier identifier of carbon table that the segment
belong to
- * @param tablePathString the store path of the segment
+ * This class provides static utility only.
*/
- public CarbonTablePath(CarbonTableIdentifier carbonTableIdentifier, String
tablePathString) {
-super(tablePathString);
-this.carbonTableIdentifier = carbonTableIdentifier;
-this.tablePath = tablePathString;
+ private CarbonTablePath() {
}
/**
@@ -130,40 +119,21 @@ public class CarbonTablePath extends Path {
}
/**
- * gets table path
+ * Return absolute path of dictionary file
*/
- public String getPath() {
-return tablePath;
+ public static String getDictionaryFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator +
getDictionaryFileName(columnId);
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
+ * Return absolute path of dictionary file
*/
- public String getDictionaryFilePath(String columnId) {
-return getMetaDataDir() + File.separator + getDictionaryFileName(columnId);
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryFilePath(String dictionaryPath, String columnId) {
+ public static String getExternalDictionaryFilePath(String dictionaryPath,
String columnId) {
return dictionaryPath + File.separator + getDictionaryFileName(columnId);
}
/**
- * This method will return the metadata directory location for a table
- *
- * @return
- */
- public String getMetadataDirectoryPath() {
-return getMetaDataDir();
- }
-
- /**
- * Return metadata path based on `tablePath`
+ * Return metadata path
*/
public static String getMetadataPath(String tablePath) {
return tablePath + File.separator + METADATA_DIR;
@@ -184,67 +154,42 @@ public class CarbonTablePath extends Path {
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary meta file
+ * Return absolute path of dictionary meta file
*/
- public String getDictionaryMetaFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + DICTIONARY_META_EXT;
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryMetaFilePath(String dictionaryPath, String
columnId) {
+ public static String getExternalDictionaryMetaFilePath(String
dictionaryPath, String columnId) {
return dictionaryPath + File.separator + columnId + DICTIONARY_META_EXT;
}
/**
- * @param columnId unique column identifier
- * @return absolute path of sort index file
+ * Return absolute path of dictionary meta file
*/
- public String getSortIndexFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + SORT_INDEX_EXT;
+ public static String getDictionaryMetaFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator + columnId +
DICTIONARY_META_EXT;
}
/**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary
[22/50] [abbrv] carbondata git commit: [CARBONDATA-2025] Unify all path construction through CarbonTablePath static method
http://git-wip-us.apache.org/repos/asf/carbondata/blob/f06824e9/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
index 9799ac2..b7b5e43 100644
---
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
+++
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
@@ -22,16 +22,14 @@ import
org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.filesystem.CarbonFileFilter;
import org.apache.carbondata.core.datastore.impl.FileFactory;
-import org.apache.carbondata.core.metadata.CarbonTableIdentifier;
import org.apache.carbondata.core.metadata.ColumnarFormatVersion;
import org.apache.hadoop.fs.Path;
-
/**
* Helps to get Table content paths.
*/
-public class CarbonTablePath extends Path {
+public class CarbonTablePath {
private static final String METADATA_DIR = "Metadata";
private static final String DICTIONARY_EXT = ".dict";
@@ -54,19 +52,10 @@ public class CarbonTablePath extends Path {
private static final String STREAMING_LOG_DIR = "log";
private static final String STREAMING_CHECKPOINT_DIR = "checkpoint";
- private String tablePath;
- private CarbonTableIdentifier carbonTableIdentifier;
-
/**
- * structure CarbonTablePath object to manage table paths
- *
- * @param carbonTableIdentifier identifier of carbon table that the segment
belong to
- * @param tablePathString the store path of the segment
+ * This class provides static utility only.
*/
- public CarbonTablePath(CarbonTableIdentifier carbonTableIdentifier, String
tablePathString) {
-super(tablePathString);
-this.carbonTableIdentifier = carbonTableIdentifier;
-this.tablePath = tablePathString;
+ private CarbonTablePath() {
}
/**
@@ -130,40 +119,21 @@ public class CarbonTablePath extends Path {
}
/**
- * gets table path
+ * Return absolute path of dictionary file
*/
- public String getPath() {
-return tablePath;
+ public static String getDictionaryFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator +
getDictionaryFileName(columnId);
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
+ * Return absolute path of dictionary file
*/
- public String getDictionaryFilePath(String columnId) {
-return getMetaDataDir() + File.separator + getDictionaryFileName(columnId);
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryFilePath(String dictionaryPath, String columnId) {
+ public static String getExternalDictionaryFilePath(String dictionaryPath,
String columnId) {
return dictionaryPath + File.separator + getDictionaryFileName(columnId);
}
/**
- * This method will return the metadata directory location for a table
- *
- * @return
- */
- public String getMetadataDirectoryPath() {
-return getMetaDataDir();
- }
-
- /**
- * Return metadata path based on `tablePath`
+ * Return metadata path
*/
public static String getMetadataPath(String tablePath) {
return tablePath + File.separator + METADATA_DIR;
@@ -184,67 +154,42 @@ public class CarbonTablePath extends Path {
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary meta file
+ * Return absolute path of dictionary meta file
*/
- public String getDictionaryMetaFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + DICTIONARY_META_EXT;
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryMetaFilePath(String dictionaryPath, String
columnId) {
+ public static String getExternalDictionaryMetaFilePath(String
dictionaryPath, String columnId) {
return dictionaryPath + File.separator + columnId + DICTIONARY_META_EXT;
}
/**
- * @param columnId unique column identifier
- * @return absolute path of sort index file
+ * Return absolute path of dictionary meta file
*/
- public String getSortIndexFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + SORT_INDEX_EXT;
+ public static String getDictionaryMetaFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator + columnId +
DICTIONARY_META_EXT;
}
/**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary
[22/50] [abbrv] carbondata git commit: [CARBONDATA-2025] Unify all path construction through CarbonTablePath static method
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9b9125b6/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
--
diff --git
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
index 9799ac2..b7b5e43 100644
---
a/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
+++
b/core/src/main/java/org/apache/carbondata/core/util/path/CarbonTablePath.java
@@ -22,16 +22,14 @@ import
org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.datastore.filesystem.CarbonFile;
import org.apache.carbondata.core.datastore.filesystem.CarbonFileFilter;
import org.apache.carbondata.core.datastore.impl.FileFactory;
-import org.apache.carbondata.core.metadata.CarbonTableIdentifier;
import org.apache.carbondata.core.metadata.ColumnarFormatVersion;
import org.apache.hadoop.fs.Path;
-
/**
* Helps to get Table content paths.
*/
-public class CarbonTablePath extends Path {
+public class CarbonTablePath {
private static final String METADATA_DIR = "Metadata";
private static final String DICTIONARY_EXT = ".dict";
@@ -54,19 +52,10 @@ public class CarbonTablePath extends Path {
private static final String STREAMING_LOG_DIR = "log";
private static final String STREAMING_CHECKPOINT_DIR = "checkpoint";
- private String tablePath;
- private CarbonTableIdentifier carbonTableIdentifier;
-
/**
- * structure CarbonTablePath object to manage table paths
- *
- * @param carbonTableIdentifier identifier of carbon table that the segment
belong to
- * @param tablePathString the store path of the segment
+ * This class provides static utility only.
*/
- public CarbonTablePath(CarbonTableIdentifier carbonTableIdentifier, String
tablePathString) {
-super(tablePathString);
-this.carbonTableIdentifier = carbonTableIdentifier;
-this.tablePath = tablePathString;
+ private CarbonTablePath() {
}
/**
@@ -130,40 +119,21 @@ public class CarbonTablePath extends Path {
}
/**
- * gets table path
+ * Return absolute path of dictionary file
*/
- public String getPath() {
-return tablePath;
+ public static String getDictionaryFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator +
getDictionaryFileName(columnId);
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
+ * Return absolute path of dictionary file
*/
- public String getDictionaryFilePath(String columnId) {
-return getMetaDataDir() + File.separator + getDictionaryFileName(columnId);
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryFilePath(String dictionaryPath, String columnId) {
+ public static String getExternalDictionaryFilePath(String dictionaryPath,
String columnId) {
return dictionaryPath + File.separator + getDictionaryFileName(columnId);
}
/**
- * This method will return the metadata directory location for a table
- *
- * @return
- */
- public String getMetadataDirectoryPath() {
-return getMetaDataDir();
- }
-
- /**
- * Return metadata path based on `tablePath`
+ * Return metadata path
*/
public static String getMetadataPath(String tablePath) {
return tablePath + File.separator + METADATA_DIR;
@@ -184,67 +154,42 @@ public class CarbonTablePath extends Path {
}
/**
- * @param columnId unique column identifier
- * @return absolute path of dictionary meta file
+ * Return absolute path of dictionary meta file
*/
- public String getDictionaryMetaFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + DICTIONARY_META_EXT;
- }
-
- /**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary file
- */
- public String getDictionaryMetaFilePath(String dictionaryPath, String
columnId) {
+ public static String getExternalDictionaryMetaFilePath(String
dictionaryPath, String columnId) {
return dictionaryPath + File.separator + columnId + DICTIONARY_META_EXT;
}
/**
- * @param columnId unique column identifier
- * @return absolute path of sort index file
+ * Return absolute path of dictionary meta file
*/
- public String getSortIndexFilePath(String columnId) {
-return getMetaDataDir() + File.separator + columnId + SORT_INDEX_EXT;
+ public static String getDictionaryMetaFilePath(String tablePath, String
columnId) {
+return getMetadataPath(tablePath) + File.separator + columnId +
DICTIONARY_META_EXT;
}
/**
- * @param dictionaryPath
- * @param columnId unique column identifier
- * @return absolute path of dictionary
[22/50] [abbrv] carbondata git commit: [CARBONDATA-2025] Unify all path construction through CarbonTablePath static method
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9daad358/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatDirectoryStructureTest.java
--
diff --git
a/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatDirectoryStructureTest.java
b/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatDirectoryStructureTest.java
index a1ccab3..4293536 100644
---
a/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatDirectoryStructureTest.java
+++
b/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatDirectoryStructureTest.java
@@ -39,21 +39,19 @@ public class CarbonFormatDirectoryStructureTest {
*/
@Test public void testTablePathStructure() throws IOException {
CarbonTableIdentifier tableIdentifier = new CarbonTableIdentifier("d1",
"t1", UUID.randomUUID().toString());
-CarbonStorePath carbonStorePath = new CarbonStorePath(CARBON_STORE);
-AbsoluteTableIdentifier absoluteTableIdentifier =
+AbsoluteTableIdentifier identifier =
AbsoluteTableIdentifier.from(CARBON_STORE + "/d1/t1", tableIdentifier);
-CarbonTablePath carbonTablePath =
CarbonStorePath.getCarbonTablePath(absoluteTableIdentifier);
-assertTrue(carbonTablePath.getPath().replace("\\",
"/").equals(CARBON_STORE + "/d1/t1"));
-assertTrue(carbonTablePath.getSchemaFilePath().replace("\\",
"/").equals(CARBON_STORE + "/d1/t1/Metadata/schema"));
-assertTrue(carbonTablePath.getTableStatusFilePath().replace("\\", "/")
+assertTrue(identifier.getTablePath().replace("\\",
"/").equals(CARBON_STORE + "/d1/t1"));
+
assertTrue(CarbonTablePath.getSchemaFilePath(identifier.getTablePath()).replace("\\",
"/").equals(CARBON_STORE + "/d1/t1/Metadata/schema"));
+
assertTrue(CarbonTablePath.getTableStatusFilePath(identifier.getTablePath()).replace("\\",
"/")
.equals(CARBON_STORE + "/d1/t1/Metadata/tablestatus"));
-assertTrue(carbonTablePath.getDictionaryFilePath("t1_c1").replace("\\",
"/")
+
assertTrue(CarbonTablePath.getDictionaryFilePath(identifier.getTablePath(),
"t1_c1").replace("\\", "/")
.equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.dict"));
-
assertTrue(carbonTablePath.getDictionaryMetaFilePath("t1_c1").replace("\\", "/")
+
assertTrue(CarbonTablePath.getDictionaryMetaFilePath(identifier.getTablePath(),
"t1_c1").replace("\\", "/")
.equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.dictmeta"));
-assertTrue(carbonTablePath.getSortIndexFilePath("t1_c1").replace("\\", "/")
+
assertTrue(CarbonTablePath.getSortIndexFilePath(identifier.getTablePath(),"t1_c1").replace("\\",
"/")
.equals(CARBON_STORE + "/d1/t1/Metadata/t1_c1.sortindex"));
-assertTrue(carbonTablePath.getCarbonDataFilePath("2", 3, 4L, 0, 0,
"999").replace("\\", "/")
+
assertTrue(CarbonTablePath.getCarbonDataFilePath(identifier.getTablePath(),
"2", 3, 4L, 0, 0, "999").replace("\\", "/")
.equals(CARBON_STORE +
"/d1/t1/Fact/Part0/Segment_2/part-3-4_batchno0-0-999.carbondata"));
}
http://git-wip-us.apache.org/repos/asf/carbondata/blob/9daad358/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatSharedDictionaryTest.java
--
diff --git
a/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatSharedDictionaryTest.java
b/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatSharedDictionaryTest.java
deleted file mode 100644
index 91384c1..000
---
a/core/src/test/java/org/apache/carbondata/core/util/path/CarbonFormatSharedDictionaryTest.java
+++ /dev/null
@@ -1,44 +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.util.path;
-
-import java.io.IOException;
-
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertTrue;
-
-/**
- * test shared dictionary paths
- */
-public class CarbonFormatSharedDictionaryTest {
-
- private final String CARBON_STORE = "/opt/carbonstore";
-
- /**
- * test shared dictionary location
- */
- @Test public void testSharedDimentionLocation() throws IOException {
-
