Skip to content

Commit 49c330a

Browse files
t-rufangt-rufang
committed
Fix term Spark usage in toolkit UI
1 parent 1c25eda commit 49c330a

31 files changed

+91
-80
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml‎

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -206,23 +206,27 @@
206206
</action>
207207

208208
<action id="Actions.SubmitSparkApplicationAction"
209-
class="com.microsoft.azure.hdinsight.spark.actions.SparkSubmitJobAction" text="Submit Spark Application"
210-
description="Submit Spark Application" icon="/icons/Spark.png"/>
209+
class="com.microsoft.azure.hdinsight.spark.actions.SparkSubmitJobAction"
210+
text="Submit Apache Spark Application"
211+
description="Submit Apache Spark Application" icon="/icons/Spark.png"/>
211212
<action id="Actions.SubmitLivySparkApplicationAction"
212-
class="com.microsoft.azure.hdinsight.spark.actions.LivySparkSelectAndSubmitAction" text="Spark on HDInsight"
213-
description="Submit Spark on HDInsight Application" icon="/icons/Spark.png"/>
213+
class="com.microsoft.azure.hdinsight.spark.actions.LivySparkSelectAndSubmitAction" text="Apache Spark on HDInsight"
214+
description="Submit Apache Spark on HDInsight Application" icon="/icons/Spark.png"/>
214215
<action id="Actions.SubmitCosmosSparkApplicationAction"
215-
class="com.microsoft.azure.hdinsight.spark.actions.CosmosSparkSelectAndSubmitAction" text="Spark on Cosmos"
216-
description="Submit Spark on Cosmos Application" icon="/icons/Spark.png"/>
216+
class="com.microsoft.azure.hdinsight.spark.actions.CosmosSparkSelectAndSubmitAction"
217+
text="Apache Spark on Cosmos"
218+
description="Submit Apache Spark on Cosmos Application" icon="/icons/Spark.png"/>
217219
<action id="Actions.SubmitCosmosServerlessSparkApplicationAction"
218-
class="com.microsoft.azure.hdinsight.spark.actions.CosmosServerlessSparkSelectAndSubmitAction" text="Spark on Cosmos Serverless"
219-
description="Submit Spark on Cosmos Serverless Application" icon="/icons/Spark.png"/>
220+
class="com.microsoft.azure.hdinsight.spark.actions.CosmosServerlessSparkSelectAndSubmitAction" text="Apache Spark on Cosmos Serverless"
221+
description="Submit Apache Spark on Cosmos Serverless Application" icon="/icons/Spark.png"/>
220222
<action id="Actions.SubmitArisSparkApplicationAction"
221-
class="com.microsoft.azure.hdinsight.spark.actions.ArisSparkSelectAndSubmitAction" text="Spark on SQL Server Big Data Cluster"
222-
description="Submit Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
223+
class="com.microsoft.azure.hdinsight.spark.actions.ArisSparkSelectAndSubmitAction"
224+
text="Apache Spark on SQL Server Big Data Cluster"
225+
description="Submit Apache Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
223226
<action id="Actions.SubmitArcadiaSparkApplicationAction"
224-
class="com.microsoft.azure.hdinsight.spark.actions.ArcadiaSparkSelectAndSubmitAction" text="Spark on Synapse"
225-
description="Submit Spark on Synapse Application" icon="/icons/Spark.png"/>
227+
class="com.microsoft.azure.hdinsight.spark.actions.ArcadiaSparkSelectAndSubmitAction"
228+
text="Apache Spark on Azure Synapse"
229+
description="Submit Apache Spark on Azure Synapse Application" icon="/icons/Spark.png"/>
226230

