You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2016/07/19 08:38:49 UTC
[1/5] incubator-carbondata git commit: change cube to table
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 6948cb05d -> e5ed64bbe
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStep.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStep.java b/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStep.java
index b41b88f..6156df3 100644
--- a/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStep.java
+++ b/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStep.java
@@ -91,7 +91,8 @@ public class CarbonSliceMergerStep extends BaseStep {
try {
// carbon data writer step meta
meta = (CarbonSliceMergerStepMeta) smi;
- StandardLogService.setThreadName(StandardLogService.getPartitionID(meta.getCubeName()), null);
+ StandardLogService.setThreadName(StandardLogService.getPartitionID(meta.getTableName()),
+ null);
// carbon data writer step data
data = (CarbonSliceMergerStepData) sdi;
@@ -128,7 +129,7 @@ public class CarbonSliceMergerStep extends BaseStep {
private void renameFolders() {
CarbonDataProcessorUtil.renameBadRecordsFromInProgressToNormal(
- meta.getSchemaName() + File.separator + meta.getCubeName() + File.separator + meta
+ meta.getDatabaseName() + File.separator + meta.getTableName() + File.separator + meta
.getTaskNo());
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStepMeta.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStepMeta.java b/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStepMeta.java
index 2770453..f6dba42 100644
--- a/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStepMeta.java
+++ b/processing/src/main/java/org/carbondata/processing/merger/step/CarbonSliceMergerStepMeta.java
@@ -73,14 +73,14 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
private String heirAndKeySize;
/**
- * schemaName
+ * databaseName
*/
- private String schemaName;
+ private String databaseName;
/**
- * cubeName
+ * tableName
*/
- private String cubeName;
+ private String tableName;
/**
* isGroupByEnabled
@@ -133,8 +133,8 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
mdkeySize = "";
measureCount = "";
heirAndKeySize = "";
- cubeName = "";
- schemaName = "";
+ tableName = "";
+ databaseName = "";
groupByEnabled = "";
aggregatorClassString = "";
aggregatorString = "";
@@ -158,8 +158,8 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
retval.append(" ").append(XMLHandler.addTagValue("MDKeySize", mdkeySize));
retval.append(" ").append(XMLHandler.addTagValue("Measurecount", measureCount));
retval.append(" ").append(XMLHandler.addTagValue("HeirAndKeySize", heirAndKeySize));
- retval.append(" ").append(XMLHandler.addTagValue("cubeName", cubeName));
- retval.append(" ").append(XMLHandler.addTagValue("schemaName", schemaName));
+ retval.append(" ").append(XMLHandler.addTagValue("tableName", tableName));
+ retval.append(" ").append(XMLHandler.addTagValue("databaseName", databaseName));
retval.append(" ").append(XMLHandler.addTagValue("isGroupByEnabled", groupByEnabled));
retval.append(" ")
.append(XMLHandler.addTagValue("aggregatorClassString", aggregatorClassString));
@@ -186,12 +186,12 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
@Override public void loadXML(Node stepnode, List<DatabaseMeta> databases,
Map<String, Counter> counters) throws KettleXMLException {
try {
- schemaName = XMLHandler.getTagValue(stepnode, "schemaName");
+ databaseName = XMLHandler.getTagValue(stepnode, "databaseName");
tabelName = XMLHandler.getTagValue(stepnode, "TableName");
mdkeySize = XMLHandler.getTagValue(stepnode, "MDKeySize");
measureCount = XMLHandler.getTagValue(stepnode, "Measurecount");
heirAndKeySize = XMLHandler.getTagValue(stepnode, "HeirAndKeySize");
- cubeName = XMLHandler.getTagValue(stepnode, "cubeName");
+ tableName = XMLHandler.getTagValue(stepnode, "tableName");
groupByEnabled = XMLHandler.getTagValue(stepnode, "isGroupByEnabled");
aggregatorClassString = XMLHandler.getTagValue(stepnode, "aggregatorClassString");
aggregatorString = XMLHandler.getTagValue(stepnode, "aggregatorString");
@@ -223,8 +223,8 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
rep.saveStepAttribute(idTransformation, idStep, "Measurecount", measureCount);
rep.saveStepAttribute(idTransformation, idStep, "HeirAndKeySize",
heirAndKeySize); //$NON-NLS-1$
- rep.saveStepAttribute(idTransformation, idStep, "cubeName", cubeName); //$NON-NLS-1$
- rep.saveStepAttribute(idTransformation, idStep, "schemaName", schemaName); //$NON-NLS-1$
+ rep.saveStepAttribute(idTransformation, idStep, "tableName", tableName); //$NON-NLS-1$
+ rep.saveStepAttribute(idTransformation, idStep, "databaseName", databaseName); //$NON-NLS-1$
rep.saveStepAttribute(idTransformation, idStep, "isGroupByEnabled", groupByEnabled);
rep.saveStepAttribute(idTransformation, idStep, "aggregatorClassString",
aggregatorClassString);
@@ -271,8 +271,8 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
mdkeySize = rep.getStepAttributeString(idStep, "MDKeySize");
measureCount = rep.getStepAttributeString(idStep, "Measurecount");
heirAndKeySize = rep.getStepAttributeString(idStep, "HeirAndKeySize");
- schemaName = rep.getStepAttributeString(idStep, "schemaName");
- cubeName = rep.getStepAttributeString(idStep, "cubeName");
+ databaseName = rep.getStepAttributeString(idStep, "databaseName");
+ tableName = rep.getStepAttributeString(idStep, "tableName");
groupByEnabled = rep.getStepAttributeString(idStep, "isGroupByEnabled");
aggregatorClassString = rep.getStepAttributeString(idStep, "aggregatorClassString");
aggregatorString = rep.getStepAttributeString(idStep, "aggregatorString");
@@ -421,31 +421,31 @@ public class CarbonSliceMergerStepMeta extends BaseStepMeta
}
/**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
/**
- * @return the cubeName
+ * @return the tableName
*/
- public String getCubeName() {
- return cubeName;
+ public String getTableName() {
+ return tableName;
}
/**
- * @param cubeName the cubeName to set
+ * @param tableName the tableName to set
*/
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/schema/metadata/ColumnsInfo.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/schema/metadata/ColumnsInfo.java b/processing/src/main/java/org/carbondata/processing/schema/metadata/ColumnsInfo.java
index 9613a86..8cf206a 100644
--- a/processing/src/main/java/org/carbondata/processing/schema/metadata/ColumnsInfo.java
+++ b/processing/src/main/java/org/carbondata/processing/schema/metadata/ColumnsInfo.java
@@ -39,11 +39,6 @@ public class ColumnsInfo {
private Map<String, KeyGenerator> keyGenerators;
/**
- * Cube name
- */
- private String cubeName;
-
- /**
* Hierarchy table names (Same will be file names for file store or
* incremental load)
*/
@@ -88,7 +83,7 @@ public class ColumnsInfo {
private int[][] propIndx;
/**
- * Dimension Index, Property column names from cube.
+ * Dimension Index, Property column names from table.
* [0] - [col2,col3] [1] - [col4,col7,col8] [2] - []
*/
private List<String>[] propColumns;
@@ -140,7 +135,7 @@ public class ColumnsInfo {
private boolean[] dimsPresent;
- private String schemaName;
+ private String databaseName;
private Map<String, GenericDataType> complexTypesMap;
@@ -193,17 +188,17 @@ public class ColumnsInfo {
}
/**
- * @return Returns the cubeName.
+ * @return Returns the tableName.
*/
- public String getCubeName() {
- return cubeName;
+ public String getTableName() {
+ return tableName;
}
/**
- * @param cubeName The cubeName to set.
+ * @param tableName The tableName to set.
*/
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
}
/**
@@ -414,20 +409,6 @@ public class ColumnsInfo {
}
/**
- * @return Returns the tableName.
- */
- public String getTableName() {
- return tableName;
- }
-
- /**
- * @param tableName The tableName to set.
- */
- public void setTableName(String tableName) {
- this.tableName = tableName;
- }
-
- /**
* @return Returns the primaryKeyMap.
*/
public Map<String, Boolean> getPrimaryKeyMap() {
@@ -473,12 +454,12 @@ public class ColumnsInfo {
this.measureColumns = measureColumns;
}
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
index 0f68ff3..ebba07a 100644
--- a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
+++ b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
@@ -67,10 +67,6 @@ public class SortDataRows {
*/
private int entryCount;
/**
- * tableName
- */
- private String tableName;
- /**
* sortBufferSize
*/
private int sortBufferSize;
@@ -134,8 +130,8 @@ public class SortDataRows {
* bufferSize
*/
private int bufferSize;
- private String schemaName;
- private String cubeName;
+ private String databaseName;
+ private String tableName;
private char[] aggType;
@@ -200,10 +196,10 @@ public class SortDataRows {
/**
* This method will be used to initialize
*/
- public void initialize(String schemaName, String cubeName)
+ public void initialize(String databaseName, String tableName)
throws CarbonSortKeyAndGroupByException {
- this.schemaName = schemaName;
- this.cubeName = cubeName;
+ this.databaseName = databaseName;
+ this.tableName = tableName;
CarbonProperties carbonProperties = CarbonProperties.getInstance();
setSortConfiguration(carbonProperties);
@@ -276,7 +272,7 @@ public class SortDataRows {
private void initAggType() {
Arrays.fill(aggType, 'n');
CarbonTable carbonTable = CarbonMetadata.getInstance()
- .getCarbonTable(schemaName + CarbonCommonConstants.UNDERSCORE + tableName);
+ .getCarbonTable(databaseName + CarbonCommonConstants.UNDERSCORE + tableName);
List<CarbonMeasure> measures = carbonTable.getMeasureByTableName(tableName);
for (int i = 0; i < measureColCount; i++) {
aggType[i] = DataTypeUtil.getAggType(measures.get(i).getDataType());
@@ -502,7 +498,7 @@ public class SortDataRows {
// get sort buffer size
this.sortBufferSize = Integer.parseInt(instance
.getProperty(CarbonCommonConstants.SORT_SIZE, CarbonCommonConstants.SORT_SIZE_DEFAULT_VAL));
- LOGGER.info("Sort size for cube: " + this.sortBufferSize);
+ LOGGER.info("Sort size for table: " + this.sortBufferSize);
// set number of intermedaite file to merge
this.numberOfIntermediateFileToBeMerged = Integer.parseInt(instance
.getProperty(CarbonCommonConstants.SORT_INTERMEDIATE_FILES_LIMIT,
@@ -525,7 +521,7 @@ public class SortDataRows {
*/
private void updateSortTempFileLocation() {
String carbonDataDirectoryPath = CarbonDataProcessorUtil
- .getLocalDataFolderLocation(schemaName, tableName, taskNo, partitionID,
+ .getLocalDataFolderLocation(databaseName, tableName, taskNo, partitionID,
segmentId);
this.tempFileLocation =
carbonDataDirectoryPath + File.separator + CarbonCommonConstants.SORT_TEMP_FILE_LOCATION;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStep.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStep.java b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStep.java
index c7b847d..199db5a 100644
--- a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStep.java
+++ b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStep.java
@@ -175,7 +175,7 @@ public class SortKeyStep extends BaseStep {
meta.getTaskNo(), this.noDictionaryColMaping);
try {
// initialize sort
- this.sortDataRows.initialize(meta.getSchemaName(), meta.getCubeName());
+ this.sortDataRows.initialize(meta.getDatabaseName(), meta.getTableName());
} catch (CarbonSortKeyAndGroupByException e) {
throw new KettleException(e);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStepMeta.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStepMeta.java b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStepMeta.java
index afbe932..57da6cb 100644
--- a/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStepMeta.java
+++ b/processing/src/main/java/org/carbondata/processing/sortandgroupby/sortdatastep/SortKeyStepMeta.java
@@ -60,14 +60,14 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
private String outputRowSize;
/**
- * cubeName
+ * tableName
*/
- private String cubeName;
+ private String tableName;
/**
- * schemaName
+ * databaseName
*/
- private String schemaName;
+ private String databaseName;
/**
* Dimension Count
@@ -125,10 +125,10 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
this.tabelName = "";
factDimLensString = "";
outputRowSize = "";
- schemaName = "";
+ databaseName = "";
noDictionaryDims = "";
noDictionaryDimsMapping = "";
- cubeName = "";
+ tableName = "";
dimensionCount = "";
complexDimensionCount = "";
measureCount = "";
@@ -151,8 +151,8 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
retval.append(" ").append(XMLHandler.addTagValue("TableName", this.tabelName));
retval.append(" ").append(XMLHandler.addTagValue("factDimLensString", factDimLensString));
retval.append(" ").append(XMLHandler.addTagValue("outputRowSize", this.outputRowSize));
- retval.append(" ").append(XMLHandler.addTagValue("cubeName", this.cubeName));
- retval.append(" ").append(XMLHandler.addTagValue("schemaName", this.schemaName));
+ retval.append(" ").append(XMLHandler.addTagValue("tableName", this.tableName));
+ retval.append(" ").append(XMLHandler.addTagValue("databaseName", this.databaseName));
retval.append(" ").append(XMLHandler.addTagValue("dimensionCount", this.dimensionCount));
retval.append(" ").append(XMLHandler.addTagValue("noDictionaryDims", this.noDictionaryDims));
retval.append(" ")
@@ -185,8 +185,8 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
this.tabelName = XMLHandler.getTagValue(stepnode, "TableName");
this.outputRowSize = XMLHandler.getTagValue(stepnode, "outputRowSize");
this.factDimLensString = XMLHandler.getTagValue(stepnode, "factDimLensString");
- this.cubeName = XMLHandler.getTagValue(stepnode, "cubeName");
- this.schemaName = XMLHandler.getTagValue(stepnode, "schemaName");
+ this.tableName = XMLHandler.getTagValue(stepnode, "tableName");
+ this.databaseName = XMLHandler.getTagValue(stepnode, "databaseName");
this.dimensionCount = XMLHandler.getTagValue(stepnode, "dimensionCount");
this.noDictionaryDims = XMLHandler.getTagValue(stepnode, "noDictionaryDims");
this.noDictionaryDimsMapping = XMLHandler.getTagValue(stepnode, "noDictionaryDimsMapping");
@@ -219,8 +219,8 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
rep.saveStepAttribute(idTransformation, idStep, "factDimLensString", factDimLensString);
rep.saveStepAttribute(idTransformation, idStep, "outputRowSize", this.outputRowSize);
- rep.saveStepAttribute(idTransformation, idStep, "cubeName", this.cubeName);
- rep.saveStepAttribute(idTransformation, idStep, "schemaName", this.schemaName);
+ rep.saveStepAttribute(idTransformation, idStep, "tableName", this.tableName);
+ rep.saveStepAttribute(idTransformation, idStep, "databaseName", this.databaseName);
rep.saveStepAttribute(idTransformation, idStep, "dimensionCount", this.dimensionCount);
rep.saveStepAttribute(idTransformation, idStep, "noDictionaryDims", this.noDictionaryDims);
rep.saveStepAttribute(idTransformation, idStep, "noDictionaryDimsMapping",
@@ -257,8 +257,8 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
try {
this.tabelName = rep.getStepAttributeString(idStep, "TableName");
this.outputRowSize = rep.getStepAttributeString(idStep, "outputRowSize");
- this.schemaName = rep.getStepAttributeString(idStep, "schemaName");
- this.cubeName = rep.getStepAttributeString(idStep, "cubeName");
+ this.databaseName = rep.getStepAttributeString(idStep, "databaseName");
+ this.tableName = rep.getStepAttributeString(idStep, "tableName");
this.dimensionCount = rep.getStepAttributeString(idStep, "dimensionCount");
this.noDictionaryDims = rep.getStepAttributeString(idStep, "noDictionaryDims");
this.noDictionaryDims = rep.getStepAttributeString(idStep, "noDictionaryDimsMapping");
@@ -358,31 +358,31 @@ public class SortKeyStepMeta extends BaseStepMeta implements StepMetaInterface {
}
/**
- * @return the cubeName
+ * @return the tableName
*/
- public String getCubeName() {
- return cubeName;
+ public String getTableName() {
+ return tableName;
}
/**
- * @param cubeName the cubeName to set
+ * @param tableName the tableName to set
*/
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
}
/**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/BadRecordslogger.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/BadRecordslogger.java b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/BadRecordslogger.java
index 4cd79ec..8e56a9b 100644
--- a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/BadRecordslogger.java
+++ b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/BadRecordslogger.java
@@ -67,7 +67,7 @@ public class BadRecordslogger {
*/
private CarbonFile logFile;
/**
- * task key which is Schemaname/CubeName/tablename
+ * task key which is DatabaseName/TableName/tablename
*/
private String taskKey;
@@ -81,7 +81,7 @@ public class BadRecordslogger {
}
/**
- * @param key Schemaname/CubeName/tablename
+ * @param key DatabaseName/TableName/tablename
* @return return "Partially" and remove from map
*/
public static String hasBadRecord(String key) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenMeta.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenMeta.java b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenMeta.java
index 77f7297..4a85f25 100644
--- a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenMeta.java
+++ b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenMeta.java
@@ -343,14 +343,11 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
* denormColumNames
*/
private String denormColumNames;
+
/**
- * cubeName
- */
- private String cubeName;
- /**
- * schemaName
+ * databaseName
*/
- private String schemaName;
+ private String databaseName;
private int currentRestructNumber;
/**
* partitionID
@@ -699,8 +696,8 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
retval.append(" ").append(XMLHandler.addTagValue("measureDataType", measureDataType));
retval.append(" ").append(XMLHandler.addTagValue("columnAndTableName_ColumnMapForAggString",
columnAndTableNameColumnMapForAggString));
- retval.append(" ").append(XMLHandler.addTagValue("schemaName", schemaName));
- retval.append(" ").append(XMLHandler.addTagValue("cubeName", cubeName));
+ retval.append(" ").append(XMLHandler.addTagValue("databaseName", databaseName));
+ retval.append(" ").append(XMLHandler.addTagValue("tableName", tableName));
retval.append(" ").append(XMLHandler.addTagValue("denormColumNames", denormColumNames));
retval.append(" ")
.append(XMLHandler.addTagValue("currentRestructNumber", currentRestructNumber));
@@ -749,8 +746,8 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
noDictionaryDims = XMLHandler.getTagValue(stepnode, "dimNoDictionary");
columnsDataTypeString = XMLHandler.getTagValue(stepnode, "dimColDataTypes");
tableName = XMLHandler.getTagValue(stepnode, "factOrAggTable");
- cubeName = XMLHandler.getTagValue(stepnode, "cubeName");
- schemaName = XMLHandler.getTagValue(stepnode, "schemaName");
+ tableName = XMLHandler.getTagValue(stepnode, "tableName");
+ databaseName = XMLHandler.getTagValue(stepnode, "databaseName");
denormColumNames = XMLHandler.getTagValue(stepnode, "denormColumNames");
currentRestructNumber =
Integer.parseInt(XMLHandler.getTagValue(stepnode, "currentRestructNumber"));
@@ -1315,9 +1312,9 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
measureDataType = rep.getStepAttributeString(idStep, "measureDataType");
columnAndTableNameColumnMapForAggString =
rep.getStepAttributeString(idStep, "columnAndTableName_ColumnMapForAggString");
- schemaName = rep.getStepAttributeString(idStep, "schemaName");
+ databaseName = rep.getStepAttributeString(idStep, "databaseName");
- cubeName = rep.getStepAttributeString(idStep, "cubeName");
+ tableName = rep.getStepAttributeString(idStep, "tableName");
denormColumNames = rep.getStepAttributeString(idStep, "denormColumNames");
currentRestructNumber = (int) rep.getStepAttributeInteger(idStep, "currentRestructNumber");
partitionID = rep.getStepAttributeString(idStep, "partitionID");
@@ -1369,8 +1366,8 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
rep.saveStepAttribute(idTransformation, idStep, "heirNadDimsLensString",
heirNadDimsLensString);
rep.saveStepAttribute(idTransformation, idStep, "measureDataType", measureDataType);
- rep.saveStepAttribute(idTransformation, idStep, "schemaName", schemaName);
- rep.saveStepAttribute(idTransformation, idStep, "cubeName", cubeName);
+ rep.saveStepAttribute(idTransformation, idStep, "databaseName", databaseName);
+ rep.saveStepAttribute(idTransformation, idStep, "tableName", tableName);
rep.saveStepAttribute(idTransformation, idStep, "denormColumNames", denormColumNames);
rep.saveStepAttribute(idTransformation, idStep, "currentRestructNumber",
currentRestructNumber);
@@ -1556,20 +1553,12 @@ public class CarbonCSVBasedSeqGenMeta extends BaseStepMeta implements StepMetaIn
this.columnAndTableNameColumnMapForAggString = columnAndTableNameColumnMapForAggString;
}
- public String getCubeName() {
- return cubeName;
- }
-
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
- }
-
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
public String getDenormColumNames() {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java
index d652a65..15c5660 100644
--- a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java
+++ b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/CarbonCSVBasedSeqGenStep.java
@@ -293,7 +293,7 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
first = false;
meta.initialize();
final Object dataProcessingLockObject = CarbonDataProcessorManager.getInstance()
- .getDataProcessingLockObject(meta.getSchemaName() + '_' + meta.getCubeName());
+ .getDataProcessingLockObject(meta.getDatabaseName() + '_' + meta.getTableName());
synchronized (dataProcessingLockObject) {
// observer of writing file in thread
this.threadStatusObserver = new ThreadStatusObserver();
@@ -347,8 +347,8 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
columnsInfo.setDims(meta.dims);
columnsInfo.setDimColNames(meta.dimColNames);
columnsInfo.setKeyGenerators(data.getKeyGenerators());
- columnsInfo.setSchemaName(meta.getSchemaName());
- columnsInfo.setCubeName(meta.getCubeName());
+ columnsInfo.setDatabaseName(meta.getDatabaseName());
+ columnsInfo.setTableName(meta.getTableName());
columnsInfo.setHierTables(meta.hirches.keySet());
columnsInfo.setBatchSize(meta.getBatchSize());
columnsInfo.setStoreType(meta.getStoreType());
@@ -369,9 +369,10 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
columnsInfo.setColumnSchemaDetailsWrapper(meta.getColumnSchemaDetailsWrapper());
columnsInfo.setColumnProperties(meta.getColumnPropertiesMap());
updateBagLogFileName();
- String key = meta.getSchemaName() + '/' + meta.getCubeName() + '_' + meta.getTableName();
+ String key = meta.getDatabaseName() + '/' + meta.getTableName() +
+ '_' + meta.getTableName();
badRecordslogger = new BadRecordslogger(key, csvFilepath, getBadLogStoreLocation(
- meta.getSchemaName() + '/' + meta.getCubeName() + "/" + meta.getTaskNo()));
+ meta.getDatabaseName() + '/' + meta.getTableName() + "/" + meta.getTaskNo()));
columnsInfo.setTimeOrdinalIndices(meta.timeOrdinalIndices);
surrogateKeyGen = new FileStoreSurrogateKeyGenForCSV(columnsInfo, meta.getPartitionID(),
@@ -696,7 +697,7 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
*/
private void updateStoreLocation() {
loadFolderLoc = CarbonDataProcessorUtil
- .getLocalDataFolderLocation(meta.getSchemaName(), meta.getTableName(), meta.getTaskNo(),
+ .getLocalDataFolderLocation(meta.getDatabaseName(), meta.getTableName(), meta.getTaskNo(),
meta.getPartitionID(), meta.getSegmentId()+"");
}
@@ -724,7 +725,7 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
Callable<Void> callable = new Callable<Void>() {
@Override public Void call() throws RuntimeException {
StandardLogService
- .setThreadName(StandardLogService.getPartitionID(meta.getCubeName()), null);
+ .setThreadName(StandardLogService.getPartitionID(meta.getTableName()), null);
try {
doProcess();
} catch (Throwable e) {
@@ -843,7 +844,7 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
private String getCarbonLocalBaseStoreLocation() {
String tempLocationKey =
- meta.getSchemaName() + CarbonCommonConstants.UNDERSCORE + meta.getCubeName()
+ meta.getDatabaseName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName()
+ CarbonCommonConstants.UNDERSCORE + meta.getTaskNo();
String strLoc = CarbonProperties.getInstance()
.getProperty(tempLocationKey, CarbonCommonConstants.STORE_LOCATION_DEFAULT_VAL);
@@ -1805,7 +1806,7 @@ public class CarbonCSVBasedSeqGenStep extends BaseStep {
*/
private void populateCarbonMeasures(String[] measures) {
CarbonTable carbonTable = CarbonMetadata.getInstance().getCarbonTable(
- meta.getSchemaName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
+ meta.getDatabaseName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
meta.carbonMeasures = new CarbonMeasure[measures.length];
msrDataType = new DataType[measures.length];
for (int i = 0; i < measures.length; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java
index 5f7be3c..a1182b3 100644
--- a/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java
+++ b/processing/src/main/java/org/carbondata/processing/surrogatekeysgenerator/csvbased/FileStoreSurrogateKeyGenForCSV.java
@@ -122,8 +122,8 @@ public class FileStoreSurrogateKeyGenForCSV extends CarbonCSVBasedDimSurrogateKe
baseStorePath = columnsInfo.getBaseStoreLocation();
setStoreFolderWithLoadNumber(
- checkAndCreateLoadFolderNumber(columnsInfo.getSchemaName(),
- columnsInfo.getCubeName()));
+ checkAndCreateLoadFolderNumber(columnsInfo.getDatabaseName(),
+ columnsInfo.getTableName()));
fileManager = new FileManager();
fileManager.setName(loadFolderName + CarbonCommonConstants.FILE_INPROGRESS_STATUS);
@@ -217,7 +217,7 @@ public class FileStoreSurrogateKeyGenForCSV extends CarbonCSVBasedDimSurrogateKe
CarbonProperties.getInstance().getProperty(CarbonCommonConstants.STORE_LOCATION_HDFS);
String[] dimColumnNames = columnsInfo.getDimColNames();
String[] dimColumnIds = columnsInfo.getDimensionColumnIds();
- String databaseName = columnsInfo.getSchemaName();
+ String databaseName = columnsInfo.getDatabaseName();
String tableName = columnsInfo.getTableName();
CarbonTable carbonTable = CarbonMetadata.getInstance()
.getCarbonTable(databaseName + CarbonCommonConstants.UNDERSCORE + tableName);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/util/CarbonSchemaParser.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/util/CarbonSchemaParser.java b/processing/src/main/java/org/carbondata/processing/util/CarbonSchemaParser.java
index 3a789f1..4a40809 100644
--- a/processing/src/main/java/org/carbondata/processing/util/CarbonSchemaParser.java
+++ b/processing/src/main/java/org/carbondata/processing/util/CarbonSchemaParser.java
@@ -95,12 +95,6 @@ public final class CarbonSchemaParser {
return columnstr;
}
- /**
- * @param cube
- * @param dimensions
- * @param isQuotesRequired
- * @return
- */
private static String getDimensionSQLQueries(List<CarbonDimension> dimensions,
CarbonDataLoadSchema carbonDataLoadSchema) {
//
@@ -148,7 +142,7 @@ public final class CarbonSchemaParser {
}
/**
- * @param cube
+ * @param table
* @param dimensions
* @return
*/
@@ -344,10 +338,10 @@ public final class CarbonSchemaParser {
}
/**
- * Get dimension string from a array of CubeDimension,which can be shared
- * CubeDimension within schema or in a cube.
+ * Get dimension string from a array of TableDimension,which can be shared
+ * TableDimension within schema or in a table.
*
- * @param cube
+ * @param table
* @param dimensions
* @return
*/
@@ -535,7 +529,7 @@ public final class CarbonSchemaParser {
* @param carbonDataLoadSchema
* @return
*/
- public static String[] getCubeDimensions(List<CarbonDimension> dimensions,
+ public static String[] getTableDimensions(List<CarbonDimension> dimensions,
CarbonDataLoadSchema carbonDataLoadSchema) {
List<String> list = new ArrayList<String>(CarbonCommonConstants.CONSTANT_SIZE_TEN);
for (CarbonDimension cDimension : dimensions) {
@@ -941,7 +935,7 @@ public final class CarbonSchemaParser {
/**
* Get Measure Name String
*
- * @param cube
+ * @param table
* @return
*/
public static String getMeasuresNamesString(List<CarbonMeasure> measures) {
@@ -966,7 +960,7 @@ public final class CarbonSchemaParser {
/**
* Get Measure Name String
*
- * @param cube
+ * @param table
* @return
*/
public static String getMeasuresUniqueColumnNamesString(List<CarbonMeasure> measures) {
@@ -991,7 +985,7 @@ public final class CarbonSchemaParser {
/**
* Get Measure Name String
*
- * @param cube
+ * @param table
* @return
*/
public static String getMeasuresNamesStringForAgg(String[] measures) {
@@ -1015,7 +1009,7 @@ public final class CarbonSchemaParser {
/**
* Get Measure Aggregator array
*
- * @param cube
+ * @param table
* @return
*/
public static String[] getMeasuresAggragatorArray(List<CarbonMeasure> measures) {
@@ -1030,7 +1024,7 @@ public final class CarbonSchemaParser {
/**
* @param schemaInfo
- * @param cube
+ * @param table
* @return
*/
public static String getActualDimensions(List<CarbonDimension> dimensions) {
@@ -1057,7 +1051,7 @@ public final class CarbonSchemaParser {
/**Method will prepare column name and its data type string inorder
* to pass to the ETL steps.
* @param schemaInfo
- * @param cube
+ * @param table
* @return
*/
public static String getDimensionsDataTypes(List<CarbonDimension> dimensions) {
@@ -1073,7 +1067,7 @@ public final class CarbonSchemaParser {
}
/**
- * @param cube
+ * @param table
* @return
*/
public static String getActualDimensionsForAggregate(String[] columns) {
@@ -1119,7 +1113,7 @@ public final class CarbonSchemaParser {
*
* @param dimensions
* @param schema
- * @param cube
+ * @param table
* @return String
*/
public static String getLevelAndDataTypeMapString(List<CarbonDimension> dimensions,
@@ -1140,7 +1134,7 @@ public final class CarbonSchemaParser {
*
* @param dimensions
* @param schema
- * @param cube
+ * @param table
* @return String
*/
public static String getComplexTypeString(List<CarbonDimension> dimensions) {
@@ -1206,10 +1200,10 @@ public final class CarbonSchemaParser {
}
/**
- * Get dimension string from a array of CubeDimension,which can be shared
- * CubeDimension within schema or in a cube.
+ * Get dimension string from a array of TableDimension,which can be shared
+ * TableDimension within schema or in a table.
*
- * @param cube
+ * @param table
* @param dimensions
* @return
*/
[3/5] incubator-carbondata git commit: change cube to table
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
index 7ae6831..25abbd5 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
@@ -63,9 +63,9 @@ import org.carbondata.spark.util.{CarbonScalaUtil, GlobalDictionaryUtil}
case class tableModel(
ifNotExistsSet: Boolean,
- var schemaName: String,
- schemaNameOp: Option[String],
- cubeName: String,
+ var databaseName: String,
+ databaseNameOp: Option[String],
+ tableName: String,
dimCols: Seq[Field],
msrCols: Seq[Field],
fromKeyword: String,
@@ -136,7 +136,7 @@ case class Dimension(name: String, hierarchies: Seq[Hierarchy], foreignKey: Opti
case class FilterCols(includeKey: String, fieldList: Seq[String])
-case class Cube(schemaName: String, cubeName: String, tableName: String, dimensions: Seq[Dimension],
+case class Table(databaseName: String, tableName: String, dimensions: Seq[Dimension],
measures: Seq[Measure], partitioner: Partitioner)
case class Default(key: String, value: String)
@@ -145,7 +145,7 @@ case class DataLoadTableFileMapping(table: String, loadPath: String)
case class CarbonMergerMapping(storeLocation: String, hdfsStoreLocation: String,
partitioner: Partitioner, metadataFilePath: String, mergedLoadName: String,
- kettleHomePath: String, cubeCreationTime: Long, schemaName: String,
+ kettleHomePath: String, tableCreationTime: Long, databaseName: String,
factTableName: String, validSegments: Array[String], tableId: String)
case class AlterTableModel(dbName: Option[String], tableName: String, compactionType: String)
@@ -153,7 +153,7 @@ case class AlterTableModel(dbName: Option[String], tableName: String, compaction
case class CompactionModel(compactionSize: Long,
compactionType: CompactionType,
carbonTable: CarbonTable,
- cubeCreationTime: Long)
+ tableCreationTime: Long)
object TableNewProcessor {
def apply(cm: tableModel, sqlContext: SQLContext): TableInfo = {
@@ -207,7 +207,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
columnSchema.setColumnProperties(colPropMap)
columnSchema.setEncodingList(encoders)
val colUniqueIdGenerator = CarbonCommonFactory.getColumnUniqueIdGenerator
- val columnUniqueId = colUniqueIdGenerator.generateUniqueId(cm.schemaName,
+ val columnUniqueId = colUniqueIdGenerator.generateUniqueId(cm.databaseName,
columnSchema)
columnSchema.setColumnUniqueId(columnUniqueId)
columnSchema.setColumnReferenceId(columnUniqueId)
@@ -269,7 +269,8 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Duplicate column found with name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName}" +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName}" +
s"Duplicate column found with name : $name")
sys.error(s"Duplicate dimensions found with name : $name")
})
@@ -364,7 +365,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
LOGGER.error(s"partition columns specified are not part of Dimension columns : $msg")
LOGGER.audit(
s"Validation failed for Create/Alter Table Operation for " +
- s"${cm.schemaName}.${cm.cubeName} " +
+ s"${cm.databaseName}.${cm.tableName} " +
s"partition columns specified are not part of Dimension columns : $msg")
sys.error(s"partition columns specified are not part of Dimension columns : $msg")
}
@@ -377,7 +378,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
val cl = part.partitionClass
LOGGER.audit(
s"Validation failed for Create/Alter Table Operation for " +
- s"${cm.schemaName}.${cm.cubeName} " +
+ s"${cm.databaseName}.${cm.tableName} " +
s"partition class specified can not be found or loaded : $cl")
sys.error(s"partition class specified can not be found or loaded : $cl")
}
@@ -394,11 +395,11 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
schemaEvol
.setSchemaEvolutionEntryList(new util.ArrayList[SchemaEvolutionEntry]())
tableSchema.setTableId(UUID.randomUUID().toString)
- tableSchema.setTableName(cm.cubeName)
+ tableSchema.setTableName(cm.tableName)
tableSchema.setListOfColumns(allColumns.asJava)
tableSchema.setSchemaEvalution(schemaEvol)
- tableInfo.setDatabaseName(cm.schemaName)
- tableInfo.setTableUniqueName(cm.schemaName + "_" + cm.cubeName)
+ tableInfo.setDatabaseName(cm.databaseName)
+ tableInfo.setTableUniqueName(cm.databaseName + "_" + cm.tableName)
tableInfo.setLastUpdatedTime(System.currentTimeMillis())
tableInfo.setFactTable(tableSchema)
tableInfo.setAggregateTableList(new util.ArrayList[TableSchema]())
@@ -477,7 +478,7 @@ class TableNewProcessor(cm: tableModel, sqlContext: SQLContext) {
}
object TableProcessor {
- def apply(cm: tableModel, sqlContext: SQLContext): Cube = {
+ def apply(cm: tableModel, sqlContext: SQLContext): Table = {
new TableProcessor(cm, sqlContext).process()
}
}
@@ -508,7 +509,7 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
levels
}
- def process(): Cube = {
+ def process(): Table = {
var levels = Seq[Level]()
var measures = Seq[Measure]()
@@ -565,7 +566,8 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Duplicate dimensions found with name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName} " +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName} " +
s"Duplicate dimensions found with name : $name")
sys.error(s"Duplicate dimensions found with name : $name")
})
@@ -574,7 +576,8 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Duplicate dimensions found with column name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName} " +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName} " +
s"Duplicate dimensions found with column name : $name")
sys.error(s"Duplicate dimensions found with column name : $name")
})
@@ -583,7 +586,8 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Duplicate measures found with name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName} " +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName} " +
s"Duplicate measures found with name : $name")
sys.error(s"Duplicate measures found with name : $name")
})
@@ -592,7 +596,8 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Duplicate measures found with column name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName} " +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName} " +
s"Duplicate measures found with column name : $name")
sys.error(s"Duplicate measures found with column name : $name")
})
@@ -606,7 +611,7 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
LOGGER.error(s"Aggregator should not be defined for dimension fields [$fault]")
LOGGER.audit(
s"Validation failed for Create/Alter Table Operation for " +
- s"${cm.schemaName}.${cm.cubeName} " +
+ s"${cm.databaseName}.${cm.tableName} " +
s"Aggregator should not be defined for dimension fields [$fault]")
sys.error(s"Aggregator should not be defined for dimension fields [$fault]")
}
@@ -616,7 +621,8 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val name = f._1
LOGGER.error(s"Dimension and Measure defined with same name : $name")
LOGGER.audit(
- s"Validation failed for Create/Alter Table Operation for ${cm.schemaName}.${cm.cubeName} " +
+ s"Validation failed for Create/Alter Table Operation " +
+ s"for ${cm.databaseName}.${cm.tableName} " +
s"Dimension and Measure defined with same name : $name")
sys.error(s"Dimension and Measure defined with same name : $name")
})
@@ -706,7 +712,7 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
val cl = part.partitionClass
LOGGER.audit(
s"Validation failed for Create/Alter Table Operation for " +
- s"${cm.schemaName}.${cm.cubeName} " +
+ s"${cm.databaseName}.${cm.tableName} " +
s"partition class specified can not be found or loaded : $cl")
sys.error(s"partition class specified can not be found or loaded : $cl")
}
@@ -718,8 +724,7 @@ class TableProcessor(cm: tableModel, sqlContext: SQLContext) {
Array(""), 20, null)
}
- Cube(cm.schemaName, cm.cubeName, cm.cubeName, dimensions, msrsUpdatedWithAggregators,
- partitioner)
+ Table(cm.databaseName, cm.tableName, dimensions, msrsUpdatedWithAggregators, partitioner)
}
// For filtering INCLUDE and EXCLUDE fields if any is defined for Dimention relation
@@ -760,34 +765,34 @@ private[sql] case class AlterTableCompaction(alterTableModel: AlterTableModel) e
def run(sqlContext: SQLContext): Seq[Row] = {
// TODO : Implement it.
var tableName = alterTableModel.tableName
- val schemaName = getDB.getDatabaseName(alterTableModel.dbName, sqlContext)
+ val databaseName = getDB.getDatabaseName(alterTableModel.dbName, sqlContext)
if (null == org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
- .getCarbonTable(schemaName + "_" + tableName)) {
- logError("alter table failed. table not found: " + schemaName + "." + tableName)
- sys.error("alter table failed. table not found: " + schemaName + "." + tableName)
+ .getCarbonTable(databaseName + "_" + tableName)) {
+ logError("alter table failed. table not found: " + databaseName + "." + tableName)
+ sys.error("alter table failed. table not found: " + databaseName + "." + tableName)
}
val relation =
CarbonEnv.getInstance(sqlContext).carbonCatalog
- .lookupRelation1(Option(schemaName), tableName)(sqlContext)
+ .lookupRelation1(Option(databaseName), tableName)(sqlContext)
.asInstanceOf[CarbonRelation]
if (relation == null) {
- sys.error(s"Table $schemaName.$tableName does not exist")
+ sys.error(s"Table $databaseName.$tableName does not exist")
}
val carbonLoadModel = new CarbonLoadModel()
- val table = relation.cubeMeta.carbonTable
+ val table = relation.tableMeta.carbonTable
carbonLoadModel.setAggTables(table.getAggregateTablesName.asScala.toArray)
carbonLoadModel.setTableName(table.getFactTableName)
val dataLoadSchema = new CarbonDataLoadSchema(table)
// Need to fill dimension relation
carbonLoadModel.setCarbonDataLoadSchema(dataLoadSchema)
- carbonLoadModel.setTableName(relation.cubeMeta.carbonTableIdentifier.getTableName)
- carbonLoadModel.setDatabaseName(relation.cubeMeta.carbonTableIdentifier.getDatabaseName)
- carbonLoadModel.setStorePath(relation.cubeMeta.storePath)
+ carbonLoadModel.setTableName(relation.tableMeta.carbonTableIdentifier.getTableName)
+ carbonLoadModel.setDatabaseName(relation.tableMeta.carbonTableIdentifier.getDatabaseName)
+ carbonLoadModel.setStorePath(relation.tableMeta.storePath)
- val partitioner = relation.cubeMeta.partitioner
+ val partitioner = relation.tableMeta.partitioner
var kettleHomePath = sqlContext.getConf("carbon.kettle.home", null)
if (null == kettleHomePath) {
@@ -807,7 +812,7 @@ private[sql] case class AlterTableCompaction(alterTableModel: AlterTableModel) e
alterTableModel,
carbonLoadModel,
partitioner,
- relation.cubeMeta.storePath,
+ relation.tableMeta.storePath,
kettleHomePath,
storeLocation
)
@@ -820,9 +825,9 @@ private[sql] case class CreateTable(cm: tableModel) extends RunnableCommand {
def run(sqlContext: SQLContext): Seq[Row] = {
val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
- cm.schemaName = getDB.getDatabaseName(cm.schemaNameOp, sqlContext)
- val tbName = cm.cubeName
- val dbName = cm.schemaName
+ cm.databaseName = getDB.getDatabaseName(cm.databaseNameOp, sqlContext)
+ val tbName = cm.tableName
+ val dbName = cm.databaseName
LOGGER.audit(s"Creating Table with Database name [$dbName] and Table name [$tbName]")
val tableInfo: TableInfo = TableNewProcessor(cm, sqlContext)
@@ -844,7 +849,7 @@ private[sql] case class CreateTable(cm: tableModel) extends RunnableCommand {
// Add Database to catalog and persist
val catalog = CarbonEnv.getInstance(sqlContext).carbonCatalog
// Need to fill partitioner class when we support partition
- val tablePath = catalog.createCubeFromThrift(tableInfo, dbName, tbName, null)(sqlContext)
+ val tablePath = catalog.createTableFromThrift(tableInfo, dbName, tbName, null)(sqlContext)
try {
sqlContext.sql(
s"""CREATE TABLE $dbName.$tbName USING carbondata""" +
@@ -860,8 +865,8 @@ private[sql] case class CreateTable(cm: tableModel) extends RunnableCommand {
LOGGER.audit(s"Deleting Table [$tbName] under Database [$dbName]" +
"as create TABLE failed")
CarbonEnv.getInstance(sqlContext).carbonCatalog
- .dropTable(relation.cubeMeta.partitioner.partitionCount,
- relation.cubeMeta.storePath,
+ .dropTable(relation.tableMeta.partitioner.partitionCount,
+ relation.tableMeta.storePath,
identifier)(sqlContext)
}
@@ -884,19 +889,19 @@ private[sql] case class CreateTable(cm: tableModel) extends RunnableCommand {
private[sql] case class DeleteLoadsById(
loadids: Seq[String],
- schemaNameOp: Option[String],
+ databaseNameOp: Option[String],
tableName: String) extends RunnableCommand {
val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
def run(sqlContext: SQLContext): Seq[Row] = {
- val schemaName = getDB.getDatabaseName(schemaNameOp, sqlContext)
- LOGGER.audit(s"Delete load by Id request has been received for $schemaName.$tableName")
+ val databaseName = getDB.getDatabaseName(databaseNameOp, sqlContext)
+ LOGGER.audit(s"Delete load by Id request has been received for $databaseName.$tableName")
// validate load ids first
validateLoadIds
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
val identifier = TableIdentifier(tableName, Option(dbName))
val relation = CarbonEnv.getInstance(sqlContext).carbonCatalog.lookupRelation1(
@@ -921,7 +926,7 @@ private[sql] case class DeleteLoadsById(
if (invalidLoadIds.isEmpty) {
- LOGGER.audit(s"Delete load by Id is successfull for $schemaName.$tableName.")
+ LOGGER.audit(s"Delete load by Id is successfull for $databaseName.$tableName.")
}
else {
sys.error("Delete load by Id is failed. No matching load id found. SegmentSeqId(s) - "
@@ -943,17 +948,17 @@ private[sql] case class DeleteLoadsById(
}
private[sql] case class DeleteLoadsByLoadDate(
- schemaNameOp: Option[String],
+ databaseNameOp: Option[String],
tableName: String,
dateField: String,
loadDate: String) extends RunnableCommand {
- val LOGGER = LogServiceFactory.getLogService("org.apache.spark.sql.cubemodel.cubeSchema")
+ val LOGGER = LogServiceFactory.getLogService("org.apache.spark.sql.tablemodel.tableSchema")
def run(sqlContext: SQLContext): Seq[Row] = {
LOGGER.audit("The delete load by load date request has been received.")
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
val identifier = TableIdentifier(tableName, Option(dbName))
val relation = CarbonEnv.getInstance(sqlContext).carbonCatalog
.lookupRelation1(identifier, None)(sqlContext).asInstanceOf[CarbonRelation]
@@ -995,7 +1000,7 @@ private[sql] case class DeleteLoadsByLoadDate(
}
private[sql] case class LoadTable(
- schemaNameOp: Option[String],
+ databaseNameOp: Option[String],
tableName: String,
factPathFromUser: String,
dimFilesPath: Seq[DataLoadTableFileMapping],
@@ -1008,7 +1013,7 @@ private[sql] case class LoadTable(
def run(sqlContext: SQLContext): Seq[Row] = {
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
val identifier = TableIdentifier(tableName, Option(dbName))
if (isOverwriteExist) {
sys.error("Overwrite is not supported for carbon table with " + dbName + "." + tableName)
@@ -1038,9 +1043,9 @@ private[sql] case class LoadTable(
sys.error(s"Table $dbName.$tableName does not exist")
}
val carbonLoadModel = new CarbonLoadModel()
- carbonLoadModel.setTableName(relation.cubeMeta.carbonTableIdentifier.getTableName)
- carbonLoadModel.setDatabaseName(relation.cubeMeta.carbonTableIdentifier.getDatabaseName)
- carbonLoadModel.setStorePath(relation.cubeMeta.storePath)
+ carbonLoadModel.setTableName(relation.tableMeta.carbonTableIdentifier.getTableName)
+ carbonLoadModel.setDatabaseName(relation.tableMeta.carbonTableIdentifier.getDatabaseName)
+ carbonLoadModel.setStorePath(relation.tableMeta.storePath)
if (dimFilesPath.isEmpty) {
carbonLoadModel.setDimFolderPath(null)
}
@@ -1049,7 +1054,7 @@ private[sql] case class LoadTable(
carbonLoadModel.setDimFolderPath(x.mkString(","))
}
- val table = relation.cubeMeta.carbonTable
+ val table = relation.tableMeta.carbonTable
carbonLoadModel.setAggTables(table.getAggregateTablesName.asScala.toArray)
carbonLoadModel.setTableName(table.getFactTableName)
val dataLoadSchema = new CarbonDataLoadSchema(table)
@@ -1064,9 +1069,9 @@ private[sql] case class LoadTable(
storeLocation = System.getProperty("java.io.tmpdir")
}
- var partitionLocation = relation.cubeMeta.storePath + "/partition/" +
- relation.cubeMeta.carbonTableIdentifier.getDatabaseName + "/" +
- relation.cubeMeta.carbonTableIdentifier.getTableName + "/"
+ var partitionLocation = relation.tableMeta.storePath + "/partition/" +
+ relation.tableMeta.carbonTableIdentifier.getDatabaseName + "/" +
+ relation.tableMeta.carbonTableIdentifier.getTableName + "/"
storeLocation = storeLocation + "/carbonstore/" + System.nanoTime()
@@ -1110,8 +1115,8 @@ private[sql] case class LoadTable(
var partitionStatus = CarbonCommonConstants.STORE_LOADSTATUS_SUCCESS
try {
// First system has to partition the data first and then call the load data
- if (null == relation.cubeMeta.partitioner.partitionColumn ||
- relation.cubeMeta.partitioner.partitionColumn(0).isEmpty) {
+ if (null == relation.tableMeta.partitioner.partitionColumn ||
+ relation.tableMeta.partitioner.partitionColumn(0).isEmpty) {
LOGGER.info("Initiating Direct Load for the Table : (" +
dbName + "." + tableName + ")")
carbonLoadModel.setFactFilePath(factPath)
@@ -1141,11 +1146,11 @@ private[sql] case class LoadTable(
carbonLoadModel.setFactFilePath(FileUtils.getPaths(partitionLocation))
}
GlobalDictionaryUtil
- .generateGlobalDictionary(sqlContext, carbonLoadModel, relation.cubeMeta.storePath)
+ .generateGlobalDictionary(sqlContext, carbonLoadModel, relation.tableMeta.storePath)
CarbonDataRDDFactory
- .loadCarbonData(sqlContext, carbonLoadModel, storeLocation, relation.cubeMeta.storePath,
+ .loadCarbonData(sqlContext, carbonLoadModel, storeLocation, relation.tableMeta.storePath,
kettleHomePath,
- relation.cubeMeta.partitioner, columinar, isAgg = false, partitionStatus)
+ relation.tableMeta.partitioner, columinar, isAgg = false, partitionStatus)
}
catch {
case ex: Exception =>
@@ -1196,16 +1201,16 @@ private[sql] case class PartitionData(databaseName: String, tableName: String, f
val identifier = TableIdentifier(tableName, Option(databaseName))
val relation = CarbonEnv.getInstance(sqlContext)
.carbonCatalog.lookupRelation1(identifier, None)(sqlContext).asInstanceOf[CarbonRelation]
- val dimNames = relation.cubeMeta.carbonTable
+ val dimNames = relation.tableMeta.carbonTable
.getDimensionByTableName(tableName).asScala.map(_.getColName)
- val msrNames = relation.cubeMeta.carbonTable
+ val msrNames = relation.tableMeta.carbonTable
.getDimensionByTableName(tableName).asScala.map(_.getColName)
val targetFolder = targetPath
partitionStatus = CarbonDataRDDFactory.partitionCarbonData(
sqlContext.sparkContext, databaseName,
tableName, factPath, targetFolder, (dimNames ++ msrNames).toArray
, fileHeader, delimiter,
- quoteChar, escapeChar, multiLine, relation.cubeMeta.partitioner)
+ quoteChar, escapeChar, multiLine, relation.tableMeta.partitioner)
if (partitionStatus == CarbonCommonConstants.STORE_LOADSTATUS_PARTIAL_SUCCESS) {
logInfo("Bad Record Found while partitioning data")
}
@@ -1213,13 +1218,13 @@ private[sql] case class PartitionData(databaseName: String, tableName: String, f
}
}
-private[sql] case class DropTableCommand(ifExistsSet: Boolean, schemaNameOp: Option[String],
+private[sql] case class DropTableCommand(ifExistsSet: Boolean, databaseNameOp: Option[String],
tableName: String)
extends RunnableCommand {
def run(sqlContext: SQLContext): Seq[Row] = {
val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
val identifier = TableIdentifier(tableName, Option(dbName))
val tmpTable = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
.getCarbonTable(dbName + "_" + tableName)
@@ -1227,7 +1232,7 @@ private[sql] case class DropTableCommand(ifExistsSet: Boolean, schemaNameOp: Opt
if (!ifExistsSet) {
LOGGER
.audit(s"Dropping carbon table with Database name [$dbName] and Table name" +
- "[$cubeName] failed")
+ "[$tableName] failed")
LOGGER.error(s"Carbon Table $dbName.$tableName metadata does not exist")
}
if (sqlContext.tableNames(dbName).map(x => x.toLowerCase())
@@ -1267,14 +1272,14 @@ private[sql] case class DropTableCommand(ifExistsSet: Boolean, schemaNameOp: Opt
LOGGER.audit(s"Deleting table [$tableName] under database [$dbName]")
CarbonEnv.getInstance(sqlContext).carbonCatalog
- .dropTable(relation.cubeMeta.partitioner.partitionCount,
- relation.cubeMeta.storePath,
- TableIdentifier(relation.cubeMeta.carbonTableIdentifier.getTableName,
- Some(relation.cubeMeta.carbonTableIdentifier.getDatabaseName))
+ .dropTable(relation.tableMeta.partitioner.partitionCount,
+ relation.tableMeta.storePath,
+ TableIdentifier(relation.tableMeta.carbonTableIdentifier.getTableName,
+ Some(relation.tableMeta.carbonTableIdentifier.getDatabaseName))
)(sqlContext)
CarbonDataRDDFactory
.dropTable(sqlContext.sparkContext, dbName, tableName,
- relation.cubeMeta.partitioner)
+ relation.tableMeta.partitioner)
QueryPartitionHelper.getInstance().removePartition(dbName, tableName)
LOGGER.audit(s"Deleted table [$tableName] under database [$dbName]")
@@ -1289,7 +1294,7 @@ private[sql] case class DropTableCommand(ifExistsSet: Boolean, schemaNameOp: Opt
val file = FileFactory.getCarbonFile(tmpTable .getMetaDataFilepath, fileType)
CarbonUtil.deleteFoldersAndFiles(file.getParentFile)
}
- // delete bad record log after drop cube
+ // delete bad record log after drop table
val badLogPath = CarbonUtil.getBadLogPath(dbName + File.separator + tableName)
val badLogFileType = FileFactory.getFileType(badLogPath)
if (FileFactory.isFileExist(badLogPath, badLogFileType)) {
@@ -1308,19 +1313,19 @@ private[sql] case class DropTableCommand(ifExistsSet: Boolean, schemaNameOp: Opt
}
private[sql] case class ShowLoads(
- schemaNameOp: Option[String],
+ databaseNameOp: Option[String],
tableName: String,
limit: Option[String],
override val output: Seq[Attribute]) extends RunnableCommand {
override def run(sqlContext: SQLContext): Seq[Row] = {
- val schemaName = getDB.getDatabaseName(schemaNameOp, sqlContext)
- val tableUniqueName = schemaName + "_" + tableName
+ val databaseName = getDB.getDatabaseName(databaseNameOp, sqlContext)
+ val tableUniqueName = databaseName + "_" + tableName
val carbonTable = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance()
.getCarbonTable(tableUniqueName)
if (carbonTable == null) {
- sys.error(s"$schemaName.$tableName is not found")
+ sys.error(s"$databaseName.$tableName is not found")
}
val path = carbonTable.getMetaDataFilepath()
@@ -1381,7 +1386,7 @@ private[sql] case class DescribeCommandFormatted(
var results: Seq[(String, String, String)] = child.schema.fields.map { field =>
val comment = if (relation.metaData.dims.contains(field.name)) {
val dimension = relation.metaData.carbonTable.getDimensionByName(
- relation.cubeMeta.carbonTableIdentifier.getTableName,
+ relation.tableMeta.carbonTableIdentifier.getTableName,
field.name)
if (null != dimension.getColumnProperties && dimension.getColumnProperties.size() > 0) {
val colprop = mapper.writeValueAsString(dimension.getColumnProperties)
@@ -1407,13 +1412,13 @@ private[sql] case class DescribeCommandFormatted(
colProps.toString()
}
results ++= Seq(("", "", ""), ("##Detailed Table Information", "", ""))
- results ++= Seq(("Database Name : ", relation.cubeMeta.carbonTableIdentifier
+ results ++= Seq(("Database Name : ", relation.tableMeta.carbonTableIdentifier
.getDatabaseName, "")
)
- results ++= Seq(("Table Name : ", relation.cubeMeta.carbonTableIdentifier.getTableName, ""))
- results ++= Seq(("CARBON Store Path : ", relation.cubeMeta.storePath, ""))
+ results ++= Seq(("Table Name : ", relation.tableMeta.carbonTableIdentifier.getTableName, ""))
+ results ++= Seq(("CARBON Store Path : ", relation.tableMeta.storePath, ""))
results ++= Seq(("", "", ""), ("#Aggregate Tables", "", ""))
- val carbonTable = relation.cubeMeta.carbonTable
+ val carbonTable = relation.tableMeta.carbonTable
val aggTables = carbonTable.getAggregateTablesName
if (aggTables.size == 0) {
results ++= Seq(("NONE", "", ""))
@@ -1474,8 +1479,8 @@ private[sql] case class DescribeNativeCommand(sql: String,
}
private[sql] case class DeleteLoadByDate(
- schemaNameOp: Option[String],
- cubeName: String,
+ databaseNameOp: Option[String],
+ tableName: String,
dateField: String,
dateValue: String
) extends RunnableCommand {
@@ -1484,17 +1489,17 @@ private[sql] case class DeleteLoadByDate(
def run(sqlContext: SQLContext): Seq[Row] = {
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
- LOGGER.audit(s"The delete load by date request has been received for $dbName.$cubeName")
- val identifier = TableIdentifier(cubeName, Option(dbName))
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
+ LOGGER.audit(s"The delete load by date request has been received for $dbName.$tableName")
+ val identifier = TableIdentifier(tableName, Option(dbName))
val relation = CarbonEnv.getInstance(sqlContext).carbonCatalog
.lookupRelation1(identifier)(sqlContext).asInstanceOf[CarbonRelation]
var level: String = ""
var carbonTable = org.carbondata.core.carbon.metadata.CarbonMetadata
- .getInstance().getCarbonTable(dbName + '_' + cubeName)
+ .getInstance().getCarbonTable(dbName + '_' + tableName)
if (relation == null) {
- LOGGER.audit(s"The delete load by date is failed. Table $dbName.$cubeName does not exist")
- sys.error(s"Table $dbName.$cubeName does not exist")
+ LOGGER.audit(s"The delete load by date is failed. Table $dbName.$tableName does not exist")
+ sys.error(s"Table $dbName.$tableName does not exist")
}
val matches: Seq[AttributeReference] = relation.dimensionsAttr.filter(
@@ -1504,13 +1509,12 @@ private[sql] case class DeleteLoadByDate(
if (matches.isEmpty) {
LOGGER.audit(
"The delete load by date is failed. " +
- "Table $dbName.$cubeName does not contain date field :" + dateField)
- sys.error(s"Table $dbName.$cubeName does not contain date field " + dateField)
+ "Table $dbName.$tableName does not contain date field :" + dateField)
+ sys.error(s"Table $dbName.$tableName does not contain date field " + dateField)
}
else {
level = matches.asJava.get(0).name
}
- val tableName = relation.metaData.carbonTable.getFactTableName
val actualColName = relation.metaData.carbonTable.getDimensionByName(tableName, level)
.getColName
@@ -1518,51 +1522,49 @@ private[sql] case class DeleteLoadByDate(
sqlContext,
new CarbonDataLoadSchema(carbonTable),
dbName,
- cubeName,
tableName,
CarbonEnv.getInstance(sqlContext).carbonCatalog.storePath,
level,
actualColName,
dateValue,
- relation.cubeMeta.partitioner)
- LOGGER.audit(s"The delete load by date $dateValue is successful for $dbName.$cubeName.")
+ relation.tableMeta.partitioner)
+ LOGGER.audit(s"The delete load by date $dateValue is successful for $dbName.$tableName.")
Seq.empty
}
}
-
private[sql] case class CleanFiles(
- schemaNameOp: Option[String],
- cubeName: String) extends RunnableCommand {
+ databaseNameOp: Option[String],
+ tableName: String) extends RunnableCommand {
val LOGGER = LogServiceFactory.getLogService(this.getClass.getCanonicalName)
def run(sqlContext: SQLContext): Seq[Row] = {
- val dbName = getDB.getDatabaseName(schemaNameOp, sqlContext)
- LOGGER.audit(s"The clean files request has been received for $dbName.$cubeName")
- val identifier = TableIdentifier(cubeName, Option(dbName))
+ val dbName = getDB.getDatabaseName(databaseNameOp, sqlContext)
+ LOGGER.audit(s"The clean files request has been received for $dbName.$tableName")
+ val identifier = TableIdentifier(tableName, Option(dbName))
val relation = CarbonEnv.getInstance(sqlContext).carbonCatalog
.lookupRelation1(identifier)(sqlContext).
asInstanceOf[CarbonRelation]
if (relation == null) {
- LOGGER.audit(s"The clean files request is failed. Table $dbName.$cubeName does not exist")
- sys.error(s"Table $dbName.$cubeName does not exist")
+ LOGGER.audit(s"The clean files request is failed. Table $dbName.$tableName does not exist")
+ sys.error(s"Table $dbName.$tableName does not exist")
}
val carbonLoadModel = new CarbonLoadModel()
- carbonLoadModel.setTableName(relation.cubeMeta.carbonTableIdentifier.getTableName)
- carbonLoadModel.setDatabaseName(relation.cubeMeta.carbonTableIdentifier.getDatabaseName)
- val table = relation.cubeMeta.carbonTable
+ carbonLoadModel.setTableName(relation.tableMeta.carbonTableIdentifier.getTableName)
+ carbonLoadModel.setDatabaseName(relation.tableMeta.carbonTableIdentifier.getDatabaseName)
+ val table = relation.tableMeta.carbonTable
carbonLoadModel.setAggTables(table.getAggregateTablesName.asScala.toArray)
carbonLoadModel.setTableName(table.getFactTableName)
- carbonLoadModel.setStorePath(relation.cubeMeta.storePath)
+ carbonLoadModel.setStorePath(relation.tableMeta.storePath)
val dataLoadSchema = new CarbonDataLoadSchema(table)
carbonLoadModel.setCarbonDataLoadSchema(dataLoadSchema)
CarbonDataRDDFactory.cleanFiles(
sqlContext.sparkContext,
carbonLoadModel,
- relation.cubeMeta.storePath,
- relation.cubeMeta.partitioner)
+ relation.tableMeta.storePath,
+ relation.tableMeta.partitioner)
LOGGER.audit("Clean files request is successfull.")
Seq.empty
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala
index 259266a..39f97f7 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonMetastoreCatalog.scala
@@ -54,7 +54,7 @@ import org.carbondata.format.{SchemaEvolutionEntry, TableInfo}
import org.carbondata.lcm.locks.ZookeeperInit
import org.carbondata.spark.util.CarbonScalaUtil.CarbonSparkUtil
-case class MetaData(var cubesMeta: ArrayBuffer[TableMeta])
+case class MetaData(var tablesMeta: ArrayBuffer[TableMeta])
case class CarbonMetaData(dims: Seq[String],
msrs: Seq[String],
@@ -109,18 +109,18 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
@transient val LOGGER = LogServiceFactory
.getLogService("org.apache.spark.sql.CarbonMetastoreCatalog")
- val cubeModifiedTimeStore = new java.util.HashMap[String, Long]()
- cubeModifiedTimeStore.put("default", System.currentTimeMillis())
+ val tableModifiedTimeStore = new java.util.HashMap[String, Long]()
+ tableModifiedTimeStore.put("default", System.currentTimeMillis())
val metadata = loadMetadata(storePath)
- def getCubeCreationTime(schemaName: String, cubeName: String): Long = {
- val cubeMeta = metadata.cubesMeta.filter(
- c => c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(schemaName) &&
- c.carbonTableIdentifier.getTableName.equalsIgnoreCase(cubeName))
- val cubeCreationTime = cubeMeta.head.carbonTable.getTableLastUpdatedTime
- cubeCreationTime
+ def getTableCreationTime(databaseName: String, tableName: String): Long = {
+ val tableMeta = metadata.tablesMeta.filter(
+ c => c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(databaseName) &&
+ c.carbonTableIdentifier.getTableName.equalsIgnoreCase(tableName))
+ val tableCreationTime = tableMeta.head.carbonTable.getTableLastUpdatedTime
+ tableCreationTime
}
def lookupRelation1(dbName: Option[String],
@@ -130,14 +130,14 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
def lookupRelation1(tableIdentifier: TableIdentifier,
alias: Option[String] = None)(sqlContext: SQLContext): LogicalPlan = {
- checkSchemasModifiedTimeAndReloadCubes()
+ checkSchemasModifiedTimeAndReloadTables()
val database = tableIdentifier.database.getOrElse(getDB.getDatabaseName(None, sqlContext))
- val cubes = metadata.cubesMeta.filter(
+ val tables = metadata.tablesMeta.filter(
c => c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(database) &&
c.carbonTableIdentifier.getTableName.equalsIgnoreCase(tableIdentifier.table))
- if (cubes.nonEmpty) {
+ if (tables.nonEmpty) {
CarbonRelation(database, tableIdentifier.table,
- CarbonSparkUtil.createSparkMeta(cubes.head.carbonTable), cubes.head, alias)(sqlContext)
+ CarbonSparkUtil.createSparkMeta(tables.head.carbonTable), tables.head, alias)(sqlContext)
} else {
LOGGER.audit(s"Table Not Found: ${tableIdentifier.table}")
throw new NoSuchTableException
@@ -145,12 +145,12 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
def tableExists(tableIdentifier: TableIdentifier)(sqlContext: SQLContext): Boolean = {
- checkSchemasModifiedTimeAndReloadCubes()
+ checkSchemasModifiedTimeAndReloadTables()
val database = tableIdentifier.database.getOrElse(getDB.getDatabaseName(None, sqlContext))
- val cubes = metadata.cubesMeta.filter(
+ val tables = metadata.tablesMeta.filter(
c => c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(database) &&
c.carbonTableIdentifier.getTableName.equalsIgnoreCase(tableIdentifier.table))
- cubes.nonEmpty
+ tables.nonEmpty
}
def loadMetadata(metadataPath: String): MetaData = {
@@ -177,28 +177,28 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
private def fillMetaData(basePath: String, fileType: FileType,
metaDataBuffer: ArrayBuffer[TableMeta]): Unit = {
- val schemasPath = basePath // + "/schemas"
+ val databasePath = basePath // + "/schemas"
try {
- if (FileFactory.isFileExist(schemasPath, fileType)) {
- val file = FileFactory.getCarbonFile(schemasPath, fileType)
- val schemaFolders = file.listFiles()
-
- schemaFolders.foreach(schemaFolder => {
- if (schemaFolder.isDirectory) {
- val dbName = schemaFolder.getName
- val cubeFolders = schemaFolder.listFiles()
-
- cubeFolders.foreach(cubeFolder => {
- if (cubeFolder.isDirectory) {
- val carbonTableIdentifier = new CarbonTableIdentifier(schemaFolder.getName,
- cubeFolder.getName, UUID.randomUUID().toString)
+ if (FileFactory.isFileExist(databasePath, fileType)) {
+ val file = FileFactory.getCarbonFile(databasePath, fileType)
+ val databaseFolders = file.listFiles()
+
+ databaseFolders.foreach(databaseFolder => {
+ if (databaseFolder.isDirectory) {
+ val dbName = databaseFolder.getName
+ val tableFolders = databaseFolder.listFiles()
+
+ tableFolders.foreach(tableFolder => {
+ if (tableFolder.isDirectory) {
+ val carbonTableIdentifier = new CarbonTableIdentifier(databaseFolder.getName,
+ tableFolder.getName, UUID.randomUUID().toString)
val carbonTablePath = CarbonStorePath.getCarbonTablePath(basePath,
carbonTableIdentifier)
- val cubeMetadataFile = carbonTablePath.getSchemaFilePath
+ val tableMetadataFile = carbonTablePath.getSchemaFilePath
- if (FileFactory.isFileExist(cubeMetadataFile, fileType)) {
- val tableName = cubeFolder.getName
- val cubeUniqueName = schemaFolder.getName + "_" + cubeFolder.getName
+ if (FileFactory.isFileExist(tableMetadataFile, fileType)) {
+ val tableName = tableFolder.getName
+ val tableUniqueName = databaseFolder.getName + "_" + tableFolder.getName
val createTBase = new ThriftReader.TBaseCreator() {
@@ -206,7 +206,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
new TableInfo()
}
}
- val thriftReader = new ThriftReader(cubeMetadataFile, createTBase)
+ val thriftReader = new ThriftReader(tableMetadataFile, createTBase)
thriftReader.open()
val tableInfo: TableInfo = thriftReader.read().asInstanceOf[TableInfo]
thriftReader.close()
@@ -221,7 +221,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
.setMetaDataFilepath(CarbonTablePath.getFolderContainingFile(schemaFilePath))
CarbonMetadata.getInstance().loadTableMetadata(wrapperTableInfo)
val carbonTable = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance()
- .getCarbonTable(cubeUniqueName)
+ .getCarbonTable(tableUniqueName)
metaDataBuffer += TableMeta(
carbonTable.getCarbonTableIdentifier,
storePath,
@@ -239,14 +239,14 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
else {
// Create folders and files.
- FileFactory.mkdirs(schemasPath, fileType)
+ FileFactory.mkdirs(databasePath, fileType)
}
}
catch {
case s: java.io.FileNotFoundException =>
// Create folders and files.
- FileFactory.mkdirs(schemasPath, fileType)
+ FileFactory.mkdirs(databasePath, fileType)
}
}
@@ -258,7 +258,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
* Load CarbonTable from wrapper tableinfo
*
*/
- def createCubeFromThrift(tableInfo: org.carbondata.core.carbon.metadata.schema.table.TableInfo,
+ def createTableFromThrift(tableInfo: org.carbondata.core.carbon.metadata.schema.table.TableInfo,
dbName: String, tableName: String, partitioner: Partitioner)
(sqlContext: SQLContext): String = {
@@ -282,7 +282,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
tableInfo.setStorePath(storePath)
CarbonMetadata.getInstance().loadTableMetadata(tableInfo)
- val cubeMeta = TableMeta(
+ val tableMeta = TableMeta(
carbonTableIdentifier,
storePath,
CarbonMetadata.getInstance().getCarbonTable(dbName + "_" + tableName),
@@ -299,7 +299,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
thriftWriter.write(thriftTableInfo)
thriftWriter.close()
- metadata.cubesMeta += cubeMeta
+ metadata.tablesMeta += tableMeta
logInfo(s"Table $tableName for Database $dbName created successfully.")
LOGGER.info("Table " + tableName + " for Database " + dbName + " created successfully.")
updateSchemasUpdatedTime(dbName, tableName)
@@ -312,10 +312,10 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
CarbonMetadata.getInstance().loadTableMetadata(wrapperTableInfo)
val carbonTable = CarbonMetadata.getInstance().getCarbonTable(
wrapperTableInfo.getTableUniqueName)
- for (i <- metadata.cubesMeta.indices) {
+ for (i <- metadata.tablesMeta.indices) {
if (wrapperTableInfo.getTableUniqueName.equals(
- metadata.cubesMeta(i).carbonTableIdentifier.getTableUniqueName)) {
- metadata.cubesMeta(i).carbonTable = carbonTable
+ metadata.tablesMeta(i).carbonTableIdentifier.getTableUniqueName)) {
+ metadata.tablesMeta(i).carbonTable = carbonTable
}
}
}
@@ -427,8 +427,8 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
* Shows all schemas which has Database name like
*/
def showDatabases(schemaLike: Option[String]): Seq[String] = {
- checkSchemasModifiedTimeAndReloadCubes()
- metadata.cubesMeta.map { c =>
+ checkSchemasModifiedTimeAndReloadTables()
+ metadata.tablesMeta.map { c =>
schemaLike match {
case Some(name) =>
if (c.carbonTableIdentifier.getDatabaseName.contains(name)) {
@@ -444,24 +444,24 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
/**
- * Shows all cubes for given schema.
+ * Shows all tables for given schema.
*/
def getTables(databaseName: Option[String])(sqlContext: SQLContext): Seq[(String, Boolean)] = {
- val schemaName = databaseName
- .getOrElse(sqlContext.asInstanceOf[HiveContext].catalog.client.currentDatabase)
- checkSchemasModifiedTimeAndReloadCubes()
- metadata.cubesMeta.filter { c =>
- c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(schemaName)
+ val dbName =
+ databaseName.getOrElse(sqlContext.asInstanceOf[HiveContext].catalog.client.currentDatabase)
+ checkSchemasModifiedTimeAndReloadTables()
+ metadata.tablesMeta.filter { c =>
+ c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(dbName)
}.map { c => (c.carbonTableIdentifier.getTableName, false) }
}
/**
- * Shows all cubes in all schemas.
+ * Shows all tables in all schemas.
*/
def getAllTables()(sqlContext: SQLContext): Seq[TableIdentifier] = {
- checkSchemasModifiedTimeAndReloadCubes()
- metadata.cubesMeta.map { c =>
+ checkSchemasModifiedTimeAndReloadTables()
+ metadata.tablesMeta.map { c =>
TableIdentifier(c.carbonTableIdentifier.getTableName,
Some(c.carbonTableIdentifier.getDatabaseName))
}
@@ -485,7 +485,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
if (FileFactory.isFileExist(metadatFilePath, fileType)) {
val file = FileFactory.getCarbonFile(metadatFilePath, fileType)
- CarbonUtil.renameCubeForDeletion(partitionCount, tableStorePath, dbName, tableName)
+ CarbonUtil.renameTableForDeletion(partitionCount, tableStorePath, dbName, tableName)
CarbonUtil.deleteFoldersAndFilesSilent(file.getParentFile)
}
@@ -498,7 +498,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
}
- metadata.cubesMeta -= metadata.cubesMeta.filter(
+ metadata.tablesMeta -= metadata.tablesMeta.filter(
c => c.carbonTableIdentifier.getDatabaseName.equalsIgnoreCase(dbName) &&
c.carbonTableIdentifier.getTableName.equalsIgnoreCase(tableName))(0)
org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
@@ -516,7 +516,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
- private def getTimestampFileAndType(schemaName: String, cubeName: String) = {
+ private def getTimestampFileAndType(databaseName: String, tableName: String) = {
val timestampFile = storePath + "/" + CarbonCommonConstants.SCHEMAS_MODIFIED_TIME_FILE
@@ -524,44 +524,44 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
(timestampFile, timestampFileType)
}
- def updateSchemasUpdatedTime(schemaName: String, cubeName: String) {
- val (timestampFile, timestampFileType) = getTimestampFileAndType(schemaName, cubeName)
+ def updateSchemasUpdatedTime(databaseName: String, tableName: String) {
+ val (timestampFile, timestampFileType) = getTimestampFileAndType(databaseName, tableName)
if (!FileFactory.isFileExist(timestampFile, timestampFileType)) {
- LOGGER.audit(s"Creating timestamp file for $schemaName.$cubeName")
+ LOGGER.audit(s"Creating timestamp file for $databaseName.$tableName")
FileFactory.createNewFile(timestampFile, timestampFileType)
}
- touchSchemasTimestampFile(schemaName, cubeName)
+ touchSchemasTimestampFile(databaseName, tableName)
- cubeModifiedTimeStore.put("default",
+ tableModifiedTimeStore.put("default",
FileFactory.getCarbonFile(timestampFile, timestampFileType).getLastModifiedTime)
}
- def touchSchemasTimestampFile(schemaName: String, cubeName: String) {
- val (timestampFile, timestampFileType) = getTimestampFileAndType(schemaName, cubeName)
+ def touchSchemasTimestampFile(databaseName: String, tableName: String) {
+ val (timestampFile, timestampFileType) = getTimestampFileAndType(databaseName, tableName)
FileFactory.getCarbonFile(timestampFile, timestampFileType)
.setLastModifiedTime(System.currentTimeMillis())
}
- def checkSchemasModifiedTimeAndReloadCubes() {
+ def checkSchemasModifiedTimeAndReloadTables() {
val (timestampFile, timestampFileType) = getTimestampFileAndType("", "")
if (FileFactory.isFileExist(timestampFile, timestampFileType)) {
if (!(FileFactory.getCarbonFile(timestampFile, timestampFileType).
- getLastModifiedTime == cubeModifiedTimeStore.get("default"))) {
+ getLastModifiedTime == tableModifiedTimeStore.get("default"))) {
refreshCache()
}
}
}
def refreshCache() {
- metadata.cubesMeta = loadMetadata(storePath).cubesMeta
+ metadata.tablesMeta = loadMetadata(storePath).tablesMeta
}
- def getSchemaLastUpdatedTime(schemaName: String, cubeName: String): Long = {
+ def getSchemaLastUpdatedTime(databaseName: String, tableName: String): Long = {
var schemaLastUpdatedTime = System.currentTimeMillis
- val (timestampFile, timestampFileType) = getTimestampFileAndType(schemaName, cubeName)
+ val (timestampFile, timestampFileType) = getTimestampFileAndType(databaseName, tableName)
if (FileFactory.isFileExist(timestampFile, timestampFileType)) {
schemaLastUpdatedTime = FileFactory.getCarbonFile(timestampFile, timestampFileType)
.getLastModifiedTime
@@ -569,22 +569,22 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
schemaLastUpdatedTime
}
- def readCubeMetaDataFile(cubeFolder: CarbonFile,
+ def readTableMetaDataFile(tableFolder: CarbonFile,
fileType: FileFactory.FileType):
(String, String, String, String, Partitioner, Long) = {
- val cubeMetadataFile = cubeFolder.getAbsolutePath + "/metadata"
+ val tableMetadataFile = tableFolder.getAbsolutePath + "/metadata"
var schema: String = ""
- var schemaName: String = ""
- var cubeName: String = ""
+ var databaseName: String = ""
+ var tableName: String = ""
var dataPath: String = ""
var partitioner: Partitioner = null
val cal = new GregorianCalendar(2011, 1, 1)
- var cubeCreationTime = cal.getTime.getTime
+ var tableCreationTime = cal.getTime.getTime
- if (FileFactory.isFileExist(cubeMetadataFile, fileType)) {
+ if (FileFactory.isFileExist(tableMetadataFile, fileType)) {
// load metadata
- val in = FileFactory.getDataInputStream(cubeMetadataFile, fileType)
+ val in = FileFactory.getDataInputStream(tableMetadataFile, fileType)
var len = 0
try {
len = in.readInt()
@@ -593,14 +593,14 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
}
while (len > 0) {
- val schemaNameBytes = new Array[Byte](len)
- in.readFully(schemaNameBytes)
+ val databaseNameBytes = new Array[Byte](len)
+ in.readFully(databaseNameBytes)
- schemaName = new String(schemaNameBytes, "UTF8")
- val cubeNameLen = in.readInt()
- val cubeNameBytes = new Array[Byte](cubeNameLen)
- in.readFully(cubeNameBytes)
- cubeName = new String(cubeNameBytes, "UTF8")
+ databaseName = new String(databaseNameBytes, "UTF8")
+ val tableNameLen = in.readInt()
+ val tableNameBytes = new Array[Byte](tableNameLen)
+ in.readFully(tableNameBytes)
+ tableName = new String(tableNameBytes, "UTF8")
val dataPathLen = in.readInt()
val dataPathBytes = new Array[Byte](dataPathLen)
@@ -625,7 +625,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
objStream.close()
try {
- cubeCreationTime = in.readLong()
+ tableCreationTime = in.readLong()
len = in.readInt()
} catch {
case others: EOFException => len = 0
@@ -635,7 +635,7 @@ class CarbonMetastoreCatalog(hiveContext: HiveContext, val storePath: String,
in.close()
}
- (schemaName, cubeName, dataPath, schema, partitioner, cubeCreationTime)
+ (databaseName, tableName, dataPath, schema, partitioner, tableCreationTime)
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala
index 834aec0..95c78bb 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonStrategies.scala
@@ -225,14 +225,14 @@ class CarbonStrategies(sqlContext: SQLContext) extends QueryPlanner[SparkPlan] {
.tableExists(toTableIdentifier(tableName.toLowerCase))(sqlContext) =>
val identifier = toTableIdentifier(tableName.toLowerCase)
ExecutedCommand(DropTableCommand(ifNotExists, identifier.database, identifier.table)) :: Nil
- case ShowLoadsCommand(schemaName, cube, limit) =>
- ExecutedCommand(ShowLoads(schemaName, cube, limit, plan.output)) :: Nil
- case LoadTable(schemaNameOp, cubeName, factPathFromUser, dimFilesPath,
+ case ShowLoadsCommand(databaseName, table, limit) =>
+ ExecutedCommand(ShowLoads(databaseName, table, limit, plan.output)) :: Nil
+ case LoadTable(databaseNameOp, tableName, factPathFromUser, dimFilesPath,
partionValues, isOverwriteExist, inputSqlString) =>
val isCarbonTable = CarbonEnv.getInstance(sqlContext).carbonCatalog
- .tableExists(TableIdentifier(cubeName, schemaNameOp))(sqlContext)
+ .tableExists(TableIdentifier(tableName, databaseNameOp))(sqlContext)
if (isCarbonTable || partionValues.nonEmpty) {
- ExecutedCommand(LoadTable(schemaNameOp, cubeName, factPathFromUser,
+ ExecutedCommand(LoadTable(databaseNameOp, tableName, factPathFromUser,
dimFilesPath, partionValues, isOverwriteExist, inputSqlString)) :: Nil
} else {
ExecutedCommand(HiveNativeCommand(inputSqlString)) :: Nil
@@ -249,9 +249,9 @@ class CarbonStrategies(sqlContext: SQLContext) extends QueryPlanner[SparkPlan] {
case e: Exception => ExecutedCommand(d) :: Nil
}
case DescribeFormattedCommand(sql, tblIdentifier) =>
- val isCube = CarbonEnv.getInstance(sqlContext).carbonCatalog
+ val isTable = CarbonEnv.getInstance(sqlContext).carbonCatalog
.tableExists(tblIdentifier)(sqlContext)
- if (isCube) {
+ if (isTable) {
val describe =
LogicalDescribeCommand(UnresolvedRelation(tblIdentifier, None), isExtended = false)
val resolvedTable = sqlContext.executePlan(describe.table).analyzed
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonCleanFilesRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonCleanFilesRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonCleanFilesRDD.scala
index 17d83b2..2eb7318 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonCleanFilesRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonCleanFilesRDD.scala
@@ -31,15 +31,15 @@ import org.carbondata.spark.util.CarbonQueryUtil
class CarbonCleanFilesRDD[V: ClassTag](
sc: SparkContext,
valueClass: Value[V],
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
partitioner: Partitioner)
extends RDD[V](sc, Nil) with Logging {
sc.setLocalProperty("spark.scheduler.pool", "DDL")
override def getPartitions: Array[Partition] = {
- val splits = CarbonQueryUtil.getTableSplits(schemaName, cubeName, null, partitioner)
+ val splits = CarbonQueryUtil.getTableSplits(databaseName, tableName, null, partitioner)
splits.zipWithIndex.map(s => new CarbonLoadPartition(id, s._2, s._1))
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala
index 3add8f0..4b2c75e 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataLoadRDD.scala
@@ -84,7 +84,7 @@ class CarbonNodePartition(rddId: Int, val idx: Int, host: String,
* @param columinar whether it is columinar
* @param currentRestructNumber current restruct number
* @param loadCount Current load count
- * @param cubeCreationTime Time of creating cube
+ * @param tableCreationTime Time of creating table
* @param schemaLastUpdatedTime Time of last schema update
* @param blocksGroupBy Blocks Array which is group by partition or host
* @param isTableSplitPartition Whether using table split partition
@@ -102,7 +102,7 @@ class CarbonDataLoadRDD[K, V](
columinar: Boolean,
currentRestructNumber: Integer,
loadCount: Integer,
- cubeCreationTime: Long,
+ tableCreationTime: Long,
schemaLastUpdatedTime: Long,
blocksGroupBy: Array[(String, Array[BlockDetails])],
isTableSplitPartition: Boolean)
@@ -308,7 +308,7 @@ class CarbonDataLoadRDD[K, V](
.addNewSliceNameToList(newSlice, listOfAllLoadFolders)
val copyListOfLoadFolders = listOfLoadFolders.asScala.toList
val copyListOfUpdatedLoadFolders = listOfUpdatedLoadFolders.asScala.toList
- loadCubeSlices(listOfAllLoadFolders, details)
+ loadTableSlices(listOfAllLoadFolders, details)
var loadFolders = Array[String]()
val loadFolder = CarbonLoaderUtil
.getAggLoadFolderLocation(newSlice, model.getDatabaseName, model.getTableName,
@@ -319,7 +319,7 @@ class CarbonDataLoadRDD[K, V](
dataloadStatus = iterateOverAggTables(aggTables, copyListOfLoadFolders.asJava,
copyListOfUpdatedLoadFolders.asJava, loadFolders)
if (CarbonCommonConstants.STORE_LOADSTATUS_FAILURE.equals(dataloadStatus)) {
- // remove the current slice from memory not the cube
+ // remove the current slice from memory not the table
CarbonLoaderUtil
.removeSliceFromMemory(model.getDatabaseName, model.getTableName, newSlice)
logInfo(s"Aggregate table creation failed")
@@ -331,7 +331,7 @@ class CarbonDataLoadRDD[K, V](
dataloadStatus
}
- def loadCubeSlices(listOfAllLoadFolders: java.util.List[String],
+ def loadTableSlices(listOfAllLoadFolders: java.util.List[String],
loadMetadataDetails: Array[LoadMetadataDetails]) = {
CarbonProperties.getInstance().addProperty("carbon.cache.used", "false")
// TODO: Implement it
@@ -342,7 +342,7 @@ class CarbonDataLoadRDD[K, V](
val listOfAllLoadFolders = CarbonQueryUtil.getListOfSlices(details)
val listOfLoadFolders = CarbonLoaderUtil.getListOfValidSlices(details)
val listOfUpdatedLoadFolders = CarbonLoaderUtil.getListOfUpdatedSlices(details)
- loadCubeSlices(listOfAllLoadFolders, details)
+ loadTableSlices(listOfAllLoadFolders, details)
var loadFolders = Array[String]()
var restructFolders = Array[String]()
for (number <- 0 to currentRestructNumber) {
@@ -370,7 +370,7 @@ class CarbonDataLoadRDD[K, V](
val listOfLoadFolders = CarbonLoaderUtil.getListOfValidSlices(details)
val listOfUpdatedLoadFolders = CarbonLoaderUtil.getListOfUpdatedSlices(details)
val listOfAllLoadFolder = CarbonQueryUtil.getListOfSlices(details)
- loadCubeSlices(listOfAllLoadFolder, details)
+ loadTableSlices(listOfAllLoadFolder, details)
var loadFolders = Array[String]()
listOfUpdatedLoadFolders.asScala.foreach { sliceNum =>
val newSlice = CarbonCommonConstants.LOAD_FOLDER + sliceNum
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataPartitionRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataPartitionRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataPartitionRDD.scala
index 710e61a..a58f2ab 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataPartitionRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataPartitionRDD.scala
@@ -49,8 +49,8 @@ class CarbonSparkRawDataPartition(rddId: Int, val idx: Int, @transient val table
class CarbonDataPartitionRDD[K, V](
sc: SparkContext,
results: PartitionResult[K, V],
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
sourcePath: String,
targetFolder: String,
requiredColumns: Array[String],
@@ -80,7 +80,7 @@ class CarbonDataPartitionRDD[K, V](
logInfo("Input split: " + split.serializableHadoopSplit.value)
val csvPart = new CSVFilePartitioner(partitioner.partitionClass, sourcePath)
- csvPart.splitFile(schemaName, cubeName,
+ csvPart.splitFile(databaseName, tableName,
split.serializableHadoopSplit.value.getPartition.getFilesPath, targetFolder,
partitioner.nodeList.toList.asJava, partitioner.partitionCount, partitioner.partitionColumn,
requiredColumns, delimiter, quoteChar, headers, escapeChar, multiLine)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
index 1b8bb38..473aa43 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDataRDDFactory.scala
@@ -63,8 +63,8 @@ object CarbonDataRDDFactory extends Logging {
// scalastyle:off
def partitionCarbonData(sc: SparkContext,
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
sourcePath: String,
targetFolder: String,
requiredColumns: Array[String],
@@ -76,12 +76,12 @@ object CarbonDataRDDFactory extends Logging {
partitioner: Partitioner): String = {
// scalastyle:on
val status = new
- CarbonDataPartitionRDD(sc, new PartitionResultImpl(), schemaName, cubeName, sourcePath,
+ CarbonDataPartitionRDD(sc, new PartitionResultImpl(), databaseName, tableName, sourcePath,
targetFolder, requiredColumns, headers, delimiter, quoteChar, escapeChar, multiLine,
partitioner
).collect
CarbonDataProcessorUtil
- .renameBadRecordsFromInProgressToNormal("partition/" + schemaName + '/' + cubeName)
+ .renameBadRecordsFromInProgressToNormal("partition/" + databaseName + '/' + tableName)
var loadStatus = CarbonCommonConstants.STORE_LOADSTATUS_SUCCESS
status.foreach {
case (key, value) =>
@@ -98,9 +98,9 @@ object CarbonDataRDDFactory extends Logging {
storeLocation: String,
hdfsStoreLocation: String,
partitioner: Partitioner) {
- val cube = CarbonMetadata.getInstance()
+ val table = CarbonMetadata.getInstance()
.getCarbonTable(carbonLoadModel.getDatabaseName + "_" + carbonLoadModel.getTableName)
- val metaDataPath: String = cube.getMetaDataFilepath
+ val metaDataPath: String = table.getMetaDataFilepath
var currentRestructNumber = CarbonUtil
.checkAndReturnCurrentRestructFolderNumber(metaDataPath, "RS_", false)
if (-1 == currentRestructNumber) {
@@ -111,8 +111,7 @@ object CarbonDataRDDFactory extends Logging {
def deleteLoadByDate(
sqlContext: SQLContext,
schema: CarbonDataLoadSchema,
- schemaName: String,
- cubeName: String,
+ databaseName: String,
tableName: String,
hdfsStoreLocation: String,
dateField: String,
@@ -122,27 +121,27 @@ object CarbonDataRDDFactory extends Logging {
val sc = sqlContext
// Delete the records based on data
- val cube = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
- .getCarbonTable(schemaName + "_" + cubeName)
+ val table = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
+ .getCarbonTable(databaseName + "_" + tableName)
var currentRestructNumber = CarbonUtil
- .checkAndReturnCurrentRestructFolderNumber(cube.getMetaDataFilepath, "RS_", false)
+ .checkAndReturnCurrentRestructFolderNumber(table.getMetaDataFilepath, "RS_", false)
if (-1 == currentRestructNumber) {
currentRestructNumber = 0
}
- val segmentStatusManager = new SegmentStatusManager(cube.getAbsoluteTableIdentifier)
- val loadMetadataDetailsArray = segmentStatusManager.readLoadMetadata(cube.getMetaDataFilepath())
- .toList
+ val segmentStatusManager = new SegmentStatusManager(table.getAbsoluteTableIdentifier)
+ val loadMetadataDetailsArray =
+ segmentStatusManager.readLoadMetadata(table.getMetaDataFilepath()).toList
val resultMap = new CarbonDeleteLoadByDateRDD(
sc.sparkContext,
new DeletedLoadResultImpl(),
- schemaName,
- cube.getDatabaseName,
+ databaseName,
+ table.getDatabaseName,
dateField,
dateFieldActualName,
dateValue,
partitioner,
- cube.getFactTableName,
+ table.getFactTableName,
tableName,
hdfsStoreLocation,
loadMetadataDetailsArray,
@@ -185,7 +184,7 @@ object CarbonDataRDDFactory extends Logging {
// Save the load metadata
val carbonLock = CarbonLockFactory
- .getCarbonLockObj(cube.getMetaDataFilepath, LockUsage.METADATA_LOCK)
+ .getCarbonLockObj(table.getMetaDataFilepath, LockUsage.METADATA_LOCK)
try {
if (carbonLock.lockWithRetries()) {
logInfo("Successfully got the table metadata file lock")
@@ -196,8 +195,8 @@ object CarbonDataRDDFactory extends Logging {
// write
CarbonLoaderUtil.writeLoadMetadata(
schema,
- schemaName,
- cube.getDatabaseName,
+ databaseName,
+ table.getDatabaseName,
updatedloadMetadataDetails.asJava
)
}
@@ -210,7 +209,7 @@ object CarbonDataRDDFactory extends Logging {
}
} else {
logError("Delete by Date request is failed")
- logger.audit(s"The delete load by date is failed for $schemaName.$cubeName")
+ logger.audit(s"The delete load by date is failed for $databaseName.$tableName")
sys.error("Delete by Date request is failed, potential causes " +
"Empty store or Invalid column type, For more details please refer logs.")
}
@@ -256,8 +255,8 @@ object CarbonDataRDDFactory extends Logging {
s"${carbonLoadModel.getDatabaseName}.${carbonLoadModel.getTableName}"
)
val carbonTable = carbonLoadModel.getCarbonDataLoadSchema.getCarbonTable
- val cubeCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
- .getCubeCreationTime(carbonLoadModel.getDatabaseName, carbonLoadModel.getTableName)
+ val tableCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
+ .getTableCreationTime(carbonLoadModel.getDatabaseName, carbonLoadModel.getTableName)
if (null == carbonLoadModel.getLoadMetadataDetails) {
readLoadMetadataDetails(carbonLoadModel, hdfsStoreLocation)
@@ -269,7 +268,7 @@ object CarbonDataRDDFactory extends Logging {
val compactionModel = CompactionModel(compactionSize,
compactionType,
carbonTable,
- cubeCreationTime
+ tableCreationTime
)
val lock = CarbonLockFactory
@@ -425,7 +424,7 @@ object CarbonDataRDDFactory extends Logging {
storeLocation,
compactionModel.carbonTable,
kettleHomePath,
- compactionModel.cubeCreationTime,
+ compactionModel.tableCreationTime,
loadsToMerge,
sqlContext
)
@@ -455,7 +454,7 @@ object CarbonDataRDDFactory extends Logging {
var currentRestructNumber = -1
// for handling of the segment Merging.
- def handleSegmentMerging(cubeCreationTime: Long): Unit = {
+ def handleSegmentMerging(tableCreationTime: Long): Unit = {
logger
.info("compaction need status is " + CarbonDataMergerUtil.checkIfAutoLoadMergingRequired())
if (CarbonDataMergerUtil.checkIfAutoLoadMergingRequired()) {
@@ -468,7 +467,7 @@ object CarbonDataRDDFactory extends Logging {
val compactionModel = CompactionModel(compactionSize,
CompactionType.MINOR_COMPACTION,
carbonTable,
- cubeCreationTime
+ tableCreationTime
)
val lock = CarbonLockFactory
.getCarbonLockObj(carbonTable.getMetaDataFilepath, LockUsage.COMPACTION_LOCK)
@@ -566,13 +565,13 @@ object CarbonDataRDDFactory extends Logging {
// reading the start time of data load.
val loadStartTime = CarbonLoaderUtil.readCurrentTime()
carbonLoadModel.setFactTimeStamp(loadStartTime)
- val cubeCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
- .getCubeCreationTime(carbonLoadModel.getDatabaseName, carbonLoadModel.getTableName)
+ val tableCreationTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
+ .getTableCreationTime(carbonLoadModel.getDatabaseName, carbonLoadModel.getTableName)
val schemaLastUpdatedTime = CarbonEnv.getInstance(sqlContext).carbonCatalog
.getSchemaLastUpdatedTime(carbonLoadModel.getDatabaseName, carbonLoadModel.getTableName)
// compaction handling
- handleSegmentMerging(cubeCreationTime)
+ handleSegmentMerging(tableCreationTime)
// get partition way from configuration
// val isTableSplitPartition = CarbonProperties.getInstance().getProperty(
@@ -710,7 +709,7 @@ object CarbonDataRDDFactory extends Logging {
columinar,
currentRestructNumber,
currentLoadCount,
- cubeCreationTime,
+ tableCreationTime,
schemaLastUpdatedTime,
blocksGroupBy,
isTableSplitPartition
@@ -765,9 +764,7 @@ object CarbonDataRDDFactory extends Logging {
aggTables.asScala.foreach { aggTableName =>
CarbonLoaderUtil
.deleteSlice(partitioner.partitionCount, carbonLoadModel.getDatabaseName,
- carbonLoadModel.getTableName, aggTableName, hdfsStoreLocation,
- currentRestructNumber, newSlice
- )
+ carbonLoadModel.getTableName, hdfsStoreLocation, currentRestructNumber, newSlice)
}
}
message = "Dataload failure"
@@ -816,14 +813,14 @@ object CarbonDataRDDFactory extends Logging {
def deleteLoadsAndUpdateMetadata(
carbonLoadModel: CarbonLoadModel,
- cube: CarbonTable, partitioner: Partitioner,
+ table: CarbonTable, partitioner: Partitioner,
hdfsStoreLocation: String,
isForceDeletion: Boolean,
currentRestructNumber: Integer) {
if (LoadMetadataUtil.isLoadDeletionRequired(carbonLoadModel)) {
val loadMetadataFilePath = CarbonLoaderUtil
.extractLoadMetadataFileLocation(carbonLoadModel)
- val segmentStatusManager = new SegmentStatusManager(cube.getAbsoluteTableIdentifier)
+ val segmentStatusManager = new SegmentStatusManager(table.getAbsoluteTableIdentifier)
val details = segmentStatusManager
.readLoadMetadata(loadMetadataFilePath)
@@ -846,10 +843,10 @@ object CarbonDataRDDFactory extends Logging {
def dropTable(
sc: SparkContext,
schema: String,
- cube: String,
+ table: String,
partitioner: Partitioner) {
val v: Value[Array[Object]] = new ValueImpl()
- new CarbonDropTableRDD(sc, v, schema, cube, partitioner).collect
+ new CarbonDropTableRDD(sc, v, schema, table, partitioner).collect
}
def cleanFiles(
@@ -857,20 +854,20 @@ object CarbonDataRDDFactory extends Logging {
carbonLoadModel: CarbonLoadModel,
hdfsStoreLocation: String,
partitioner: Partitioner) {
- val cube = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
+ val table = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance
.getCarbonTable(carbonLoadModel.getDatabaseName + "_" + carbonLoadModel.getTableName)
- val metaDataPath: String = cube.getMetaDataFilepath
+ val metaDataPath: String = table.getMetaDataFilepath
var currentRestructNumber = CarbonUtil
.checkAndReturnCurrentRestructFolderNumber(metaDataPath, "RS_", false)
if (-1 == currentRestructNumber) {
currentRestructNumber = 0
}
val carbonLock = CarbonLockFactory
- .getCarbonLockObj(cube.getMetaDataFilepath, LockUsage.METADATA_LOCK)
+ .getCarbonLockObj(table.getMetaDataFilepath, LockUsage.METADATA_LOCK)
try {
if (carbonLock.lockWithRetries()) {
deleteLoadsAndUpdateMetadata(carbonLoadModel,
- cube,
+ table,
partitioner,
hdfsStoreLocation,
isForceDeletion = true,
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadByDateRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadByDateRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadByDateRDD.scala
index 889166a..ce09d0d 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadByDateRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadByDateRDD.scala
@@ -33,8 +33,8 @@ import org.carbondata.spark.util.CarbonQueryUtil
class CarbonDeleteLoadByDateRDD[K, V](
sc: SparkContext,
result: DeletedLoadResult[K, V],
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
dateField: String,
dateFieldActualName: String,
dateValue: String,
@@ -49,7 +49,7 @@ class CarbonDeleteLoadByDateRDD[K, V](
sc.setLocalProperty("spark.scheduler.pool", "DDL")
override def getPartitions: Array[Partition] = {
- val splits = CarbonQueryUtil.getTableSplits(schemaName, cubeName, null, partitioner)
+ val splits = CarbonQueryUtil.getTableSplits(databaseName, tableName, null, partitioner)
splits.zipWithIndex.map {s =>
new CarbonLoadPartition(id, s._2, s._1)
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadRDD.scala
index 4616ca9..c4c5ded 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDeleteLoadRDD.scala
@@ -31,14 +31,14 @@ class CarbonDeleteLoadRDD[V: ClassTag](
sc: SparkContext,
valueClass: Value[V],
loadId: Int,
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
partitioner: Partitioner)
extends RDD[V](sc, Nil) with Logging {
sc.setLocalProperty("spark.scheduler.pool", "DDL")
override def getPartitions: Array[Partition] = {
- val splits = CarbonQueryUtil.getTableSplits(schemaName, cubeName, null, partitioner)
+ val splits = CarbonQueryUtil.getTableSplits(databaseName, tableName, null, partitioner)
splits.zipWithIndex.map {f =>
new CarbonLoadPartition(id, f._2, f._1)
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDropTableRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDropTableRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDropTableRDD.scala
index 513916c..acd98b5 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDropTableRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonDropTableRDD.scala
@@ -29,15 +29,15 @@ import org.carbondata.spark.util.CarbonQueryUtil
class CarbonDropTableRDD[V: ClassTag](
sc: SparkContext,
valueClass: Value[V],
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
partitioner: Partitioner)
extends RDD[V](sc, Nil) with Logging {
sc.setLocalProperty("spark.scheduler.pool", "DDL")
override def getPartitions: Array[Partition] = {
- val splits = CarbonQueryUtil.getTableSplits(schemaName, cubeName, null, partitioner)
+ val splits = CarbonQueryUtil.getTableSplits(databaseName, tableName, null, partitioner)
splits.zipWithIndex.map { s =>
new CarbonLoadPartition(id, s._2, s._1)
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala
index c1361f5..f26cedf 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonMergerRDD.scala
@@ -58,7 +58,7 @@ class CarbonMergerRDD[K, V](
val hdfsStoreLocation = carbonMergerMapping.hdfsStoreLocation
val metadataFilePath = carbonMergerMapping.metadataFilePath
val mergedLoadName = carbonMergerMapping.mergedLoadName
- val schemaName = carbonMergerMapping.schemaName
+ val databaseName = carbonMergerMapping.databaseName
val factTableName = carbonMergerMapping.factTableName
val tableId = carbonMergerMapping.tableId
override def compute(theSplit: Partition, context: TaskContext): Iterator[(K, V)] = {
@@ -97,7 +97,7 @@ class CarbonMergerRDD[K, V](
colCardinality
)
- val exec = new CarbonCompactionExecutor(segmentMapping, segmentProperties, schemaName,
+ val exec = new CarbonCompactionExecutor(segmentMapping, segmentProperties, databaseName,
factTableName, hdfsStoreLocation, carbonLoadModel.getCarbonDataLoadSchema.getCarbonTable,
dataFileMetadataSegMapping
)
@@ -122,7 +122,7 @@ class CarbonMergerRDD[K, V](
CarbonCommonConstants.LOAD_FOLDER.length(), mergedLoadName.length()
)
- val tempStoreLoc = CarbonDataProcessorUtil.getLocalDataFolderLocation(schemaName,
+ val tempStoreLoc = CarbonDataProcessorUtil.getLocalDataFolderLocation(databaseName,
factTableName,
carbonLoadModel.getTaskNo,
"0",
@@ -133,7 +133,7 @@ class CarbonMergerRDD[K, V](
carbonLoadModel.setPartitionId("0")
val merger =
new RowResultMerger(result2,
- schemaName,
+ databaseName,
factTableName,
segmentProperties,
tempStoreLoc,
@@ -171,7 +171,7 @@ class CarbonMergerRDD[K, V](
override def getPartitions: Array[Partition] = {
val startTime = System.currentTimeMillis()
val absoluteTableIdentifier: AbsoluteTableIdentifier = new AbsoluteTableIdentifier(
- hdfsStoreLocation, new CarbonTableIdentifier(schemaName, factTableName, tableId)
+ hdfsStoreLocation, new CarbonTableIdentifier(databaseName, factTableName, tableId)
)
val (carbonInputFormat: CarbonInputFormat[Array[Object]], job: Job) =
QueryPlanUtil.createCarbonInputFormat(absoluteTableIdentifier)
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
index e7f131d..7783aaf 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/CarbonScanRDD.scala
@@ -64,7 +64,7 @@ class CarbonScanRDD[V: ClassTag](
filterExpression: Expression,
keyClass: RawValue[V],
@transient conf: Configuration,
- cubeCreationTime: Long,
+ tableCreationTime: Long,
schemaLastUpdatedTime: Long,
baseStoreLocation: String)
extends RDD[V](sc, Nil) with Logging {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/rdd/Compactor.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/rdd/Compactor.scala b/integration/spark/src/main/scala/org/carbondata/spark/rdd/Compactor.scala
index d63e730..056e336 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/rdd/Compactor.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/rdd/Compactor.scala
@@ -46,14 +46,14 @@ object Compactor {
storeLocation: String,
carbonTable: CarbonTable,
kettleHomePath: String,
- cubeCreationTime: Long,
+ tableCreationTime: Long,
loadsToMerge: java.util.List[LoadMetadataDetails],
sqlContext: SQLContext): Unit = {
val startTime = System.nanoTime();
val mergedLoadName = CarbonDataMergerUtil.getMergedLoadName(loadsToMerge)
var finalMergeStatus = false
- val schemaName: String = carbonLoadModel.getDatabaseName
+ val databaseName: String = carbonLoadModel.getDatabaseName
val factTableName = carbonLoadModel.getTableName
val storePath = hdfsStoreLocation
val validSegments: Array[String] = CarbonDataMergerUtil
@@ -65,8 +65,8 @@ object Compactor {
carbonTable.getMetaDataFilepath(),
mergedLoadName,
kettleHomePath,
- cubeCreationTime,
- schemaName,
+ tableCreationTime,
+ databaseName,
factTableName,
validSegments,
carbonTable.getAbsoluteTableIdentifier.getCarbonTableIdentifier.getTableId
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/carbondata/spark/util/GlobalDictionaryUtil.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/carbondata/spark/util/GlobalDictionaryUtil.scala b/integration/spark/src/main/scala/org/carbondata/spark/util/GlobalDictionaryUtil.scala
index 2c23a07..8d0f31c 100644
--- a/integration/spark/src/main/scala/org/carbondata/spark/util/GlobalDictionaryUtil.scala
+++ b/integration/spark/src/main/scala/org/carbondata/spark/util/GlobalDictionaryUtil.scala
@@ -407,7 +407,7 @@ object GlobalDictionaryUtil extends Logging {
// update CarbonDataLoadSchema
val carbonTable = catalog.lookupRelation1(Option(model.table.getDatabaseName),
model.table.getTableName)(sqlContext)
- .asInstanceOf[CarbonRelation].cubeMeta.carbonTable
+ .asInstanceOf[CarbonRelation].tableMeta.carbonTable
carbonLoadModel.setCarbonDataLoadSchema(new CarbonDataLoadSchema(carbonTable))
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala
index 5909419..79ba649 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/AllDataTypesTestCaseAggregate.scala
@@ -37,51 +37,51 @@ class AllDataTypesTestCaseAggregate extends QueryTest with BeforeAndAfterAll {
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
sql(
- "CREATE TABLE alldatatypescubeAGG (empno int, empname String, designation String, doj " +
+ "CREATE TABLE alldatatypestableAGG (empno int, empname String, designation String, doj " +
"Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname " +
"String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance " +
"int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
sql(
- "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE alldatatypescubeAGG " +
+ "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE alldatatypestableAGG " +
"OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
}
test(
- "select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeAGG where " +
+ "select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableAGG where " +
"empname in ('arvind','ayushi') group by empno,empname,utilization")
{
checkAnswer(
sql(
- "select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeAGG where" +
+ "select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableAGG where" +
" empname in ('arvind','ayushi') group by empno,empname,utilization"),
Seq(Row(11, "arvind", 96.2, 1, 11), Row(15, "ayushi", 91.5, 1, 15)))
}
test(
- "select empname,trim(designation),avg(salary),avg(empno) from alldatatypescubeAGG where " +
+ "select empname,trim(designation),avg(salary),avg(empno) from alldatatypestableAGG where " +
"empname in ('arvind','ayushi') group by empname,trim(designation)")
{
checkAnswer(
sql(
- "select empname,trim(designation),avg(salary),avg(empno) from alldatatypescubeAGG where " +
+ "select empname,trim(designation),avg(salary),avg(empno) from alldatatypestableAGG where " +
"empname in ('arvind','ayushi') group by empname,trim(designation)"),
Seq(Row("arvind", "SE", 5040.56, 11.0), Row("ayushi", "SSA", 13245.48, 15.0)))
}
test(
"select empname,length(designation),max(empno),min(empno), avg(empno) from " +
- "alldatatypescubeAGG where empname in ('arvind','ayushi') group by empname,length" +
+ "alldatatypestableAGG where empname in ('arvind','ayushi') group by empname,length" +
"(designation) order by empname")
{
checkAnswer(
sql(
"select empname,length(designation),max(empno),min(empno), avg(empno) from " +
- "alldatatypescubeAGG where empname in ('arvind','ayushi') group by empname,length" +
+ "alldatatypestableAGG where empname in ('arvind','ayushi') group by empname,length" +
"(designation) order by empname"),
Seq(Row("arvind", 2, 11, 11, 11.0), Row("ayushi", 3, 15, 15, 15.0)))
}
override def afterAll {
- sql("drop table alldatatypescubeAGG")
+ sql("drop table alldatatypestableAGG")
}
}
\ No newline at end of file
[2/5] incubator-carbondata git commit: change cube to table
Posted by ja...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
index b119317..a9c651c 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/aggquery/IntegerDataTypeTestCase.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE integertypecubeAgg (empno int, workgroupcategory string, deptno int, projectcode int, attendance int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypecubeAgg OPTIONS ('DELIMITER'= ',', 'QUOTECHAR'= '\"', 'FILEHEADER'='')")
+ sql("CREATE TABLE integertypetableAgg (empno int, workgroupcategory string, deptno int, projectcode int, attendance int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypetableAgg OPTIONS ('DELIMITER'= ',', 'QUOTECHAR'= '\"', 'FILEHEADER'='')")
}
- test("select empno from integertypecubeAgg") {
+ test("select empno from integertypetableAgg") {
checkAnswer(
- sql("select empno from integertypecubeAgg"),
+ sql("select empno from integertypetableAgg"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20)))
}
override def afterAll {
- sql("drop table integertypecubeAgg")
+ sql("drop table integertypetableAgg")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala
index f5fc8e9..c8a8383 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionCardinalityBoundryTest.scala
@@ -107,7 +107,7 @@ class DataCompactionCardinalityBoundryTest extends QueryTest with BeforeAndAfter
}
override def afterAll {
- /* sql("drop cube cardinalityTest") */
+ /* sql("drop table cardinalityTest") */
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.enable.load.merge", "false")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala
index 368c83b..4a69294 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionLockTest.scala
@@ -102,7 +102,7 @@ class DataCompactionLockTest extends QueryTest with BeforeAndAfterAll {
override def afterAll {
- /* sql("drop cube compactionLockTestTable") */
+ /* sql("drop table compactionLockTestTable") */
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
carbonLock.unlock()
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala
index 9f87ada..00fffab 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/datacompaction/DataCompactionTest.scala
@@ -149,7 +149,7 @@ class DataCompactionTest extends QueryTest with BeforeAndAfterAll {
}
override def afterAll {
- /* sql("drop cube normalcompaction") */
+ /* sql("drop table normalcompaction") */
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.enable.load.merge", "false")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
index e32d9c6..233ec4a 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/dataload/TestLoadDataWithHiveSyntax.scala
@@ -40,10 +40,10 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
}
test("test data loading and validate query output") {
- //Create test cube and hive table
+ //Create test table and hive table
sql("CREATE table testtable (empno int, empname String, designation String, doj String, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate String, projectenddate String,attendance double,utilization double,salary double) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('DICTIONARY_EXCLUDE'='empno,empname,designation,doj,workgroupcategory,workgroupcategoryname,deptno,deptname,projectcode,projectjoindate,projectenddate')")
sql("create table testhivetable(empno int, empname String, designation string, doj String, workgroupcategory int, workgroupcategoryname String,deptno int, deptname String, projectcode int, projectjoindate String,projectenddate String, attendance double,utilization double,salary double)row format delimited fields terminated by ','")
- //load data into test cube and hive table and validate query result
+ //load data into test table and hive table and validate query result
sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO table testtable")
sql("LOAD DATA local inpath './src/test/resources/datawithoutheader.csv' overwrite INTO table testhivetable")
checkAnswer(sql("select * from testtable"), sql("select * from testhivetable"))
@@ -51,24 +51,24 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE testtable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
sql("LOAD DATA local inpath './src/test/resources/datawithoutheader.csv' INTO table testhivetable")
checkAnswer(sql("select * from testtable"), sql("select * from testhivetable"))
- //drop test cube and table
+ //drop test table and table
sql("drop table testtable")
sql("drop table testhivetable")
}
/**
- * TODO: temporarily changing cube names to different names,
- * however deletion and creation of cube with same name
+ * TODO: temporarily changing table names to different names,
+ * however deletion and creation of table with same name
*/
test("test data loading with different case file header and validate query output") {
- //Create test cube and hive table
+ //Create test table and hive table
sql("CREATE table testtable1 (empno int, empname String, designation String, doj String, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate String, projectenddate String,attendance double,utilization double,salary double) STORED BY 'org.apache.carbondata.format' TBLPROPERTIES('DICTIONARY_EXCLUDE'='empno,empname,designation,doj,workgroupcategory,workgroupcategoryname,deptno,deptname,projectcode,projectjoindate,projectenddate')")
sql("create table testhivetable1(empno int, empname String, designation string, doj String, workgroupcategory int, workgroupcategoryname String,deptno int, deptname String, projectcode int, projectjoindate String,projectenddate String, attendance double,utilization double,salary double)row format delimited fields terminated by ','")
- //load data into test cube and hive table and validate query result
+ //load data into test table and hive table and validate query result
sql("LOAD DATA local inpath './src/test/resources/datawithoutheader.csv' INTO table testtable1 options('DELIMITER'=',', 'QUOTECHAR'='\"', 'FILEHEADER'='EMPno,empname,designation,doj,workgroupcategory,workgroupcategoryname,deptno,deptname,projectcode,projectjoindate,projectenddate,attendance,utilization,SALARY')")
sql("LOAD DATA local inpath './src/test/resources/datawithoutheader.csv' overwrite INTO table testhivetable1")
checkAnswer(sql("select * from testtable1"), sql("select * from testhivetable1"))
- //drop test cube and table
+ //drop test table and table
sql("drop table testtable1")
sql("drop table testhivetable1")
}
@@ -185,15 +185,16 @@ class TestLoadDataWithHiveSyntax extends QueryTest with BeforeAndAfterAll {
}
test("test carbon table data loading when table name is in different case with create table, for UpperCase") {
- sql("create table UPPERCASEcube(empno Int, empname String, designation String, " +
+ sql("create table UPPERCASEtable(empno Int, empname String, designation String, " +
"doj String, workgroupcategory Int, workgroupcategoryname String, deptno Int, " +
"deptname String, projectcode Int, projectjoindate String, projectenddate String, " +
"attendance Int,utilization Double,salary Double) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO table uppercasecube OPTIONS('DELIMITER'=',', 'QUOTECHAR'='\"')")
- sql("drop table UpperCaseCube")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO table uppercasetable OPTIONS('DELIMITER'=',', 'QUOTECHAR'='\"')")
+ sql("drop table UpperCaseTable")
}
test("test carbon table data loading when table name is in different case with create table ,for LowerCase") {
+ sql("drop table if exists lowercaseCUBE")
sql("create table lowercaseCUBE(empno Int, empname String, designation String, " +
"doj String, workgroupcategory Int, workgroupcategoryname String, deptno Int, " +
"deptname String, projectcode Int, projectjoindate String, projectenddate String, " +
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/deleteTable/TestDeleteTableNewDDL.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/deleteTable/TestDeleteTableNewDDL.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/deleteTable/TestDeleteTableNewDDL.scala
index 7b58308..42367b7 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/deleteTable/TestDeleteTableNewDDL.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/deleteTable/TestDeleteTableNewDDL.scala
@@ -5,7 +5,7 @@ import org.apache.spark.sql.common.util.QueryTest
import org.scalatest.BeforeAndAfterAll
/**
- * test class for testing the create cube DDL.
+ * test class for testing the create table DDL.
*/
class TestDeleteTableNewDDL extends QueryTest with BeforeAndAfterAll {
@@ -54,6 +54,7 @@ class TestDeleteTableNewDDL extends QueryTest with BeforeAndAfterAll {
}
test("drop table using case insensitive table name") {
+ sql("drop table if exists CaseInsensitiveTable")
// create table
sql(
"CREATE table CaseInsensitiveTable (ID int, date String, country String, name " +
@@ -71,7 +72,7 @@ class TestDeleteTableNewDDL extends QueryTest with BeforeAndAfterAll {
"phonetype String, serialname String, salary int) stored by 'org.apache.carbondata.format'" +
"TBLPROPERTIES('DICTIONARY_INCLUDE'='ID', 'DICTIONARY_INCLUDE'='salary')"
)
-
+ sql("drop table if exists CaseInsensitiveTable")
}
test("drop table using dbName and table name") {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
index 478203a..9fe9ba6 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/AllDataTypesTestCase.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class AllDataTypesTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE alldatatypescube (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE alldatatypescube OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
+ sql("CREATE TABLE alldatatypestable (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE alldatatypestable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
}
- test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescube where empname in ('arvind','ayushi') group by empno,empname,utilization") {
+ test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestable where empname in ('arvind','ayushi') group by empno,empname,utilization") {
checkAnswer(
- sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescube where empname in ('arvind','ayushi') group by empno,empname,utilization"),
+ sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestable where empname in ('arvind','ayushi') group by empno,empname,utilization"),
Seq(Row(11, "arvind", 96.2, 1, 11), Row(15, "ayushi", 91.5, 1, 15)))
}
override def afterAll {
- sql("drop table alldatatypescube")
+ sql("drop table alldatatypestable")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
index 65e125e..de9aa2c 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/HighCardinalityDataTypesTestCase.scala
@@ -36,9 +36,15 @@ import org.carbondata.core.util.CarbonProperties
class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
+
+ sql("drop table if exists NO_DICTIONARY_HIVE_1")
+ sql("drop table if exists NO_DICTIONARY_CARBON_1")
+ sql("drop table if exists NO_DICTIONARY_CARBON_8")
+ sql("drop table if exists filtertestTable")
+
//For the Hive table creation and data loading
sql(
- "create table NO_DICTIONARY_HIVE_6(empno int,empname string,designation string,doj " +
+ "create table NO_DICTIONARY_HIVE_1(empno int,empname string,designation string,doj " +
"Timestamp,workgroupcategory int, " +
"workgroupcategoryname string,deptno int, deptname string, projectcode int, " +
"projectjoindate Timestamp,projectenddate Timestamp,attendance int, "
@@ -48,10 +54,10 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
)
sql(
"load data local inpath './src/test/resources/datawithoutheader.csv' into table " +
- "NO_DICTIONARY_HIVE_6"
+ "NO_DICTIONARY_HIVE_1"
);
- //For Carbon cube creation.
- sql("CREATE TABLE NO_DICTIONARY_CARBON_6 (empno Int, " +
+ //For Carbon table creation.
+ sql("CREATE TABLE NO_DICTIONARY_CARBON_1 (empno Int, " +
"doj Timestamp, workgroupcategory Int, empname String,workgroupcategoryname String, " +
"deptno Int, deptname String, projectcode Int, projectjoindate Timestamp, " +
"projectenddate Timestamp, designation String,attendance Int,utilization " +
@@ -59,11 +65,11 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
"TBLPROPERTIES('DICTIONARY_EXCLUDE'='empno,empname,designation')"
)
sql(
- "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE NO_DICTIONARY_CARBON_6 " +
+ "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE NO_DICTIONARY_CARBON_1 " +
"OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')"
)
- sql("CREATE TABLE NO_DICTIONARY_CARBON_7 (empno string, " +
+ sql("CREATE TABLE NO_DICTIONARY_CARBON_8 (empno string, " +
"doj Timestamp, workgroupcategory Int, empname String,workgroupcategoryname String, " +
"deptno Int, deptname String, projectcode Int, projectjoindate Timestamp, " +
"projectenddate Timestamp, designation String,attendance Int,utilization " +
@@ -71,7 +77,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
"TBLPROPERTIES('DICTIONARY_EXCLUDE'='empno,empname,designation')"
)
sql(
- "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE NO_DICTIONARY_CARBON_7 " +
+ "LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE NO_DICTIONARY_CARBON_8 " +
"OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')"
)
sql("CREATE TABLE filtertestTable (ID Int,date Timestamp, country String, " +
@@ -90,7 +96,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
test("Count (*) with filter") {
checkAnswer(
- sql("select count(*) from NO_DICTIONARY_CARBON_6 where empno=11"),
+ sql("select count(*) from NO_DICTIONARY_CARBON_1 where empno=11"),
Seq(Row(1))
)
}
@@ -99,7 +105,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_6"),
+ sql("select empno from NO_DICTIONARY_CARBON_1"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20))
)
@@ -110,7 +116,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_7 where empno like '12%'"),
+ sql("select empno from NO_DICTIONARY_CARBON_8 where empno like '12%'"),
Seq(Row("12"))
)
}
@@ -119,7 +125,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_7 where empno>'19'"),
+ sql("select empno from NO_DICTIONARY_CARBON_8 where empno>'19'"),
Seq(Row("20"))
)
}
@@ -128,7 +134,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_6 where empno in(11,12,13)"),
+ sql("select empno from NO_DICTIONARY_CARBON_1 where empno in(11,12,13)"),
Seq(Row(11), Row(12), Row(13))
)
}
@@ -136,7 +142,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_6 where empno not in(11,12,13,14,15,16,17)"),
+ sql("select empno from NO_DICTIONARY_CARBON_1 where empno not in(11,12,13,14,15,16,17)"),
Seq(Row(18), Row(19), Row(20))
)
}
@@ -145,7 +151,7 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno from NO_DICTIONARY_CARBON_6 where empno=17"),
+ sql("select empno from NO_DICTIONARY_CARBON_1 where empno=17"),
Seq(Row(17))
)
}
@@ -164,8 +170,8 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
- sql("select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_6 where empno=17"),
- sql("select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_6 where empno=17")
+ sql("select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_1 where empno=17"),
+ sql("select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_1 where empno=17")
)
}
@@ -173,8 +179,8 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
test("ORDER Query with NO_DICTIONARY_COLUMN Compare With HIVE RESULT") {
checkAnswer(
- sql("select empno from NO_DICTIONARY_HIVE_6 order by empno"),
- sql("select empno from NO_DICTIONARY_CARBON_6 order by empno")
+ sql("select empno from NO_DICTIONARY_HIVE_1 order by empno"),
+ sql("select empno from NO_DICTIONARY_CARBON_1 order by empno")
)
}
//TODO need to add filter test cases for no dictionary columns
@@ -183,30 +189,30 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
// RESULT") {
//
// checkAnswer(
- // sql("select empno from NO_DICTIONARY_HIVE_6 where empno=15 and deptno=12"),
- // sql("select empno from NO_DICTIONARY_CARBON_6 where empno=15 and deptno=12"))
+ // sql("select empno from NO_DICTIONARY_HIVE_1 where empno=15 and deptno=12"),
+ // sql("select empno from NO_DICTIONARY_CARBON_1 where empno=15 and deptno=12"))
// }
test("Distinct Query with NO_DICTIONARY_COLUMN Compare With HIVE RESULT") {
checkAnswer(
- sql("select count(distinct empno) from NO_DICTIONARY_HIVE_6"),
- sql("select count(distinct empno) from NO_DICTIONARY_CARBON_6")
+ sql("select count(distinct empno) from NO_DICTIONARY_HIVE_1"),
+ sql("select count(distinct empno) from NO_DICTIONARY_CARBON_1")
)
}
test("Sum Query with NO_DICTIONARY_COLUMN Compare With HIVE RESULT") {
checkAnswer(
- sql("select sum(empno) from NO_DICTIONARY_HIVE_6"),
- sql("select sum(empno) from NO_DICTIONARY_CARBON_6")
+ sql("select sum(empno) from NO_DICTIONARY_HIVE_1"),
+ sql("select sum(empno) from NO_DICTIONARY_CARBON_1")
)
}
test("average Query with NO_DICTIONARY_COLUMN Compare With HIVE RESULT") {
checkAnswer(
- sql("select avg(empno) from NO_DICTIONARY_HIVE_6"),
- sql("select avg(empno) from NO_DICTIONARY_CARBON_6")
+ sql("select avg(empno) from NO_DICTIONARY_HIVE_1"),
+ sql("select avg(empno) from NO_DICTIONARY_CARBON_1")
)
}
@@ -215,11 +221,11 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
checkAnswer(
sql(
- "select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_6 group by empno,empname," +
+ "select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_1 group by empno,empname," +
"workgroupcategory"
),
sql(
- "select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_6 group by empno," +
+ "select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_1 group by empno," +
"empname,workgroupcategory"
)
)
@@ -228,13 +234,15 @@ class NO_DICTIONARY_COL_TestCase extends QueryTest with BeforeAndAfterAll {
test("Multiple column Detail Query with NO_DICTIONARY_COLUMN Compare With HIVE RESULT") {
checkAnswer(
- sql("select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_6"),
- sql("select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_6 ")
+ sql("select empno,empname,workgroupcategory from NO_DICTIONARY_HIVE_1"),
+ sql("select empno,empname,workgroupcategory from NO_DICTIONARY_CARBON_1 ")
)
}
override def afterAll {
- //sql("drop cube NO_DICTIONARY_HIVE_1")
- //sql("drop cube NO_DICTIONARY_CARBON_1")
+ sql("drop table NO_DICTIONARY_HIVE_1")
+ sql("drop table NO_DICTIONARY_CARBON_1")
+ sql("drop table NO_DICTIONARY_CARBON_8")
+ sql("drop table filtertestTable")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
index d955148..cfafd11 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/detailquery/IntegerDataTypeTestCase.scala
@@ -32,17 +32,17 @@ import org.scalatest.BeforeAndAfterAll
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE integertypecube (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE integertypecube OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
+ sql("CREATE TABLE integertypetable (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA LOCAL INPATH './src/test/resources/data.csv' INTO TABLE integertypetable OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
}
- test("select empno from integertypecube") {
+ test("select empno from integertypetable") {
checkAnswer(
- sql("select empno from integertypecube"),
+ sql("select empno from integertypetable"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20)))
}
override def afterAll {
- sql("drop table integertypecube")
+ sql("drop table integertypetable")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/directdictionary/TimestampDataTypeDirectDictionaryTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/directdictionary/TimestampDataTypeDirectDictionaryTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/directdictionary/TimestampDataTypeDirectDictionaryTestCase.scala
index b8e2988..483a766 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/directdictionary/TimestampDataTypeDirectDictionaryTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/directdictionary/TimestampDataTypeDirectDictionaryTestCase.scala
@@ -22,16 +22,15 @@ package org.carbondata.spark.testsuite.directdictionary
import java.io.File
import java.sql.Timestamp
+import org.apache.spark.sql.Row
import org.apache.spark.sql.common.util.CarbonHiveContext._
-import org.apache.spark.{SparkConf, SparkContext}
-import org.apache.spark.sql.{CarbonContext, Row}
import org.apache.spark.sql.common.util.QueryTest
import org.apache.spark.sql.hive.HiveContext
+import org.scalatest.BeforeAndAfterAll
import org.carbondata.core.constants.CarbonCommonConstants
-import org.carbondata.core.util.CarbonProperties
import org.carbondata.core.keygenerator.directdictionary.timestamp.TimeStampGranularityConstants
-import org.scalatest.BeforeAndAfterAll
+import org.carbondata.core.util.CarbonProperties
/**
@@ -52,7 +51,7 @@ class TimestampDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfte
)
CarbonProperties.getInstance().addProperty("carbon.direct.dictionary", "true")
sql(
- "CREATE TABLE directDictionaryCube (empno int,doj Timestamp, " +
+ "CREATE TABLE directDictionaryTable (empno int,doj Timestamp, " +
"salary int) " +
"STORED BY 'org.apache.carbondata.format'"
)
@@ -62,7 +61,7 @@ class TimestampDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfte
val currentDirectory = new File(this.getClass.getResource("/").getPath + "/../../")
.getCanonicalPath
var csvFilePath = currentDirectory + "/src/test/resources/datasample.csv"
- sql("LOAD DATA local inpath '" + csvFilePath + "' INTO TABLE directDictionaryCube OPTIONS" +
+ sql("LOAD DATA local inpath '" + csvFilePath + "' INTO TABLE directDictionaryTable OPTIONS" +
"('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
} catch {
@@ -71,9 +70,9 @@ class TimestampDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfte
}
}
- test("select doj from directDictionaryCube") {
+ test("select doj from directDictionaryTable") {
checkAnswer(
- sql("select doj from directDictionaryCube"),
+ sql("select doj from directDictionaryTable"),
Seq(Row(Timestamp.valueOf("2016-03-14 15:00:09.0")),
Row(Timestamp.valueOf("2016-04-14 15:00:09.0"))
)
@@ -81,31 +80,31 @@ class TimestampDataTypeDirectDictionaryTest extends QueryTest with BeforeAndAfte
}
- test("select doj from directDictionaryCube with equals filter") {
+ test("select doj from directDictionaryTable with equals filter") {
checkAnswer(
- sql("select doj from directDictionaryCube where doj='2016-03-14 15:00:09'"),
+ sql("select doj from directDictionaryTable where doj='2016-03-14 15:00:09'"),
Seq(Row(Timestamp.valueOf("2016-03-14 15:00:09")))
)
}
- test("select doj from directDictionaryCube with greater than filter") {
+ test("select doj from directDictionaryTable with greater than filter") {
checkAnswer(
- sql("select doj from directDictionaryCube where doj>'2016-03-14 15:00:09'"),
+ sql("select doj from directDictionaryTable where doj>'2016-03-14 15:00:09'"),
Seq(Row(Timestamp.valueOf("2016-04-14 15:00:09")))
)
}
- test("select count(doj) from directDictionaryCube") {
+ test("select count(doj) from directDictionaryTable") {
checkAnswer(
- sql("select count(doj) from directDictionaryCube"),
+ sql("select count(doj) from directDictionaryTable"),
Seq(Row(2))
)
}
override def afterAll {
- sql("drop table directDictionaryCube")
+ sql("drop table directDictionaryTable")
CarbonProperties.getInstance()
.addProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT, "dd-MM-yyyy")
CarbonProperties.getInstance().addProperty("carbon.direct.dictionary", "false")
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
index eec9a0c..670981f 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/AllDataTypesTestCaseFilter.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class AllDataTypesTestCaseFilter extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE alldatatypescubeFilter (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypescubeFilter OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
+ sql("CREATE TABLE alldatatypestableFilter (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypestableFilter OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
}
- test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeFilter where empname in ('arvind','ayushi') group by empno,empname,utilization") {
+ test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableFilter where empname in ('arvind','ayushi') group by empno,empname,utilization") {
checkAnswer(
- sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeFilter where empname in ('arvind','ayushi') group by empno,empname,utilization"),
+ sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableFilter where empname in ('arvind','ayushi') group by empno,empname,utilization"),
Seq(Row(11, "arvind", 96.2, 1, 11), Row(15, "ayushi", 91.5, 1, 15)))
}
override def afterAll {
- sql("drop table alldatatypescubeFilter")
+ sql("drop table alldatatypestableFilter")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
index 4d5f482..9e0434d 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/filterexpr/IntegerDataTypeTestCase.scala
@@ -32,17 +32,17 @@ import org.scalatest.BeforeAndAfterAll
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE integertypecubeFilter (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypecubeFilter OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
+ sql("CREATE TABLE integertypetableFilter (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypetableFilter OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
}
- test("select empno from integertypecubeFilter") {
+ test("select empno from integertypetableFilter") {
checkAnswer(
- sql("select empno from integertypecubeFilter"),
+ sql("select empno from integertypetableFilter"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20)))
}
override def afterAll {
- sql("drop table integertypecubeFilter")
+ sql("drop table integertypetableFilter")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
index d088021..fd5b57d 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/AllDataTypesTestCaseJoin.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class AllDataTypesTestCaseJoin extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE alldatatypescubeJoin (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypescubeJoin OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
+ sql("CREATE TABLE alldatatypestableJoin (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypestableJoin OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
}
- test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeJoin where empname in ('arvind','ayushi') group by empno,empname,utilization") {
+ test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableJoin where empname in ('arvind','ayushi') group by empno,empname,utilization") {
checkAnswer(
- sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubeJoin where empname in ('arvind','ayushi') group by empno,empname,utilization"),
+ sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestableJoin where empname in ('arvind','ayushi') group by empno,empname,utilization"),
Seq(Row(11, "arvind", 96.2, 1, 11), Row(15, "ayushi", 91.5, 1, 15)))
}
override def afterAll {
- sql("drop table alldatatypescubeJoin")
+ sql("drop table alldatatypestableJoin")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
index 6dac5c7..5a14e5f 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/joinquery/IntegerDataTypeTestCase.scala
@@ -32,17 +32,17 @@ import org.scalatest.BeforeAndAfterAll
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE integertypecubejoin (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypecubejoin OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
+ sql("CREATE TABLE integertypetablejoin (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE integertypetablejoin OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
}
- test("select empno from integertypecubejoin") {
+ test("select empno from integertypetablejoin") {
checkAnswer(
- sql("select empno from integertypecubejoin"),
+ sql("select empno from integertypetablejoin"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20)))
}
override def afterAll {
- sql("drop table integertypecubejoin")
+ sql("drop table integertypetablejoin")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
index 9562c8f..4aab691 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/AllDataTypesTestCaseSort.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class AllDataTypesTestCaseSort extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE alldatatypescubesort (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypescubesort OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
+ sql("CREATE TABLE alldatatypestablesort (empno int, empname String, designation String, doj Timestamp, workgroupcategory int, workgroupcategoryname String, deptno int, deptname String, projectcode int, projectjoindate Timestamp, projectenddate Timestamp,attendance int,utilization int,salary int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE alldatatypestablesort OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')");
}
- test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubesort where empname in ('arvind','ayushi') group by empno,empname,utilization order by empno") {
+ test("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestablesort where empname in ('arvind','ayushi') group by empno,empname,utilization order by empno") {
checkAnswer(
- sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypescubesort where empname in ('arvind','ayushi') group by empno,empname,utilization order by empno"),
+ sql("select empno,empname,utilization,count(salary),sum(empno) from alldatatypestablesort where empname in ('arvind','ayushi') group by empno,empname,utilization order by empno"),
Seq(Row(11, "arvind", 96.2, 1, 11), Row(15, "ayushi", 91.5, 1, 15)))
}
override def afterAll {
- sql("drop table alldatatypescubesort")
+ sql("drop table alldatatypestablesort")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
index d0c4a6a..f15ccae 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/testsuite/sortexpr/IntegerDataTypeTestCase.scala
@@ -33,17 +33,17 @@ import org.scalatest.BeforeAndAfterAll
class IntegerDataTypeTestCase extends QueryTest with BeforeAndAfterAll {
override def beforeAll {
- sql("CREATE TABLE inttypecubesort (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
- sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE inttypecubesort OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
+ sql("CREATE TABLE inttypetablesort (empno int, workgroupcategory string, deptno int, projectcode int,attendance int) STORED BY 'org.apache.carbondata.format'")
+ sql("LOAD DATA local inpath './src/test/resources/data.csv' INTO TABLE inttypetablesort OPTIONS('DELIMITER'= ',', 'QUOTECHAR'= '\"')")
}
- test("select empno from inttypecubesort") {
+ test("select empno from inttypetablesort") {
checkAnswer(
- sql("select empno from inttypecubesort"),
+ sql("select empno from inttypetablesort"),
Seq(Row(11), Row(12), Row(13), Row(14), Row(15), Row(16), Row(17), Row(18), Row(19), Row(20)))
}
override def afterAll {
- sql("drop table inttypecubesort")
+ sql("drop table inttypetablesort")
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala
index ef59484..0edc9e9 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/util/AutoHighCardinalityIdentifyTestCase.scala
@@ -56,10 +56,10 @@ class AutoHighCardinalityIdentifyTestCase extends QueryTest with BeforeAndAfterA
dimensionFilePath: String,
header: String): CarbonLoadModel = {
val carbonLoadModel = new CarbonLoadModel
- carbonLoadModel.setTableName(relation.cubeMeta.carbonTableIdentifier.getDatabaseName)
- carbonLoadModel.setDatabaseName(relation.cubeMeta.carbonTableIdentifier.getTableName)
- // carbonLoadModel.setSchema(relation.cubeMeta.schema)
- val table = relation.cubeMeta.carbonTable
+ carbonLoadModel.setTableName(relation.tableMeta.carbonTableIdentifier.getDatabaseName)
+ carbonLoadModel.setDatabaseName(relation.tableMeta.carbonTableIdentifier.getTableName)
+ // carbonLoadModel.setSchema(relation.tableMeta.schema)
+ val table = relation.tableMeta.carbonTable
val carbonSchema = new CarbonDataLoadSchema(table)
carbonLoadModel.setDatabaseName(table.getDatabaseName)
carbonLoadModel.setTableName(table.getFactTableName)
@@ -137,9 +137,9 @@ class AutoHighCardinalityIdentifyTestCase extends QueryTest with BeforeAndAfterA
}
test("auto identify high cardinality column in first load #396") {
- val oldTable = relation.cubeMeta.carbonTable
+ val oldTable = relation.tableMeta.carbonTable
sql(s"LOAD DATA LOCAL INPATH '$filePath' into table highcard")
- val newTable = relation.cubeMeta.carbonTable
+ val newTable = relation.tableMeta.carbonTable
sql(s"select count(hc1) from highcard").show
// check dictionary file
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/test/scala/org/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/test/scala/org/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala b/integration/spark/src/test/scala/org/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
index dff2fbc..5d26965 100644
--- a/integration/spark/src/test/scala/org/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
+++ b/integration/spark/src/test/scala/org/carbondata/spark/util/GlobalDictionaryUtilTestCase.scala
@@ -58,10 +58,10 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
dimensionFilePath: String,
header: String): CarbonLoadModel = {
val carbonLoadModel = new CarbonLoadModel
- carbonLoadModel.setTableName(relation.cubeMeta.carbonTableIdentifier.getDatabaseName)
- carbonLoadModel.setDatabaseName(relation.cubeMeta.carbonTableIdentifier.getTableName)
- // carbonLoadModel.setSchema(relation.cubeMeta.schema)
- val table = relation.cubeMeta.carbonTable
+ carbonLoadModel.setTableName(relation.tableMeta.carbonTableIdentifier.getDatabaseName)
+ carbonLoadModel.setDatabaseName(relation.tableMeta.carbonTableIdentifier.getTableName)
+ // carbonLoadModel.setSchema(relation.tableMeta.schema)
+ val table = relation.tableMeta.carbonTable
val carbonSchema = new CarbonDataLoadSchema(table)
carbonLoadModel.setDatabaseName(table.getDatabaseName)
carbonLoadModel.setTableName(table.getFactTableName)
@@ -72,7 +72,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
carbonLoadModel.setCsvDelimiter(",")
carbonLoadModel.setComplexDelimiterLevel1("\\$")
carbonLoadModel.setComplexDelimiterLevel2("\\:")
- carbonLoadModel.setStorePath(relation.cubeMeta.storePath)
+ carbonLoadModel.setStorePath(relation.tableMeta.storePath)
carbonLoadModel
}
@@ -156,7 +156,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
}
def checkDictionary(relation: CarbonRelation, columnName: String, value: String) {
- val table = relation.cubeMeta.carbonTable
+ val table = relation.tableMeta.carbonTable
val dimension = table.getDimensionByName(table.getFactTableName, columnName)
val tableIdentifier = new CarbonTableIdentifier(table.getDatabaseName, table.getFactTableName, "uniqueid")
@@ -175,7 +175,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
GlobalDictionaryUtil
.generateGlobalDictionary(CarbonHiveContext,
carbonLoadModel,
- sampleRelation.cubeMeta.storePath
+ sampleRelation.tableMeta.storePath
)
// test for dimension table
@@ -183,7 +183,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
// CarbonDataLoadModel
// carbonLoadModel = buildCarbonLoadModel(dimSampleRelation, filePath, dimFilePath, null)
// GlobalDictionaryUtil.generateGlobalDictionary(CarbonHiveContext, carbonLoadModel,
- // dimSampleRelation.cubeMeta.dataPath, false)
+ // dimSampleRelation.tableMeta.dataPath, false)
}
test("[Issue-190]load csv file without header And support complex type") {
@@ -193,7 +193,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
GlobalDictionaryUtil
.generateGlobalDictionary(CarbonHiveContext,
carbonLoadModel,
- complexRelation.cubeMeta.storePath
+ complexRelation.tableMeta.storePath
)
}
@@ -209,7 +209,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
GlobalDictionaryUtil
.generateGlobalDictionary(CarbonHiveContext,
carbonLoadModel,
- sampleRelation.cubeMeta.storePath
+ sampleRelation.tableMeta.storePath
)
checkDictionary(incrementalLoadTableRelation, "deviceInformationId", "100010")
@@ -222,7 +222,7 @@ class GlobalDictionaryUtilTestCase extends QueryTest with BeforeAndAfterAll {
GlobalDictionaryUtil
.generateGlobalDictionary(CarbonHiveContext,
carbonLoadModel,
- sampleRelation.cubeMeta.storePath
+ sampleRelation.tableMeta.storePath
)
checkDictionary(incrementalLoadTableRelation, "deviceInformationId", "100077")
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/lcm/locks/LocalFileLock.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/lcm/locks/LocalFileLock.java b/processing/src/main/java/org/carbondata/lcm/locks/LocalFileLock.java
index a1cf40a..1672117 100644
--- a/processing/src/main/java/org/carbondata/lcm/locks/LocalFileLock.java
+++ b/processing/src/main/java/org/carbondata/lcm/locks/LocalFileLock.java
@@ -62,9 +62,9 @@ public class LocalFileLock extends AbstractCarbonLock {
public static final String tmpPath;
- private String cubeName;
+ private String tableName;
- private String schemaName;
+ private String databaseName;
/**
* LOGGER for logging the messages.
@@ -84,11 +84,11 @@ public class LocalFileLock extends AbstractCarbonLock {
this.lockUsage = lockUsage;
location = location.replace("\\", "/");
String tempStr = location.substring(0, location.lastIndexOf('/'));
- cubeName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
+ tableName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
tempStr = tempStr.substring(0, tempStr.lastIndexOf('/'));
- schemaName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
+ databaseName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
this.location =
- tmpPath + File.separator + schemaName + File.separator + cubeName + File.separator
+ tmpPath + File.separator + databaseName + File.separator + tableName + File.separator
+ this.lockUsage;
initRetry();
}
@@ -100,16 +100,16 @@ public class LocalFileLock extends AbstractCarbonLock {
*/
@Override public boolean lock() {
try {
- String schemaFolderPath = tmpPath + File.separator + schemaName;
- String cubeFolderPath = schemaFolderPath + File.separator + cubeName;
- // create dir with schema name in tmp location.
- if (!FileFactory.isFileExist(schemaFolderPath, FileFactory.getFileType(tmpPath))) {
- FileFactory.mkdirs(schemaFolderPath, FileFactory.getFileType(tmpPath));
+ String databaseFolderPath = tmpPath + File.separator + databaseName;
+ String tableFolderPath = databaseFolderPath + File.separator + tableName;
+ // create dir with database name in tmp location.
+ if (!FileFactory.isFileExist(databaseFolderPath, FileFactory.getFileType(tmpPath))) {
+ FileFactory.mkdirs(databaseFolderPath, FileFactory.getFileType(tmpPath));
}
- // create dir with cube name in tmp location.
- if (!FileFactory.isFileExist(cubeFolderPath, FileFactory.getFileType(tmpPath))) {
- FileFactory.mkdirs(cubeFolderPath, FileFactory.getFileType(tmpPath));
+ // create dir with table name in tmp location.
+ if (!FileFactory.isFileExist(tableFolderPath, FileFactory.getFileType(tmpPath))) {
+ FileFactory.mkdirs(tableFolderPath, FileFactory.getFileType(tmpPath));
}
if (!FileFactory.isFileExist(location, FileFactory.getFileType(location))) {
FileFactory.createNewLockFile(location, FileFactory.getFileType(location));
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/lcm/locks/ZooKeeperLocking.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/lcm/locks/ZooKeeperLocking.java b/processing/src/main/java/org/carbondata/lcm/locks/ZooKeeperLocking.java
index ce5a62b..2d18b54 100644
--- a/processing/src/main/java/org/carbondata/lcm/locks/ZooKeeperLocking.java
+++ b/processing/src/main/java/org/carbondata/lcm/locks/ZooKeeperLocking.java
@@ -50,7 +50,7 @@ public class ZooKeeperLocking extends AbstractCarbonLock {
private static final String zooKeeperLocation = CarbonCommonConstants.ZOOKEEPER_LOCATION;
/**
- * Unique folder for each cube with SchemaName_CubeName
+ * Unique folder for each table with DatabaseName_TableName
*/
private final String tableIdFolder;
@@ -75,17 +75,17 @@ public class ZooKeeperLocking extends AbstractCarbonLock {
this.lockTypeFolder = zooKeeperLocation;
location = location.replace("\\", "/");
String tempStr = location.substring(0, location.lastIndexOf('/'));
- String schemaName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
+ String databaseName = tempStr.substring(tempStr.lastIndexOf('/') + 1, tempStr.length());
- String cubeName = location.substring(location.lastIndexOf('/') + 1, location.length());
+ String tableName = location.substring(location.lastIndexOf('/') + 1, location.length());
- this.tableIdFolder = zooKeeperLocation + CarbonCommonConstants.FILE_SEPARATOR + schemaName
- + '.' + cubeName;
+ this.tableIdFolder = zooKeeperLocation + CarbonCommonConstants.FILE_SEPARATOR + databaseName
+ + '.' + tableName;
zk = ZookeeperInit.getInstance().getZookeeper();
- this.lockTypeFolder = zooKeeperLocation + CarbonCommonConstants.FILE_SEPARATOR + schemaName
- + '.' + cubeName + CarbonCommonConstants.FILE_SEPARATOR
+ this.lockTypeFolder = zooKeeperLocation + CarbonCommonConstants.FILE_SEPARATOR + databaseName
+ + '.' + tableName + CarbonCommonConstants.FILE_SEPARATOR
+ lockUsage.toString();
try {
createBaseNode();
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/lcm/status/SegmentStatusManager.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/lcm/status/SegmentStatusManager.java b/processing/src/main/java/org/carbondata/lcm/status/SegmentStatusManager.java
index cc652d7..3949f47 100644
--- a/processing/src/main/java/org/carbondata/lcm/status/SegmentStatusManager.java
+++ b/processing/src/main/java/org/carbondata/lcm/status/SegmentStatusManager.java
@@ -165,15 +165,15 @@ public class SegmentStatusManager {
/**
* This method reads the load metadata file
*
- * @param cubeFolderPath
+ * @param tableFolderPath
* @return
*/
- public LoadMetadataDetails[] readLoadMetadata(String cubeFolderPath) {
+ public LoadMetadataDetails[] readLoadMetadata(String tableFolderPath) {
Gson gsonObjectToRead = new Gson();
DataInputStream dataInputStream = null;
BufferedReader buffReader = null;
InputStreamReader inStream = null;
- String metadataFileName = cubeFolderPath + CarbonCommonConstants.FILE_SEPARATOR
+ String metadataFileName = tableFolderPath + CarbonCommonConstants.FILE_SEPARATOR
+ CarbonCommonConstants.LOADMETADATA_FILENAME;
LoadMetadataDetails[] listOfLoadFolderDetailsArray;
@@ -228,12 +228,12 @@ public class SegmentStatusManager {
/**
* updates deletion status
* @param loadIds
- * @param cubeFolderPath
+ * @param tableFolderPath
* @return
*/
- public List<String> updateDeletionStatus(List<String> loadIds, String cubeFolderPath) {
+ public List<String> updateDeletionStatus(List<String> loadIds, String tableFolderPath) {
ICarbonLock carbonLock =
- CarbonLockFactory.getCarbonLockObj(cubeFolderPath, LockUsage.METADATA_LOCK);
+ CarbonLockFactory.getCarbonLockObj(tableFolderPath, LockUsage.METADATA_LOCK);
List<String> invalidLoadIds = new ArrayList<String>(0);
try {
if (carbonLock.lockWithRetries()) {
@@ -250,7 +250,7 @@ public class SegmentStatusManager {
return loadIds;
}
// read existing metadata details in load metadata.
- listOfLoadFolderDetailsArray = readLoadMetadata(cubeFolderPath);
+ listOfLoadFolderDetailsArray = readLoadMetadata(tableFolderPath);
if (listOfLoadFolderDetailsArray != null && listOfLoadFolderDetailsArray.length != 0) {
updateDeletionStatus(loadIds, listOfLoadFolderDetailsArray, invalidLoadIds);
if(invalidLoadIds.isEmpty())
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/api/dataloader/SchemaInfo.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/api/dataloader/SchemaInfo.java b/processing/src/main/java/org/carbondata/processing/api/dataloader/SchemaInfo.java
index 3f6b8a0..c3d71ec 100644
--- a/processing/src/main/java/org/carbondata/processing/api/dataloader/SchemaInfo.java
+++ b/processing/src/main/java/org/carbondata/processing/api/dataloader/SchemaInfo.java
@@ -22,9 +22,9 @@ package org.carbondata.processing.api.dataloader;
public class SchemaInfo {
/**
- * schemaName
+ * databaseName
*/
- private String schemaName;
+ private String databaseName;
/**
* srcDriverName
@@ -47,9 +47,9 @@ public class SchemaInfo {
private String srcPwd;
/**
- * cubeName
+ * tableName
*/
- private String cubeName;
+ private String tableName;
/**
* isAutoAggregateRequest
@@ -132,12 +132,12 @@ public class SchemaInfo {
this.srcPwd = srcPwd;
}
- public String getCubeName() {
- return cubeName;
+ public String getTableName() {
+ return tableName;
}
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
+ public void setTableName(String tableName) {
+ this.tableName = tableName;
}
/**
@@ -155,17 +155,17 @@ public class SchemaInfo {
}
/**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java b/processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java
index ca21ec1..93b65da 100644
--- a/processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java
+++ b/processing/src/main/java/org/carbondata/processing/csvload/DataGraphExecuter.java
@@ -246,7 +246,7 @@ public class DataGraphExecuter {
}
//Don't change the logic of creating key
- String key = model.getSchemaName() + '/' + model.getCubeName() + '_' + model.getTableName();
+ String key = model.getDatabaseName() + '/' + model.getTableName() + '_' + model.getTableName();
if (trans.getErrors() > 0) {
LOGGER.error("Graph Execution had errors");
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java b/processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java
index 6a66817..97a1a29 100644
--- a/processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java
+++ b/processing/src/main/java/org/carbondata/processing/csvload/GraphExecutionUtil.java
@@ -195,7 +195,7 @@ public final class GraphExecutionUtil {
/**
* This method update the column Name
*
- * @param cube
+ * @param table
* @param tableName
* @param schema
*/
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/dataprocessor/DataProcessTaskStatus.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/dataprocessor/DataProcessTaskStatus.java b/processing/src/main/java/org/carbondata/processing/dataprocessor/DataProcessTaskStatus.java
index 44ce52b..abda9a2 100644
--- a/processing/src/main/java/org/carbondata/processing/dataprocessor/DataProcessTaskStatus.java
+++ b/processing/src/main/java/org/carbondata/processing/dataprocessor/DataProcessTaskStatus.java
@@ -57,9 +57,7 @@ public class DataProcessTaskStatus implements IDataProcessStatus, Serializable {
*/
private int taskType;
- private String schemaName;
-
- private String cubeName;
+ private String databaseName;
private String tableName;
@@ -89,9 +87,8 @@ public class DataProcessTaskStatus implements IDataProcessStatus, Serializable {
private String escapeCharacter;
- public DataProcessTaskStatus(String schemaName, String cubeName, String tableName) {
- this.schemaName = schemaName;
- this.cubeName = cubeName;
+ public DataProcessTaskStatus(String databaseName, String tableName) {
+ this.databaseName = databaseName;
this.tableName = tableName;
this.desc = "";
this.setNewSchemaFilePath("");
@@ -134,17 +131,17 @@ public class DataProcessTaskStatus implements IDataProcessStatus, Serializable {
}
/**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
/**
@@ -161,20 +158,6 @@ public class DataProcessTaskStatus implements IDataProcessStatus, Serializable {
this.tableName = tableName;
}
- /**
- * @return the cubeName
- */
- public String getCubeName() {
- return cubeName;
- }
-
- /**
- * @param cubeName the cubeName to set
- */
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
- }
-
public String getDesc() {
return desc;
}
@@ -268,11 +251,11 @@ public class DataProcessTaskStatus implements IDataProcessStatus, Serializable {
*/
public IDataProcessStatus makeCopy() {
IDataProcessStatus copy = new DataProcessTaskStatus();
- copy.setCubeName(this.cubeName);
+ copy.setTableName(this.tableName);
copy.setDataloadstatusid(this.dataloadstatusid);
copy.setDesc(this.desc);
copy.setKey(this.key);
- copy.setSchemaName(schemaName);
+ copy.setDatabaseName(databaseName);
copy.setStatus(status);
return copy;
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/dataprocessor/IDataProcessStatus.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/dataprocessor/IDataProcessStatus.java b/processing/src/main/java/org/carbondata/processing/dataprocessor/IDataProcessStatus.java
index 54c7463..c1bd9a7 100644
--- a/processing/src/main/java/org/carbondata/processing/dataprocessor/IDataProcessStatus.java
+++ b/processing/src/main/java/org/carbondata/processing/dataprocessor/IDataProcessStatus.java
@@ -59,7 +59,7 @@ public interface IDataProcessStatus {
/**
* This method is used to get the Key for saving status of data loading.
*
- * @return String - Key (schemaName + cubeName + tableName).
+ * @return String - Key (databaseName + tableName + tableName).
*/
String getKey();
@@ -92,24 +92,14 @@ public interface IDataProcessStatus {
void setTaskType(int taskType);
/**
- * @return the schemaName
+ * @return the databaseName
*/
- String getSchemaName();
+ String getDatabaseName();
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- void setSchemaName(String schemaName);
-
- /**
- * @return the cubeName
- */
- String getCubeName();
-
- /**
- * @param cubeName the cubeName to set
- */
- void setCubeName(String cubeName);
+ void setDatabaseName(String databaseName);
/**
* @return the tableName
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/graphgenerator/GraphGenerator.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/graphgenerator/GraphGenerator.java b/processing/src/main/java/org/carbondata/processing/graphgenerator/GraphGenerator.java
index f61e5dd..a342c86 100644
--- a/processing/src/main/java/org/carbondata/processing/graphgenerator/GraphGenerator.java
+++ b/processing/src/main/java/org/carbondata/processing/graphgenerator/GraphGenerator.java
@@ -126,13 +126,13 @@ public class GraphGenerator {
*/
private int yAxixLocation = 100;
/**
- * schemaName
+ * databaseName
*/
- private String schemaName;
+ private String databaseName;
/**
- * cube
+ * table
*/
- // private Cube cube;
+ // private Table table;
/**
* instance
*/
@@ -203,7 +203,7 @@ public class GraphGenerator {
this.isAutoAggRequest = schemaInfo.isAutoAggregateRequest();
//this.schema = schema;
this.carbonDataLoadSchema = carbonDataLoadSchema;
- this.schemaName = carbonDataLoadSchema.getCarbonTable().getDatabaseName();
+ this.databaseName = carbonDataLoadSchema.getCarbonTable().getDatabaseName();
this.partitionID = partitionID;
this.factStoreLocation = factStoreLocation;
this.isColumnar = Boolean.parseBoolean(CarbonCommonConstants.IS_COLUMNAR_STORAGE_DEFAULTVALUE);
@@ -269,7 +269,7 @@ public class GraphGenerator {
private void initialise() {
this.instance = CarbonProperties.getInstance();
//TO-DO need to take care while supporting aggregate table using new schema.
- //aggregateTable = CarbonSchemaParser.getAggregateTable(cube, schema);
+ //aggregateTable = CarbonSchemaParser.getAggregateTable(table, schema);
this.factTableName = carbonDataLoadSchema.getCarbonTable().getFactTableName();
}
@@ -282,7 +282,7 @@ public class GraphGenerator {
private void validateAndInitialiseKettelEngine() throws GraphGeneratorException {
File file = new File(
- outputLocation + File.separator + schemaInfo.getSchemaName() + File.separator
+ outputLocation + File.separator + schemaInfo.getDatabaseName() + File.separator
+ this.tableName + File.separator + this.segmentId + File.separator + this.taskNo
+ File.separator);
boolean isDirCreated = false;
@@ -388,7 +388,7 @@ public class GraphGenerator {
trans.addTransHop(mdkeyToSliceMerger);
String graphFilePath =
- outputLocation + File.separator + schemaInfo.getSchemaName() + File.separator
+ outputLocation + File.separator + schemaInfo.getDatabaseName() + File.separator
+ this.tableName + File.separator + segmentId + File.separator + this.taskNo
+ File.separator + this.tableName + ".ktr";
generateGraphFile(trans, graphFilePath);
@@ -457,8 +457,8 @@ public class GraphGenerator {
sliceMerger.setMdkeySize(configurationInfo.getMdkeySize());
sliceMerger.setMeasureCount(configurationInfo.getMeasureCount());
sliceMerger.setTabelName(configurationInfo.getTableName());
- sliceMerger.setCubeName(schemaInfo.getCubeName());
- sliceMerger.setSchemaName(schemaInfo.getSchemaName());
+ sliceMerger.setTableName(schemaInfo.getTableName());
+ sliceMerger.setDatabaseName(schemaInfo.getDatabaseName());
if (null != this.factStoreLocation) {
sliceMerger.setCurrentRestructNumber(
CarbonUtil.getRestructureNumber(this.factStoreLocation, this.factTableName));
@@ -541,8 +541,8 @@ public class GraphGenerator {
seqMeta.setBatchSize(Integer.parseInt(graphConfiguration.getBatchSize()));
seqMeta.setNoDictionaryDims(graphConfiguration.getNoDictionaryDims());
seqMeta.setDimensionColumnsDataType(graphConfiguration.getDimensionColumnsDataType());
- seqMeta.setCubeName(schemaInfo.getCubeName());
- seqMeta.setSchemaName(schemaInfo.getSchemaName());
+ seqMeta.setTableName(schemaInfo.getTableName());
+ seqMeta.setDatabaseName(schemaInfo.getDatabaseName());
seqMeta.setComplexDelimiterLevel1(schemaInfo.getComplexDelimiterLevel1());
seqMeta.setComplexDelimiterLevel2(schemaInfo.getComplexDelimiterLevel2());
seqMeta.setCurrentRestructNumber(graphConfiguration.getCurrentRestructNumber());
@@ -602,8 +602,8 @@ public class GraphGenerator {
carbonMdKey.setSegmentId(segmentId);
carbonMdKey.setNumberOfCores(graphConfiguration.getNumberOfCores());
carbonMdKey.setTableName(graphConfiguration.getTableName());
- carbonMdKey.setSchemaName(schemaInfo.getSchemaName());
- carbonMdKey.setCubeName(schemaInfo.getCubeName());
+ carbonMdKey.setDatabaseName(schemaInfo.getDatabaseName());
+ carbonMdKey.setTableName(schemaInfo.getTableName());
carbonMdKey.setComplexTypeString(graphConfiguration.getComplexTypeString());
carbonMdKey.setCurrentRestructNumber(graphConfiguration.getCurrentRestructNumber());
carbonMdKey.setAggregateLevels(CarbonDataProcessorUtil
@@ -747,8 +747,8 @@ public class GraphGenerator {
sortRowsMeta.setSegmentId(segmentId);
sortRowsMeta.setTaskNo(taskNo);
sortRowsMeta.setTabelName(graphConfiguration.getTableName());
- sortRowsMeta.setCubeName(schemaInfo.getCubeName());
- sortRowsMeta.setSchemaName(schemaInfo.getSchemaName());
+ sortRowsMeta.setTableName(schemaInfo.getTableName());
+ sortRowsMeta.setDatabaseName(schemaInfo.getDatabaseName());
sortRowsMeta.setOutputRowSize(actualMeasures.length + 1 + "");
sortRowsMeta.setCurrentRestructNumber(graphConfiguration.getCurrentRestructNumber());
sortRowsMeta.setDimensionCount(graphConfiguration.getDimensions().length + "");
@@ -787,9 +787,9 @@ public class GraphGenerator {
.getDimensionByTableName(carbonDataLoadSchema.getCarbonTable().getFactTableName());
prepareIsUseInvertedIndex(dimensions, graphConfiguration);
graphConfiguration
- .setDimensions(CarbonSchemaParser.getCubeDimensions(dimensions, carbonDataLoadSchema));
+ .setDimensions(CarbonSchemaParser.getTableDimensions(dimensions, carbonDataLoadSchema));
graphConfiguration
- .setActualDims(CarbonSchemaParser.getCubeDimensions(dimensions, carbonDataLoadSchema));
+ .setActualDims(CarbonSchemaParser.getTableDimensions(dimensions, carbonDataLoadSchema));
graphConfiguration
.setColumnPropertiesString(CarbonSchemaParser.getColumnPropertiesString(dimensions));
graphConfiguration.setComplexTypeString(CarbonSchemaParser.getComplexTypeString(dimensions));
@@ -860,10 +860,10 @@ public class GraphGenerator {
.setActualDimensionColumns(CarbonSchemaParser.getActualDimensions(dimensions));
graphConfiguration
.setDimensionColumnsDataType(CarbonSchemaParser.getDimensionsDataTypes(dimensions));
- //graphConfiguration.setNormHiers(CarbonSchemaParser.getNormHiers(cube, schema));
+ //graphConfiguration.setNormHiers(CarbonSchemaParser.getNormHiers(table, schema));
graphConfiguration.setMeasureDataTypeInfo(CarbonSchemaParser.getMeasuresDataType(measures));
graphConfiguration.setStoreLocation(
- this.schemaName + '/' + carbonDataLoadSchema.getCarbonTable().getFactTableName());
+ this.databaseName + '/' + carbonDataLoadSchema.getCarbonTable().getFactTableName());
graphConfiguration.setBlockletSize(
(instance.getProperty("com.huawei.unibi.carbon.blocklet.size", DEFAUL_BLOCKLET_SIZE)));
graphConfiguration.setMaxBlockletInFile(
@@ -919,7 +919,7 @@ public class GraphGenerator {
return CarbonSchemaParser.QUOTES;
}
- public CarbonTable getCube() {
+ public CarbonTable getTable() {
return carbonDataLoadSchema.getCarbonTable();
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/graphgenerator/configuration/GraphConfigurationInfo.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/graphgenerator/configuration/GraphConfigurationInfo.java b/processing/src/main/java/org/carbondata/processing/graphgenerator/configuration/GraphConfigurationInfo.java
index 1b2afa5..750f5b0 100644
--- a/processing/src/main/java/org/carbondata/processing/graphgenerator/configuration/GraphConfigurationInfo.java
+++ b/processing/src/main/java/org/carbondata/processing/graphgenerator/configuration/GraphConfigurationInfo.java
@@ -64,7 +64,7 @@ public class GraphConfigurationInfo {
private String jndiName;
- private Map<String, String> cubeMeasuresAndDataTypeMap;
+ private Map<String, String> tableMeasuresAndDataTypeMap;
private String tableInputSqlQuery;
@@ -515,17 +515,17 @@ public class GraphConfigurationInfo {
}
/**
- * @return the cubeMeasuresAndDataTypeMap
+ * @return the tableMeasuresAndDataTypeMap
*/
- public Map<String, String> getCubeMeasuresAndDataTypeMap() {
- return cubeMeasuresAndDataTypeMap;
+ public Map<String, String> getTableMeasuresAndDataTypeMap() {
+ return tableMeasuresAndDataTypeMap;
}
/**
- * @param cubeMeasuresAndDataTypeMap the cubeMeasuresAndDataTypeMap to set
+ * @param tableMeasuresAndDataTypeMap the tableMeasuresAndDataTypeMap to set
*/
- public void setCubeMeasuresAndDataTypeMap(Map<String, String> cubeMeasuresAndDataTypeMap) {
- this.cubeMeasuresAndDataTypeMap = cubeMeasuresAndDataTypeMap;
+ public void setTableMeasuresAndDataTypeMap(Map<String, String> tableMeasuresAndDataTypeMap) {
+ this.tableMeasuresAndDataTypeMap = tableMeasuresAndDataTypeMap;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStep.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStep.java b/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStep.java
index 1b89823..619da5e 100644
--- a/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStep.java
+++ b/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStep.java
@@ -252,7 +252,7 @@ public class MDKeyGenStep extends BaseStep {
private boolean setStepConfiguration() {
this.tableName = meta.getTableName();
storeLocation = CarbonDataProcessorUtil
- .getLocalDataFolderLocation(meta.getSchemaName(), meta.getTableName(),
+ .getLocalDataFolderLocation(meta.getDatabaseName(), meta.getTableName(),
String.valueOf(meta.getTaskNo()), meta.getPartitionID(), meta.getSegmentId()+"");
isNoDictionaryDimension =
RemoveDictionaryUtil.convertStringToBooleanArr(meta.getNoDictionaryDimsMapping());
@@ -301,7 +301,7 @@ public class MDKeyGenStep extends BaseStep {
}
CarbonTable carbonTable = CarbonMetadata.getInstance()
- .getCarbonTable(meta.getSchemaName() + CarbonCommonConstants.UNDERSCORE + tableName);
+ .getCarbonTable(meta.getDatabaseName() + CarbonCommonConstants.UNDERSCORE + tableName);
wrapperColumnSchema = CarbonUtil
.getColumnSchemaList(carbonTable.getDimensionByTableName(tableName),
carbonTable.getMeasureByTableName(tableName));
@@ -376,7 +376,7 @@ public class MDKeyGenStep extends BaseStep {
*/
private CarbonFactDataHandlerModel getCarbonFactDataHandlerModel() {
CarbonFactDataHandlerModel carbonFactDataHandlerModel = new CarbonFactDataHandlerModel();
- carbonFactDataHandlerModel.setDatabaseName(meta.getSchemaName());
+ carbonFactDataHandlerModel.setDatabaseName(meta.getDatabaseName());
carbonFactDataHandlerModel.setTableName(tableName);
carbonFactDataHandlerModel.setMeasureCount(measureCount);
carbonFactDataHandlerModel.setMdKeyLength(data.generator.getKeySizeInBytes());
@@ -398,7 +398,7 @@ public class MDKeyGenStep extends BaseStep {
aggType = new char[measureCount];
Arrays.fill(aggType, 'n');
CarbonTable carbonTable = CarbonMetadata.getInstance().getCarbonTable(
- meta.getSchemaName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
+ meta.getDatabaseName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
List<CarbonMeasure> measures = carbonTable.getMeasureByTableName(meta.getTableName());
for (int i = 0; i < measureCount; i++) {
aggType[i] = DataTypeUtil.getAggType(measures.get(i).getDataType());
@@ -482,7 +482,7 @@ public class MDKeyGenStep extends BaseStep {
String carbonStorePath =
CarbonProperties.getInstance().getProperty(CarbonCommonConstants.STORE_LOCATION_HDFS);
CarbonTable carbonTable = CarbonMetadata.getInstance().getCarbonTable(
- meta.getSchemaName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
+ meta.getDatabaseName() + CarbonCommonConstants.UNDERSCORE + meta.getTableName());
CarbonTablePath carbonTablePath =
CarbonStorePath.getCarbonTablePath(carbonStorePath, carbonTable.getCarbonTableIdentifier());
String carbonDataDirectoryPath =
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStepMeta.java
----------------------------------------------------------------------
diff --git a/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStepMeta.java b/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStepMeta.java
index 9b65e63..92894c3 100644
--- a/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStepMeta.java
+++ b/processing/src/main/java/org/carbondata/processing/mdkeygen/MDKeyGenStepMeta.java
@@ -66,14 +66,9 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
private String numberOfCores;
/**
- * cubeName
+ * databaseName
*/
- private String cubeName;
-
- /**
- * schemaName
- */
- private String schemaName;
+ private String databaseName;
/**
* aggregateLevels
@@ -156,8 +151,8 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
tableName = "";
numberOfCores = "";
aggregateLevels = "";
- cubeName = "";
- schemaName = "";
+ tableName = "";
+ databaseName = "";
columnGroupsString = "";
noDictionaryDims = "";
currentRestructNumber = -1;
@@ -175,8 +170,8 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
retval.append(" ").append(XMLHandler.addTagValue("TableName", tableName));
retval.append(" ").append(XMLHandler.addTagValue("AggregateLevels", aggregateLevels));
retval.append(" ").append(XMLHandler.addTagValue("NumberOfCores", numberOfCores));
- retval.append(" ").append(XMLHandler.addTagValue("cubeName", cubeName));
- retval.append(" ").append(XMLHandler.addTagValue("schemaName", schemaName));
+ retval.append(" ").append(XMLHandler.addTagValue("tableName", tableName));
+ retval.append(" ").append(XMLHandler.addTagValue("databaseName", databaseName));
retval.append(" ").append(XMLHandler.addTagValue("noDictionaryDims", noDictionaryDims));
retval.append(" ").append(XMLHandler.addTagValue("measureCount", measureCount));
retval.append(" ").append(XMLHandler.addTagValue("dimensionsStoreType", columnGroupsString));
@@ -204,8 +199,8 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
tableName = XMLHandler.getTagValue(stepnode, "TableName");
aggregateLevels = XMLHandler.getTagValue(stepnode, "AggregateLevels");
numberOfCores = XMLHandler.getTagValue(stepnode, "NumberOfCores");
- schemaName = XMLHandler.getTagValue(stepnode, "schemaName");
- cubeName = XMLHandler.getTagValue(stepnode, "cubeName");
+ databaseName = XMLHandler.getTagValue(stepnode, "databaseName");
+ tableName = XMLHandler.getTagValue(stepnode, "tableName");
noDictionaryDims = XMLHandler.getTagValue(stepnode, "noDictionaryDims");
measureCount = XMLHandler.getTagValue(stepnode, "measureCount");
columnGroupsString = XMLHandler.getTagValue(stepnode, "dimensionsStoreType");
@@ -232,8 +227,8 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
rep.saveStepAttribute(idTransformation, idStep, "TableName", tableName);
rep.saveStepAttribute(idTransformation, idStep, "AggregateLevels", aggregateLevels);
rep.saveStepAttribute(idTransformation, idStep, "NumberOfCores", numberOfCores);
- rep.saveStepAttribute(idTransformation, idStep, "schemaName", schemaName);
- rep.saveStepAttribute(idTransformation, idStep, "cubeName", cubeName);
+ rep.saveStepAttribute(idTransformation, idStep, "databaseName", databaseName);
+ rep.saveStepAttribute(idTransformation, idStep, "tableName", tableName);
rep.saveStepAttribute(idTransformation, idStep, "noDictionaryDims", noDictionaryDims);
rep.saveStepAttribute(idTransformation, idStep, "measureCount", measureCount);
rep.saveStepAttribute(idTransformation, idStep, "dimensionsStoreType", columnGroupsString);
@@ -264,8 +259,8 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
tableName = rep.getStepAttributeString(idStep, "TableName");
aggregateLevels = rep.getStepAttributeString(idStep, "AggregateLevels");
numberOfCores = rep.getStepAttributeString(idStep, "NumberOfCores");
- schemaName = rep.getStepAttributeString(idStep, "schemaName");
- cubeName = rep.getStepAttributeString(idStep, "cubeName");
+ databaseName = rep.getStepAttributeString(idStep, "databaseName");
+ tableName = rep.getStepAttributeString(idStep, "tableName");
noDictionaryDims = rep.getStepAttributeString(idStep, "noDictionaryDims");
measureCount = rep.getStepAttributeString(idStep, "measureCount");
columnGroupsString = rep.getStepAttributeString(idStep, "dimensionsStoreType");
@@ -335,31 +330,17 @@ public class MDKeyGenStepMeta extends BaseStepMeta implements StepMetaInterface
}
/**
- * @return the cubeName
- */
- public String getCubeName() {
- return cubeName;
- }
-
- /**
- * @param cubeName the cubeName to set
- */
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
- }
-
- /**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @param schemaName the schemaName to set
+ * @param databaseName the databaseName to set
*/
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
/**
[4/5] incubator-carbondata git commit: change cube to table
Posted by ja...@apache.org.
change cube to table
change Cube to Table
fix style
change schemaName to databaseName
change SchemaName to DatabaseName
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/84b476bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/84b476bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/84b476bc
Branch: refs/heads/master
Commit: 84b476bc41b77d9736da916949e105dda28df31c
Parents: 6948cb0
Author: jackylk <ja...@huawei.com>
Authored: Sun Jul 17 22:57:58 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Tue Jul 19 16:33:39 2016 +0800
----------------------------------------------------------------------
.../common/logging/impl/StandardLogService.java | 4 +-
.../common/ext/ColumnUniqueIdGenerator.java | 2 +-
.../carbondata/core/cache/CarbonLRUCache.java | 2 +-
.../core/carbon/CarbonDataLoadSchema.java | 2 +-
.../carbon/metadata/schema/table/TableInfo.java | 2 +-
.../core/service/ColumnUniqueIdService.java | 4 +-
.../org/carbondata/core/util/CarbonUtil.java | 34 +--
.../org/carbondata/scan/filter/FilterUtil.java | 2 +-
.../carbondata/scan/model/CarbonQueryPlan.java | 44 ++--
.../examples/GenerateDictionaryExample.scala | 2 +-
.../hadoop/test/util/StoreCreator.java | 46 ++--
.../spark/merger/CarbonCompactionExecutor.java | 8 +-
.../spark/merger/CompactionCallable.java | 8 +-
.../spark/merger/RowResultMerger.java | 20 +-
.../carbondata/spark/load/CarbonLoaderUtil.java | 79 ++++---
.../partition/api/impl/CSVFilePartitioner.java | 23 +-
.../api/impl/QueryPartitionHelper.java | 44 ++--
.../carbondata/spark/util/CarbonQueryUtil.java | 6 +-
.../carbondata/spark/util/LoadMetadataUtil.java | 6 +-
.../spark/sql/CarbonCatalystOperators.scala | 4 +-
.../org/apache/spark/sql/CarbonContext.scala | 16 +-
.../spark/sql/CarbonDatasourceRelation.scala | 28 ++-
.../org/apache/spark/sql/CarbonOperators.scala | 10 +-
.../org/apache/spark/sql/CarbonSqlParser.scala | 29 +--
.../execution/command/carbonTableSchema.scala | 228 ++++++++++---------
.../spark/sql/hive/CarbonMetastoreCatalog.scala | 172 +++++++-------
.../spark/sql/hive/CarbonStrategies.scala | 14 +-
.../spark/rdd/CarbonCleanFilesRDD.scala | 6 +-
.../spark/rdd/CarbonDataLoadRDD.scala | 14 +-
.../spark/rdd/CarbonDataPartitionRDD.scala | 6 +-
.../spark/rdd/CarbonDataRDDFactory.scala | 81 ++++---
.../spark/rdd/CarbonDeleteLoadByDateRDD.scala | 6 +-
.../spark/rdd/CarbonDeleteLoadRDD.scala | 6 +-
.../spark/rdd/CarbonDropTableRDD.scala | 6 +-
.../carbondata/spark/rdd/CarbonMergerRDD.scala | 10 +-
.../carbondata/spark/rdd/CarbonScanRDD.scala | 2 +-
.../org/carbondata/spark/rdd/Compactor.scala | 8 +-
.../spark/util/GlobalDictionaryUtil.scala | 2 +-
.../AllDataTypesTestCaseAggregate.scala | 18 +-
.../aggquery/IntegerDataTypeTestCase.scala | 10 +-
.../DataCompactionCardinalityBoundryTest.scala | 2 +-
.../datacompaction/DataCompactionLockTest.scala | 2 +-
.../datacompaction/DataCompactionTest.scala | 2 +-
.../dataload/TestLoadDataWithHiveSyntax.scala | 23 +-
.../deleteTable/TestDeleteTableNewDDL.scala | 5 +-
.../detailquery/AllDataTypesTestCase.scala | 10 +-
.../HighCardinalityDataTypesTestCase.scala | 72 +++---
.../detailquery/IntegerDataTypeTestCase.scala | 10 +-
...estampDataTypeDirectDictionaryTestCase.scala | 29 ++-
.../filterexpr/AllDataTypesTestCaseFilter.scala | 10 +-
.../filterexpr/IntegerDataTypeTestCase.scala | 10 +-
.../joinquery/AllDataTypesTestCaseJoin.scala | 10 +-
.../joinquery/IntegerDataTypeTestCase.scala | 10 +-
.../sortexpr/AllDataTypesTestCaseSort.scala | 10 +-
.../sortexpr/IntegerDataTypeTestCase.scala | 10 +-
.../AutoHighCardinalityIdentifyTestCase.scala | 12 +-
.../util/GlobalDictionaryUtilTestCase.scala | 22 +-
.../org/carbondata/lcm/locks/LocalFileLock.java | 26 +--
.../carbondata/lcm/locks/ZooKeeperLocking.java | 14 +-
.../lcm/status/SegmentStatusManager.java | 14 +-
.../processing/api/dataloader/SchemaInfo.java | 28 +--
.../processing/csvload/DataGraphExecuter.java | 2 +-
.../processing/csvload/GraphExecutionUtil.java | 2 +-
.../dataprocessor/DataProcessTaskStatus.java | 39 +---
.../dataprocessor/IDataProcessStatus.java | 20 +-
.../graphgenerator/GraphGenerator.java | 42 ++--
.../configuration/GraphConfigurationInfo.java | 14 +-
.../processing/mdkeygen/MDKeyGenStep.java | 10 +-
.../processing/mdkeygen/MDKeyGenStepMeta.java | 55 ++---
.../merger/step/CarbonSliceMergerStep.java | 5 +-
.../merger/step/CarbonSliceMergerStepMeta.java | 52 ++---
.../processing/schema/metadata/ColumnsInfo.java | 43 +---
.../sortandgroupby/sortdata/SortDataRows.java | 20 +-
.../sortdatastep/SortKeyStep.java | 2 +-
.../sortdatastep/SortKeyStepMeta.java | 52 ++---
.../csvbased/BadRecordslogger.java | 4 +-
.../csvbased/CarbonCSVBasedSeqGenMeta.java | 41 ++--
.../csvbased/CarbonCSVBasedSeqGenStep.java | 19 +-
.../FileStoreSurrogateKeyGenForCSV.java | 6 +-
.../processing/util/CarbonSchemaParser.java | 40 ++--
80 files changed, 857 insertions(+), 956 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/common/src/main/java/org/carbondata/common/logging/impl/StandardLogService.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/carbondata/common/logging/impl/StandardLogService.java b/common/src/main/java/org/carbondata/common/logging/impl/StandardLogService.java
index 07cd7bb..2592e2a 100644
--- a/common/src/main/java/org/carbondata/common/logging/impl/StandardLogService.java
+++ b/common/src/main/java/org/carbondata/common/logging/impl/StandardLogService.java
@@ -125,8 +125,8 @@ public final class StandardLogService implements LogService {
StandardLogService.doLog = doLog;
}
- public static String getPartitionID(String cubeName) {
- return cubeName.substring(cubeName.lastIndexOf('_') + 1, cubeName.length());
+ public static String getPartitionID(String tableName) {
+ return tableName.substring(tableName.lastIndexOf('_') + 1, tableName.length());
}
public static void setThreadName(String partitionID, String queryID) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/common/ext/ColumnUniqueIdGenerator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/common/ext/ColumnUniqueIdGenerator.java b/core/src/main/java/org/carbondata/common/ext/ColumnUniqueIdGenerator.java
index 0ef3950..bc96302 100644
--- a/core/src/main/java/org/carbondata/common/ext/ColumnUniqueIdGenerator.java
+++ b/core/src/main/java/org/carbondata/common/ext/ColumnUniqueIdGenerator.java
@@ -30,7 +30,7 @@ public class ColumnUniqueIdGenerator implements ColumnUniqueIdService {
private static ColumnUniqueIdService columnUniqueIdService = new ColumnUniqueIdGenerator();
- @Override public String generateUniqueId(String schemaName, ColumnSchema columnSchema) {
+ @Override public String generateUniqueId(String databaseName, ColumnSchema columnSchema) {
return UUID.randomUUID().toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/core/cache/CarbonLRUCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/core/cache/CarbonLRUCache.java b/core/src/main/java/org/carbondata/core/cache/CarbonLRUCache.java
index 71259a9..72ee209 100644
--- a/core/src/main/java/org/carbondata/core/cache/CarbonLRUCache.java
+++ b/core/src/main/java/org/carbondata/core/cache/CarbonLRUCache.java
@@ -44,7 +44,7 @@ public final class CarbonLRUCache {
private static final LogService LOGGER =
LogServiceFactory.getLogService(CarbonLRUCache.class.getName());
/**
- * Map that will contain key as cube unique name and value as cache Holder
+ * Map that will contain key as table unique name and value as cache Holder
* object
*/
private Map<String, Cacheable> lruCacheMap;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/core/carbon/CarbonDataLoadSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/core/carbon/CarbonDataLoadSchema.java b/core/src/main/java/org/carbondata/core/carbon/CarbonDataLoadSchema.java
index 31e8243..f23f600 100644
--- a/core/src/main/java/org/carbondata/core/carbon/CarbonDataLoadSchema.java
+++ b/core/src/main/java/org/carbondata/core/carbon/CarbonDataLoadSchema.java
@@ -84,7 +84,7 @@ public class CarbonDataLoadSchema implements Serializable {
/**
* Dimension Relation object which will be filled from
- * Load DML Command to support normalized cube data load
+ * Load DML Command to support normalized table data load
*/
public static class DimensionRelation implements Serializable {
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/core/carbon/metadata/schema/table/TableInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/core/carbon/metadata/schema/table/TableInfo.java b/core/src/main/java/org/carbondata/core/carbon/metadata/schema/table/TableInfo.java
index 0b3348c..0a9cfca 100644
--- a/core/src/main/java/org/carbondata/core/carbon/metadata/schema/table/TableInfo.java
+++ b/core/src/main/java/org/carbondata/core/carbon/metadata/schema/table/TableInfo.java
@@ -56,7 +56,7 @@ public class TableInfo implements Serializable {
private List<TableSchema> aggregateTableList;
/**
- * last updated time to update the cube if any changes
+ * last updated time to update the table if any changes
*/
private long lastUpdatedTime;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/core/service/ColumnUniqueIdService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/core/service/ColumnUniqueIdService.java b/core/src/main/java/org/carbondata/core/service/ColumnUniqueIdService.java
index 9c65e3f..e2e0807 100644
--- a/core/src/main/java/org/carbondata/core/service/ColumnUniqueIdService.java
+++ b/core/src/main/java/org/carbondata/core/service/ColumnUniqueIdService.java
@@ -26,9 +26,9 @@ import org.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema;
public interface ColumnUniqueIdService {
/**
- * @param schemaName
+ * @param databaseName
* @param columnSchema
* @return generate unique id
*/
- public String generateUniqueId(String schemaName, ColumnSchema columnSchema);
+ public String generateUniqueId(String databaseName, ColumnSchema columnSchema);
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/core/util/CarbonUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/carbondata/core/util/CarbonUtil.java
index 2368139..c63dccc 100644
--- a/core/src/main/java/org/carbondata/core/util/CarbonUtil.java
+++ b/core/src/main/java/org/carbondata/core/util/CarbonUtil.java
@@ -458,17 +458,17 @@ public final class CarbonUtil {
}
/**
- * This function will rename the cube to be deleted
+ * This function will rename the table to be deleted
*
* @param partitionCount
* @param storePath
- * @param schemaName
- * @param cubeName
+ * @param databaseName
+ * @param tableName
*/
- public static void renameCubeForDeletion(int partitionCount, String storePath, String schemaName,
- String cubeName) {
- String cubeNameWithPartition = "";
- String schemaNameWithPartition = "";
+ public static void renameTableForDeletion(int partitionCount, String storePath,
+ String databaseName, String tableName) {
+ String tableNameWithPartition = "";
+ String databaseNameWithPartition = "";
String fullPath = "";
String newFilePath = "";
String newFileName = "";
@@ -477,20 +477,20 @@ public final class CarbonUtil {
FileFactory.FileType fileType = null;
ExecutorService executorService = Executors.newFixedThreadPool(10);
for (int i = 0; i < partitionCount; i++) {
- schemaNameWithPartition = schemaName + '_' + i;
- cubeNameWithPartition = cubeName + '_' + i;
- newFileName = cubeNameWithPartition + '_' + time;
- fullPath = storePath + File.separator + schemaNameWithPartition + File.separator
- + cubeNameWithPartition;
+ databaseNameWithPartition = databaseName + '_' + i;
+ tableNameWithPartition = tableName + '_' + i;
+ newFileName = tableNameWithPartition + '_' + time;
+ fullPath = storePath + File.separator + databaseNameWithPartition + File.separator
+ + tableNameWithPartition;
newFilePath =
- storePath + File.separator + schemaNameWithPartition + File.separator + newFileName;
+ storePath + File.separator + databaseNameWithPartition + File.separator + newFileName;
fileType = FileFactory.getFileType(fullPath);
try {
if (FileFactory.isFileExist(fullPath, fileType)) {
CarbonFile file = FileFactory.getCarbonFile(fullPath, fileType);
boolean isRenameSuccessfull = file.renameTo(newFilePath);
if (!isRenameSuccessfull) {
- LOGGER.error("Problem renaming the cube :: " + fullPath);
+ LOGGER.error("Problem renaming the table :: " + fullPath);
c = new DeleteFolderAndFiles(file);
executorService.submit(c);
} else {
@@ -499,7 +499,7 @@ public final class CarbonUtil {
}
}
} catch (IOException e) {
- LOGGER.error("Problem renaming the cube :: " + fullPath);
+ LOGGER.error("Problem renaming the table :: " + fullPath);
}
}
executorService.shutdown();
@@ -867,7 +867,7 @@ public final class CarbonUtil {
}
}
- public static String getCarbonStorePath(String schemaName, String cubeName) {
+ public static String getCarbonStorePath(String databaseName, String tableName) {
CarbonProperties prop = CarbonProperties.getInstance();
if (null == prop) {
return null;
@@ -1075,7 +1075,7 @@ public final class CarbonUtil {
}
/**
- * Thread to delete the cubes
+ * Thread to delete the tables
*
*/
private static final class DeleteFolderAndFiles implements Callable<Void> {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/scan/filter/FilterUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/scan/filter/FilterUtil.java b/core/src/main/java/org/carbondata/scan/filter/FilterUtil.java
index a991d0f..d08b5a8 100644
--- a/core/src/main/java/org/carbondata/scan/filter/FilterUtil.java
+++ b/core/src/main/java/org/carbondata/scan/filter/FilterUtil.java
@@ -897,7 +897,7 @@ public final class FilterUtil {
// if (DataType.TIMESTAMP == carbonDimension.getDataType()) {
// return Integer.MAX_VALUE;
// }
- // Get data from all the available slices of the cube
+ // Get data from all the available slices of the table
if (null != dimCarinality) {
return dimCarinality[carbonDimension.getKeyOrdinal()];
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/core/src/main/java/org/carbondata/scan/model/CarbonQueryPlan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/carbondata/scan/model/CarbonQueryPlan.java b/core/src/main/java/org/carbondata/scan/model/CarbonQueryPlan.java
index 840aa02..d914b06 100644
--- a/core/src/main/java/org/carbondata/scan/model/CarbonQueryPlan.java
+++ b/core/src/main/java/org/carbondata/scan/model/CarbonQueryPlan.java
@@ -40,18 +40,14 @@ public class CarbonQueryPlan implements Serializable {
private static final long serialVersionUID = -9036044826928017164L;
/**
- * Schema name , if user asks select * from datasight.employee.
- * then datasight is the schame name.
- * Remains null if the user does not select schema name.
+ * Database name
*/
- private String schemaName;
+ private String databaseName;
/**
- * Cube name .
- * if user asks select * from datasight.employee. then employee is the cube name.
- * It is mandatory.
+ * Table name
*/
- private String cubeName;
+ private String tableName;
/**
* List of dimensions.
@@ -110,23 +106,23 @@ public class CarbonQueryPlan implements Serializable {
private boolean rawDetailQuery;
/**
- * Constructor created with cube name.
+ * Constructor created with table name.
*
- * @param cubeName
+ * @param tableName
*/
- public CarbonQueryPlan(String cubeName) {
- this.cubeName = cubeName;
+ public CarbonQueryPlan(String tableName) {
+ this.tableName = tableName;
}
/**
- * Constructor created with schema name and cube name.
+ * Constructor created with database name and table name.
*
- * @param schemaName
- * @param cubeName
+ * @param databaseName
+ * @param tableName
*/
- public CarbonQueryPlan(String schemaName, String cubeName) {
- this.cubeName = cubeName;
- this.schemaName = schemaName;
+ public CarbonQueryPlan(String databaseName, String tableName) {
+ this.tableName = tableName;
+ this.databaseName = databaseName;
}
/**
@@ -160,17 +156,17 @@ public class CarbonQueryPlan implements Serializable {
}
/**
- * @return the schemaName
+ * @return the databaseName
*/
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
/**
- * @return the cubeName
+ * @return the tableName
*/
- public String getCubeName() {
- return cubeName;
+ public String getTableName() {
+ return tableName;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/examples/src/main/scala/org/carbondata/examples/GenerateDictionaryExample.scala
----------------------------------------------------------------------
diff --git a/examples/src/main/scala/org/carbondata/examples/GenerateDictionaryExample.scala b/examples/src/main/scala/org/carbondata/examples/GenerateDictionaryExample.scala
index 5269d05..728bdb0 100644
--- a/examples/src/main/scala/org/carbondata/examples/GenerateDictionaryExample.scala
+++ b/examples/src/main/scala/org/carbondata/examples/GenerateDictionaryExample.scala
@@ -64,7 +64,7 @@ object GenerateDictionaryExample {
val carbonRelation = CarbonEnv.getInstance(cc).carbonCatalog.
lookupRelation1(Option(dataBaseName),
tableName) (cc).asInstanceOf[CarbonRelation]
- val carbonTable = carbonRelation.cubeMeta.carbonTable
+ val carbonTable = carbonRelation.tableMeta.carbonTable
val dimensions = carbonTable.getDimensionByTableName(tableName.toLowerCase())
.toArray.map(_.asInstanceOf[CarbonDimension])
// scalastyle:off println
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/hadoop/src/test/java/org/carbondata/hadoop/test/util/StoreCreator.java
----------------------------------------------------------------------
diff --git a/hadoop/src/test/java/org/carbondata/hadoop/test/util/StoreCreator.java b/hadoop/src/test/java/org/carbondata/hadoop/test/util/StoreCreator.java
index 3776918..0919e74 100644
--- a/hadoop/src/test/java/org/carbondata/hadoop/test/util/StoreCreator.java
+++ b/hadoop/src/test/java/org/carbondata/hadoop/test/util/StoreCreator.java
@@ -131,8 +131,8 @@ public class StoreCreator {
LoadModel loadModel = new LoadModel();
String partitionId = "0";
loadModel.setSchema(schema);
- loadModel.setSchemaName(absoluteTableIdentifier.getCarbonTableIdentifier().getDatabaseName());
- loadModel.setCubeName(absoluteTableIdentifier.getCarbonTableIdentifier().getTableName());
+ loadModel.setDatabaseName(absoluteTableIdentifier.getCarbonTableIdentifier().getDatabaseName());
+ loadModel.setTableName(absoluteTableIdentifier.getCarbonTableIdentifier().getTableName());
loadModel.setTableName(absoluteTableIdentifier.getCarbonTableIdentifier().getTableName());
loadModel.setFactFilePath(factFilePath);
loadModel.setLoadMetadataDetails(new ArrayList<LoadMetadataDetails>());
@@ -334,9 +334,9 @@ public class StoreCreator {
System.setProperty("KETTLE_HOME", kettleHomePath);
new File(storeLocation).mkdirs();
String outPutLoc = storeLocation + "/etl";
- String schemaName = loadModel.getSchemaName();
- String cubeName = loadModel.getCubeName();
- String tempLocationKey = schemaName + '_' + cubeName + "_1";
+ String databaseName = loadModel.getDatabaseName();
+ String tableName = loadModel.getTableName();
+ String tempLocationKey = databaseName + '_' + tableName + "_1";
CarbonProperties.getInstance().addProperty(tempLocationKey, storeLocation);
CarbonProperties.getInstance().addProperty("store_output_location", outPutLoc);
CarbonProperties.getInstance().addProperty("send.signal.load", "false");
@@ -349,18 +349,17 @@ public class StoreCreator {
CarbonProperties.getInstance().addProperty("is.compressed.keyblock", "false");
CarbonProperties.getInstance().addProperty("carbon.leaf.node.size", "120000");
- String tableName = loadModel.getTableName();
String fileNamePrefix = "";
String graphPath =
- outPutLoc + File.separator + loadModel.getSchemaName() + File.separator + tableName
+ outPutLoc + File.separator + loadModel.getDatabaseName() + File.separator + tableName
+ File.separator + 0 + File.separator + 1 + File.separator + tableName + ".ktr";
File path = new File(graphPath);
if (path.exists()) {
path.delete();
}
- DataProcessTaskStatus schmaModel = new DataProcessTaskStatus(schemaName, cubeName, tableName);
+ DataProcessTaskStatus schmaModel = new DataProcessTaskStatus(databaseName, tableName);
schmaModel.setCsvFilePath(loadModel.getFactFilePath());
SchemaInfo info = new SchemaInfo();
BlockDetails blockDetails = new BlockDetails(loadModel.getFactFilePath(),
@@ -368,8 +367,8 @@ public class StoreCreator {
GraphGenerator.blockInfo.put("qwqwq", new BlockDetails[] { blockDetails });
schmaModel.setBlocksID("qwqwq");
schmaModel.setEscapeCharacter("\\");
- info.setSchemaName(schemaName);
- info.setCubeName(cubeName);
+ info.setDatabaseName(databaseName);
+ info.setTableName(tableName);
generateGraph(schmaModel, info, loadModel.getTableName(), "0", loadModel.getSchema(), null,
currentRestructNumber, loadModel.getLoadMetadataDetails());
@@ -380,11 +379,11 @@ public class StoreCreator {
info, "0", loadModel.getSchema());
// LoadMetadataDetails[] loadDetails =
// CarbonUtil.readLoadMetadata(loadModel.schema.getCarbonTable().getMetaDataFilepath());
- writeLoadMetadata(loadModel.schema, loadModel.getCubeName(), loadModel.getTableName(),
+ writeLoadMetadata(loadModel.schema, loadModel.getTableName(), loadModel.getTableName(),
new ArrayList<LoadMetadataDetails>());
String segLocation =
- storeLocation + "/" + schemaName + "/" + tableName + "/Fact/Part0/Segment_0";
+ storeLocation + "/" + databaseName + "/" + tableName + "/Fact/Part0/Segment_0";
File file = new File(segLocation);
File factFile = null;
File[] folderList = file.listFiles();
@@ -408,8 +407,8 @@ public class StoreCreator {
}
}
- public static void writeLoadMetadata(CarbonDataLoadSchema schema, String schemaName,
- String cubeName, List<LoadMetadataDetails> listOfLoadFolderDetails) throws IOException {
+ public static void writeLoadMetadata(CarbonDataLoadSchema schema, String databaseName,
+ String tableName, List<LoadMetadataDetails> listOfLoadFolderDetails) throws IOException {
LoadMetadataDetails loadMetadataDetails = new LoadMetadataDetails();
loadMetadataDetails.setTimestamp(readCurrentTime());
loadMetadataDetails.setLoadStatus("SUCCESS");
@@ -511,8 +510,7 @@ public class StoreCreator {
private CarbonDataLoadSchema schema;
private String tableName;
- private String cubeName;
- private String schemaName;
+ private String databaseName;
private List<LoadMetadataDetails> loadMetaDetail;
private String factFilePath;
@@ -536,12 +534,8 @@ public class StoreCreator {
return tableName;
}
- public String getCubeName() {
- return cubeName;
- }
-
- public String getSchemaName() {
- return schemaName;
+ public String getDatabaseName() {
+ return databaseName;
}
public void setLoadMetadataDetails(List<LoadMetadataDetails> loadMetaDetail) {
@@ -556,12 +550,8 @@ public class StoreCreator {
this.tableName = tableName;
}
- public void setCubeName(String cubeName) {
- this.cubeName = cubeName;
- }
-
- public void setSchemaName(String schemaName) {
- this.schemaName = schemaName;
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CarbonCompactionExecutor.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CarbonCompactionExecutor.java b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CarbonCompactionExecutor.java
index e2cd277..d001a59 100644
--- a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CarbonCompactionExecutor.java
+++ b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CarbonCompactionExecutor.java
@@ -55,7 +55,7 @@ public class CarbonCompactionExecutor {
private final Map<String, List<DataFileFooter>> dataFileMetadataSegMapping;
private QueryExecutor queryExecutor;
private final SegmentProperties destinationSegProperties;
- private final String schemaName;
+ private final String databaseName;
private final String factTableName;
private final Map<String, TaskBlockInfo> segmentMapping;
private final String storePath;
@@ -70,13 +70,13 @@ public class CarbonCompactionExecutor {
* Constructor
* @param segmentMapping
* @param segmentProperties
- * @param schemaName
+ * @param databaseName
* @param factTableName
* @param storePath
* @param carbonTable
*/
public CarbonCompactionExecutor(Map<String, TaskBlockInfo> segmentMapping,
- SegmentProperties segmentProperties, String schemaName, String factTableName,
+ SegmentProperties segmentProperties, String databaseName, String factTableName,
String storePath, CarbonTable carbonTable,
Map<String, List<DataFileFooter>> dataFileMetadataSegMapping) {
@@ -84,7 +84,7 @@ public class CarbonCompactionExecutor {
this.destinationSegProperties = segmentProperties;
- this.schemaName = schemaName;
+ this.databaseName = databaseName;
this.factTableName = factTableName;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CompactionCallable.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CompactionCallable.java b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CompactionCallable.java
index 7289e61..16b4924 100644
--- a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CompactionCallable.java
+++ b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/CompactionCallable.java
@@ -38,14 +38,14 @@ public class CompactionCallable implements Callable<Void> {
private final String storeLocation;
private final CarbonTable carbonTable;
private final String kettleHomePath;
- private final Long cubeCreationTime;
+ private final Long tableCreationTime;
private final List<LoadMetadataDetails> loadsToMerge;
private final SQLContext sqlContext;
private final CarbonLoadModel carbonLoadModel;
public CompactionCallable(String hdfsStoreLocation, CarbonLoadModel carbonLoadModel,
Partitioner partitioner, String storeLocation, CarbonTable carbonTable, String kettleHomePath,
- Long cubeCreationTime, List<LoadMetadataDetails> loadsToMerge, SQLContext sqlContext) {
+ Long tableCreationTime, List<LoadMetadataDetails> loadsToMerge, SQLContext sqlContext) {
this.hdfsStoreLocation = hdfsStoreLocation;
this.carbonLoadModel = carbonLoadModel;
@@ -53,7 +53,7 @@ public class CompactionCallable implements Callable<Void> {
this.storeLocation = storeLocation;
this.carbonTable = carbonTable;
this.kettleHomePath = kettleHomePath;
- this.cubeCreationTime = cubeCreationTime;
+ this.tableCreationTime = tableCreationTime;
this.loadsToMerge = loadsToMerge;
this.sqlContext = sqlContext;
}
@@ -61,7 +61,7 @@ public class CompactionCallable implements Callable<Void> {
@Override public Void call() throws Exception {
Compactor.triggerCompaction(hdfsStoreLocation, carbonLoadModel, partitioner, storeLocation,
- carbonTable, kettleHomePath, cubeCreationTime, loadsToMerge, sqlContext);
+ carbonTable, kettleHomePath, tableCreationTime, loadsToMerge, sqlContext);
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/integration/spark/merger/RowResultMerger.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/RowResultMerger.java b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/RowResultMerger.java
index 54e32a0..4098dca 100644
--- a/integration/spark/src/main/java/org/carbondata/integration/spark/merger/RowResultMerger.java
+++ b/integration/spark/src/main/java/org/carbondata/integration/spark/merger/RowResultMerger.java
@@ -59,7 +59,7 @@ import org.carbondata.spark.load.CarbonLoadModel;
*/
public class RowResultMerger {
- private final String schemaName;
+ private final String databaseName;
private final String tableName;
private final String tempStoreLocation;
private final int measureCount;
@@ -78,9 +78,9 @@ public class RowResultMerger {
private static final LogService LOGGER =
LogServiceFactory.getLogService(RowResultMerger.class.getName());
- public RowResultMerger(List<RawResultIterator> iteratorList, String schemaName, String tableName,
- SegmentProperties segProp, String tempStoreLocation, CarbonLoadModel loadModel,
- int[] colCardinality) {
+ public RowResultMerger(List<RawResultIterator> iteratorList, String databaseName,
+ String tableName, SegmentProperties segProp, String tempStoreLocation,
+ CarbonLoadModel loadModel, int[] colCardinality) {
this.rawResultIteratorList = iteratorList;
// create the List of RawResultIterator.
@@ -97,7 +97,7 @@ public class RowResultMerger {
LOGGER.error("Error while new File(tempStoreLocation).mkdirs() ");
}
- this.schemaName = schemaName;
+ this.databaseName = databaseName;
this.tableName = tableName;
this.measureCount = segprop.getMeasures().size();
@@ -212,7 +212,7 @@ public class RowResultMerger {
*/
private CarbonFactDataHandlerModel getCarbonFactDataHandlerModel(CarbonLoadModel loadModel) {
CarbonFactDataHandlerModel carbonFactDataHandlerModel = new CarbonFactDataHandlerModel();
- carbonFactDataHandlerModel.setDatabaseName(schemaName);
+ carbonFactDataHandlerModel.setDatabaseName(databaseName);
carbonFactDataHandlerModel.setTableName(tableName);
carbonFactDataHandlerModel.setMeasureCount(segprop.getMeasures().size());
carbonFactDataHandlerModel.setCompactionFlow(true);
@@ -225,7 +225,7 @@ public class RowResultMerger {
carbonFactDataHandlerModel.setDimensionCount(
segprop.getDimensions().size() - carbonFactDataHandlerModel.getNoDictionaryCount());
CarbonTable carbonTable = CarbonMetadata.getInstance()
- .getCarbonTable(schemaName + CarbonCommonConstants.UNDERSCORE + tableName);
+ .getCarbonTable(databaseName + CarbonCommonConstants.UNDERSCORE + tableName);
List<ColumnSchema> wrapperColumnSchema = CarbonUtil
.getColumnSchemaList(carbonTable.getDimensionByTableName(tableName),
carbonTable.getMeasureByTableName(tableName));
@@ -246,7 +246,7 @@ public class RowResultMerger {
carbonFactDataHandlerModel.setFactDimLens(segprop.getDimColumnsCardinality());
String carbonDataDirectoryPath =
- checkAndCreateCarbonStoreLocation(this.factStoreLocation, schemaName, tableName,
+ checkAndCreateCarbonStoreLocation(this.factStoreLocation, databaseName, tableName,
loadModel.getPartitionId(), loadModel.getSegmentId());
carbonFactDataHandlerModel.setCarbonDataDirectoryPath(carbonDataDirectoryPath);
@@ -258,11 +258,11 @@ public class RowResultMerger {
*
* @return data directory path
*/
- private String checkAndCreateCarbonStoreLocation(String factStoreLocation, String schemaName,
+ private String checkAndCreateCarbonStoreLocation(String factStoreLocation, String databaseName,
String tableName, String partitionId, String segmentId) {
String carbonStorePath = factStoreLocation;
CarbonTable carbonTable = CarbonMetadata.getInstance()
- .getCarbonTable(schemaName + CarbonCommonConstants.UNDERSCORE + tableName);
+ .getCarbonTable(databaseName + CarbonCommonConstants.UNDERSCORE + tableName);
CarbonTableIdentifier carbonTableIdentifier = carbonTable.getCarbonTableIdentifier();
CarbonTablePath carbonTablePath =
CarbonStorePath.getCarbonTablePath(carbonStorePath, carbonTableIdentifier);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java b/integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
index 52f8fb7..ae1cf73 100644
--- a/integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
+++ b/integration/spark/src/main/java/org/carbondata/spark/load/CarbonLoaderUtil.java
@@ -162,8 +162,7 @@ public final class CarbonLoaderUtil {
path.delete();
}
- DataProcessTaskStatus schmaModel =
- new DataProcessTaskStatus(databaseName, tableName, loadModel.getTableName());
+ DataProcessTaskStatus schmaModel = new DataProcessTaskStatus(databaseName, tableName);
schmaModel.setCsvFilePath(loadModel.getFactFilePath());
schmaModel.setDimCSVDirLoc(loadModel.getDimFolderPath());
if (loadModel.isDirectLoad()) {
@@ -177,8 +176,8 @@ public final class CarbonLoaderUtil {
schmaModel.setEscapeCharacter(loadModel.getEscapeChar());
SchemaInfo info = new SchemaInfo();
- info.setSchemaName(databaseName);
- info.setCubeName(tableName);
+ info.setDatabaseName(databaseName);
+ info.setTableName(tableName);
info.setAutoAggregateRequest(loadModel.isAggLoadRequest());
info.setComplexDelimiterLevel1(loadModel.getComplexDelimiterLevel1());
info.setComplexDelimiterLevel2(loadModel.getComplexDelimiterLevel2());
@@ -191,12 +190,12 @@ public final class CarbonLoaderUtil {
info, loadModel.getPartitionId(), loadModel.getCarbonDataLoadSchema());
}
- public static String[] getStorelocs(String schemaName, String cubeName, String factTableName,
+ public static String[] getStorelocs(String databaseName, String tableName, String factTableName,
String hdfsStoreLocation, int currentRestructNumber) {
String[] loadFolders;
String baseStorelocation =
- hdfsStoreLocation + File.separator + schemaName + File.separator + cubeName;
+ hdfsStoreLocation + File.separator + databaseName + File.separator + tableName;
String factStorepath =
baseStorelocation + File.separator + CarbonCommonConstants.RESTRUCTRE_FOLDER
@@ -231,11 +230,11 @@ public final class CarbonLoaderUtil {
return activeSlices;
}
- public static String getAggLoadFolderLocation(String loadFolderName, String schemaName,
- String cubeName, String aggTableName, String hdfsStoreLocation, int currentRestructNumber) {
+ public static String getAggLoadFolderLocation(String loadFolderName, String databaseName,
+ String tableName, String aggTableName, String hdfsStoreLocation, int currentRestructNumber) {
for (int i = currentRestructNumber; i >= 0; i--) {
String aggTableLocation =
- getTableLocation(schemaName, cubeName, aggTableName, hdfsStoreLocation, i);
+ getTableLocation(databaseName, tableName, aggTableName, hdfsStoreLocation, i);
String aggStorepath = aggTableLocation + File.separator + loadFolderName;
try {
if (FileFactory.isFileExist(aggStorepath, FileFactory.getFileType(aggStorepath))) {
@@ -248,26 +247,26 @@ public final class CarbonLoaderUtil {
return null;
}
- public static String getTableLocation(String schemaName, String cubeName, String aggTableName,
+ public static String getTableLocation(String databaseName, String tableName, String aggTableName,
String hdfsStoreLocation, int currentRestructNumber) {
String baseStorelocation =
- hdfsStoreLocation + File.separator + schemaName + File.separator + cubeName;
+ hdfsStoreLocation + File.separator + databaseName + File.separator + tableName;
String aggTableLocation =
baseStorelocation + File.separator + CarbonCommonConstants.RESTRUCTRE_FOLDER
+ currentRestructNumber + File.separator + aggTableName;
return aggTableLocation;
}
- public static void deleteTable(int partitionCount, String schemaName, String cubeName,
+ public static void deleteTable(int partitionCount, String databaseName, String tableName,
String aggTableName, String hdfsStoreLocation, int currentRestructNumber) {
String aggTableLoc = null;
- String partitionSchemaName = null;
- String partitionCubeName = null;
+ String partitionDatabaseName = null;
+ String partitionTableName = null;
for (int i = 0; i < partitionCount; i++) {
- partitionSchemaName = schemaName + '_' + i;
- partitionCubeName = cubeName + '_' + i;
+ partitionDatabaseName = databaseName + '_' + i;
+ partitionTableName = tableName + '_' + i;
for (int j = currentRestructNumber; j >= 0; j--) {
- aggTableLoc = getTableLocation(partitionSchemaName, partitionCubeName, aggTableName,
+ aggTableLoc = getTableLocation(partitionDatabaseName, partitionTableName, aggTableName,
hdfsStoreLocation, j);
deleteStorePath(aggTableLoc);
}
@@ -285,16 +284,16 @@ public final class CarbonLoaderUtil {
}
}
- public static void deleteSlice(int partitionCount, String schemaName, String cubeName,
- String tableName, String hdfsStoreLocation, int currentRestructNumber, String loadFolder) {
+ public static void deleteSlice(int partitionCount, String databaseName, String tableName,
+ String hdfsStoreLocation, int currentRestructNumber, String loadFolder) {
String tableLoc = null;
- String partitionSchemaName = null;
- String partitionCubeName = null;
+ String partitionDatabaseName = null;
+ String partitionTableName = null;
for (int i = 0; i < partitionCount; i++) {
- partitionSchemaName = schemaName + '_' + i;
- partitionCubeName = cubeName + '_' + i;
+ partitionDatabaseName = databaseName + '_' + i;
+ partitionTableName = tableName + '_' + i;
tableLoc =
- getTableLocation(partitionSchemaName, partitionCubeName, tableName, hdfsStoreLocation,
+ getTableLocation(partitionDatabaseName, partitionTableName, tableName, hdfsStoreLocation,
currentRestructNumber);
tableLoc = tableLoc + File.separator + loadFolder;
deleteStorePath(tableLoc);
@@ -416,7 +415,7 @@ public final class CarbonLoaderUtil {
return updatedSlices;
}
- public static void removeSliceFromMemory(String schemaName, String cubeName, String loadName) {
+ public static void removeSliceFromMemory(String databaseName, String tableName, String loadName) {
// TODO: Remove from memory
}
@@ -678,8 +677,8 @@ public final class CarbonLoaderUtil {
* API will provide the load folder path for the store inorder to store the same
* in the metadata.
*/
- public static String getLoadFolderPath(CarbonLoadModel loadModel, String cubeName,
- String schemaName, int currentRestructNumber) {
+ public static String getLoadFolderPath(CarbonLoadModel loadModel, String tableName,
+ String databaseName, int currentRestructNumber) {
//CHECKSTYLE:OFF Approval No:Approval-V1R2C10_005
@@ -687,9 +686,9 @@ public final class CarbonLoaderUtil {
Boolean.valueOf(CarbonProperties.getInstance().getProperty("dataload.hdfs.copy", "true"));
// CHECKSTYLE:ON
- if (null == cubeName && null == schemaName) {
- schemaName = loadModel.getDatabaseName();
- cubeName = loadModel.getTableName();
+ if (null == tableName && null == databaseName) {
+ databaseName = loadModel.getDatabaseName();
+ tableName = loadModel.getTableName();
}
String factTable = loadModel.getTableName();
String hdfsLoadedTable = null;
@@ -703,7 +702,7 @@ public final class CarbonLoaderUtil {
if (!hdfsLocation.equals(localStore)) {
String hdfsStoreLocation = hdfsLocation;
hdfsStoreLocation =
- hdfsStoreLocation + File.separator + schemaName + File.separator + cubeName;
+ hdfsStoreLocation + File.separator + databaseName + File.separator + tableName;
int rsCounter = currentRestructNumber;
if (rsCounter == -1) {
@@ -804,7 +803,7 @@ public final class CarbonLoaderUtil {
}
public static void writeLoadMetadata(CarbonDataLoadSchema schema,
- String schemaName, String tableName,
+ String databaseName, String tableName,
List<LoadMetadataDetails> listOfLoadFolderDetails) throws IOException {
CarbonTablePath carbonTablePath = CarbonStorePath
.getCarbonTablePath(schema.getCarbonTable().getStorePath(),
@@ -882,8 +881,8 @@ public final class CarbonLoaderUtil {
boolean copyStore =
Boolean.valueOf(CarbonProperties.getInstance().getProperty("dataload.hdfs.copy", "true"));
- String schemaName = loadModel.getDatabaseName();
- String cubeName = loadModel.getTableName();
+ String databaseName = loadModel.getDatabaseName();
+ String tableName = loadModel.getTableName();
String factTable = loadModel.getTableName();
String aggTableName = loadModel.getAggTableName();
@@ -895,23 +894,23 @@ public final class CarbonLoaderUtil {
.getProperty(CarbonCommonConstants.STORE_LOCATION,
CarbonCommonConstants.STORE_LOCATION_DEFAULT_VAL);
if (!loadModel.isAggLoadRequest()) {
- copyMergeToHDFS(schemaName, cubeName, factTable, hdfsLocation, localStore,
+ copyMergeToHDFS(databaseName, tableName, factTable, hdfsLocation, localStore,
currentRestructNumber, mergedLoadName);
}
if (null != aggTableName) {
- copyMergeToHDFS(schemaName, cubeName, aggTableName, hdfsLocation, localStore,
+ copyMergeToHDFS(databaseName, tableName, aggTableName, hdfsLocation, localStore,
currentRestructNumber, mergedLoadName);
}
try {
CarbonUtil.deleteFoldersAndFiles(new File[] {
- new File(localStore + File.separator + schemaName + File.separator + cubeName) });
+ new File(localStore + File.separator + databaseName + File.separator + tableName) });
} catch (CarbonUtilException e) {
LOGGER.error("Error while CarbonUtil.deleteFoldersAndFiles ");
}
}
}
- public static void copyMergeToHDFS(String schemaName, String cubeName, String factTable,
+ public static void copyMergeToHDFS(String databaseName, String tableName, String factTable,
String hdfsLocation, String localStore, int currentRestructNumber, String mergedLoadName) {
try {
//If the hdfs store and the local store configured differently, then copy
@@ -921,7 +920,7 @@ public final class CarbonLoaderUtil {
*/
String currentloadedStore = localStore;
currentloadedStore =
- currentloadedStore + File.separator + schemaName + File.separator + cubeName;
+ currentloadedStore + File.separator + databaseName + File.separator + tableName;
int rsCounter = currentRestructNumber;
@@ -952,7 +951,7 @@ public final class CarbonLoaderUtil {
//Identify the Load_X folder in the HDFS store
String hdfsStoreLocation = hdfsLocation;
hdfsStoreLocation =
- hdfsStoreLocation + File.separator + schemaName + File.separator + cubeName;
+ hdfsStoreLocation + File.separator + databaseName + File.separator + tableName;
rsCounter = currentRestructNumber;
if (rsCounter == -1) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/CSVFilePartitioner.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/CSVFilePartitioner.java b/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/CSVFilePartitioner.java
index 2a466b7..ce9a654 100644
--- a/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/CSVFilePartitioner.java
+++ b/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/CSVFilePartitioner.java
@@ -85,17 +85,10 @@ public class CSVFilePartitioner {
return partialSuccess;
}
- /**
- * @param sourceFilePath - Source raw data file in local disk
- * @param targetFolder - Target folder to save the partitioned files
- * @param nodes
- * @param properties
- * @param i
- */
- @Deprecated public void splitFile(String schemaName, String cubeName, List<String> sourceFilePath,
- String targetFolder, List<String> nodes, int partitionCount, String[] partitionColumn,
- String[] requiredColumns, String delimiter, String quoteChar, String fileHeader,
- String escapeChar, boolean multiLine) throws Exception {
+ @Deprecated public void splitFile(String databaseName, String tableName,
+ List<String> sourceFilePath, String targetFolder, List<String> nodes, int partitionCount,
+ String[] partitionColumn, String[] requiredColumns, String delimiter, String quoteChar,
+ String fileHeader, String escapeChar, boolean multiLine) throws Exception {
LOGGER
.info("Processing file split: " + sourceFilePath);
@@ -107,9 +100,9 @@ public class CSVFilePartitioner {
HashMap<Partition, CSVWriter> outputStreamsMap =
new HashMap<Partition, CSVWriter>(CarbonCommonConstants.DEFAULT_COLLECTION_SIZE);
- String key = schemaName + '_' + cubeName;
+ String key = databaseName + '_' + tableName;
badRecordslogger = new BadRecordslogger(key, "Partition_" + System.currentTimeMillis() + ".log",
- getBadLogStoreLocation("partition/" + schemaName + '/' + cubeName));
+ getBadLogStoreLocation("partition/" + databaseName + '/' + tableName));
CSVReader dataInputStream = null;
@@ -290,8 +283,8 @@ public class CSVFilePartitioner {
partialSuccess = true;
skippedLines++;
badRecordslogger.addBadRecordsToBilder(record, record.length,
- "No. of columns not matched with cube columns", null);
- LOGGER.error("BAD Record Found: No. of columns not matched with cube columns, "
+ "No. of columns not matched with table columns", null);
+ LOGGER.error("BAD Record Found: No. of columns not matched with table columns, "
+ "Skipping line: (" + (recordCounter + 1) + ") in File :" + fileAbsolutePath);
} catch (Exception e) {
partialSuccess = true;
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/QueryPartitionHelper.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/QueryPartitionHelper.java b/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/QueryPartitionHelper.java
index c14515b..50b9b53 100644
--- a/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/QueryPartitionHelper.java
+++ b/integration/spark/src/main/java/org/carbondata/spark/partition/api/impl/QueryPartitionHelper.java
@@ -97,7 +97,7 @@ public final class QueryPartitionHelper {
}
- private void checkInitialization(String cubeUniqueName, Partitioner partitioner) {
+ private void checkInitialization(String tableUniqueName, Partitioner partitioner) {
//Initialise if not done earlier
//String nodeListString = null;
@@ -114,7 +114,7 @@ public final class QueryPartitionHelper {
LOGGER.info("nodeList : " + Arrays.toString(partitioner.nodeList()));
}
- if (partitionerMap.get(cubeUniqueName) == null) {
+ if (partitionerMap.get(tableUniqueName) == null) {
DataPartitioner dataPartitioner;
try {
dataPartitioner =
@@ -124,8 +124,8 @@ public final class QueryPartitionHelper {
List<Partition> partitions = dataPartitioner.getAllPartitions();
DefaultLoadBalancer loadBalancer =
new DefaultLoadBalancer(Arrays.asList(partitioner.nodeList()), partitions);
- partitionerMap.put(cubeUniqueName, dataPartitioner);
- loadBalancerMap.put(cubeUniqueName, loadBalancer);
+ partitionerMap.put(tableUniqueName, dataPartitioner);
+ loadBalancerMap.put(tableUniqueName, loadBalancer);
} catch (ClassNotFoundException e) {
LOGGER.error(e,
e.getMessage());
@@ -143,47 +143,47 @@ public final class QueryPartitionHelper {
* Get partitions applicable for query based on filters applied in query
*/
public List<Partition> getPartitionsForQuery(CarbonQueryPlan queryPlan, Partitioner partitioner) {
- String cubeUniqueName = queryPlan.getSchemaName() + '_' + queryPlan.getCubeName();
- checkInitialization(cubeUniqueName, partitioner);
+ String tableUniqueName = queryPlan.getDatabaseName() + '_' + queryPlan.getTableName();
+ checkInitialization(tableUniqueName, partitioner);
- DataPartitioner dataPartitioner = partitionerMap.get(cubeUniqueName);
+ DataPartitioner dataPartitioner = partitionerMap.get(tableUniqueName);
List<Partition> queryPartitions = dataPartitioner.getPartitions(queryPlan);
return queryPartitions;
}
- public List<Partition> getAllPartitions(String schemaName, String cubeName,
+ public List<Partition> getAllPartitions(String databaseName, String tableName,
Partitioner partitioner) {
- String cubeUniqueName = schemaName + '_' + cubeName;
- checkInitialization(cubeUniqueName, partitioner);
+ String tableUniqueName = databaseName + '_' + tableName;
+ checkInitialization(tableUniqueName, partitioner);
- DataPartitioner dataPartitioner = partitionerMap.get(cubeUniqueName);
+ DataPartitioner dataPartitioner = partitionerMap.get(tableUniqueName);
return dataPartitioner.getAllPartitions();
}
- public void removePartition(String schemaName, String cubeName) {
- String cubeUniqueName = schemaName + '_' + cubeName;
- partitionerMap.remove(cubeUniqueName);
+ public void removePartition(String databaseName, String tableName) {
+ String tableUniqueName = databaseName + '_' + tableName;
+ partitionerMap.remove(tableUniqueName);
}
/**
* Get the node name where the partition is assigned to.
*/
- public String getLocation(Partition partition, String schemaName, String cubeName,
+ public String getLocation(Partition partition, String databaseName, String tableName,
Partitioner partitioner) {
- String cubeUniqueName = schemaName + '_' + cubeName;
- checkInitialization(cubeUniqueName, partitioner);
+ String tableUniqueName = databaseName + '_' + tableName;
+ checkInitialization(tableUniqueName, partitioner);
- DefaultLoadBalancer loadBalancer = loadBalancerMap.get(cubeUniqueName);
+ DefaultLoadBalancer loadBalancer = loadBalancerMap.get(tableUniqueName);
return loadBalancer.getNodeForPartitions(partition);
}
- public String[] getPartitionedColumns(String schemaName, String cubeName,
+ public String[] getPartitionedColumns(String databaseName, String tableName,
Partitioner partitioner) {
- String cubeUniqueName = schemaName + '_' + cubeName;
- checkInitialization(cubeUniqueName, partitioner);
- DataPartitioner dataPartitioner = partitionerMap.get(cubeUniqueName);
+ String tableUniqueName = databaseName + '_' + tableName;
+ checkInitialization(tableUniqueName, partitioner);
+ DataPartitioner dataPartitioner = partitionerMap.get(tableUniqueName);
return dataPartitioner.getPartitionedColumns();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/spark/util/CarbonQueryUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/spark/util/CarbonQueryUtil.java b/integration/spark/src/main/java/org/carbondata/spark/util/CarbonQueryUtil.java
index b9d5fce..c2cbbb5 100644
--- a/integration/spark/src/main/java/org/carbondata/spark/util/CarbonQueryUtil.java
+++ b/integration/spark/src/main/java/org/carbondata/spark/util/CarbonQueryUtil.java
@@ -56,14 +56,14 @@ public final class CarbonQueryUtil {
/**
* It creates the one split for each region server.
*/
- public static synchronized TableSplit[] getTableSplits(String schemaName, String cubeName,
+ public static synchronized TableSplit[] getTableSplits(String databaseName, String tableName,
CarbonQueryPlan queryPlan, Partitioner partitioner) throws IOException {
//Just create splits depends on locations of region servers
List<Partition> allPartitions = null;
if (queryPlan == null) {
allPartitions =
- QueryPartitionHelper.getInstance().getAllPartitions(schemaName, cubeName, partitioner);
+ QueryPartitionHelper.getInstance().getAllPartitions(databaseName, tableName, partitioner);
} else {
allPartitions =
QueryPartitionHelper.getInstance().getPartitionsForQuery(queryPlan, partitioner);
@@ -74,7 +74,7 @@ public final class CarbonQueryUtil {
List<String> locations = new ArrayList<String>(CarbonCommonConstants.CONSTANT_SIZE_TEN);
Partition partition = allPartitions.get(i);
String location = QueryPartitionHelper.getInstance()
- .getLocation(partition, schemaName, cubeName, partitioner);
+ .getLocation(partition, databaseName, tableName, partitioner);
locations.add(location);
splits[i].setPartition(partition);
splits[i].setLocations(locations);
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/java/org/carbondata/spark/util/LoadMetadataUtil.java
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/java/org/carbondata/spark/util/LoadMetadataUtil.java b/integration/spark/src/main/java/org/carbondata/spark/util/LoadMetadataUtil.java
index d35eb87..d46cbdf 100644
--- a/integration/spark/src/main/java/org/carbondata/spark/util/LoadMetadataUtil.java
+++ b/integration/spark/src/main/java/org/carbondata/spark/util/LoadMetadataUtil.java
@@ -45,12 +45,12 @@ public final class LoadMetadataUtil {
}
public static boolean isLoadDeletionRequired(CarbonLoadModel loadModel) {
- CarbonTable cube = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance()
+ CarbonTable table = org.carbondata.core.carbon.metadata.CarbonMetadata.getInstance()
.getCarbonTable(loadModel.getDatabaseName() + '_' + loadModel.getTableName());
- String metaDataLocation = cube.getMetaDataFilepath();
+ String metaDataLocation = table.getMetaDataFilepath();
SegmentStatusManager segmentStatusManager =
- new SegmentStatusManager(cube.getAbsoluteTableIdentifier());
+ new SegmentStatusManager(table.getAbsoluteTableIdentifier());
LoadMetadataDetails[] details = segmentStatusManager.readLoadMetadata(metaDataLocation);
if (details != null && details.length != 0) {
for (LoadMetadataDetails oneRow : details) {
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/CarbonCatalystOperators.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonCatalystOperators.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonCatalystOperators.scala
index c7333cf..2f5ec6f 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonCatalystOperators.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonCatalystOperators.scala
@@ -48,9 +48,9 @@ object getDB {
}
/**
- * Shows Loads in a cube
+ * Shows Loads in a table
*/
-case class ShowLoadsCommand(schemaNameOp: Option[String], cube: String, limit: Option[String])
+case class ShowLoadsCommand(databaseNameOp: Option[String], table: String, limit: Option[String])
extends LogicalPlan with Command {
override def children: Seq[LogicalPlan] = Seq.empty
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
index d47d255..1d46081 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonContext.scala
@@ -128,8 +128,8 @@ object CarbonContext {
val datasourceShortName: String = "carbondata"
/**
- * @param schemaName - Schema Name
- * @param cubeName - Cube Name
+ * @param databaseName - Database Name
+ * @param tableName - Table Name
* @param factPath - Raw CSV data path
* @param targetPath - Target path where the file will be split as per partition
* @param delimiter - default file delimiter is comma(,)
@@ -147,8 +147,8 @@ object CarbonContext {
* lines for end of quote & skip all lines if end of quote not found.
*/
final def partitionData(
- schemaName: String = null,
- cubeName: String,
+ databaseName: String = null,
+ tableName: String,
factPath: String,
targetPath: String,
delimiter: String = ",",
@@ -157,11 +157,11 @@ object CarbonContext {
escapeChar: String = null,
multiLine: Boolean = false)(hiveContext: HiveContext): String = {
updateCarbonPorpertiesPath(hiveContext)
- var schemaNameLocal = schemaName
- if (schemaNameLocal == null) {
- schemaNameLocal = "default"
+ var databaseNameLocal = databaseName
+ if (databaseNameLocal == null) {
+ databaseNameLocal = "default"
}
- val partitionDataClass = PartitionData(schemaName, cubeName, factPath, targetPath, delimiter,
+ val partitionDataClass = PartitionData(databaseName, tableName, factPath, targetPath, delimiter,
quoteChar, fileHeader, escapeChar, multiLine)
partitionDataClass.run(hiveContext)
partitionDataClass.partitionStatus
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala
index 5613d71..35d989a 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonDatasourceRelation.scala
@@ -147,10 +147,10 @@ private[sql] case class CarbonDatasourceRelation(
def sqlContext: SQLContext = context
override val sizeInBytes: Long = {
- val tablePath = carbonRelation.cubeMeta.storePath + CarbonCommonConstants.FILE_SEPARATOR +
- carbonRelation.cubeMeta.carbonTableIdentifier.getDatabaseName +
+ val tablePath = carbonRelation.tableMeta.storePath + CarbonCommonConstants.FILE_SEPARATOR +
+ carbonRelation.tableMeta.carbonTableIdentifier.getDatabaseName +
CarbonCommonConstants.FILE_SEPARATOR +
- carbonRelation.cubeMeta.carbonTableIdentifier.getTableName
+ carbonRelation.tableMeta.carbonTableIdentifier.getTableName
val fileType = FileFactory.getFileType
if(FileFactory.isFileExist(tablePath, fileType)) {
FileFactory.getDirectorySize(tablePath)
@@ -161,18 +161,16 @@ private[sql] case class CarbonDatasourceRelation(
}
/**
- * Represents logical plan for one carbon cube
+ * Represents logical plan for one carbon table
*/
case class CarbonRelation(
- schemaName: String,
- cubeName: String,
+ databaseName: String,
+ tableName: String,
metaData: CarbonMetaData,
- cubeMeta: TableMeta,
+ tableMeta: TableMeta,
alias: Option[String])(@transient sqlContext: SQLContext)
extends LeafNode with MultiInstanceRelation {
- def tableName: String = cubeName
-
def recursiveMethod(dimName: String, childDim: CarbonDimension): String = {
childDim.getDataType.toString.toLowerCase match {
case "array" => s"${
@@ -212,13 +210,13 @@ case class CarbonRelation(
}
override def newInstance(): LogicalPlan = {
- CarbonRelation(schemaName, cubeName, metaData, cubeMeta, alias)(sqlContext)
+ CarbonRelation(databaseName, tableName, metaData, tableMeta, alias)(sqlContext)
.asInstanceOf[this.type]
}
val dimensionsAttr = {
val sett = new LinkedHashSet(
- cubeMeta.carbonTable.getDimensionByTableName(cubeMeta.carbonTableIdentifier.getTableName)
+ tableMeta.carbonTable.getDimensionByTableName(tableMeta.carbonTableIdentifier.getTableName)
.asScala.asJava)
sett.asScala.toSeq.filter(!_.getColumnSchema.isInvisible).map(dim => {
val output: DataType = metaData.carbonTable
@@ -239,10 +237,10 @@ case class CarbonRelation(
}
val measureAttr = {
- val factTable = cubeMeta.carbonTable.getFactTableName
+ val factTable = tableMeta.carbonTable.getFactTableName
new LinkedHashSet(
- cubeMeta.carbonTable.
- getMeasureByTableName(cubeMeta.carbonTable.getFactTableName).
+ tableMeta.carbonTable.
+ getMeasureByTableName(tableMeta.carbonTable.getFactTableName).
asScala.asJava).asScala.toSeq.filter(!_.getColumnSchema.isInvisible)
.map(x => AttributeReference(x.getColName, CarbonMetastoreTypes.toDataType(
metaData.carbonTable.getMeasureByName(factTable, x.getColName).getDataType.toString
@@ -263,7 +261,7 @@ case class CarbonRelation(
override def equals(other: Any): Boolean = {
other match {
case p: CarbonRelation =>
- p.schemaName == schemaName && p.output == output && p.cubeName == cubeName
+ p.databaseName == databaseName && p.output == output && p.tableName == tableName
case _ => false
}
}
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/CarbonOperators.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonOperators.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonOperators.scala
index 782b87c..21aded4 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonOperators.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonOperators.scala
@@ -50,7 +50,7 @@ case class CarbonScan(
val unprocessedExprs = new ArrayBuffer[Expression]()
val buildCarbonPlan: CarbonQueryPlan = {
- val plan: CarbonQueryPlan = new CarbonQueryPlan(relationRaw.schemaName, relationRaw.tableName)
+ val plan: CarbonQueryPlan = new CarbonQueryPlan(relationRaw.databaseName, relationRaw.tableName)
val dimensions = carbonTable.getDimensionByTableName(carbonTable.getFactTableName)
val measures = carbonTable.getMeasureByTableName(carbonTable.getFactTableName)
@@ -168,17 +168,17 @@ case class CarbonScan(
// setting queryid
buildCarbonPlan.setQueryId(ocRaw.getConf("queryId", System.nanoTime() + ""))
- val cubeCreationTime = carbonCatalog
- .getCubeCreationTime(relationRaw.schemaName, relationRaw.tableName)
+ val tableCreationTime = carbonCatalog
+ .getTableCreationTime(relationRaw.databaseName, relationRaw.tableName)
val schemaLastUpdatedTime = carbonCatalog
- .getSchemaLastUpdatedTime(relationRaw.schemaName, relationRaw.tableName)
+ .getSchemaLastUpdatedTime(relationRaw.databaseName, relationRaw.tableName)
val big = new CarbonScanRDD(
ocRaw.sparkContext,
model,
buildCarbonPlan.getFilterExpression,
kv,
conf,
- cubeCreationTime,
+ tableCreationTime,
schemaLastUpdatedTime,
carbonCatalog.storePath)
big
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/84b476bc/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
index 1694a7e..361d882 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CarbonSqlParser.scala
@@ -197,10 +197,10 @@ class CarbonSqlParser()
(aggregation).? ~ (",".? ~> partitioner).?
protected lazy val aggOptions =
(noDictionaryDims).? ~ (",".? ~> aggregation).? ~ (",".? ~> partitioner).?
- protected lazy val showcreateCubeOptionDef =
+ protected lazy val showcreateTableOptionDef =
("(" ~> aggOptionsForShowCreate <~ ")")
- protected lazy val createCubeOptionDef =
+ protected lazy val createTableOptionDef =
("(" ~> aggOptions <~ ")")
protected val escapedIdentifier = "`([^`]+)`".r
@@ -536,7 +536,7 @@ class CarbonSqlParser()
Option[Partitioner] = {
// by default setting partition class empty.
- // later in cube schema it is setting to default value.
+ // later in table schema it is setting to default value.
var partitionClass: String = ""
var partitionCount: Int = 1
var partitionColNames: Array[String] = Array[String]()
@@ -890,15 +890,15 @@ class CarbonSqlParser()
LOAD ~> DATA ~> opt(LOCAL) ~> INPATH ~> stringLit ~ opt(OVERWRITE) ~
(INTO ~> TABLE ~> (ident <~ ".").? ~ ident) ~
(OPTIONS ~> "(" ~> repsep(loadOptions, ",") <~ ")").? <~ opt(";") ^^ {
- case filePath ~ isOverwrite ~ cube ~ partionDataOptions =>
- val (schema, cubename) = cube match {
- case schemaName ~ cubeName => (schemaName, cubeName.toLowerCase())
+ case filePath ~ isOverwrite ~ table ~ partionDataOptions =>
+ val (schema, tablename) = table match {
+ case databaseName ~ tableName => (databaseName, tableName.toLowerCase())
}
if(partionDataOptions.isDefined) {
validateOptions(partionDataOptions)
}
val patitionOptionsMap = partionDataOptions.getOrElse(List.empty[(String, String)]).toMap
- LoadTable(schema, cubename, filePath, Seq(), patitionOptionsMap, isOverwrite.isDefined)
+ LoadTable(schema, tablename, filePath, Seq(), patitionOptionsMap, isOverwrite.isDefined)
}
private def validateOptions(partionDataOptions: Option[List[(String, String)]]): Unit = {
@@ -1161,8 +1161,8 @@ class CarbonSqlParser()
SHOW ~> (LOADS|SEGMENTS) ~> FOR ~> TABLE ~> (ident <~ ".").? ~ ident ~
(LIMIT ~> numericLit).? <~
opt(";") ^^ {
- case schemaName ~ cubeName ~ limit =>
- ShowLoadsCommand(schemaName, cubeName.toLowerCase(), limit)
+ case databaseName ~ tableName ~ limit =>
+ ShowLoadsCommand(databaseName, tableName.toLowerCase(), limit)
}
protected lazy val segmentId: Parser[String] =
@@ -1175,8 +1175,9 @@ class CarbonSqlParser()
DELETE ~> (LOAD|SEGMENT) ~> repsep(segmentId, ",") ~ (FROM ~> TABLE ~>
(ident <~ ".").? ~ ident) <~
opt(";") ^^ {
- case loadids ~ cube => cube match {
- case schemaName ~ cubeName => DeleteLoadsById(loadids, schemaName, cubeName.toLowerCase())
+ case loadids ~ table => table match {
+ case databaseName ~ tableName =>
+ DeleteLoadsById(loadids, databaseName, tableName.toLowerCase())
}
}
@@ -1184,16 +1185,16 @@ class CarbonSqlParser()
DELETE ~> (LOADS|SEGMENTS) ~> FROM ~> TABLE ~> (ident <~ ".").? ~ ident ~
(WHERE ~> (STARTTIME <~ BEFORE) ~ stringLit) <~
opt(";") ^^ {
- case schema ~ cube ~ condition =>
+ case schema ~ table ~ condition =>
condition match {
case dateField ~ dateValue =>
- DeleteLoadsByLoadDate(schema, cube.toLowerCase(), dateField, dateValue)
+ DeleteLoadsByLoadDate(schema, table.toLowerCase(), dateField, dateValue)
}
}
protected lazy val cleanFiles: Parser[LogicalPlan] =
CLEAN ~> FILES ~> FOR ~> TABLE ~> (ident <~ ".").? ~ ident <~ opt(";") ^^ {
- case schemaName ~ cubeName => CleanFiles(schemaName, cubeName.toLowerCase())
+ case databaseName ~ tableName => CleanFiles(databaseName, tableName.toLowerCase())
}
}
[5/5] incubator-carbondata git commit: [CARBONDATA-61] Change cube to
table This closes #42
Posted by ja...@apache.org.
[CARBONDATA-61] Change cube to table This closes #42
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/e5ed64bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/e5ed64bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/e5ed64bb
Branch: refs/heads/master
Commit: e5ed64bbe68d5b4e057d823f48961bfc16c5fc89
Parents: 6948cb0 84b476b
Author: jackylk <ja...@huawei.com>
Authored: Tue Jul 19 16:37:59 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Tue Jul 19 16:37:59 2016 +0800
----------------------------------------------------------------------
.../common/logging/impl/StandardLogService.java | 4 +-
.../common/ext/ColumnUniqueIdGenerator.java | 2 +-
.../carbondata/core/cache/CarbonLRUCache.java | 2 +-
.../core/carbon/CarbonDataLoadSchema.java | 2 +-
.../carbon/metadata/schema/table/TableInfo.java | 2 +-
.../core/service/ColumnUniqueIdService.java | 4 +-
.../org/carbondata/core/util/CarbonUtil.java | 34 +--
.../org/carbondata/scan/filter/FilterUtil.java | 2 +-
.../carbondata/scan/model/CarbonQueryPlan.java | 44 ++--
.../examples/GenerateDictionaryExample.scala | 2 +-
.../hadoop/test/util/StoreCreator.java | 46 ++--
.../spark/merger/CarbonCompactionExecutor.java | 8 +-
.../spark/merger/CompactionCallable.java | 8 +-
.../spark/merger/RowResultMerger.java | 20 +-
.../carbondata/spark/load/CarbonLoaderUtil.java | 79 ++++---
.../partition/api/impl/CSVFilePartitioner.java | 23 +-
.../api/impl/QueryPartitionHelper.java | 44 ++--
.../carbondata/spark/util/CarbonQueryUtil.java | 6 +-
.../carbondata/spark/util/LoadMetadataUtil.java | 6 +-
.../spark/sql/CarbonCatalystOperators.scala | 4 +-
.../org/apache/spark/sql/CarbonContext.scala | 16 +-
.../spark/sql/CarbonDatasourceRelation.scala | 28 ++-
.../org/apache/spark/sql/CarbonOperators.scala | 10 +-
.../org/apache/spark/sql/CarbonSqlParser.scala | 29 +--
.../execution/command/carbonTableSchema.scala | 228 ++++++++++---------
.../spark/sql/hive/CarbonMetastoreCatalog.scala | 172 +++++++-------
.../spark/sql/hive/CarbonStrategies.scala | 14 +-
.../spark/rdd/CarbonCleanFilesRDD.scala | 6 +-
.../spark/rdd/CarbonDataLoadRDD.scala | 14 +-
.../spark/rdd/CarbonDataPartitionRDD.scala | 6 +-
.../spark/rdd/CarbonDataRDDFactory.scala | 81 ++++---
.../spark/rdd/CarbonDeleteLoadByDateRDD.scala | 6 +-
.../spark/rdd/CarbonDeleteLoadRDD.scala | 6 +-
.../spark/rdd/CarbonDropTableRDD.scala | 6 +-
.../carbondata/spark/rdd/CarbonMergerRDD.scala | 10 +-
.../carbondata/spark/rdd/CarbonScanRDD.scala | 2 +-
.../org/carbondata/spark/rdd/Compactor.scala | 8 +-
.../spark/util/GlobalDictionaryUtil.scala | 2 +-
.../AllDataTypesTestCaseAggregate.scala | 18 +-
.../aggquery/IntegerDataTypeTestCase.scala | 10 +-
.../DataCompactionCardinalityBoundryTest.scala | 2 +-
.../datacompaction/DataCompactionLockTest.scala | 2 +-
.../datacompaction/DataCompactionTest.scala | 2 +-
.../dataload/TestLoadDataWithHiveSyntax.scala | 23 +-
.../deleteTable/TestDeleteTableNewDDL.scala | 5 +-
.../detailquery/AllDataTypesTestCase.scala | 10 +-
.../HighCardinalityDataTypesTestCase.scala | 72 +++---
.../detailquery/IntegerDataTypeTestCase.scala | 10 +-
...estampDataTypeDirectDictionaryTestCase.scala | 29 ++-
.../filterexpr/AllDataTypesTestCaseFilter.scala | 10 +-
.../filterexpr/IntegerDataTypeTestCase.scala | 10 +-
.../joinquery/AllDataTypesTestCaseJoin.scala | 10 +-
.../joinquery/IntegerDataTypeTestCase.scala | 10 +-
.../sortexpr/AllDataTypesTestCaseSort.scala | 10 +-
.../sortexpr/IntegerDataTypeTestCase.scala | 10 +-
.../AutoHighCardinalityIdentifyTestCase.scala | 12 +-
.../util/GlobalDictionaryUtilTestCase.scala | 22 +-
.../org/carbondata/lcm/locks/LocalFileLock.java | 26 +--
.../carbondata/lcm/locks/ZooKeeperLocking.java | 14 +-
.../lcm/status/SegmentStatusManager.java | 14 +-
.../processing/api/dataloader/SchemaInfo.java | 28 +--
.../processing/csvload/DataGraphExecuter.java | 2 +-
.../processing/csvload/GraphExecutionUtil.java | 2 +-
.../dataprocessor/DataProcessTaskStatus.java | 39 +---
.../dataprocessor/IDataProcessStatus.java | 20 +-
.../graphgenerator/GraphGenerator.java | 42 ++--
.../configuration/GraphConfigurationInfo.java | 14 +-
.../processing/mdkeygen/MDKeyGenStep.java | 10 +-
.../processing/mdkeygen/MDKeyGenStepMeta.java | 55 ++---
.../merger/step/CarbonSliceMergerStep.java | 5 +-
.../merger/step/CarbonSliceMergerStepMeta.java | 52 ++---
.../processing/schema/metadata/ColumnsInfo.java | 43 +---
.../sortandgroupby/sortdata/SortDataRows.java | 20 +-
.../sortdatastep/SortKeyStep.java | 2 +-
.../sortdatastep/SortKeyStepMeta.java | 52 ++---
.../csvbased/BadRecordslogger.java | 4 +-
.../csvbased/CarbonCSVBasedSeqGenMeta.java | 41 ++--
.../csvbased/CarbonCSVBasedSeqGenStep.java | 19 +-
.../FileStoreSurrogateKeyGenForCSV.java | 6 +-
.../processing/util/CarbonSchemaParser.java | 40 ++--
80 files changed, 857 insertions(+), 956 deletions(-)
----------------------------------------------------------------------