Merge pull request #1668 from marklogic/release/6.6.1

Merge release/6.6.1 into master
marklogic · May 31, 2024 · 265ddc2 · 265ddc2
2 parents 917ae8c + 2b6c54f
commit 265ddc2
Show file tree

Hide file tree

Showing 19 changed files with 393 additions and 162 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,9 @@ def getJava(){
         return "/home/builder/java/jdk-17.0.2"
     }else if(env.JAVA_VERSION=="JAVA11"){
         return "/home/builder/java/jdk-11.0.2"
-    }else{
+    }else if(env.JAVA_VERSION=="JAVA21"){
+		return "/home/builder/java/jdk-21.0.1"
+	}else{
         return "/home/builder/java/openjdk-1.8.0-262"
     }
 }
@@ -195,19 +197,18 @@ pipeline{
       }
     }
 
-// Can't run these as all the Optic Update tests fail now (as expected) on 11.1.0.
-// 		stage('regressions-11.1.0') {
-// 			when {
-// 				allOf {
-// 					branch 'develop'
-// 					expression {return params.regressions}
-// 				}
-// 			}
-// 			steps {
-// 			runAllTests('Release', '11.1.0', false)
-// 				junit '**/build/**/TEST*.xml'
-// 			}
-// 		}
+		stage('regressions-11.2.0') {
+			when {
+				allOf {
+					branch 'develop'
+					expression {return params.regressions}
+				}
+			}
+			steps {
+			runAllTests('Release', '11.2.0', false)
+				junit '**/build/**/TEST*.xml'
+			}
+		}
 
 		stage('regressions-11') {
 			when {
@@ -247,7 +248,7 @@ pipeline{
 				junit '**/build/**/TEST*.xml'
 			}
 		}
-    
+
 		stage('regressions-10.0') {
 			when {
 				allOf {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=com.marklogic
-version=6.6.0
+version=6.6.1
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/marklogic-client-api-functionaltests/build.gradle b/marklogic-client-api-functionaltests/build.gradle
@@ -29,6 +29,12 @@ dependencies {
   implementation "org.jdom:jdom2:2.0.6.1"
   implementation "com.marklogic:ml-app-deployer:4.6.1"
 
+	if (JavaVersion.current().isJava9Compatible()) {
+		implementation 'javax.xml.bind:jaxb-api:2.3.1'
+		implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.8'
+		implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1'
+	}
+
   testImplementation 'ch.qos.logback:logback-classic:1.3.14'
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
 	testImplementation 'org.xmlunit:xmlunit-legacy:2.9.0'

diff --git a/...tionaltests/src/test/java/com/marklogic/client/fastfunctest/TestAppServerConstraints.java b/...tionaltests/src/test/java/com/marklogic/client/fastfunctest/TestAppServerConstraints.java
@@ -445,10 +445,7 @@ public void testNegativePointInvalidValue() throws Exception {
 			result = e.getMessage();
 		}
 
-		String expectedResult = markLogicVersion.getMajor() <= 11 ?
-			"<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>" :
-			"arg2 is not of type xs:double";
-
+		String expectedResult = "<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>";
 		assertTrue(result.contains(expectedResult), "Unexpected result: " + result);
 	}
 
@@ -626,14 +623,8 @@ public void testNegativePointInvalidValue_ChildConstraint() throws Exception {
 			result = ex.getMessage();
 		}
 
-		String expectedResult = markLogicVersion.getMajor() <= 11 ?
-			"<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>" :
-			"arg2 is not of type xs:double";
-
-		assertTrue(
-			result.contains(expectedResult),
-			"Unexpected result: " + result
-		);
+		String expectedResult = "<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>";
+		assertTrue(result.contains(expectedResult), "Unexpected result: " + result);
 	}
 
     @Test
@@ -820,10 +811,7 @@ public void testNegativePointInvalidValue_GeoElementConstraint() throws Exceptio
 			result = e.getMessage();
 		}
 
-		String expectedResult = markLogicVersion.getMajor() <= 11 ?
-			"<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>" :
-			"arg2 is not of type xs:double";
-
+		String expectedResult = "<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '12,A'.]</search:warning>";
 		assertTrue(result.contains(expectedResult), "Unexpected result: " + result);
 	}
 
@@ -1012,10 +1000,7 @@ public void testNegativePointInvalidValue_GeoElemPairConstraint() throws Excepti
 			result = e.getMessage();
         }
 
