query changes in masterCatalog/deleted minor logging

uwescience · Jun 7, 2015 · a80943e · a80943e
1 parent c0f73f3
commit a80943e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/edu/washington/escience/myria/api/DatasetResource.java b/src/edu/washington/escience/myria/api/DatasetResource.java
@@ -351,7 +351,6 @@ public Response deleteDataset(@PathParam("userName") final String userName,
       @PathParam("programName") final String programName, @PathParam("relationName") final String relationName)
       throws DbException {
     DatasetStatus status = server.getDatasetStatus(RelationKey.of(userName, programName, relationName));
-    LOGGER.info(status.toString());
     if (status == null) {
       /* Dataset not found, throw a 404 (Not Found) */
       throw new MyriaApiException(Status.NOT_FOUND, "That dataset was not found");

diff --git a/src/edu/washington/escience/myria/coordinator/catalog/MasterCatalog.java b/src/edu/washington/escience/myria/coordinator/catalog/MasterCatalog.java
@@ -373,8 +373,7 @@ protected List<RelationKey> job(final SQLiteConnection sqliteConnection) throws
 
           try {
             final SQLiteStatement statement =
-                sqliteConnection.prepare(
-                    "SELECT user_name,program_name,relation_name FROM relations WHERE tombstone=0;", false);
+                sqliteConnection.prepare("SELECT user_name,program_name,relation_name FROM relations;", false);
             while (statement.step()) {
               relations.add(RelationKey.of(statement.columnString(0), statement.columnString(1), statement
                   .columnString(2)));
@@ -1969,7 +1968,7 @@ protected Void job(final SQLiteConnection sqliteConnection) throws CatalogExcept
           try {
             SQLiteStatement statement =
                 sqliteConnection
-                    .prepare("UPDATE relations SET num_tuples=? WHERE user_name=? AND program_name=? AND relation_name=?;");
+                    .prepare("UPDATE relations SET num_tuples=? WHERE user_name=? AND program_name=? AND relation_name=? and tombstone=0;");
             statement.bind(1, count);
             statement.bind(2, relation.getUserName());
             statement.bind(3, relation.getProgramName());