227231
<action id="AzureToolkit.AzureSignIn" class="com.microsoft.azuretools.ijidea.actions.AzureSignInAction" text="Azure Sign In..." />
228232
<action id="AzureToolkit.SelectSubscriptions" class="com.microsoft.azuretools.ijidea.actions.SelectSubscriptionsAction" text="Select Subscriptions..."
@@ -276,17 +280,17 @@
276280
<keyboard-shortcut first-keystroke="ctrl shift alt F2" keymap="$default"/>
277281
</action>
278282
<action id="Spark.RunScalaLocalConsole" class="com.microsoft.azure.hdinsight.spark.console.RunSparkLocalConsoleActionDelegate"
279-
text="Run Spark Local Console(Scala)" description="Run Spark Local Console (Scala language)">
283+
text="Run Apache Spark Local Console(Scala)" description="Run Apache Spark Local Console (Scala language)">
280284
</action>
281285
<action id="Spark.RunScalaLivyConsole" class="com.microsoft.azure.hdinsight.spark.console.RunSparkLivyConsoleActionDelegate"
282-
text="Run Spark Livy Interactive Session Console(Scala)" description="Run Spark Livy Interactive Session Console (Scala language)">
286+
text="Run Apache Spark Livy Interactive Session Console(Scala)" description="Run Apache Spark Livy Interactive Session Console (Scala language)">
283287
</action>
284288
<action id="SparkConsole.Execute" class="com.microsoft.azure.hdinsight.spark.console.SparkConsoleExecuteAction" text="Execute Spark Console Statement">
285289
<keyboard-shortcut first-keystroke="control ENTER" keymap="$default"/>
286290
<keyboard-shortcut keymap="Mac OS X" first-keystroke="meta shift ENTER"/>
287291
</action>
288292
<action id="Spark.SendSelectionToConsole" class="com.microsoft.azure.hdinsight.spark.console.SparkSendSelectionToConsoleActionDelegate"
289-
text="Send Selection To Spark Console" description="Send selection to Spark console">
293+
text="Send Selection To Apache Spark Console" description="Send selection to Apache Spark console">
290294
<add-to-group group-id="RunContextPopupGroup" anchor="last"/>
291295
<keyboard-shortcut first-keystroke="control shift S" keymap="$default"/>
292296
<keyboard-shortcut keymap="Mac OS X" first-keystroke="ctrl shift S"/>
@@ -354,7 +358,7 @@
354358
<reference ref="Actions.WhatsNew"/>
355359
</group>
356360

357-
<group id="SparkConsoleGroup" text="Spark Console" description="Spark Console" popup="true">
361+
<group id="SparkConsoleGroup" text="Apache Spark Console" description="Apache Spark Console" popup="true">
358362
<add-to-group group-id="RunContextPopupGroup" anchor="last"/>
359363
<add-to-group group-id="ToolsMenu" anchor="last"/>
360364
<reference ref="Spark.RunScalaLocalConsole"/>
@@ -368,53 +372,58 @@
368372
class="com.microsoft.azure.hdinsight.spark.run.action.SelectNoneSparkTypeAction" text="None" >
369373
</action>
370374
<action id="Actions.SelectCosmosSparkType"
371-
class="com.microsoft.azure.hdinsight.spark.run.action.SelectCosmosSparkTypeAction" text="Spark on Cosmos" >
375+
class="com.microsoft.azure.hdinsight.spark.run.action.SelectCosmosSparkTypeAction" text="Apache Spark on Cosmos" >
372376
</action>
373377
<action id="Actions.SelectCosmosServerlessSparkType"
374-
class="com.microsoft.azure.hdinsight.spark.run.action.SelectCosmosServerlessSparkTypeAction" text="Spark on Cosmos Serverless" >
378+
class="com.microsoft.azure.hdinsight.spark.run.action.SelectCosmosServerlessSparkTypeAction" text="Apache Spark on Cosmos Serverless" >
375379
</action>
376380
<action id="Actions.SelectHDInsightSparkType"
377-
class="com.microsoft.azure.hdinsight.spark.run.action.SelectHDInsightSparkTypeAction" text="Spark on HDInsight" >
381+
class="com.microsoft.azure.hdinsight.spark.run.action.SelectHDInsightSparkTypeAction" text="Apache Spark on HDInsight" >
378382
</action>
379383
<action id="Actions.SelectArisSparkType"
380-
class="com.microsoft.azure.hdinsight.spark.run.action.SelectArisSparkTypeAction" text="Spark on SQL Server Big Data Cluster" >
384+
class="com.microsoft.azure.hdinsight.spark.run.action.SelectArisSparkTypeAction"
385+
text="Apache Spark on SQL Server Big Data Cluster" >
381386
</action>
382387
<action id="Actions.SelectArcadiaSparkType"
383-
class="com.microsoft.azure.hdinsight.spark.run.action.SelectArcadiaSparkTypeAction" text="Spark on Synapse" >
388+
class="com.microsoft.azure.hdinsight.spark.run.action.SelectArcadiaSparkTypeAction"
389+
text="Apache Spark on Azure Synapse" >
384390
</action>
385391
</group>
386392

