CADC-13452 various fixes

opencadc · Sep 12, 2024 · aa2a916 · aa2a916
1 parent 40959f3
commit aa2a916
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/PutAction.java
@@ -219,7 +219,7 @@ private void createTable(TapSchemaDAO ts, String schemaName, String tableName) t
             throw new ResourceAlreadyExistsException("table " + tableName + " already exists");
         }
         // flag table as created using the API to allow table deletion in the DeleteAction
-        td.apiCreated = true;
+        inputTable.apiCreated = true;
 
         Profiler prof = new Profiler(PutAction.class);
         DatabaseTransactionManager tm = new DatabaseTransactionManager(ds);

diff --git a/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableUpdateRunner.java b/cadc-tap-schema/src/main/java/ca/nrc/cadc/vosi/actions/TableUpdateRunner.java
@@ -231,6 +231,7 @@ protected void indexTable(Map<String, List<String>> params) {
         String tableName = getSingleValue("table", params);
         String columnName = getSingleValue("index", params);
         boolean unique = "true".equals(getSingleValue("unique", params));
+        log.debug(String.format("indexing table=%s column=%s unique=%s", tableName, columnName, unique));
 
         if (tableName == null) {
             throw new IllegalArgumentException("missing parameter 'table'");

diff --git a/youcat/src/intTest/java/org/opencadc/youcat/TableUpdateTest.java b/youcat/src/intTest/java/org/opencadc/youcat/TableUpdateTest.java
@@ -188,14 +188,17 @@ public void testCreateUniqueIndex() {
     }
 
     @Test
-    public void testIngestTest() {
+    public void testIngestTable() {
         try {
             clearSchemaPerms();
             TapPermissions tp = new TapPermissions(null, true, null, null);
             super.setPerms(schemaOwner, testSchemaName, tp, 200);
 
-            // create test table and schema
+            // cleanup
             String testTable = testSchemaName + ".test_ingest_table";
+            doDelete(schemaOwner, testTable, true);
+
+            // create test table and schema
             TableDesc td = doCreateTable(schemaOwner, testTable);
 
             // delete the schema from tap_schema
@@ -206,10 +209,10 @@ public void testIngestTest() {
             }
 
             // run the ingest
-            doIngestTable(schemaOwner, testTable);
+            doIngestTable(schemaOwner, testTable, ExecutionPhase.COMPLETED);
 
             // cleanup on success
-            doDelete(schemaOwner, td.getTableName(), false);
+            doDelete(schemaOwner, testTable, false);
         } catch (Exception unexpected) {
             log.error("unexpected exception", unexpected);
             Assert.fail("unexpected exception: " + unexpected);
@@ -243,7 +246,7 @@ public void testIngestUnsupportedDataType() {
             log.debug("created database table: " + testTable);
 
             try {
-                doIngestTable(schemaOwner, testTable);
+                doIngestTable(schemaOwner, testTable, ExecutionPhase.ERROR);
             } catch (UnsupportedOperationException expected) {
                 log.info("expected exception: " + expected);
             }
@@ -256,7 +259,7 @@ public void testIngestUnsupportedDataType() {
         }
     }
 
-    void doIngestTable(Subject subject, String tableName) throws Exception {
+    void doIngestTable(Subject subject, String tableName, ExecutionPhase expected) throws Exception {
         // create job
         Map<String,Object> params = new TreeMap<String,Object>();
         params.put("op", "ingest");
@@ -296,8 +299,7 @@ void doIngestTable(Subject subject, String tableName) throws Exception {
 
         JobReader r = new JobReader();
         Job end = r.read(new StringReader(xml2));
-        log.debug(end.getErrorSummary().toString());
-//        Assert.assertEquals("final job state", ExecutionPhase.COMPLETED, end.getExecutionPhase());
+        Assert.assertEquals("final job state", expected, end.getExecutionPhase());
     }
 
 }