-		String expectedResult = markLogicVersion.getMajor() <= 11 ?
-			"<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '-12,A'.]</search:warning>" :
-			"arg2 is not of type xs:double";
-
+		String expectedResult = "<search:warning id=\"SEARCH-IGNOREDQTEXT\">[Invalid text, cannot parse geospatial point from '-12,A'.]</search:warning>";
         assertTrue(result.contains(expectedResult), "Unexpected result: " + result);
     }
 

diff --git a/...api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestOpticOnViews.java b/...api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestOpticOnViews.java
@@ -2213,10 +2213,7 @@ public void testFromSqlUnionSelectOrderbyLimitOffset() {
 		  .orderBy(op.desc("id"))
 		  .limit(3)
 		  .offset(1)
-		  // This is no longer working on MarkLogic 12 nightly. Neither op.col("name") works now op.schemaCol("opticFunctionalTest.detail.name").
-		  // We get an error of "Invalid arguments: expression column myName with undefined expression".
-		  //.select(p.as("myName", p.col("name")))
-		  ;
+		  .select(op.as("myName", op.col("name")));
 
 	  JacksonHandle jacksonHandle = new JacksonHandle();
 	  jacksonHandle.setMimetype("application/json");
@@ -2225,8 +2222,8 @@ public void testFromSqlUnionSelectOrderbyLimitOffset() {
 	  JsonNode rows = result.path("rows");
 
 	  assertEquals(2, rows.size());
-	  assertEquals("Detail 5", rows.path(0).path("opticFunctionalTest.detail.name").path("value").asText());
-	  assertEquals("Detail 4", rows.path(1).path("opticFunctionalTest.detail.name").path("value").asText());
+	  assertEquals("Detail 5", rows.path(0).path("myName").path("value").asText());
+	  assertEquals("Detail 4", rows.path(1).path("myName").path("value").asText());
   }
 
 

diff --git a/...c/test/java/com/marklogic/client/fastfunctest/datamovement/QueryBatcherJobReportTest.java b/...c/test/java/com/marklogic/client/fastfunctest/datamovement/QueryBatcherJobReportTest.java
@@ -37,7 +37,6 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -189,10 +188,9 @@ public void jobReport() throws Exception {
 	}
 
 	@Test
-	public void testNullQdef() throws IOException, InterruptedException {
+	public void testNullQdef() {
 		System.out.println("In testNullQdef method");
 		JsonNode node = null;
-		JacksonHandle jacksonHandle = null;
 
 		WriteBatcher wbatcher = dmManager.newWriteBatcher().withBatchSize(32).withThreadCount(20);
 		try {
@@ -203,19 +201,7 @@ public void testNullQdef() throws IOException, InterruptedException {
 		}
 
 		try {
-			wbatcher.add("/nulldoc", jacksonHandle);
-			fail("Exception was not thrown, when it should have been");
-		} catch (IllegalArgumentException e) {
-			assertTrue(e.getMessage().equals("contentHandle must not be null"));
-		}
-
-		QueryManager queryMgr = dbClient.newQueryManager();
-		StringQueryDefinition querydef = queryMgr.newStringDefinition();
-
-		querydef = null;
-
-		try {
-			QueryBatcher batcher = dmManager.newQueryBatcher(querydef).withBatchSize(32).withThreadCount(20);
+			dmManager.newQueryBatcher((StringQueryDefinition) null).withBatchSize(32).withThreadCount(20);
 			fail("Exception was not thrown, when it should have been");
 		} catch (IllegalArgumentException e) {
 			assertTrue(e.getMessage().equals("query must not be null"));

diff --git a/marklogic-client-api/build.gradle b/marklogic-client-api/build.gradle
@@ -2,7 +2,6 @@
 
 plugins {
     id 'maven-publish'
-    id 'distribution'
 }
 
 group = 'com.marklogic'
@@ -81,7 +80,7 @@ jar {
     )
 }
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     exclude ('property', '*.xsd', '*.xjb')
     from sourceSets.main.allSource
 }
@@ -109,9 +108,9 @@ javadoc {
     }
 }
 
-task javadocJar (type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+task javadocJar(type: Jar, dependsOn: javadoc) {
+	archiveClassifier = 'javadoc'
+	from javadoc.destinationDir
 }
 
 Node pomCustomizations = new NodeBuilder(). project {
@@ -180,47 +179,6 @@ publishing {
     }
 }
 
-distZip {
-    archiveFileName = "$project.name-$rootProject.version-with-dependencies.zip"
-    dependsOn javadoc
-}
-
-distributions {
-    main {
-        contents {
-            from("..") {
-                include("NOTICE.TXT")
-            }
-            from("src/main/resources") {
-                include ("Readme.txt")
-                include ("LICENSE.txt")
-            }
-            into ("example") {
-                from ("../examples/src/main/resources") {
-                    include ("data/**")
-                    include ("scripts/**")
-                    include ("Example.properties")
-                }
-                from ("../examples/src/main/resources/example") {
-                    include ("README.txt")
-                }
-                from ("../examples/src/main/java/") {
-                    include ("com/marklogic/client/example/cookbook/*.java")
-                    include ("com/marklogic/client/example/handle/*.java")
-                    include ("com/marklogic/client/example/extension/*.java")
-                }
-            }
-            into ("doc/api") {
-                from ("build/docs/javadoc")
-            }
-            into("lib") {
-                from jar
-                from(project.configurations.runtimeClasspath)
-            }
-        }
-    }
-}
-
 task printClassPath() {
     doLast {
         println sourceSets.main.runtimeClasspath.asPath+':'+sourceSets.test.runtimeClasspath.asPath

diff --git a/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java b/marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/BatcherImpl.java
@@ -17,11 +17,16 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.datamovement.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public abstract class BatcherImpl implements Batcher {
+
+	private final Logger logger = LoggerFactory.getLogger(getClass());
+
   private String jobName = "unnamed";
   private String jobId = null;
   private int batchSize = 100;
@@ -31,6 +36,7 @@ public abstract class BatcherImpl implements Batcher {
   private JobTicket jobTicket;
   private Calendar jobStartTime;
   private Calendar jobEndTime;
+
   private final AtomicBoolean stopped = new AtomicBoolean(false);
   private final AtomicBoolean started = new AtomicBoolean(false);
 
@@ -136,19 +142,32 @@ void setJobEndTime() {
     this.jobEndTime = Calendar.getInstance();
   }
 
-  AtomicBoolean getStarted() {
-    return this.started;
-  }
   @Override
   public boolean isStarted() {
     return started.get();
   }
+
   @Override
   public boolean isStopped() {
     return stopped.get();
   }
-  AtomicBoolean getStopped() {
-    return this.stopped;
+
+	final void setStartedToTrue() {
+		logger.info("Setting 'started' to true.");
+		this.started.set(true);
+	}
+
+	final void setStoppedToTrue() {
+		logger.info("Setting 'stopped' to true.");
+		this.stopped.set(true);
+	}
+
+  final boolean isStoppedTrue() {
+	  // This method is necessary as calling "isStopped()" results in different behavior in QueryBatcherImpl, where
+	  // that method has been overridden to inspect the thread pool status instead. It's not clear why that was done,
+	  // so this preserves the existing behavior where the value of `stopped` is check in multiple places (it would seem
+	  // that in all of those places, calling "isStopped()" would be preferable).
+	  return this.stopped.get() == true;
   }
 
   protected DataMovementManagerImpl getMoveMgr() {

diff --git a/...ent-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java b/...ent-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java
@@ -78,12 +78,14 @@ public JobReport getJobReport(JobTicket ticket) {
   @Override
   public void stopJob(JobTicket ticket) {
     if ( ticket == null ) throw new IllegalArgumentException("ticket must not be null");
+	logger.info("Stopping {} job with ID: {}", ticket.getJobType(), ticket.getJobId());
     service.stopJob(ticket, activeJobs);
   }
 
   @Override
   public void stopJob(Batcher batcher) {
     if ( batcher == null ) throw new IllegalArgumentException("batcher must not be null");
+	logger.info("Stopping batcher; job name: {}; job ID: {}", batcher.getJobName(), batcher.getJobId());
     service.stopJob(batcher, activeJobs);
   }