387-
<action id="Actions.SparkSubmitJobActionGroups" class="com.microsoft.azure.hdinsight.spark.run.action.SparkSubmitJobActionGroups" text="Submit Spark Application"/>
393+
<action id="Actions.SparkSubmitJobActionGroups" class="com.microsoft.azure.hdinsight.spark.run.action.SparkSubmitJobActionGroups" text="Submit Apache Spark Application"/>
388394

389-
<action id="Actions.SparkRunLivyConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLivyConsoleActionGroups" text="Run Spark Console"/>
395+
<action id="Actions.SparkRunLivyConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLivyConsoleActionGroups" text="Run Apache Spark Console"/>
390396

391-
<action id="Actions.SparkRunLocalConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLocalConsoleActionGroups" text="Run Spark Local Console"/>
397+
<action id="Actions.SparkRunLocalConsoleActionGroups" class="com.microsoft.azure.hdinsight.spark.console.SparkRunLocalConsoleActionGroups" text="Run Apache Spark Local Console"/>
392398

393399
<action id="Actions.RunArcadiaSparkConsoleAction"
394-
class="com.microsoft.azure.hdinsight.spark.console.SelectArcadiaSparkTypeThenRunLivyConsoleAction" text="Spark on Arcadia"
395-
description="Start an interactive console for Spark on Arcadia Application" icon="/icons/Spark.png"/>
400+
class="com.microsoft.azure.hdinsight.spark.console.SelectArcadiaSparkTypeThenRunLivyConsoleAction"
401+
text="Apache Spark on Azure Synapse"
402+
description="Start an interactive console for Apache Spark on Azure Synapse Application" icon="/icons/Spark.png"/>
396403
<action id="Actions.RunLivySparkConsoleAction"
397-
class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLivyConsoleAction" text="Spark on HDInsight"
398-
description="Start an interactive console for Spark on HDInsight Application" icon="/icons/Spark.png"/>
404+
class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLivyConsoleAction" text="Apache Spark on HDInsight"
405+
description="Start an interactive console for Apache Spark on HDInsight Application" icon="/icons/Spark.png"/>
399406
<action id="Actions.RunCosmosSparkConsoleAction"
400-
class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLivyConsoleAction" text="Spark on Cosmos"
401-
description="Start an interactive console for Spark on Cosmos Application" icon="/icons/Spark.png"/>
407+
class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLivyConsoleAction" text="Apache Spark on Cosmos"
408+
description="Start an interactive console for Apache Spark on Cosmos Application" icon="/icons/Spark.png"/>
402409
<action id="Actions.RunArisSparkConsoleAction"
403-
class="com.microsoft.azure.hdinsight.spark.console.SelectArisSparkTypeThenRunLivyConsoleAction" text="Spark on SQL Server Big Data Cluster"
404-
description="Start an interactive console for Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
410+
class="com.microsoft.azure.hdinsight.spark.console.SelectArisSparkTypeThenRunLivyConsoleAction"
411+
text="Apache Spark on SQL Server Big Data Cluster"
412+
description="Start an interactive console for Apache Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
405413

