You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@carbondata.apache.org by GitBox <gi...@apache.org> on 2020/04/28 13:42:11 UTC
[GitHub] [carbondata] akashrn5 commented on a change in pull request #3727: [CARBONDATA-3778] Change conf.getProperty("carbon.storelocation") to CarbonEvn.getDatabaseLocation in mv module
akashrn5 commented on a change in pull request #3727:
URL: https://github.com/apache/carbondata/pull/3727#discussion_r416616355
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -228,8 +200,8 @@ private static ICarbonLock getStatusLock(String databaseName) {
* @param schemaList schemas of which are need to be updated in mv status
* @param status status to be updated for the mv schemas
*/
- public void updateStatus(List<MVSchema> schemaList,
- MVStatus status) throws IOException {
+ public void updateStatus(MVManager viewManager, List<MVSchema> schemaList, MVStatus status)
Review comment:
correct the style like before
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -121,70 +100,63 @@ private SchemaProvider getSchemaProvider(String databaseName) {
return schemaProvider;
}
- public MVSchema getSchema(MVManager viewManager,
- String databaseName, String viewName) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ public MVSchema getSchema(MVManager viewManager, String databaseName, String viewName)
+ throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return null;
}
return schemaProvider.retrieveSchema(viewManager, viewName);
}
- List<MVSchema> getSchemas(MVManager viewManager,
- String databaseName, CarbonTable carbonTable) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ List<MVSchema> getSchemas(MVManager viewManager, String databaseName, CarbonTable carbonTable)
+ throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return Collections.emptyList();
} else {
return schemaProvider.retrieveSchemas(viewManager, carbonTable);
}
}
- List<MVSchema> getSchemas(MVManager viewManager,
- String databaseName) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ List<MVSchema> getSchemas(MVManager viewManager, String databaseName) throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return Collections.emptyList();
} else {
return schemaProvider.retrieveAllSchemas(viewManager);
}
}
- void saveSchema(MVManager viewManager, String databaseName,
- MVSchema viewSchema) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ void saveSchema(MVManager viewManager, String databaseName, MVSchema viewSchema)
Review comment:
please keep the style as before, revert the method signature changes, just change `SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);`
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -121,70 +100,63 @@ private SchemaProvider getSchemaProvider(String databaseName) {
return schemaProvider;
}
- public MVSchema getSchema(MVManager viewManager,
- String databaseName, String viewName) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ public MVSchema getSchema(MVManager viewManager, String databaseName, String viewName)
+ throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return null;
}
return schemaProvider.retrieveSchema(viewManager, viewName);
}
- List<MVSchema> getSchemas(MVManager viewManager,
- String databaseName, CarbonTable carbonTable) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ List<MVSchema> getSchemas(MVManager viewManager, String databaseName, CarbonTable carbonTable)
Review comment:
same as below comment
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -121,70 +100,63 @@ private SchemaProvider getSchemaProvider(String databaseName) {
return schemaProvider;
}
- public MVSchema getSchema(MVManager viewManager,
- String databaseName, String viewName) throws IOException {
Review comment:
same as below comment
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -121,70 +100,63 @@ private SchemaProvider getSchemaProvider(String databaseName) {
return schemaProvider;
}
- public MVSchema getSchema(MVManager viewManager,
- String databaseName, String viewName) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ public MVSchema getSchema(MVManager viewManager, String databaseName, String viewName)
+ throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return null;
}
return schemaProvider.retrieveSchema(viewManager, viewName);
}
- List<MVSchema> getSchemas(MVManager viewManager,
- String databaseName, CarbonTable carbonTable) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ List<MVSchema> getSchemas(MVManager viewManager, String databaseName, CarbonTable carbonTable)
+ throws IOException {
+ SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);
if (schemaProvider == null) {
return Collections.emptyList();
} else {
return schemaProvider.retrieveSchemas(viewManager, carbonTable);
}
}
- List<MVSchema> getSchemas(MVManager viewManager,
- String databaseName) throws IOException {
- SchemaProvider schemaProvider = this.getSchemaProvider(databaseName);
+ List<MVSchema> getSchemas(MVManager viewManager, String databaseName) throws IOException {
Review comment:
please keep the style as before, revert the method signature changes, just change `SchemaProvider schemaProvider = this.getSchemaProvider(viewManager, databaseName);`
##########
File path: core/src/main/java/org/apache/carbondata/core/view/MVProvider.java
##########
@@ -74,42 +74,21 @@
private static final String STATUS_FILE_NAME = "mv_status";
- private final String storeLocation;
-
private final Map<String, SchemaProvider> schemaProviders = new ConcurrentHashMap<>();
- private MVProvider(String storeLocation) {
- this.storeLocation = storeLocation;
- }
-
- public static MVProvider get() {
- String storeLocation =
- CarbonProperties.getInstance().getProperty(CarbonCommonConstants.STORE_LOCATION);
- if (storeLocation == null) {
- throw new RuntimeException(
- "Property [" + CarbonCommonConstants.STORE_LOCATION + "] is not set.");
- }
- return new MVProvider(storeLocation);
- }
-
private static String getSchemaPath(String schemaRoot, String viewName) {
return schemaRoot + CarbonCommonConstants.FILE_SEPARATOR + "mv_schema." + viewName;
}
- private SchemaProvider getSchemaProvider(String databaseName) {
+ private SchemaProvider getSchemaProvider(MVManager viewManager, String databaseName) {
String databaseNameUpper = databaseName.toUpperCase();
SchemaProvider schemaProvider = this.schemaProviders.get(databaseNameUpper);
if (schemaProvider == null) {
synchronized (this.schemaProviders) {
schemaProvider = this.schemaProviders.get(databaseNameUpper);
if (schemaProvider == null) {
- String databaseLocation;
- if (databaseNameUpper.equalsIgnoreCase(CarbonCommonConstants.DATABASE_DEFAULT_NAME)) {
- databaseLocation = CarbonUtil.checkAndAppendHDFSUrl(this.storeLocation);
- } else {
- databaseLocation = CarbonUtil.checkAndAppendHDFSUrl(this.storeLocation +
- CarbonCommonConstants.FILE_SEPARATOR + databaseName + ".db");
- }
+ final String databaseLocation = FileFactory.getCarbonFile(
Review comment:
1. assign `viewManager.getDatabaseLocation(databaseName)` to a variable as databaseLocation.
2.assign ` FileFactory.getCarbonFile(databaseLocation)` to a variable and reuse same in if check condition at line number 92
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org