Changeset 31010 for other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

Timestamp:

2016-10-31T15:14:07+13:00 (7 years ago)

Author:

davidb

Message:

Tidy up on generating Spark App name

File:

• other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java (modified) (2 diffs)

other-projects/hathitrust/solr-extracted-features/trunk/src/main/java/org/hathitrust/extractedfeatures/ProcessForSolrIngest.java

@@ -42 +42 @@
     }
 
+    protected String generateSparkAppName(String exec_mode)
+    {
+        String spark_app_name = "[" + exec_mode + "] Extract Features: Process for Solr Ingest";
+        spark_app_name += " [" + _json_list_filename + "]";
+
+        if (_solr_url != null) { 
+            spark_app_name += " solr_url=" + _solr_url;
+        }
+        
+        if (_output_dir != null) { 
+            spark_app_name += " output_dir=" + _output_dir;
+        }
+        
+        return spark_app_name;
+    }
+    
     public void execPerVolume()
     {   
-        String spark_app_name = "[Per Volume] Extract Features: Process for Solr Ingest";
-        spark_app_name += " [" + _json_list_filename + "]";
-
-        if (_solr_url != null) { 
-            spark_app_name += "solr_url=" + _solr_url;
-        }
-        
-        if (_output_dir != null) { 
-            spark_app_name += "output_dir=" + _output_dir;
-        }
-        
+        String spark_app_name = generateSparkAppName("Per Volume");     
         
         SparkConf conf = new SparkConf().setAppName(spark_app_name);
@@ -96 +102 @@
     public void execPerPage()
     {   
-        String spark_app_name = "[Per Page] Extract Features: Process for Solr Ingest";
-        spark_app_name += " [" + _json_list_filename + "]";
-
-        if (_solr_url != null) { 
-            spark_app_name += "solr_url=" + _solr_url;
-        }
-        
-        if (_output_dir != null) { 
-            spark_app_name += "output_dir=" + _output_dir;
-        }
+        String spark_app_name = generateSparkAppName("Per Page");       
         
         SparkConf conf = new SparkConf().setAppName(spark_app_name);