406414
<action id="Actions.RunArcadiaSparkLocalConsoleAction"
407-
class="com.microsoft.azure.hdinsight.spark.console.SelectArcadiaSparkTypeThenRunLocalConsoleAction" text="Spark on Arcadia"
408-
description="Start a Spark local console for Spark on Arcadia Application" icon="/icons/Spark.png"/>
415+
class="com.microsoft.azure.hdinsight.spark.console.SelectArcadiaSparkTypeThenRunLocalConsoleAction" text="Apache Spark on Azure Synapse"
416+
description="Start a Apache Spark local console for Apache Spark on Azure Synapse Application" icon="/icons/Spark.png"/>
409417
<action id="Actions.RunLivySparkLocalConsoleAction"
410-
class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLocalConsoleAction" text="Spark on HDInsight"
411-
description="Start a Spark local console for Spark on HDInsight Application" icon="/icons/Spark.png"/>
418+
class="com.microsoft.azure.hdinsight.spark.console.SelectLivySparkTypeThenRunLocalConsoleAction" text="Apache Spark on HDInsight"
419+
description="Start a Apache Spark local console for Apache Spark on HDInsight Application" icon="/icons/Spark.png"/>
412420
<action id="Actions.RunCosmosSparkLocalConsoleAction"
413-
class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLocalConsoleAction" text="Spark on Cosmos"
414-
description="Start a Spark local console for Spark on Cosmos Application" icon="/icons/Spark.png"/>
421+
class="com.microsoft.azure.hdinsight.spark.console.SelectCosmosSparkTypeThenRunLocalConsoleAction" text="Apache Spark on Cosmos"
422+
description="Start a Apache Spark local console for Apache Spark on Cosmos Application" icon="/icons/Spark.png"/>
415423
<action id="Actions.RunArisSparkLocalConsoleAction"
416-
class="com.microsoft.azure.hdinsight.spark.console.SelectArisSparkTypeThenRunLocalConsoleAction" text="Spark on SQL Server Big Data Cluster"
417-
description="Start a Spark local console for Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
424+
class="com.microsoft.azure.hdinsight.spark.console.SelectArisSparkTypeThenRunLocalConsoleAction"
425+
text="Apache Spark on SQL Server Big Data Cluster"
426+
description="Start a Apache Spark local console for Apache Spark on SQL Server Big Data Cluster Application" icon="/icons/Spark.png"/>
418427
<action id="page.new" class="com.microsoft.intellij.actions.CreateFunctionAction"
419428
text="Azure Function Class"
420429
description="Create New Azure Function Class">

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/cosmosspark/CosmosSparkClusterOpsCtrl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public void refreshActionPerformed(@Nullable AnActionEvent anActionEvent) {
276276
String errorHint = "Error loading Serverless jobs. ";
277277
log().warn(errorHint + ExceptionUtils.getStackTrace(err));
278278
// show warning message when view serverless jobs failed
279-
PluginUtil.displayWarningDialog("View Spark on Cosmos Serverless Jobs ", errorHint + err.getMessage());
279+
PluginUtil.displayWarningDialog("View Apache Spark on Cosmos Serverless Jobs ", errorHint + err.getMessage());
280280
})
281281
// retry should be allowed when error happened
282282
.retry()

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/common/CosmosSparkSubmitModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ open class CosmosSparkSubmitModel : SparkSubmitModel {
5151
Pair(SparkSubmissionParameter.ExecutorCores, SparkSubmissionParameter.ExecutorCoresDefaultValue)).stream()
5252
}
5353

54-
override fun getSparkClusterTypeDisplayName(): String = "Azure Data Lake Spark cluster"
54+
override fun getSparkClusterTypeDisplayName(): String = "Apache Spark on Cosmos cluster"
5555
}

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkLivySessionProcessHandler.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class SparkLivySessionProcessHandler(val process: SparkLivySessionProcess)
6969
}
7070

