- Cleanup NThreads/Threads variable naming

- Rework JobStatus into SortedSet
hardforkio · Jul 1, 2020 · 6761856 · 6761856
1 parent 0be8f1b
commit 6761856
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 67 deletions.
diff --git a/autodoc/src/main/java/com/bakdata/conquery/Constants.java b/autodoc/src/main/java/com/bakdata/conquery/Constants.java
@@ -54,7 +54,6 @@
 import com.bakdata.conquery.models.config.QueryConfig;
 import com.bakdata.conquery.models.config.StandaloneConfig;
 import com.bakdata.conquery.models.config.StorageConfig;
-import com.bakdata.conquery.models.config.ThreadPoolDefinition;
 import com.bakdata.conquery.models.config.XodusConfig;
 import com.bakdata.conquery.models.datasets.Column;
 import com.bakdata.conquery.models.datasets.Table;

diff --git a/backend/src/main/java/com/bakdata/conquery/commands/CollectEntitiesCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/CollectEntitiesCommand.java
@@ -58,7 +58,7 @@ public void configure(Subparser subparser) {
 	protected void run(Environment environment, Namespace namespace, ConqueryConfig config) throws Exception {
 		verbose = Boolean.TRUE.equals(namespace.getBoolean("-verbose"));
 
-		ExecutorService pool = Executors.newFixedThreadPool(config.getPreprocessor().getThreads());
+		ExecutorService pool = Executors.newFixedThreadPool(config.getPreprocessor().getNThreads());
 
 		Collection<EntityExtractor> jobs = findPreprocessedJobs(config);
 

diff --git a/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/PreprocessorCommand.java
@@ -85,7 +85,7 @@ public void configure(Subparser subparser) {
 	@Override
 	protected void run(Environment environment, Namespace namespace, ConqueryConfig config) throws Exception {
 		if (pool == null) {
-			pool = Executors.newFixedThreadPool(config.getPreprocessor().getThreads());
+			pool = Executors.newFixedThreadPool(config.getPreprocessor().getNThreads());
 		}
 
 		final Collection<TableImportDescriptor> descriptors = new ArrayList<>();

diff --git a/backend/src/main/java/com/bakdata/conquery/commands/SlaveCommand.java b/backend/src/main/java/com/bakdata/conquery/commands/SlaveCommand.java
@@ -3,7 +3,6 @@
 import java.io.File;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -90,7 +89,7 @@ protected void run(Environment environment, Namespace namespace, ConqueryConfig
 			log.warn("Had to create Storage Dir at `{}`", config.getStorage().getDirectory());
 		}
 
-		workers = new Workers(new RoundRobinQueue<>(config.getQueries().getRoundRobinQueueCapacity()), config.getQueries().getNThreads(), config.getStorage().getThreads());
+		workers = new Workers(new RoundRobinQueue<>(config.getQueries().getRoundRobinQueueCapacity()), config.getQueries().getNThreads(), config.getStorage().getNThreads());
 
 		File storageDir = config.getStorage().getDirectory();
 		for(File directory : storageDir.listFiles((file, name) -> name.startsWith("worker_"))) {
@@ -258,8 +257,6 @@ private void reportJobManagerStatus() {
 			jobManagerStatus.getJobs().addAll(worker.getJobManager().reportStatus().getJobs());
 		}
 
-		jobManagerStatus.getJobs().sort(Comparator.comparingDouble(js -> js.getProgressReporter().getProgress()));
-
 		try {
 			context.trySend(new UpdateJobManagerStatus(jobManagerStatus));
 		}

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/ClusterConfig.java
@@ -21,5 +21,6 @@ public class ClusterConfig extends Configuration {
 	private MinaConfig mina = new MinaConfig();
 	@Min(1)
 	private int entityBucketSize = 1000;
-
+
+
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/PreprocessingConfig.java
@@ -13,7 +13,7 @@ public class PreprocessingConfig {
 	@Valid
 	private PreprocessingDirectories[] directories;
 	@Min(1)
-	private int threads = Runtime.getRuntime().availableProcessors();
+	private int nThreads = Runtime.getRuntime().availableProcessors();
 	@Min(0)
 	private int maximumPrintedErrors = 10;
 

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/QueryConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/QueryConfig.java
@@ -8,9 +8,6 @@
 @Getter @Setter @ToString
 public class QueryConfig {
 
-	@Deprecated
-	private ThreadPoolDefinition executionPool = new ThreadPoolDefinition();
-
 	private int roundRobinQueueCapacity = 10;
 	private int nThreads = Runtime.getRuntime().availableProcessors();
 

diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/StorageConfig.java b/backend/src/main/java/com/bakdata/conquery/models/config/StorageConfig.java
@@ -6,7 +6,6 @@
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import com.bakdata.conquery.models.exceptions.validators.ExistingFile;
 import io.dropwizard.util.Duration;
 import lombok.Getter;
 import lombok.Setter;
@@ -25,6 +24,6 @@ public class StorageConfig {
 	@NotNull
 	private Duration weakCacheDuration = Duration.hours(48);
 
-	@Min(0)
-	private int threads = Runtime.getRuntime().availableProcessors();
+	@Min(1)
+	private int nThreads = Runtime.getRuntime().availableProcessors();
 }
diff --git a/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java b/backend/src/main/java/com/bakdata/conquery/models/config/ThreadPoolDefinition.java
diff --git a/backend/src/main/java/com/bakdata/conquery/models/jobs/JobExecutor.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobExecutor.java
@@ -55,9 +55,9 @@ public boolean cancelJob(UUID jobId) {
 	}
 
 	public List<Job> getJobs() {
-		List<Job> jobs = new ArrayList<>(this.jobs.size()+1);
+		List<Job> jobs = new ArrayList<>(this.jobs.size() + 1);
 		Job current = currentJob.get();
-		if(current!=null) {
+		if (current != null) {
 			jobs.add(current);
 		}
 		jobs.addAll(this.jobs);

diff --git a/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManager.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManager.java
@@ -1,6 +1,5 @@
 package com.bakdata.conquery.models.jobs;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -43,7 +42,6 @@ public void stop() throws Exception {
 
 	public JobManagerStatus reportStatus() {
 		return new JobManagerStatus(
-				LocalDateTime.now(),
 				getSlowJobs()
 						.stream()
 						.map(job -> new JobStatus(job.getJobId(), job.getProgressReporter(), job.getLabel(), job.isCancelled()))

diff --git a/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java b/backend/src/main/java/com/bakdata/conquery/models/jobs/JobManagerStatus.java
@@ -2,27 +2,29 @@
 
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.Data;
 import lombok.NonNull;
-import lombok.Setter;
-import lombok.ToString;
 
-@NoArgsConstructor @AllArgsConstructor @Getter @Setter @ToString
+
+@Data
 public class JobManagerStatus {
 	@NonNull @NotNull
-	private LocalDateTime timestamp;
+	private final LocalDateTime timestamp = LocalDateTime.now();
 	@NotNull
-	private List<JobStatus> jobs = Collections.emptyList();
-
+	private final SortedSet<JobStatus> jobs = new TreeSet<>(Comparator.comparingDouble(job -> job.getProgressReporter().getStartTime()));
+
+	public JobManagerStatus(Collection<? extends JobStatus> jobs){
+		this.jobs.addAll(jobs);
+	}
+
 	public int size() {
 		return jobs.size();
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,5 +21,6 @@ public class ClusterConfig extends Configuration { @@
     	private MinaConfig mina = new MinaConfig();
     	@Min(1)
     	private int entityBucketSize = 1000;
     }