[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r367249750
##
File path:
integration/spark-carbon-common-test/src/test/scala/org/apache/carbondata/sql/commands/TestCarbonShowCacheCommand.scala
##
@@ -175,13 +175,13 @@ class TestCarbonShowCacheCommand extends QueryTest with
BeforeAndAfterAll {
// Empty database
sql("use cache_empty_db").collect()
val result1 = sql("show metacache").collect()
-assertResult(2)(result1.length)
-assertResult(Row("cache_empty_db", "ALL", "0 B", "0 B", "0 B",
"DRIVER"))(result1(1))
+sql("show metacache").show()
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r367249802
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -169,41 +224,32 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
}
val (driverIndexSize, driverDatamapSize, allDictSize) =
getAllDriverCacheSize(tablePaths
.toList)
- if (driverRows.nonEmpty) {
+ if (driverIndexSize + driverDatamapSize + allDictSize != 0 &&
driverRows.size!=0) {
(Seq(
- Row("ALL", "ALL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER"),
- Row(currentDatabase,
-"ALL",
-driverdbIndexSize,
-driverdbDatamapSize,
-driverdbDictSize,
-"DRIVER")
+ Row("TOTAL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER")
) ++ driverRows).collect {
- case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
-Row(row(0), row(1), bytesToDisplaySize(row.getLong(2)),
- bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "DRIVER")
+ case row if row.getLong(1) != 0L || row.getLong(2) != 0L ||
row.getLong(3) != 0L =>
+Row(row(0), bytesToDisplaySize(row.getLong(1)),
+ bytesToDisplaySize(row.getLong(2)),
bytesToDisplaySize(row.getLong(3)), "DRIVER")
}
} else {
-makeEmptyCacheRows(currentDatabase)
+Seq()
}
} else {
- makeEmptyCacheRows(currentDatabase)
+ Seq()
}
-// val (serverIndexSize, serverDataMapSize) =
getAllIndexServerCacheSize
-val indexDisplayRows = if (indexServerRows.nonEmpty) {
+val indexDisplayRows = if (indexAllIndexSize + indexAllDatamapSize != 0 &&
+ indexServerRows.size != 0) {
(Seq(
-Row("ALL", "ALL", indexAllIndexSize, indexAllDatamapSize,
indexAllDictSize, "INDEX SERVER"),
-Row(currentDatabase,
- "ALL",
- indexdbIndexSize,
- indexdbDatamapSize,
- driverdbDictSize,
- "INDEX SERVER")
+Row("TOTAL", indexAllIndexSize, indexAllDatamapSize, indexAllDictSize,
"INDEX SERVER")
) ++ indexServerRows).collect {
-case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
- Row(row.get(0), row.get(1), bytesToDisplaySize(row.getLong(2)),
-bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "INDEX SERVER")
+case row if row.getLong(1) != 0L || row.getLong(2) != 0L ||
row.getLong(3) != 0L =>
+ Row(row.get(0),
+bytesToDisplaySize(row.getLong(1)),
+bytesToDisplaySize(row.getLong(2)),
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r367249817
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
##
@@ -560,9 +560,9 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser {
}
protected lazy val showCache: Parser[LogicalPlan] =
-SHOW ~> METACACHE ~> opt(ontable) <~ opt(";") ^^ {
- case table =>
-CarbonShowCacheCommand(table)
+(SHOW ~> opt(EXECUTOR) <~ METACACHE) ~ opt(ontable) <~ opt(";") ^^ {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r367249765
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -110,13 +132,41 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
}
}
+ def getAllExecutorCache(sparkSession: SparkSession): Seq[Row] = {
+val isDistributedPruningEnabled = CarbonProperties.getInstance()
+ .isDistributedPruningEnabled("", "")
+if (!isDistributedPruningEnabled) {
+ // Block here. this feature is only with index server enabled
+ throw new UnsupportedOperationException(
+"Show Executor Metacache is only avalable with Index Server Enabled")
+ Seq()
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180545
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala
##
@@ -562,7 +563,13 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser {
protected lazy val showCache: Parser[LogicalPlan] =
SHOW ~> METACACHE ~> opt(ontable) <~ opt(";") ^^ {
case table =>
-CarbonShowCacheCommand(table)
+CarbonShowCacheCommand(false, table)
+}
+
+ protected lazy val showExecutorCache: Parser[LogicalPlan] =
+SHOW ~> EXECUTOR ~> METACACHE ~> opt(ontable) <~ opt(";") ^^ {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180496
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -135,23 +193,46 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
carbonTables.flatMap {
mainTable =>
try {
-makeRows(getTableCacheFromIndexServer(mainTable)(sparkSession),
mainTable)
+val row = makeRows(getTableCacheFromIndexServer(showExecutorCache,
+ mainTable)(sparkSession), mainTable)
+var res: List[Any] = null
+for (i <- row.toList) {
+ res = i.toSeq.toList
+}
+if (res(1) == 0 && res(2) == 0 && res(3) == 0) {
+ Seq()
+} else {
+ row
+}
} catch {
case ex: UnsupportedOperationException => Seq()
}
}
-} else { Seq() }
+} else {
+ Seq()
+}
val driverRows = if (cache != null) {
carbonTables.flatMap {
carbonTable =>
try {
-makeRows(getTableCacheFromDriver(sparkSession, carbonTable),
carbonTable)
+val row = makeRows(getTableCacheFromDriver(sparkSession,
carbonTable), carbonTable)
+var res: List[Any] = null
+for (i <- row.toList) {
+ res = i.toSeq.toList
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180462
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -135,23 +193,46 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
carbonTables.flatMap {
mainTable =>
try {
-makeRows(getTableCacheFromIndexServer(mainTable)(sparkSession),
mainTable)
+val row = makeRows(getTableCacheFromIndexServer(showExecutorCache,
+ mainTable)(sparkSession), mainTable)
+var res: List[Any] = null
+for (i <- row.toList) {
+ res = i.toSeq.toList
+}
+if (res(1) == 0 && res(2) == 0 && res(3) == 0) {
+ Seq()
+} else {
+ row
+}
} catch {
case ex: UnsupportedOperationException => Seq()
}
}
-} else { Seq() }
+} else {
+ Seq()
+}
val driverRows = if (cache != null) {
carbonTables.flatMap {
carbonTable =>
try {
-makeRows(getTableCacheFromDriver(sparkSession, carbonTable),
carbonTable)
+val row = makeRows(getTableCacheFromDriver(sparkSession,
carbonTable), carbonTable)
+var res: List[Any] = null
+for (i <- row.toList) {
+ res = i.toSeq.toList
+}
+if (res(1) == 0 && res(2) == 0 && res(3) == 0) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180429
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -171,39 +252,33 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
.toList)
if (driverRows.nonEmpty) {
(Seq(
- Row("ALL", "ALL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER"),
- Row(currentDatabase,
-"ALL",
-driverdbIndexSize,
-driverdbDatamapSize,
-driverdbDictSize,
-"DRIVER")
+ Row("TOTAL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER")
) ++ driverRows).collect {
- case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
-Row(row(0), row(1), bytesToDisplaySize(row.getLong(2)),
- bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "DRIVER")
+ case row if row.getLong(1) != 0L || row.getLong(2) != 0L ||
row.getLong(3) != 0L =>
+Row(row(0), bytesToDisplaySize(row.getLong(1)),
+ bytesToDisplaySize(row.getLong(2)),
bytesToDisplaySize(row.getLong(3)), "DRIVER")
}
} else {
-makeEmptyCacheRows(currentDatabase)
+makeEmptyCacheRows(currentDatabase, "DRIVER")
}
} else {
- makeEmptyCacheRows(currentDatabase)
+ makeEmptyCacheRows(currentDatabase, "DRIVER")
}
-// val (serverIndexSize, serverDataMapSize) =
getAllIndexServerCacheSize
-val indexDisplayRows = if (indexServerRows.nonEmpty) {
- (Seq(
-Row("ALL", "ALL", indexAllIndexSize, indexAllDatamapSize,
indexAllDictSize, "INDEX SERVER"),
-Row(currentDatabase,
- "ALL",
- indexdbIndexSize,
- indexdbDatamapSize,
- driverdbDictSize,
- "INDEX SERVER")
- ) ++ indexServerRows).collect {
-case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
- Row(row.get(0), row.get(1), bytesToDisplaySize(row.getLong(2)),
-bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "INDEX SERVER")
+val indexDisplayRows = if (isDistributedPruningEnabled) {
+ if (indexServerRows.nonEmpty) {
+(Seq(
+ Row("TOTAL", indexAllIndexSize, indexAllDatamapSize,
indexAllDictSize, "INDEX SERVER")
+) ++ indexServerRows).collect {
+ case row if row.getLong(1) != 0L || row.getLong(2) != 0L ||
row.getLong(3) != 0L =>
+Row(row.get(0),
+ bytesToDisplaySize(row.getLong(1)),
+ bytesToDisplaySize(row.getLong(2)),
+ bytesToDisplaySize(row.getLong(3)),
+ "INDEX SERVER")
+}
+ } else {
+makeEmptyCacheRows(currentDatabase, "INDEXSERVER")
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180105
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -110,13 +137,42 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
}
}
+ def getAllExecutorCache(sparkSession: SparkSession): Seq[Row] = {
+val isDistributedPruningEnabled = CarbonProperties.getInstance()
+ .isDistributedPruningEnabled("", "")
+if (!isDistributedPruningEnabled) {
+ getAllTablesCache(sparkSession)
+}
+else {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180130
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -110,13 +137,42 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
}
}
+ def getAllExecutorCache(sparkSession: SparkSession): Seq[Row] = {
+val isDistributedPruningEnabled = CarbonProperties.getInstance()
+ .isDistributedPruningEnabled("", "")
+if (!isDistributedPruningEnabled) {
+ getAllTablesCache(sparkSession)
+}
+else {
+ // get all the executor details from the index server
+ try {
+val executorCacheValue = executeJobToGetCache(showExecutorCache,
List())
+val result = executorCacheValue.flatMap {
+ iterator =>
+Seq(Row(iterator._1, bytesToDisplaySize(iterator._3)))
+}
+result
+ }
+ catch {
+case ex: Exception =>
+ LOGGER.error("Error while getting cache from the Index Server", ex)
+ Seq()
+ }
+}
+ }
+
def getAllTablesCache(sparkSession: SparkSession): Seq[Row] = {
val currentDatabase = sparkSession.sessionState.catalog.getCurrentDatabase
val cache = CacheProvider.getInstance().getCarbonCache
val isDistributedPruningEnabled = CarbonProperties.getInstance()
.isDistributedPruningEnabled("", "")
-if (cache == null && !isDistributedPruningEnabled) {
- return makeEmptyCacheRows(currentDatabase)
+if (!isDistributedPruningEnabled) {
+ if (cache == null) {
+return makeEmptyCacheRows(currentDatabase, "DRIVER")
+ }
+ if (cache.getCurrentSize == 0) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180259
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -171,39 +252,33 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
.toList)
if (driverRows.nonEmpty) {
(Seq(
- Row("ALL", "ALL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER"),
- Row(currentDatabase,
-"ALL",
-driverdbIndexSize,
-driverdbDatamapSize,
-driverdbDictSize,
-"DRIVER")
+ Row("TOTAL", driverIndexSize, driverDatamapSize, allDictSize,
"DRIVER")
) ++ driverRows).collect {
- case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
-Row(row(0), row(1), bytesToDisplaySize(row.getLong(2)),
- bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "DRIVER")
+ case row if row.getLong(1) != 0L || row.getLong(2) != 0L ||
row.getLong(3) != 0L =>
+Row(row(0), bytesToDisplaySize(row.getLong(1)),
+ bytesToDisplaySize(row.getLong(2)),
bytesToDisplaySize(row.getLong(3)), "DRIVER")
}
} else {
-makeEmptyCacheRows(currentDatabase)
+makeEmptyCacheRows(currentDatabase, "DRIVER")
}
} else {
- makeEmptyCacheRows(currentDatabase)
+ makeEmptyCacheRows(currentDatabase, "DRIVER")
}
-// val (serverIndexSize, serverDataMapSize) =
getAllIndexServerCacheSize
-val indexDisplayRows = if (indexServerRows.nonEmpty) {
- (Seq(
-Row("ALL", "ALL", indexAllIndexSize, indexAllDatamapSize,
indexAllDictSize, "INDEX SERVER"),
-Row(currentDatabase,
- "ALL",
- indexdbIndexSize,
- indexdbDatamapSize,
- driverdbDictSize,
- "INDEX SERVER")
- ) ++ indexServerRows).collect {
-case row if row.getLong(2) != 0L || row.getLong(3) != 0L ||
row.getLong(4) != 0L =>
- Row(row.get(0), row.get(1), bytesToDisplaySize(row.getLong(2)),
-bytesToDisplaySize(row.getLong(3)),
bytesToDisplaySize(row.getLong(4)), "INDEX SERVER")
+val indexDisplayRows = if (isDistributedPruningEnabled) {
+ if (indexServerRows.nonEmpty) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180193
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -127,6 +183,8 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
carbonTables += carbonTable
}
} catch {
+ case ex: AnalysisException =>
+LOGGER.info("Unable to access Carbon table object for table" +
tableIdent.table)
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180075
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -41,25 +42,42 @@ import org.apache.carbondata.spark.util.CarbonScalaUtil
import org.apache.carbondata.spark.util.CommonUtil.bytesToDisplaySize
-case class CarbonShowCacheCommand(tableIdentifier: Option[TableIdentifier],
+case class CarbonShowCacheCommand(showExecutorCache: Boolean,
+tableIdentifier: Option[TableIdentifier],
internalCall: Boolean = false)
extends MetadataCommand {
private lazy val cacheResult: Seq[(String, Int, Long, String)] = {
-executeJobToGetCache(List())
+executeJobToGetCache(showExecutorCache, List())
}
private val LOGGER =
LogServiceFactory.getLogService(classOf[CarbonShowCacheCommand].getName)
override def output: Seq[AttributeReference] = {
if (tableIdentifier.isEmpty) {
- Seq(
-AttributeReference("Database", StringType, nullable = false)(),
-AttributeReference("Table", StringType, nullable = false)(),
-AttributeReference("Index size", StringType, nullable = false)(),
-AttributeReference("Datamap size", StringType, nullable = false)(),
-AttributeReference("Dictionary size", StringType, nullable = false)(),
-AttributeReference("Cache Location", StringType, nullable = false)())
+ val isDistributedPruningEnabled = CarbonProperties.getInstance()
+.isDistributedPruningEnabled("", "")
+ if (showExecutorCache == false) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180004
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -74,7 +92,15 @@ case class CarbonShowCacheCommand(tableIdentifier:
Option[TableIdentifier],
/**
* Assemble result for database
*/
- getAllTablesCache(sparkSession)
+ if (showExecutorCache == false) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365180029
##
File path:
integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/cache/CarbonShowCacheCommand.scala
##
@@ -41,25 +42,42 @@ import org.apache.carbondata.spark.util.CarbonScalaUtil
import org.apache.carbondata.spark.util.CommonUtil.bytesToDisplaySize
-case class CarbonShowCacheCommand(tableIdentifier: Option[TableIdentifier],
+case class CarbonShowCacheCommand(showExecutorCache: Boolean,
+tableIdentifier: Option[TableIdentifier],
internalCall: Boolean = false)
extends MetadataCommand {
private lazy val cacheResult: Seq[(String, Int, Long, String)] = {
-executeJobToGetCache(List())
+executeJobToGetCache(showExecutorCache, List())
}
private val LOGGER =
LogServiceFactory.getLogService(classOf[CarbonShowCacheCommand].getName)
override def output: Seq[AttributeReference] = {
if (tableIdentifier.isEmpty) {
- Seq(
-AttributeReference("Database", StringType, nullable = false)(),
-AttributeReference("Table", StringType, nullable = false)(),
-AttributeReference("Index size", StringType, nullable = false)(),
-AttributeReference("Datamap size", StringType, nullable = false)(),
-AttributeReference("Dictionary size", StringType, nullable = false)(),
-AttributeReference("Cache Location", StringType, nullable = false)())
+ val isDistributedPruningEnabled = CarbonProperties.getInstance()
+.isDistributedPruningEnabled("", "")
+ if (showExecutorCache == false) {
+Seq(
+ AttributeReference("Database and Table", StringType, nullable =
false)(),
+ AttributeReference("Index size", StringType, nullable = false)(),
+ AttributeReference("Datamap size", StringType, nullable = false)(),
+ AttributeReference("Dictionary size", StringType, nullable =
false)(),
+ AttributeReference("Cache Location", StringType, nullable = false)())
+ } else {
+if (!isDistributedPruningEnabled) {
+ Seq(
+AttributeReference("Database and Table", StringType, nullable =
false)(),
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365179930
##
File path:
integration/spark2/src/main/scala/org/apache/carbondata/indexserver/IndexServer.scala
##
@@ -57,7 +57,7 @@ trait ServerInterface {
/**
* Get the cache size for the specified tables.
*/
- def showCache(tableIds: String) : Array[String]
+ def showCache(executorCache: Boolean, tableIds: String) : Array[String]
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365179961
##
File path:
integration/spark2/src/main/scala/org/apache/carbondata/indexserver/IndexServer.scala
##
@@ -205,14 +205,18 @@ object IndexServer extends ServerInterface {
}
}
- override def showCache(tableId: String = ""): Array[String] = doAs {
+ override def showCache(executorCache: Boolean, tableId: String = ""):
Array[String] = doAs {
val jobgroup: String = "Show Cache " + (tableId match {
- case "" => "for all tables"
+ case "" =>
+executorCache match {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] [carbondata] vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]: Changes to show metacache command
vikramahuja1001 commented on a change in pull request #3565: [CARBONDATA-3662]:
Changes to show metacache command
URL: https://github.com/apache/carbondata/pull/3565#discussion_r365179893
##
File path:
integration/spark2/src/main/scala/org/apache/carbondata/indexserver/DistributedShowCacheRDD.scala
##
@@ -71,10 +75,21 @@ class DistributedShowCacheRDD(@transient private val ss:
SparkSession, tableUniq
.getTableUniqueName
} else {
dataMap.getDataMapSchema.getRelationIdentifier.getDatabaseName +
"_" + dataMap
- .getDataMapSchema.getDataMapName
+.getDataMapSchema.getDataMapName
+}
+if (executorCache == true) {
Review comment:
done
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:
us...@infra.apache.org
With regards,
Apache Git Services