7171
override fun startNotify() {
72-
notifyTextAvailable("Start Spark Livy Interactive Session Console in cluster ${process.session.baseUrl.host}...\n", SYSTEM)
72+
notifyTextAvailable("Start Apache Spark Livy Interactive Session Console in cluster ${process.session.baseUrl.host}...\n", SYSTEM)
7373
addProcessListener(object : ProcessAdapter() {
7474
override fun startNotified(event: ProcessEvent) {
7575
val stdoutReader = SparkSimpleLogStreamReader(this@SparkLivySessionProcessHandler, process.inputStream, STDOUT)

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLivyConsoleConfigurationType.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class SparkScalaLivyConsoleConfigurationType : ScalaConsoleConfigurationType() {
3535

3636
override fun getDisplayName(): String = "Spark Livy Interactive Session Console(Scala)"
3737

38-
override fun getConfigurationTypeDescription(): String = "Spark Livy Interactive Session Console(Scala) run configurations"
38+
override fun getConfigurationTypeDescription(): String = "Apache Spark Livy Interactive Session Console(Scala) " +
39+
"run configurations"
3940

4041
override fun getId(): String = "SparkScalaLivyConsoleRunConfiguration"
4142
}

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLivyConsoleRunConfigurationFactory.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ class SparkScalaLivyConsoleRunConfigurationFactory(sparkConsoleType: SparkScalaL
4545
template.project,
4646
this,
4747
template,
48-
"${template.name} >> Synapse Spark Livy Interactive Session Console(Scala)")
48+
"${template.name} >> Apache Spark on Azure Synapse Livy Interactive Session Console(Scala)")
4949
is CosmosSparkRunConfiguration ->
5050
CosmosSparkScalaLivyConsoleRunConfiguration(
5151
template.project,
5252
this,
5353
template,
54-
"${template.name} >> Azure Data Lake Spark Livy Interactive Session Console(Scala)")
54+
"${template.name} >> Apache Spark on Cosmos Livy Interactive Session Console(Scala)")
5555
is LivySparkBatchJobRunConfiguration ->
5656
SparkScalaLivyConsoleRunConfiguration(
5757
template.project,

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLocalConsoleConfigurationType.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class SparkScalaLocalConsoleConfigurationType : ScalaConsoleConfigurationType()
3535

3636
override fun getDisplayName(): String = "Spark Local Console(Scala)"
3737

38-
override fun getConfigurationTypeDescription(): String = "Spark local console(Scala) run configurations"
38+
override fun getConfigurationTypeDescription(): String = "Apache Spark local console(Scala) run configurations"
3939

4040
override fun getId(): String = "SparkScalaLocalConsoleRunConfiguration"
4141
}

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkScalaLocalConsoleRunConfiguration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class SparkScalaLocalConsoleRunConfiguration(
217217
val newLibConf: NewLibraryConfiguration = JarRepositoryManager.resolveAndDownload(
218218
project, libraryCoord, false, false, true, null, projectRepositories) ?: return@runInWriteAction
219219
val libraryType = newLibConf.libraryType
220-
val library = LibraryTablesRegistrar.getInstance().getLibraryTable(project).createLibrary("Spark Console(auto-fix): $libraryCoord")
220+
val library = LibraryTablesRegistrar.getInstance().getLibraryTable(project).createLibrary("Apache Spark Console(auto-fix): $libraryCoord")
221221

222222
val editor = NewLibraryEditor(libraryType, newLibConf.properties)
223223
newLibConf.addRoots(editor)

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkSendSelectionToConsoleAction.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class SparkSendSelectionToConsoleAction : AzureAnAction(), ILogger {
6363

6464
setEnabled(true)
6565
} catch (ex: Exception) {
66-
log().debug("Send to Spark Console action is Disabled", ex)
66+
log().debug("Send to Apache Spark Console action is Disabled", ex)
6767
}
6868
}
6969

@@ -96,7 +96,7 @@ class SparkSendSelectionToConsoleAction : AzureAnAction(), ILogger {
9696
outputStream.write("$text\n".toByteArray(UTF_8))
9797
outputStream.flush()
9898
} catch (ex: Exception) {
99-
val errMsg = "Failed to send codes `$text` to Spark Console"
99+
val errMsg = "Failed to send codes `$text` to Apache Spark Console"
100100
log().warn(errMsg, ex)
101101
EventUtil.logError(operation, ErrorType.systemError, IOException(errMsg, ex), null, null)
102102
}

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/ArcadiaSparkBatchRunner.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ class ArcadiaSparkBatchRunner : SparkBatchJobRunner() {
4949
: Observable<ISparkBatchJob> = Observable.fromCallable {
5050
(submitModel as ArcadiaSparkSubmitModel).apply {
5151
if (sparkCompute == null || tenantId == null || sparkWorkspace == null) {
52-
log().warn("Synapse Spark pool is not selected. " +
52+
log().warn("Apache Spark Pool for Azure Synapse is not selected. " +
5353
"spark pool: $sparkCompute, tenant id: $tenantId, spark workspace: $sparkWorkspace")
54-
throw ExecutionException("Synapse Spark pool is not selected")
54+
throw ExecutionException("Apache Spark Pool for Azure Synapse is not selected")
5555
}
5656
}
5757
}.flatMap { arcadiaModel -> ArcadiaSparkComputeManager.getInstance()

0 commit comments

Comments
 (0)