[cuebot] Fix typos in GPU queries. (#1051)

AcademySoftwareFoundation · Oct 20, 2021 · 9f82ae5 · 9f82ae5
1 parent 553f7ae
commit 9f82ae5
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 2 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/GroupDaoJdbc.java b/cuebot/src/main/java/com/imageworks/spcue/dao/postgres/GroupDaoJdbc.java
@@ -254,7 +254,7 @@ public void updateDefaultJobMinGpus(GroupInterface group, int value) {
  throw new IllegalArgumentException(msg);
  }
  getJdbcTemplate().update(
- "UPDATE folder SET int_job_min_gpu=? WHERE pk_folder=?",
+ "UPDATE folder SET int_job_min_gpus=? WHERE pk_folder=?",
  value, group.getId());
  }
 
@@ -268,7 +268,7 @@ public void updateMaxGpus(GroupInterface group, int value) {
  }
 
  getJdbcTemplate().update(
- "UPDATE folder_resource SET int_max_gpu=? WHERE pk_folder=?",
+ "UPDATE folder_resource SET int_max_gpus=? WHERE pk_folder=?",
  value, group.getId());
  }
 

diff --git a/cuebot/src/test/java/com/imageworks/spcue/test/dao/postgres/GroupDaoTests.java b/cuebot/src/test/java/com/imageworks/spcue/test/dao/postgres/GroupDaoTests.java
@@ -230,6 +230,39 @@ public void testUpdateDefaultJobMinCores() {
  Integer.class, group.getGroupId()));
  }
 
+ @Test
+ @Transactional
+ @Rollback(true)
+ public void testUpdateDefaultJobMaxGpus() {
+ GroupDetail group = createGroup();
+ assertEquals(Integer.valueOf(-1), jdbcTemplate.queryForObject(
+ "SELECT int_job_max_gpus FROM folder WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateDefaultJobMaxGpus(group, 100);
+ assertEquals(Integer.valueOf(100), jdbcTemplate.queryForObject(
+ "SELECT int_job_max_gpus FROM folder WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateDefaultJobMaxGpus(group, -1);
+ assertEquals(Integer.valueOf(-1), jdbcTemplate.queryForObject(
+ "SELECT int_job_max_gpus FROM folder WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+
+ }
+
+ @Test
+ @Transactional
+ @Rollback(true)
+ public void testUpdateDefaultJobMinGpus() {
+ GroupDetail group = createGroup();
+ assertEquals(Integer.valueOf(-1), jdbcTemplate.queryForObject(
+ "SELECT int_job_min_gpus FROM folder WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateDefaultJobMinGpus(group, 100);
+ assertEquals(Integer.valueOf(100), jdbcTemplate.queryForObject(
+ "SELECT int_job_min_gpus FROM folder WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ }
+
  @Test
  @Transactional
  @Rollback(true)
@@ -276,6 +309,38 @@ public void testUpdateMaxCores() {
  Integer.class, group.getGroupId()));
  }
 
+ @Test
+ @Transactional
+ @Rollback(true)
+ public void testUpdateMinGpus() {
+ GroupDetail group = createGroup();
+ assertEquals(Integer.valueOf(0), jdbcTemplate.queryForObject(
+ "SELECT int_min_gpus FROM folder_resource WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateMinGpus(group, 10);
+ assertEquals(Integer.valueOf(10), jdbcTemplate.queryForObject(
+ "SELECT int_min_gpus FROM folder_resource WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ }
+
+ @Test
+ @Transactional
+ @Rollback(true)
+ public void testUpdateMaxGpus() {
+ GroupDetail group = createGroup();
+ assertEquals(Integer.valueOf(-1), jdbcTemplate.queryForObject(
+ "SELECT int_max_gpus FROM folder_resource WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateMaxGpus(group, 100);
+ assertEquals(Integer.valueOf(100), jdbcTemplate.queryForObject(
+ "SELECT int_max_gpus FROM folder_resource WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ groupDao.updateMaxGpus(group, -5);
+ assertEquals(Integer.valueOf(-1), jdbcTemplate.queryForObject(
+ "SELECT int_max_gpus FROM folder_resource WHERE pk_folder=?",
+ Integer.class, group.getGroupId()));
+ }
+
  @Test
  @Transactional
  @Rollback(true)