Merge pull request #1617 from marklogic/feature/cleanup

Small cleanup before 6.4.0 release

Author: rjrudin

examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/BulkLoadFromJdbcRaw.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 MarkLogic Corporation
+ * Copyright (c) 2023 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/ExtractRowsViaTemplate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 MarkLogic Corporation
+ * Copyright (c) 2023 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/datamovement/QueryBatcherJobReportTest.java

@@ -683,16 +683,15 @@ public void run() {
 			assertTrue((batchResults2.size()>initialUrisSize && batchResults2.size()<= 2436));
 		}
 		finally {
-			// Delete all uris.
+			// This shouldn't be necessary - i.e. tests should perform cleanup before they start, not after - but
+			// leaving this in case one of the older functional tests runs after this that doesn't yet cleanup the
+			// database before it runs.
 			QueryBatcher deleteBatcher = dmManager.newQueryBatcher(urisList.iterator())
 			        .onUrisReady(new DeleteListener())
 			        .withThreadCount(10);
 			dmManager.startJob(deleteBatcher);
 			deleteBatcher.awaitCompletion();
 			dmManager.stopJob(deleteBatcher);
-			int docCnt = dbClient.newServerEval().xquery(qMaxBatches).eval().next().getNumber().intValue();
-			System.out.println("All setMaxBatches docs should have been deleted. Count after DeleteListener job is " + docCnt);
-//			assertTrue(docCnt == 0);
 		}
 	}
 }