Skip to content

Commit 012a10b

Browse files
committed
Revert deletion of parameters
1 parent 9975ed9 commit 012a10b

File tree

4 files changed

+0
-33
lines changed

4 files changed

+0
-33
lines changed

src/main/java/cloudgene/mapred/api/v2/admin/ArchiveJob.java

-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ public Representation get() {
8383
job.setState(AbstractJob.STATE_RETIRED);
8484
dao.update(job);
8585

86-
ParameterDao parameterDao = new ParameterDao(getDatabase());
87-
parameterDao.deleteAllByJob(job);
88-
8986
if (externalWorkspace != null) {
9087
try {
9188
externalWorkspace.delete(job.getId());

src/main/java/cloudgene/mapred/api/v2/jobs/GetJobDetails.java

-3
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ public Representation deleteJob(Representation entity) {
149149
job.setState(AbstractJob.STATE_DELETED);
150150
dao.update(job);
151151

152-
ParameterDao parameterDao = new ParameterDao(getDatabase());
153-
parameterDao.deleteAllByJob(job);
154-
155152
Settings settings = getSettings();
156153

157154
IExternalWorkspace externalWorkspace = null;

src/main/java/cloudgene/mapred/cron/CleanUpTasks.java

-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public class CleanUpTasks {
2626
public static int executeRetire(Database database, Settings settings) {
2727
JobDao dao = new JobDao(database);
2828

29-
ParameterDao parameterDao = new ParameterDao(database);
30-
3129
List<AbstractJob> oldJobs = dao.findAllNotifiedJobs();
3230

3331
int deleted = 0;
@@ -57,8 +55,6 @@ public static int executeRetire(Database database, Settings settings) {
5755
dao.update(job);
5856

5957

60-
parameterDao.deleteAllByJob(job);
61-
6258
log.info("Job " + job.getId() + " retired.");
6359
deleted++;
6460

src/main/java/cloudgene/mapred/database/ParameterDao.java

-23
Original file line numberDiff line numberDiff line change
@@ -183,29 +183,6 @@ public CloudgeneParameterOutput findById(int id) {
183183
}
184184
}
185185

186-
public boolean deleteAllByJob(AbstractJob job) {
187-
try {
188-
189-
StringBuilder sql = new StringBuilder();
190-
sql.append("delete ");
191-
sql.append("from parameter ");
192-
sql.append("where job_id = ?");
193-
194-
Object[] params = new Object[1];
195-
params[0] = job.getId();
196-
197-
update(sql.toString(), params);
198-
199-
log.debug("delete all parameters by job_id '" + job.getId() + "' successful.");
200-
201-
return true;
202-
203-
} catch (SQLException e) {
204-
log.error("delete all parameters by job_id '" + job.getId() + "' failed.", e);
205-
return false;
206-
}
207-
}
208-
209186
class ParameterInputMapper implements IRowMapper {
210187

211188
@Override

0 commit comments

Comments
 (0)