You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2017/07/29 21:59:57 UTC
[20/28] lucene-solr:jira/solr-6630: Merging master
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
index d56382e..6cffc4f 100644
--- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java
@@ -163,7 +163,7 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 {
assertNotNull(actual.getSimilarity());
}
- private static String withWhich = "<schema name=\"tiny\" version=\"1.1\">\n" +
+ private String withWhich = "<schema name=\"tiny\" version=\"1.1\">\n" +
" <field name=\"id\" type=\"string\" indexed=\"true\" stored=\"true\" required=\"true\"/>\n" +
" <field name=\"text\" type=\"text\" indexed=\"true\" stored=\"true\"/>\n" +
" <field name=\"which\" type=\"int\" indexed=\"true\" stored=\"true\"/>\n" +
@@ -177,11 +177,11 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 {
" </fieldtype>\n" +
" <fieldType name=\"string\" class=\"solr.StrField\"/>\n" +
- " <fieldType name=\"int\" class=\"solr.TrieIntField\" precisionStep=\"0\" positionIncrementGap=\"0\"/>" +
+ " <fieldType name=\"int\" class=\""+RANDOMIZED_NUMERIC_FIELDTYPES.get(Integer.class)+"\" precisionStep=\"0\" positionIncrementGap=\"0\"/>" +
" <similarity class=\"${solr.test.simfac1}\"/> " +
"</schema>";
- private static String withoutWhich = "<schema name=\"tiny\" version=\"1.1\">\n" +
+ private String withoutWhich = "<schema name=\"tiny\" version=\"1.1\">\n" +
" <field name=\"id\" type=\"string\" indexed=\"true\" stored=\"true\" required=\"true\"/>\n" +
" <field name=\"text\" type=\"text\" indexed=\"true\" stored=\"true\"/>\n" +
" <uniqueKey>id</uniqueKey>\n" +
@@ -193,7 +193,7 @@ public class ChangedSchemaMergeTest extends SolrTestCaseJ4 {
" </analyzer>\n" +
" </fieldtype>\n" +
" <fieldType name=\"string\" class=\"solr.StrField\"/>\n" +
- " <fieldType name=\"int\" class=\"solr.TrieIntField\" precisionStep=\"0\" positionIncrementGap=\"0\"/>" +
+ " <fieldType name=\"int\" class=\""+RANDOMIZED_NUMERIC_FIELDTYPES.get(Integer.class)+"\" precisionStep=\"0\" positionIncrementGap=\"0\"/>" +
" <similarity class=\"${solr.test.simfac2}\"/> " +
"</schema>";
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
index d42d6dd..3ab1eb9 100644
--- a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
@@ -40,7 +40,8 @@ public class DateFieldTest extends SolrTestCaseJ4 {
SolrConfig config = new SolrConfig
(new SolrResourceLoader(Paths.get(testInstanceDir)), testConfHome + "solrconfig.xml", null);
IndexSchema schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema.xml", config);
- f = random().nextBoolean()? new TrieDateField() : new DatePointField();
+ f = Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)
+ ? new DatePointField() : new TrieDateField();
f.init(schema, Collections.<String,String>emptyMap());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index 43c0006..dcda834 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -614,8 +614,8 @@ public class DocValuesTest extends SolrTestCaseJ4 {
long minSortable = toSortableLong.get(i).apply(minVal);
long maxSortable = toSortableLong.get(i).apply(maxVal);
- if((minInclusive && minSortable<=valSortable || !minInclusive && minSortable<valSortable) &&
- (maxInclusive && maxSortable>=valSortable || !maxInclusive && maxSortable>valSortable)) {
+ if((minInclusive && minSortable<=valSortable || !minInclusive && minSortable<valSortable || (min.equals("*") && val == negativeInfinity[i])) &&
+ (maxInclusive && maxSortable>=valSortable || !maxInclusive && maxSortable>valSortable || (max.equals("*") && val == positiveInfinity[i]))) {
counter++;
tests.add("//result/doc["+counter+"]/str[@name='id'][.="+(k+1)+"]");
tests.add("//result/doc["+counter+"]/float[@name='score'][.=1.0]");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
index aa5a8a9..4d70c0e 100644
--- a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java
@@ -152,9 +152,9 @@ public class EnumFieldTest extends SolrTestCaseJ4 {
@Test
public void testBogusEnumIndexing() throws Exception {
- ignoreException("Unknown value for enum field: blabla");
- ignoreException("Unknown value for enum field: 10");
- ignoreException("Unknown value for enum field: -4");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: blabla");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: 10");
+ ignoreException("Unknown value for enum field: " + FIELD_NAME + ", value: -4");
clearIndex();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java b/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
index 1438cac..632b413 100644
--- a/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java
@@ -18,7 +18,7 @@ package org.apache.solr.schema;
import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
-import org.junit.BeforeClass;
+import org.apache.solr.common.SolrException;
import org.junit.Test;
import java.io.File;
@@ -26,12 +26,6 @@ import java.io.IOException;
public class ExternalFileFieldSortTest extends SolrTestCaseJ4 {
- @BeforeClass
- public static void beforeTests() throws Exception {
- initCore("solrconfig-basic.xml", "schema-eff.xml");
- updateExternalFile();
- }
-
static void updateExternalFile() throws IOException {
final String testHome = SolrTestCaseJ4.getFile("solr/collection1").getParent();
String filename = "external_eff";
@@ -48,7 +42,10 @@ public class ExternalFileFieldSortTest extends SolrTestCaseJ4 {
}
@Test
- public void testSort() {
+ public void testSort() throws Exception {
+ initCore("solrconfig-basic.xml", "schema-eff.xml");
+ updateExternalFile();
+
addDocuments();
assertQ("query",
req("q", "*:*", "sort", "eff asc"),
@@ -56,4 +53,12 @@ public class ExternalFileFieldSortTest extends SolrTestCaseJ4 {
"//result/doc[position()=2]/str[.='1']",
"//result/doc[position()=10]/str[.='8']");
}
+
+ @Test
+ public void testPointKeyFieldType() throws Exception {
+ // This one should fail though, no "node" parameter specified
+ SolrException e = expectThrows(SolrException.class,
+ () -> initCore("solrconfig-basic.xml", "bad-schema-eff.xml"));
+ assertTrue(e.getMessage().contains("has a Point field type, which is not supported."));
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/IntPointPrefixActsAsRangeQueryFieldType.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/IntPointPrefixActsAsRangeQueryFieldType.java b/solr/core/src/test/org/apache/solr/schema/IntPointPrefixActsAsRangeQueryFieldType.java
new file mode 100644
index 0000000..e9acdee
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/schema/IntPointPrefixActsAsRangeQueryFieldType.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.schema;
+
+import org.apache.lucene.search.Query;
+import org.apache.solr.search.QParser;
+
+/**
+ * Custom field type that overrides the prefix query behavior to map "X*" to [X TO Integer.MAX_VALUE].
+ * * This is used for testing overridden prefix query for custom fields in TestOverriddenPrefixQueryForCustomFieldType
+ *
+ * @see TrieIntPrefixActsAsRangeQueryFieldType
+ */
+public class IntPointPrefixActsAsRangeQueryFieldType extends IntPointField {
+
+ public Query getPrefixQuery(QParser parser, SchemaField sf, String termStr) {
+ return getRangeQuery(parser, sf, termStr, Integer.MAX_VALUE + "", true, false);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
index 897af92..013ff0e 100644
--- a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
@@ -17,7 +17,9 @@
package org.apache.solr.schema;
import java.io.File;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.solr.SolrTestCaseJ4;
@@ -56,117 +58,74 @@ public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 {
@SuppressWarnings("deprecation")
@Test
public void testDefaultOmitNorms() throws Exception {
- BinaryField bin;
- TextField t;
- TrieDateField dt;
- StrField s;
- TrieIntField ti;
- TrieLongField tl;
- TrieFloatField tf;
- TrieDoubleField td;
- BoolField b;
+ final List<Class<? extends FieldType>> types
+ = Arrays.asList(TrieDateField.class, DatePointField.class,
+ TrieIntField.class, IntPointField.class,
+ TrieLongField.class, IntPointField.class,
+ TrieFloatField.class, FloatPointField.class,
+ TrieDoubleField.class, DoublePointField.class,
+ StrField.class, BoolField.class,
+ // Non-prims, omitNorms always defaults to false regardless of schema version...
+ TextField.class, BinaryField.class);
// ***********************
// With schema version 1.4:
// ***********************
schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema12.xml", config);
-
- dt = new TrieDateField();
- dt.init(schema, initMap);
- assertFalse(dt.hasProperty(FieldType.OMIT_NORMS));
-
- s = new StrField();
- s.init(schema, initMap);
- assertFalse(s.hasProperty(FieldType.OMIT_NORMS));
-
- ti = new TrieIntField();
- ti.init(schema, initMap);
- assertFalse(ti.hasProperty(FieldType.OMIT_NORMS));
-
- tl = new TrieLongField();
- tl.init(schema, initMap);
- assertFalse(tl.hasProperty(FieldType.OMIT_NORMS));
-
- tf = new TrieFloatField();
- tf.init(schema, initMap);
- assertFalse(tf.hasProperty(FieldType.OMIT_NORMS));
- td = new TrieDoubleField();
- td.init(schema, initMap);
- assertFalse(td.hasProperty(FieldType.OMIT_NORMS));
-
- b = new BoolField();
- b.init(schema, initMap);
- assertFalse(b.hasProperty(FieldType.OMIT_NORMS));
-
- // Non-primitive fields
- t = new TextField();
- t.init(schema, initMap);
- assertFalse(t.hasProperty(FieldType.OMIT_NORMS));
-
- bin = new BinaryField();
- bin.init(schema, initMap);
- assertFalse(bin.hasProperty(FieldType.OMIT_NORMS));
+ for (Class<? extends FieldType> clazz : types) {
+ FieldType ft = clazz.newInstance();
+ ft.init(schema, initMap);
+ assertFalse(ft.getClass().getName(), ft.hasProperty(FieldType.OMIT_NORMS));
+ }
+
// ***********************
// With schema version 1.5
// ***********************
schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema15.xml", config);
- dt = new TrieDateField();
- dt.init(schema, initMap);
- assertTrue(dt.hasProperty(FieldType.OMIT_NORMS));
-
- s = new StrField();
- s.init(schema, initMap);
- assertTrue(s.hasProperty(FieldType.OMIT_NORMS));
-
- ti = new TrieIntField();
- ti.init(schema, initMap);
- assertTrue(ti.hasProperty(FieldType.OMIT_NORMS));
-
- tl = new TrieLongField();
- tl.init(schema, initMap);
- assertTrue(tl.hasProperty(FieldType.OMIT_NORMS));
-
- tf = new TrieFloatField();
- tf.init(schema, initMap);
- assertTrue(tf.hasProperty(FieldType.OMIT_NORMS));
-
- td = new TrieDoubleField();
- td.init(schema, initMap);
- assertTrue(td.hasProperty(FieldType.OMIT_NORMS));
-
- b = new BoolField();
- b.init(schema, initMap);
- assertTrue(b.hasProperty(FieldType.OMIT_NORMS));
-
- // Non-primitive fields
- t = new TextField();
- t.init(schema, initMap);
- assertFalse(t.hasProperty(FieldType.OMIT_NORMS));
-
- bin = new BinaryField();
- bin.init(schema, initMap);
- assertFalse(bin.hasProperty(FieldType.OMIT_NORMS));
+ for (Class<? extends FieldType> clazz : types) {
+ FieldType ft = clazz.newInstance();
+ ft.init(schema, initMap);
+ assertEquals(ft.getClass().getName(),
+ ft instanceof PrimitiveFieldType,
+ ft.hasProperty(FieldType.OMIT_NORMS));
+ }
+
}
- public void testTrieDateField() {
+ public void testDateField() {
schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema15.xml", config);
- TrieDateField tdt = new TrieDateField();
- Map<String, String> args = new HashMap<>();
- args.put("sortMissingLast", "true");
- args.put("indexed", "true");
- args.put("stored", "false");
- args.put("docValues", "true");
- args.put("precisionStep", "16");
- tdt.setArgs(schema, args);
- assertTrue(tdt.hasProperty(FieldType.OMIT_NORMS));
- assertTrue(tdt.hasProperty(FieldType.SORT_MISSING_LAST));
- assertTrue(tdt.hasProperty(FieldType.INDEXED));
- assertFalse(tdt.hasProperty(FieldType.STORED));
- assertTrue(tdt.hasProperty(FieldType.DOC_VALUES));
- assertEquals(16, tdt.getPrecisionStep());
+
+ final TrieDateField tdt = new TrieDateField();
+ {
+ final Map<String, String> args = new HashMap<>();
+ args.put("sortMissingLast", "true");
+ args.put("indexed", "true");
+ args.put("stored", "false");
+ args.put("docValues", "true");
+ args.put("precisionStep", "16");
+ tdt.setArgs(schema, args);
+ assertEquals(16, tdt.getPrecisionStep());
+ }
+ final DatePointField pdt = new DatePointField();
+ {
+ final Map<String, String> args = new HashMap<>();
+ args.put("sortMissingLast", "true");
+ args.put("indexed", "true");
+ args.put("stored", "false");
+ args.put("docValues", "true");
+ pdt.setArgs(schema, args);
+ }
+
+ for (FieldType ft : Arrays.asList(tdt, pdt)) {
+ assertTrue(ft.getClass().getName(), ft.hasProperty(FieldType.OMIT_NORMS));
+ assertTrue(ft.getClass().getName(), ft.hasProperty(FieldType.SORT_MISSING_LAST));
+ assertTrue(ft.getClass().getName(), ft.hasProperty(FieldType.INDEXED));
+ assertFalse(ft.getClass().getName(), ft.hasProperty(FieldType.STORED));
+ assertTrue(ft.getClass().getName(), ft.hasProperty(FieldType.DOC_VALUES));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
index 42e72ee..b3958f8 100644
--- a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
+++ b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java
@@ -149,7 +149,7 @@ public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase {
payload = payload.replace("myNewFieldTypeName", newFieldTypeName);
RestTestHarness publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- String response = publisher.post("/schema?wt=json", SolrTestCaseJ4.json(payload));
+ String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
@@ -219,7 +219,7 @@ public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase {
payload = payload.replace("myNewFieldTypeName", newFieldTypeName);
RestTestHarness publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- String response = publisher.post("/schema?wt=json", SolrTestCaseJ4.json(payload));
+ String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
@@ -281,7 +281,7 @@ public class TestBulkSchemaConcurrent extends AbstractFullDistribZkTestBase {
payload = payload.replace("myNewFieldTypeName", newFieldTypeName);
RestTestHarness publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- String response = publisher.post("/schema?wt=json", SolrTestCaseJ4.json(payload));
+ String response = publisher.post("/schema", SolrTestCaseJ4.json(payload));
Map map = (Map) ObjectBuilder.getVal(new JSONParser(new StringReader(response)));
Object errors = map.get("errors");
if (errors != null) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8d00e53b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
deleted file mode 100644
index e6e4da1..0000000
--- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.schema;
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
-import org.apache.solr.common.cloud.ClusterState;
-import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkCoreNodeProps;
-import org.apache.solr.util.BaseTestHarness;
-import org.apache.solr.util.RestTestHarness;
-import org.apache.zookeeper.data.Stat;
-import org.eclipse.jetty.servlet.ServletHolder;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.restlet.ext.servlet.ServerServlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-@Ignore
-public class TestCloudManagedSchemaConcurrent extends AbstractFullDistribZkTestBase {
- private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private static final String SUCCESS_XPATH = "/response/lst[@name='responseHeader']/int[@name='status'][.='0']";
- private static final String PUT_DYNAMIC_FIELDNAME = "newdynamicfieldPut";
- private static final String POST_DYNAMIC_FIELDNAME = "newdynamicfieldPost";
- private static final String PUT_FIELDNAME = "newfieldPut";
- private static final String POST_FIELDNAME = "newfieldPost";
- private static final String PUT_FIELDTYPE = "newfieldtypePut";
- private static final String POST_FIELDTYPE = "newfieldtypePost";
-
- public TestCloudManagedSchemaConcurrent() {
- super();
- sliceCount = 4;
- }
-
- @BeforeClass
- public static void initSysProperties() {
- System.setProperty("managed.schema.mutable", "true");
- System.setProperty("enable.update.log", "true");
- }
-
- @Override
- public void distribTearDown() throws Exception {
- super.distribTearDown();
- for (RestTestHarness h : restTestHarnesses) {
- h.close();
- }
- }
-
- @Override
- protected String getCloudSolrConfig() {
- return "solrconfig-managed-schema.xml";
- }
-
- @Override
- public SortedMap<ServletHolder,String> getExtraServlets() {
- final SortedMap<ServletHolder,String> extraServlets = new TreeMap<>();
- final ServletHolder solrRestApi = new ServletHolder("SolrSchemaRestApi", ServerServlet.class);
- solrRestApi.setInitParameter("org.restlet.application", "org.apache.solr.rest.SolrSchemaRestApi");
- extraServlets.put(solrRestApi, "/schema/*"); // '/schema/*' matches '/schema', '/schema/', and '/schema/whatever...'
- return extraServlets;
- }
-
- private List<RestTestHarness> restTestHarnesses = new ArrayList<>();
-
- private void setupHarnesses() {
- for (final SolrClient client : clients) {
- RestTestHarness harness = new RestTestHarness(() -> ((HttpSolrClient)client).getBaseURL());
- restTestHarnesses.add(harness);
- }
- }
-
- private static void verifySuccess(String request, String response) throws Exception {
- String result = BaseTestHarness.validateXPath(response, SUCCESS_XPATH);
- if (null != result) {
- String msg = "QUERY FAILED: xpath=" + result + " request=" + request + " response=" + response;
- log.error(msg);
- fail(msg);
- }
- }
-
- private static void addFieldPut(RestTestHarness publisher, String fieldName, int updateTimeoutSecs) throws Exception {
- final String content = "{\"type\":\"text\",\"stored\":\"false\"}";
- String request = "/schema/fields/" + fieldName + "?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.put(request, content);
- verifySuccess(request, response);
- }
-
- private static void addFieldPost(RestTestHarness publisher, String fieldName, int updateTimeoutSecs) throws Exception {
- final String content = "[{\"name\":\""+fieldName+"\",\"type\":\"text\",\"stored\":\"false\"}]";
- String request = "/schema/fields/?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.post(request, content);
- verifySuccess(request, response);
- }
-
- private static void addDynamicFieldPut(RestTestHarness publisher, String dynamicFieldPattern, int updateTimeoutSecs) throws Exception {
- final String content = "{\"type\":\"text\",\"stored\":\"false\"}";
- String request = "/schema/dynamicfields/" + dynamicFieldPattern + "?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.put(request, content);
- verifySuccess(request, response);
- }
-
- private static void addDynamicFieldPost(RestTestHarness publisher, String dynamicFieldPattern, int updateTimeoutSecs) throws Exception {
- final String content = "[{\"name\":\""+dynamicFieldPattern+"\",\"type\":\"text\",\"stored\":\"false\"}]";
- String request = "/schema/dynamicfields/?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.post(request, content);
- verifySuccess(request, response);
- }
-
- private static void copyField(RestTestHarness publisher, String source, String dest, int updateTimeoutSecs) throws Exception {
- final String content = "[{\"source\":\""+source+"\",\"dest\":[\""+dest+"\"]}]";
- String request = "/schema/copyfields/?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.post(request, content);
- verifySuccess(request, response);
- }
-
- private static void addFieldTypePut(RestTestHarness publisher, String typeName, int updateTimeoutSecs) throws Exception {
- final String content = "{\"class\":\"solr.TrieIntField\"}";
- String request = "/schema/fieldtypes/" + typeName + "?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.put(request, content);
- verifySuccess(request, response);
- }
-
- private static void addFieldTypePost(RestTestHarness publisher, String typeName, int updateTimeoutSecs) throws Exception {
- final String content = "[{\"name\":\""+typeName+"\",\"class\":\"solr.TrieIntField\"}]";
- String request = "/schema/fieldtypes/?wt=xml";
- if (updateTimeoutSecs > 0)
- request += "&updateTimeoutSecs="+updateTimeoutSecs;
- String response = publisher.post(request, content);
- verifySuccess(request, response);
- }
-
- private String[] getExpectedFieldResponses(Info info) {
- String[] expectedAddFields = new String[1 + info.numAddFieldPuts + info.numAddFieldPosts];
- expectedAddFields[0] = SUCCESS_XPATH;
-
- for (int i = 0; i < info.numAddFieldPuts; ++i) {
- String newFieldName = PUT_FIELDNAME + info.fieldNameSuffix + i;
- expectedAddFields[1 + i]
- = "/response/arr[@name='fields']/lst/str[@name='name'][.='" + newFieldName + "']";
- }
-
- for (int i = 0; i < info.numAddFieldPosts; ++i) {
- String newFieldName = POST_FIELDNAME + info.fieldNameSuffix + i;
- expectedAddFields[1 + info.numAddFieldPuts + i]
- = "/response/arr[@name='fields']/lst/str[@name='name'][.='" + newFieldName + "']";
- }
-
- return expectedAddFields;
- }
-
- private String[] getExpectedDynamicFieldResponses(Info info) {
- String[] expectedAddDynamicFields = new String[1 + info.numAddDynamicFieldPuts + info.numAddDynamicFieldPosts];
- expectedAddDynamicFields[0] = SUCCESS_XPATH;
-
- for (int i = 0; i < info.numAddDynamicFieldPuts; ++i) {
- String newDynamicFieldPattern = PUT_DYNAMIC_FIELDNAME + info.fieldNameSuffix + i + "_*";
- expectedAddDynamicFields[1 + i]
- = "/response/arr[@name='dynamicFields']/lst/str[@name='name'][.='" + newDynamicFieldPattern + "']";
- }
-
- for (int i = 0; i < info.numAddDynamicFieldPosts; ++i) {
- String newDynamicFieldPattern = POST_DYNAMIC_FIELDNAME + info.fieldNameSuffix + i + "_*";
- expectedAddDynamicFields[1 + info.numAddDynamicFieldPuts + i]
- = "/response/arr[@name='dynamicFields']/lst/str[@name='name'][.='" + newDynamicFieldPattern + "']";
- }
-
- return expectedAddDynamicFields;
- }
-
- private String[] getExpectedCopyFieldResponses(Info info) {
- ArrayList<String> expectedCopyFields = new ArrayList<>();
- expectedCopyFields.add(SUCCESS_XPATH);
- for (CopyFieldInfo cpi : info.copyFields) {
- String expectedSourceName = cpi.getSourceField();
- expectedCopyFields.add
- ("/response/arr[@name='copyFields']/lst/str[@name='source'][.='" + expectedSourceName + "']");
- String expectedDestName = cpi.getDestField();
- expectedCopyFields.add
- ("/response/arr[@name='copyFields']/lst/str[@name='dest'][.='" + expectedDestName + "']");
- }
-
- return expectedCopyFields.toArray(new String[expectedCopyFields.size()]);
- }
-
- private String[] getExpectedFieldTypeResponses(Info info) {
- String[] expectedAddFieldTypes = new String[1 + info.numAddFieldTypePuts + info.numAddFieldTypePosts];
- expectedAddFieldTypes[0] = SUCCESS_XPATH;
-
- for (int i = 0; i < info.numAddFieldTypePuts; ++i) {
- String newFieldTypeName = PUT_FIELDTYPE + info.fieldNameSuffix + i;
- expectedAddFieldTypes[1 + i]
- = "/response/arr[@name='fieldTypes']/lst/str[@name='name'][.='" + newFieldTypeName + "']";
- }
-
- for (int i = 0; i < info.numAddFieldTypePosts; ++i) {
- String newFieldTypeName = POST_FIELDTYPE + info.fieldNameSuffix + i;
- expectedAddFieldTypes[1 + info.numAddFieldTypePuts + i]
- = "/response/arr[@name='fieldTypes']/lst/str[@name='name'][.='" + newFieldTypeName + "']";
- }
-
- return expectedAddFieldTypes;
- }
-
-
- @Test
- @ShardsFixed(num = 8)
- public void test() throws Exception {
- verifyWaitForSchemaUpdateToPropagate();
- setupHarnesses();
- concurrentOperationsTest();
- schemaLockTest();
- }
-
- private static class Info {
- int numAddFieldPuts = 0;
- int numAddFieldPosts = 0;
- int numAddDynamicFieldPuts = 0;
- int numAddDynamicFieldPosts = 0;
- int numAddFieldTypePuts = 0;
- int numAddFieldTypePosts = 0;
- public String fieldNameSuffix;
- List<CopyFieldInfo> copyFields = new ArrayList<>();
-
- public Info(String fieldNameSuffix) {
- this.fieldNameSuffix = fieldNameSuffix;
- }
- }
-
- private enum Operation {
- PUT_AddField {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- String fieldname = PUT_FIELDNAME + info.numAddFieldPuts++;
- addFieldPut(publisher, fieldname, 15);
- }
- },
- POST_AddField {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- String fieldname = POST_FIELDNAME + info.numAddFieldPosts++;
- addFieldPost(publisher, fieldname, 15);
- }
- },
- PUT_AddDynamicField {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- addDynamicFieldPut(publisher, PUT_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPuts++ + "_*", 15);
- }
- },
- POST_AddDynamicField {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- addDynamicFieldPost(publisher, POST_DYNAMIC_FIELDNAME + info.numAddDynamicFieldPosts++ + "_*", 15);
- }
- },
- POST_AddCopyField {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- String sourceField = null;
- String destField = null;
-
- int sourceType = random().nextInt(3);
- if (sourceType == 0) { // existing
- sourceField = "name";
- } else if (sourceType == 1) { // newly created
- sourceField = "copySource" + fieldNum;
- addFieldPut(publisher, sourceField, 15);
- } else { // dynamic
- sourceField = "*_dynamicSource" + fieldNum + "_t";
- // * only supported if both src and dst use it
- destField = "*_dynamicDest" + fieldNum + "_t";
- }
-
- if (destField == null) {
- int destType = random().nextInt(2);
- if (destType == 0) { // existing
- destField = "title";
- } else { // newly created
- destField = "copyDest" + fieldNum;
- addFieldPut(publisher, destField, 15);
- }
- }
- copyField(publisher, sourceField, destField, 15);
- info.copyFields.add(new CopyFieldInfo(sourceField, destField));
- }
- },
- PUT_AddFieldType {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- String typeName = PUT_FIELDTYPE + info.numAddFieldTypePuts++;
- addFieldTypePut(publisher, typeName, 15);
- }
- },
- POST_AddFieldType {
- @Override public void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception {
- String typeName = POST_FIELDTYPE + info.numAddFieldTypePosts++;
- addFieldTypePost(publisher, typeName, 15);
- }
- };
-
-
- public abstract void execute(RestTestHarness publisher, int fieldNum, Info info) throws Exception;
-
- private static final Operation[] VALUES = values();
- public static Operation randomOperation() {
- return VALUES[r.nextInt(VALUES.length)];
- }
- }
-
- private void verifyWaitForSchemaUpdateToPropagate() throws Exception {
- String testCollectionName = "collection1";
-
- ClusterState clusterState = cloudClient.getZkStateReader().getClusterState();
- Replica shard1Leader = clusterState.getLeader(testCollectionName, "shard1");
- final String coreUrl = (new ZkCoreNodeProps(shard1Leader)).getCoreUrl();
- assertNotNull(coreUrl);
-
- RestTestHarness harness = new RestTestHarness(() -> coreUrl.endsWith("/") ? coreUrl.substring(0, coreUrl.length()-1) : coreUrl);
- try {
- addFieldTypePut(harness, "fooInt", 15);
- } finally {
- harness.close();
- }
-
- // go into ZK to get the version of the managed schema after the update
- SolrZkClient zkClient = cloudClient.getZkStateReader().getZkClient();
- Stat stat = new Stat();
- String znodePath = "/configs/conf1/managed-schema";
- byte[] managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
- int schemaZkVersion = stat.getVersion();
-
- // now loop over all replicas and verify each has the same schema version
- Replica randomReplicaNotLeader = null;
- for (Slice slice : clusterState.getActiveSlices(testCollectionName)) {
- for (Replica replica : slice.getReplicas()) {
- validateZkVersion(replica, schemaZkVersion, 0, false);
-
- // save a random replica to test zk watcher behavior
- if (randomReplicaNotLeader == null && !replica.getName().equals(shard1Leader.getName()))
- randomReplicaNotLeader = replica;
- }
- }
- assertNotNull(randomReplicaNotLeader);
-
- // now update the data and then verify the znode watcher fires correctly
- // before an after a zk session expiration (see SOLR-6249)
- zkClient.setData(znodePath, managedSchemaBytes, schemaZkVersion, false);
- stat = new Stat();
- managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
- int updatedSchemaZkVersion = stat.getVersion();
- assertTrue(updatedSchemaZkVersion > schemaZkVersion);
- validateZkVersion(randomReplicaNotLeader, updatedSchemaZkVersion, 2, true);
-
- // ok - looks like the watcher fired correctly on the replica
- // now, expire that replica's zk session and then verify the watcher fires again (after reconnect)
- JettySolrRunner randomReplicaJetty =
- getJettyOnPort(getReplicaPort(randomReplicaNotLeader));
- assertNotNull(randomReplicaJetty);
- chaosMonkey.expireSession(randomReplicaJetty);
-
- // update the data again to cause watchers to fire
- zkClient.setData(znodePath, managedSchemaBytes, updatedSchemaZkVersion, false);
- stat = new Stat();
- managedSchemaBytes = zkClient.getData(znodePath, null, stat, false);
- updatedSchemaZkVersion = stat.getVersion();
- // give up to 10 secs for the replica to recover after zk session loss and see the update
- validateZkVersion(randomReplicaNotLeader, updatedSchemaZkVersion, 10, true);
- }
-
- /**
- * Sends a GET request to get the zk schema version from a specific replica.
- */
- protected void validateZkVersion(Replica replica, int schemaZkVersion, int waitSecs, boolean retry) throws Exception {
- final String replicaUrl = (new ZkCoreNodeProps(replica)).getCoreUrl();
- RestTestHarness testHarness = new RestTestHarness(() -> replicaUrl.endsWith("/") ? replicaUrl.substring(0, replicaUrl.length()-1) : replicaUrl);
- try {
- long waitMs = waitSecs * 1000L;
- if (waitMs > 0) Thread.sleep(waitMs); // wait a moment for the zk watcher to fire
-
- try {
- testHarness.validateQuery("/schema/zkversion?wt=xml", "//zkversion=" + schemaZkVersion);
- } catch (Exception exc) {
- if (retry) {
- // brief wait before retrying
- Thread.sleep(waitMs > 0 ? waitMs : 2000L);
-
- testHarness.validateQuery("/schema/zkversion?wt=xml", "//zkversion=" + schemaZkVersion);
- } else {
- throw exc;
- }
- }
- } finally {
- testHarness.close();
- }
- }
-
- private void concurrentOperationsTest() throws Exception {
-
- // First, add a bunch of fields and dynamic fields via PUT and POST, as well as copyFields,
- // but do it fast enough and verify shards' schemas after all of them are added
- int numFields = 100;
- Info info = new Info("");
-
- for (int fieldNum = 0; fieldNum <= numFields ; ++fieldNum) {
- RestTestHarness publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- Operation.randomOperation().execute(publisher, fieldNum, info);
- }
-
- String[] expectedAddFields = getExpectedFieldResponses(info);
- String[] expectedAddDynamicFields = getExpectedDynamicFieldResponses(info);
- String[] expectedCopyFields = getExpectedCopyFieldResponses(info);
- String[] expectedAddFieldTypes = getExpectedFieldTypeResponses(info);
-
- boolean success = false;
- long maxTimeoutMillis = 100000;
- long startTime = System.nanoTime();
- String request = null;
- String response = null;
- String result = null;
-
- while ( ! success
- && TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutMillis) {
- Thread.sleep(100);
-
- for (RestTestHarness client : restTestHarnesses) {
- // verify addFieldTypePuts and addFieldTypePosts
- request = "/schema/fieldtypes?wt=xml";
- response = client.query(request);
- result = BaseTestHarness.validateXPath(response, expectedAddFieldTypes);
- if (result != null) {
- break;
- }
-
- // verify addFieldPuts and addFieldPosts
- request = "/schema/fields?wt=xml";
- response = client.query(request);
- result = BaseTestHarness.validateXPath(response, expectedAddFields);
- if (result != null) {
- break;
- }
-
- // verify addDynamicFieldPuts and addDynamicFieldPosts
- request = "/schema/dynamicfields?wt=xml";
- response = client.query(request);
- result = BaseTestHarness.validateXPath(response, expectedAddDynamicFields);
- if (result != null) {
- break;
- }
-
- // verify copyFields
- request = "/schema/copyfields?wt=xml";
- response = client.query(request);
- result = BaseTestHarness.validateXPath(response, expectedCopyFields);
- if (result != null) {
- break;
- }
- }
- success = (result == null);
- }
- if ( ! success) {
- String msg = "QUERY FAILED: xpath=" + result + " request=" + request + " response=" + response;
- log.error(msg);
- fail(msg);
- }
- }
-
- private abstract class PutPostThread extends Thread {
- RestTestHarness harness;
- Info info;
- public String fieldName;
-
- public PutPostThread(RestTestHarness harness, Info info) {
- this.harness = harness;
- this.info = info;
- }
-
- public abstract void run();
- }
-
- private class PutFieldThread extends PutPostThread {
- public PutFieldThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = PUT_FIELDNAME + "Thread" + info.numAddFieldPuts++;
- }
- public void run() {
- try {
- // don't have the client side wait for all replicas to see the update or that defeats the purpose
- // of testing the locking support on the server-side
- addFieldPut(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private class PostFieldThread extends PutPostThread {
- public PostFieldThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = POST_FIELDNAME + "Thread" + info.numAddFieldPosts++;
- }
- public void run() {
- try {
- addFieldPost(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private class PutFieldTypeThread extends PutPostThread {
- public PutFieldTypeThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = PUT_FIELDTYPE + "Thread" + info.numAddFieldTypePuts++;
- }
- public void run() {
- try {
- addFieldTypePut(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private class PostFieldTypeThread extends PutPostThread {
- public PostFieldTypeThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = POST_FIELDTYPE + "Thread" + info.numAddFieldTypePosts++;
- }
- public void run() {
- try {
- addFieldTypePost(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private class PutDynamicFieldThread extends PutPostThread {
- public PutDynamicFieldThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = PUT_FIELDNAME + "Thread" + info.numAddFieldPuts++;
- }
- public void run() {
- try {
- addFieldPut(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private class PostDynamicFieldThread extends PutPostThread {
- public PostDynamicFieldThread(RestTestHarness harness, Info info) {
- super(harness, info);
- fieldName = POST_FIELDNAME + "Thread" + info.numAddFieldPosts++;
- }
- public void run() {
- try {
- addFieldPost(harness, fieldName, -1);
- } catch (Exception e) {
- // log.error("###ACTUAL FAILURE!");
- throw new RuntimeException(e);
- }
- }
- }
-
- private void schemaLockTest() throws Exception {
-
- // First, add a bunch of fields via PUT and POST, as well as copyFields,
- // but do it fast enough and verify shards' schemas after all of them are added
- int numFields = 5;
- Info info = new Info("Thread");
-
- for (int i = 0; i <= numFields ; ++i) {
- // System.err.println("###ITERATION: " + i);
- RestTestHarness publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PostFieldThread postFieldThread = new PostFieldThread(publisher, info);
- postFieldThread.start();
-
- publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PutFieldThread putFieldThread = new PutFieldThread(publisher, info);
- putFieldThread.start();
-
- publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PostDynamicFieldThread postDynamicFieldThread = new PostDynamicFieldThread(publisher, info);
- postDynamicFieldThread.start();
-
- publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PutDynamicFieldThread putDynamicFieldThread = new PutDynamicFieldThread(publisher, info);
- putDynamicFieldThread.start();
-
- publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PostFieldTypeThread postFieldTypeThread = new PostFieldTypeThread(publisher, info);
- postFieldTypeThread.start();
-
- publisher = restTestHarnesses.get(r.nextInt(restTestHarnesses.size()));
- PutFieldTypeThread putFieldTypeThread = new PutFieldTypeThread(publisher, info);
- putFieldTypeThread.start();
-
- postFieldThread.join();
- putFieldThread.join();
- postDynamicFieldThread.join();
- putDynamicFieldThread.join();
- postFieldTypeThread.join();
- putFieldTypeThread.join();
-
- String[] expectedAddFields = getExpectedFieldResponses(info);
- String[] expectedAddFieldTypes = getExpectedFieldTypeResponses(info);
- String[] expectedAddDynamicFields = getExpectedDynamicFieldResponses(info);
-
- boolean success = false;
- long maxTimeoutMillis = 100000;
- long startTime = System.nanoTime();
- String request = null;
- String response = null;
- String result = null;
-
- while ( ! success
- && TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTime, TimeUnit.NANOSECONDS) < maxTimeoutMillis) {
- Thread.sleep(10);
-
- // int j = 0;
- for (RestTestHarness client : restTestHarnesses) {
- // System.err.println("###CHECKING HARNESS: " + j++ + " for iteration: " + i);
-
- // verify addFieldPuts and addFieldPosts
- request = "/schema/fields?wt=xml";
- response = client.query(request);
- //System.err.println("###RESPONSE: " + response);
- result = BaseTestHarness.validateXPath(response, expectedAddFields);
-
- if (result != null) {
- // System.err.println("###FAILURE!");
- break;
- }
-
- // verify addDynamicFieldPuts and addDynamicFieldPosts
- request = "/schema/dynamicfields?wt=xml";
- response = client.query(request);
- //System.err.println("###RESPONSE: " + response);
- result = BaseTestHarness.validateXPath(response, expectedAddDynamicFields);
-
- if (result != null) {
- // System.err.println("###FAILURE!");
- break;
- }
-
- request = "/schema/fieldtypes?wt=xml";
- response = client.query(request);
- //System.err.println("###RESPONSE: " + response);
- result = BaseTestHarness.validateXPath(response, expectedAddFieldTypes);
-
- if (result != null) {
- // System.err.println("###FAILURE!");
- break;
- }
-
- }
- success = (result == null);
- }
- if ( ! success) {
- String msg = "QUERY FAILED: xpath=" + result + " request=" + request + " response=" + response;
- log.error(msg);
- fail(msg);
- }
- }
- }
-
- private static class CopyFieldInfo {
- private String sourceField;
- private String destField;
-
- public CopyFieldInfo(String sourceField, String destField) {
- this.sourceField = sourceField;
- this.destField = destField;
- }
-
- public String getSourceField() { return sourceField; }
- public String getDestField() { return destField; }
- }
-}