Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jira/solr-8593

This commit is contained in:
Kevin Risden 2016-05-05 08:37:42 -05:00
parent 4ea7f4ef9b 382ffdb636
commit aae6f2703f
29 changed files with 276 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
View File

@ -132,7 +132,7 @@ class GeoComplexPolygon extends GeoBasePolygon {
// If we're right on top of any of the test planes, we navigate solely on that plane. // If we're right on top of any of the test planes, we navigate solely on that plane.
if (testPointFixedYPlane.evaluateIsZero(thePoint)) { if (testPointFixedYPlane.evaluateIsZero(thePoint)) {
// Use the XZ plane exclusively. // Use the XZ plane exclusively.
final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedYPlane, testPointFixedYAbovePlane, testPointFixedYBelowPlane, testPoint, thePoint); final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedYPlane, testPointFixedYAbovePlane, testPointFixedYBelowPlane, thePoint);
// Traverse our way from the test point to the check point. Use the y tree because that's fixed. // Traverse our way from the test point to the check point. Use the y tree because that's fixed.
if (!yTree.traverse(crossingEdgeIterator, testPoint.y)) { if (!yTree.traverse(crossingEdgeIterator, testPoint.y)) {
// Endpoint is on edge // Endpoint is on edge
@ -141,7 +141,7 @@ class GeoComplexPolygon extends GeoBasePolygon {
return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet; return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet;
} else if (testPointFixedXPlane.evaluateIsZero(thePoint)) { } else if (testPointFixedXPlane.evaluateIsZero(thePoint)) {
// Use the YZ plane exclusively. // Use the YZ plane exclusively.
final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedXPlane, testPointFixedXAbovePlane, testPointFixedXBelowPlane, testPoint, thePoint); final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedXPlane, testPointFixedXAbovePlane, testPointFixedXBelowPlane, thePoint);
// Traverse our way from the test point to the check point. Use the x tree because that's fixed. // Traverse our way from the test point to the check point. Use the x tree because that's fixed.
if (!xTree.traverse(crossingEdgeIterator, testPoint.x)) { if (!xTree.traverse(crossingEdgeIterator, testPoint.x)) {
// Endpoint is on edge // Endpoint is on edge
@ -150,7 +150,7 @@ class GeoComplexPolygon extends GeoBasePolygon {
return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet; return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet;
} else if (testPointFixedZPlane.evaluateIsZero(thePoint)) { } else if (testPointFixedZPlane.evaluateIsZero(thePoint)) {
// Use the XY plane exclusively. // Use the XY plane exclusively.
final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedZPlane, testPointFixedZAbovePlane, testPointFixedZBelowPlane, testPoint, thePoint); final LinearCrossingEdgeIterator crossingEdgeIterator = new LinearCrossingEdgeIterator(testPointFixedZPlane, testPointFixedZAbovePlane, testPointFixedZBelowPlane, thePoint);
// Traverse our way from the test point to the check point. Use the z tree because that's fixed. // Traverse our way from the test point to the check point. Use the z tree because that's fixed.
if (!zTree.traverse(crossingEdgeIterator, testPoint.z)) { if (!zTree.traverse(crossingEdgeIterator, testPoint.z)) {
// Endpoint is on edge // Endpoint is on edge
@ -159,6 +159,9 @@ class GeoComplexPolygon extends GeoBasePolygon {
return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet; return ((crossingEdgeIterator.crossingCount & 1) == 0)?testPointInSet:!testPointInSet;
} else { } else {
// This is the expensive part!!
// Changing the code below has an enormous impact on the queries per second we see with the benchmark.
// We need to use two planes to get there. We don't know which two planes will do it but we can figure it out. // We need to use two planes to get there. We don't know which two planes will do it but we can figure it out.
final Plane travelPlaneFixedX = new Plane(1.0, 0.0, 0.0, -thePoint.x); final Plane travelPlaneFixedX = new Plane(1.0, 0.0, 0.0, -thePoint.x);
final Plane travelPlaneFixedY = new Plane(0.0, 1.0, 0.0, -thePoint.y); final Plane travelPlaneFixedY = new Plane(0.0, 1.0, 0.0, -thePoint.y);
@ -186,7 +189,15 @@ class GeoComplexPolygon extends GeoBasePolygon {
for (final GeoPoint p : XIntersectionsY) { for (final GeoPoint p : XIntersectionsY) {
// Travel would be in YZ plane (fixed x) then in XZ (fixed y) // Travel would be in YZ plane (fixed x) then in XZ (fixed y)
final double newDistance = Math.abs(testPoint.x - p.x) + Math.abs(thePoint.y - p.y); // We compute distance we need to travel as a placeholder for the number of intersections we might encounter.
//final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.x - p.x;
final double tpDelta2 = testPoint.z - p.z;
final double cpDelta1 = thePoint.y - p.y;
final double cpDelta2 = thePoint.z - p.z;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.x - p.x) * (testPoint.x - p.x) + (testPoint.z - p.z) * (testPoint.z - p.z) + (thePoint.y - p.y) * (thePoint.y - p.y) + (thePoint.z - p.z) * (thePoint.z - p.z);
//final double newDistance = Math.abs(testPoint.x - p.x) + Math.abs(thePoint.y - p.y);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.y; firstLegValue = testPoint.y;
@ -202,7 +213,14 @@ class GeoComplexPolygon extends GeoBasePolygon {
} }
for (final GeoPoint p : XIntersectionsZ) { for (final GeoPoint p : XIntersectionsZ) {
// Travel would be in YZ plane (fixed x) then in XY (fixed z) // Travel would be in YZ plane (fixed x) then in XY (fixed z)
final double newDistance = Math.abs(testPoint.x - p.x) + Math.abs(thePoint.z - p.z); //final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.x - p.x;
final double tpDelta2 = testPoint.y - p.y;
final double cpDelta1 = thePoint.y - p.y;
final double cpDelta2 = thePoint.z - p.z;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.x - p.x) * (testPoint.x - p.x) + (testPoint.y - p.y) * (testPoint.y - p.y) + (thePoint.y - p.y) * (thePoint.y - p.y) + (thePoint.z - p.z) * (thePoint.z - p.z);
//final double newDistance = Math.abs(testPoint.x - p.x) + Math.abs(thePoint.z - p.z);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.z; firstLegValue = testPoint.z;
@ -218,7 +236,14 @@ class GeoComplexPolygon extends GeoBasePolygon {
} }
for (final GeoPoint p : YIntersectionsX) { for (final GeoPoint p : YIntersectionsX) {
// Travel would be in XZ plane (fixed y) then in YZ (fixed x) // Travel would be in XZ plane (fixed y) then in YZ (fixed x)
final double newDistance = Math.abs(testPoint.y - p.y) + Math.abs(thePoint.x - p.x); //final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.y - p.y;
final double tpDelta2 = testPoint.z - p.z;
final double cpDelta1 = thePoint.x - p.x;
final double cpDelta2 = thePoint.z - p.z;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.y - p.y) * (testPoint.y - p.y) + (testPoint.z - p.z) * (testPoint.z - p.z) + (thePoint.x - p.x) * (thePoint.x - p.x) + (thePoint.z - p.z) * (thePoint.z - p.z);
//final double newDistance = Math.abs(testPoint.y - p.y) + Math.abs(thePoint.x - p.x);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.x; firstLegValue = testPoint.x;
@ -234,7 +259,14 @@ class GeoComplexPolygon extends GeoBasePolygon {
} }
for (final GeoPoint p : YIntersectionsZ) { for (final GeoPoint p : YIntersectionsZ) {
// Travel would be in XZ plane (fixed y) then in XY (fixed z) // Travel would be in XZ plane (fixed y) then in XY (fixed z)
final double newDistance = Math.abs(testPoint.y - p.y) + Math.abs(thePoint.z - p.z); //final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.x - p.x;
final double tpDelta2 = testPoint.y - p.y;
final double cpDelta1 = thePoint.x - p.x;
final double cpDelta2 = thePoint.z - p.z;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.x - p.x) * (testPoint.x - p.x) + (testPoint.y - p.y) * (testPoint.y - p.y) + (thePoint.x - p.x) * (thePoint.x - p.x) + (thePoint.z - p.z) * (thePoint.z - p.z);
//final double newDistance = Math.abs(testPoint.y - p.y) + Math.abs(thePoint.z - p.z);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.z; firstLegValue = testPoint.z;
@ -250,7 +282,14 @@ class GeoComplexPolygon extends GeoBasePolygon {
} }
for (final GeoPoint p : ZIntersectionsX) { for (final GeoPoint p : ZIntersectionsX) {
// Travel would be in XY plane (fixed z) then in YZ (fixed x) // Travel would be in XY plane (fixed z) then in YZ (fixed x)
final double newDistance = Math.abs(testPoint.z - p.z) + Math.abs(thePoint.x - p.x); //final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.y - p.y;
final double tpDelta2 = testPoint.z - p.z;
final double cpDelta1 = thePoint.y - p.y;
final double cpDelta2 = thePoint.x - p.x;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.y - p.y) * (testPoint.y - p.y) + (testPoint.z - p.z) * (testPoint.z - p.z) + (thePoint.y - p.y) * (thePoint.y - p.y) + (thePoint.x - p.x) * (thePoint.x - p.x);
//final double newDistance = Math.abs(testPoint.z - p.z) + Math.abs(thePoint.x - p.x);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.x; firstLegValue = testPoint.x;
@ -266,7 +305,14 @@ class GeoComplexPolygon extends GeoBasePolygon {
} }
for (final GeoPoint p : ZIntersectionsY) { for (final GeoPoint p : ZIntersectionsY) {
// Travel would be in XY plane (fixed z) then in XZ (fixed y) // Travel would be in XY plane (fixed z) then in XZ (fixed y)
final double newDistance = Math.abs(testPoint.z - p.z) + Math.abs(thePoint.y - p.y); //final double newDistance = p.arcDistance(testPoint) + p.arcDistance(thePoint);
final double tpDelta1 = testPoint.x - p.x;
final double tpDelta2 = testPoint.z - p.z;
final double cpDelta1 = thePoint.y - p.y;
final double cpDelta2 = thePoint.x - p.x;
final double newDistance = tpDelta1 * tpDelta1 + tpDelta2 * tpDelta2 + cpDelta1 * cpDelta1 + cpDelta2 * cpDelta2;
//final double newDistance = (testPoint.x - p.x) * (testPoint.x - p.x) + (testPoint.z - p.z) * (testPoint.z - p.z) + (thePoint.y - p.y) * (thePoint.y - p.y) + (thePoint.x - p.x) * (thePoint.x - p.x);
//final double newDistance = Math.abs(testPoint.z - p.z) + Math.abs(thePoint.y - p.y);
if (newDistance < bestDistance) { if (newDistance < bestDistance) {
bestDistance = newDistance; bestDistance = newDistance;
firstLegValue = testPoint.y; firstLegValue = testPoint.y;
@ -284,7 +330,7 @@ class GeoComplexPolygon extends GeoBasePolygon {
assert bestDistance > 0.0 : "Best distance should not be zero unless on single plane"; assert bestDistance > 0.0 : "Best distance should not be zero unless on single plane";
assert bestDistance < Double.MAX_VALUE : "Couldn't find an intersection point of any kind"; assert bestDistance < Double.MAX_VALUE : "Couldn't find an intersection point of any kind";
final DualCrossingEdgeIterator edgeIterator = new DualCrossingEdgeIterator(firstLegPlane, firstLegAbovePlane, firstLegBelowPlane, secondLegPlane, testPoint, thePoint, intersectionPoint); final DualCrossingEdgeIterator edgeIterator = new DualCrossingEdgeIterator(firstLegPlane, firstLegAbovePlane, firstLegBelowPlane, secondLegPlane, thePoint, intersectionPoint);
if (!firstLegTree.traverse(edgeIterator, firstLegValue)) { if (!firstLegTree.traverse(edgeIterator, firstLegValue)) {
return true; return true;
} }
@ -666,7 +712,7 @@ class GeoComplexPolygon extends GeoBasePolygon {
public int crossingCount = 0; public int crossingCount = 0;
public LinearCrossingEdgeIterator(final Plane plane, final Plane abovePlane, final Plane belowPlane, final Vector testPoint, final Vector thePoint) { public LinearCrossingEdgeIterator(final Plane plane, final Plane abovePlane, final Plane belowPlane, final Vector thePoint) {
this.plane = plane; this.plane = plane;
this.abovePlane = abovePlane; this.abovePlane = abovePlane;
this.belowPlane = belowPlane; this.belowPlane = belowPlane;
@ -815,11 +861,9 @@ class GeoComplexPolygon extends GeoBasePolygon {
private boolean isSecondLeg = false; private boolean isSecondLeg = false;
private final Plane testPointPlane; private final Plane testPointPlane;
private final Plane testPointInsidePlane; private final Plane testPointAbovePlane;
private final Plane testPointOutsidePlane; private final Plane testPointBelowPlane;
private final Plane travelPlane; private final Plane travelPlane;
private final Plane travelInsidePlane;
private final Plane travelOutsidePlane;
private final Vector thePoint; private final Vector thePoint;
private final GeoPoint intersectionPoint; private final GeoPoint intersectionPoint;
@ -829,14 +873,25 @@ class GeoComplexPolygon extends GeoBasePolygon {
private final SidedPlane testPointOtherCutoffPlane; private final SidedPlane testPointOtherCutoffPlane;
private final SidedPlane checkPointOtherCutoffPlane; private final SidedPlane checkPointOtherCutoffPlane;
private final SidedPlane insideTestPointCutoffPlane; // These are computed on an as-needed basis
private final SidedPlane insideTravelCutoffPlane;
private boolean computedInsideOutside = false;
private Plane testPointInsidePlane;
private Plane testPointOutsidePlane;
private Plane travelInsidePlane;
private Plane travelOutsidePlane;
private SidedPlane insideTestPointCutoffPlane;
private SidedPlane insideTravelCutoffPlane;
// The counter
public int crossingCount = 0; public int crossingCount = 0;
public DualCrossingEdgeIterator(final Plane testPointPlane, final Plane testPointAbovePlane, final Plane testPointBelowPlane, public DualCrossingEdgeIterator(final Plane testPointPlane, final Plane testPointAbovePlane, final Plane testPointBelowPlane,
final Plane travelPlane, final Vector testPoint, final Vector thePoint, final GeoPoint intersectionPoint) { final Plane travelPlane, final Vector thePoint, final GeoPoint intersectionPoint) {
this.testPointPlane = testPointPlane; this.testPointPlane = testPointPlane;
this.testPointAbovePlane = testPointAbovePlane;
this.testPointBelowPlane = testPointBelowPlane;
this.travelPlane = travelPlane; this.travelPlane = travelPlane;
this.thePoint = thePoint; this.thePoint = thePoint;
this.intersectionPoint = intersectionPoint; this.intersectionPoint = intersectionPoint;
@ -854,66 +909,67 @@ class GeoComplexPolygon extends GeoBasePolygon {
this.testPointOtherCutoffPlane = new SidedPlane(testPoint, testPointPlane, intersectionPoint); this.testPointOtherCutoffPlane = new SidedPlane(testPoint, testPointPlane, intersectionPoint);
this.checkPointOtherCutoffPlane = new SidedPlane(thePoint, travelPlane, intersectionPoint); this.checkPointOtherCutoffPlane = new SidedPlane(thePoint, travelPlane, intersectionPoint);
// Convert travel plane to a sided plane
final Membership intersectionBound1 = new SidedPlane(testPoint, travelPlane, travelPlane.D);
// Convert testPoint plane to a sided plane
final Membership intersectionBound2 = new SidedPlane(thePoint, testPointPlane, testPointPlane.D);
// Sanity check // Sanity check
assert testPointCutoffPlane.isWithin(intersectionPoint) : "intersection must be within testPointCutoffPlane"; assert testPointCutoffPlane.isWithin(intersectionPoint) : "intersection must be within testPointCutoffPlane";
assert testPointOtherCutoffPlane.isWithin(intersectionPoint) : "intersection must be within testPointOtherCutoffPlane"; assert testPointOtherCutoffPlane.isWithin(intersectionPoint) : "intersection must be within testPointOtherCutoffPlane";
assert checkPointCutoffPlane.isWithin(intersectionPoint) : "intersection must be within checkPointCutoffPlane"; assert checkPointCutoffPlane.isWithin(intersectionPoint) : "intersection must be within checkPointCutoffPlane";
assert checkPointOtherCutoffPlane.isWithin(intersectionPoint) : "intersection must be within checkPointOtherCutoffPlane"; assert checkPointOtherCutoffPlane.isWithin(intersectionPoint) : "intersection must be within checkPointOtherCutoffPlane";
assert intersectionBound1.isWithin(intersectionPoint) : "intersection must be within intersectionBound1";
assert intersectionBound2.isWithin(intersectionPoint) : "intersection must be within intersectionBound2";
// Figure out which of the above/below planes are inside vs. outside. To do this,
// we look for the point that is within the bounds of the testPointPlane and travelPlane. The two sides that intersected there are the inside
// borders.
final Plane travelAbovePlane = new Plane(travelPlane, true);
final Plane travelBelowPlane = new Plane(travelPlane, false);
final GeoPoint[] aboveAbove = travelAbovePlane.findIntersections(planetModel, testPointAbovePlane, intersectionBound1, intersectionBound2); }
assert aboveAbove != null : "Above + above should not be coplanar";
final GeoPoint[] aboveBelow = travelAbovePlane.findIntersections(planetModel, testPointBelowPlane, intersectionBound1, intersectionBound2); protected void computeInsideOutside() {
assert aboveBelow != null : "Above + below should not be coplanar"; if (!computedInsideOutside) {
final GeoPoint[] belowBelow = travelBelowPlane.findIntersections(planetModel, testPointBelowPlane, intersectionBound1, intersectionBound2); // Convert travel plane to a sided plane
assert belowBelow != null : "Below + below should not be coplanar"; final Membership intersectionBound1 = new SidedPlane(testPoint, travelPlane, travelPlane.D);
final GeoPoint[] belowAbove = travelBelowPlane.findIntersections(planetModel, testPointAbovePlane, intersectionBound1, intersectionBound2); // Convert testPoint plane to a sided plane
assert belowAbove != null : "Below + above should not be coplanar"; final Membership intersectionBound2 = new SidedPlane(thePoint, testPointPlane, testPointPlane.D);
assert ((aboveAbove.length > 0)?1:0) + ((aboveBelow.length > 0)?1:0) + ((belowBelow.length > 0)?1:0) + ((belowAbove.length > 0)?1:0) == 1 : "Can be exactly one inside point, instead was: aa="+aboveAbove.length+" ab=" + aboveBelow.length+" bb="+ belowBelow.length+" ba=" + belowAbove.length; assert intersectionBound1.isWithin(intersectionPoint) : "intersection must be within intersectionBound1";
assert intersectionBound2.isWithin(intersectionPoint) : "intersection must be within intersectionBound2";
final GeoPoint insideIntersection;
if (aboveAbove.length > 0) { // Figure out which of the above/below planes are inside vs. outside. To do this,
travelInsidePlane = travelAbovePlane; // we look for the point that is within the bounds of the testPointPlane and travelPlane. The two sides that intersected there are the inside
testPointInsidePlane = testPointAbovePlane; // borders.
travelOutsidePlane = travelBelowPlane; final Plane travelAbovePlane = new Plane(travelPlane, true);
testPointOutsidePlane = testPointBelowPlane; final Plane travelBelowPlane = new Plane(travelPlane, false);
insideIntersection = aboveAbove[0];
} else if (aboveBelow.length > 0) { final GeoPoint[] aboveAbove = travelAbovePlane.findIntersections(planetModel, testPointAbovePlane, intersectionBound1, intersectionBound2);
travelInsidePlane = travelAbovePlane; assert aboveAbove != null : "Above + above should not be coplanar";
testPointInsidePlane = testPointBelowPlane; final GeoPoint[] aboveBelow = travelAbovePlane.findIntersections(planetModel, testPointBelowPlane, intersectionBound1, intersectionBound2);
travelOutsidePlane = travelBelowPlane; assert aboveBelow != null : "Above + below should not be coplanar";
testPointOutsidePlane = testPointAbovePlane; final GeoPoint[] belowBelow = travelBelowPlane.findIntersections(planetModel, testPointBelowPlane, intersectionBound1, intersectionBound2);
insideIntersection = aboveBelow[0]; assert belowBelow != null : "Below + below should not be coplanar";
} else if (belowBelow.length > 0) { final GeoPoint[] belowAbove = travelBelowPlane.findIntersections(planetModel, testPointAbovePlane, intersectionBound1, intersectionBound2);
travelInsidePlane = travelBelowPlane; assert belowAbove != null : "Below + above should not be coplanar";
testPointInsidePlane = testPointBelowPlane;
travelOutsidePlane = travelAbovePlane; assert ((aboveAbove.length > 0)?1:0) + ((aboveBelow.length > 0)?1:0) + ((belowBelow.length > 0)?1:0) + ((belowAbove.length > 0)?1:0) == 1 : "Can be exactly one inside point, instead was: aa="+aboveAbove.length+" ab=" + aboveBelow.length+" bb="+ belowBelow.length+" ba=" + belowAbove.length;
testPointOutsidePlane = testPointAbovePlane;
insideIntersection = belowBelow[0]; if (aboveAbove.length > 0) {
} else { travelInsidePlane = travelAbovePlane;
travelInsidePlane = travelBelowPlane; testPointInsidePlane = testPointAbovePlane;
testPointInsidePlane = testPointAbovePlane; travelOutsidePlane = travelBelowPlane;
travelOutsidePlane = travelAbovePlane; testPointOutsidePlane = testPointBelowPlane;
testPointOutsidePlane = testPointBelowPlane; } else if (aboveBelow.length > 0) {
insideIntersection = belowAbove[0]; travelInsidePlane = travelAbovePlane;
testPointInsidePlane = testPointBelowPlane;
travelOutsidePlane = travelBelowPlane;
testPointOutsidePlane = testPointAbovePlane;
} else if (belowBelow.length > 0) {
travelInsidePlane = travelBelowPlane;
testPointInsidePlane = testPointBelowPlane;
travelOutsidePlane = travelAbovePlane;
testPointOutsidePlane = testPointAbovePlane;
} else {
travelInsidePlane = travelBelowPlane;
testPointInsidePlane = testPointAbovePlane;
travelOutsidePlane = travelAbovePlane;
testPointOutsidePlane = testPointBelowPlane;
}
insideTravelCutoffPlane = new SidedPlane(thePoint, testPointInsidePlane, testPointInsidePlane.D);
insideTestPointCutoffPlane = new SidedPlane(testPoint, travelInsidePlane, travelInsidePlane.D);
computedInsideOutside = true;
} }
insideTravelCutoffPlane = new SidedPlane(thePoint, testPointInsidePlane, testPointInsidePlane.D);
insideTestPointCutoffPlane = new SidedPlane(testPoint, travelInsidePlane, travelInsidePlane.D);
} }
public void setSecondLeg() { public void setSecondLeg() {
@ -982,29 +1038,11 @@ class GeoComplexPolygon extends GeoBasePolygon {
// Plane crossing, either first leg or second leg // Plane crossing, either first leg or second leg
final Plane plane;
final Plane insidePlane;
final Plane outsidePlane;
final SidedPlane bound1;
final SidedPlane bound2;
if (isSecondLeg) {
plane = travelPlane;
insidePlane = travelInsidePlane;
outsidePlane = travelOutsidePlane;
bound1 = checkPointCutoffPlane;
bound2 = checkPointOtherCutoffPlane;
} else {
plane = testPointPlane;
insidePlane = testPointInsidePlane;
outsidePlane = testPointOutsidePlane;
bound1 = testPointCutoffPlane;
bound2 = testPointOtherCutoffPlane;
}
if (crossingPoint.isNumericallyIdentical(edge.startPoint)) { if (crossingPoint.isNumericallyIdentical(edge.startPoint)) {
//System.err.println(" Crossing point = edge.startPoint"); //System.err.println(" Crossing point = edge.startPoint");
// We have to figure out if this crossing should be counted. // We have to figure out if this crossing should be counted.
computeInsideOutside();
// Does the crossing for this edge go up, or down? Or can't we tell? // Does the crossing for this edge go up, or down? Or can't we tell?
final GeoPoint[] insideTestPointPlaneIntersections = testPointInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTestPointCutoffPlane); final GeoPoint[] insideTestPointPlaneIntersections = testPointInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTestPointCutoffPlane);
final GeoPoint[] insideTravelPlaneIntersections = travelInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTravelCutoffPlane); final GeoPoint[] insideTravelPlaneIntersections = travelInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTravelCutoffPlane);
@ -1050,7 +1088,12 @@ class GeoComplexPolygon extends GeoBasePolygon {
// a decision whether to count or not based on that. // a decision whether to count or not based on that.
// Compute the crossing points of this other edge. // Compute the crossing points of this other edge.
final GeoPoint[] otherCrossingPoints = plane.findCrossings(planetModel, assessEdge.plane, bound1, bound2, assessEdge.startPlane, assessEdge.endPlane); final GeoPoint[] otherCrossingPoints;
if (isSecondLeg) {
otherCrossingPoints = travelPlane.findCrossings(planetModel, assessEdge.plane, checkPointCutoffPlane, checkPointOtherCutoffPlane, assessEdge.startPlane, assessEdge.endPlane);
} else {
otherCrossingPoints = testPointPlane.findCrossings(planetModel, assessEdge.plane, testPointCutoffPlane, testPointOtherCutoffPlane, assessEdge.startPlane, assessEdge.endPlane);
}
// Look for a matching endpoint. If the other endpoint doesn't show up, it is either out of bounds (in which case the // Look for a matching endpoint. If the other endpoint doesn't show up, it is either out of bounds (in which case the
// transition won't be counted for that edge), or it is not a crossing for that edge (so, same conclusion). // transition won't be counted for that edge), or it is not a crossing for that edge (so, same conclusion).
@ -1079,7 +1122,8 @@ class GeoComplexPolygon extends GeoBasePolygon {
} else if (crossingPoint.isNumericallyIdentical(edge.endPoint)) { } else if (crossingPoint.isNumericallyIdentical(edge.endPoint)) {
//System.err.println(" Crossing point = edge.endPoint"); //System.err.println(" Crossing point = edge.endPoint");
// Figure out if the crossing should be counted. // Figure out if the crossing should be counted.
computeInsideOutside();
// Does the crossing for this edge go up, or down? Or can't we tell? // Does the crossing for this edge go up, or down? Or can't we tell?
final GeoPoint[] insideTestPointPlaneIntersections = testPointInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTestPointCutoffPlane); final GeoPoint[] insideTestPointPlaneIntersections = testPointInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTestPointCutoffPlane);
final GeoPoint[] insideTravelPlaneIntersections = travelInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTravelCutoffPlane); final GeoPoint[] insideTravelPlaneIntersections = travelInsidePlane.findIntersections(planetModel, edge.plane, edge.startPlane, edge.endPlane, insideTravelCutoffPlane);

2
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoPoint.java
View File

@ -121,7 +121,7 @@ public class GeoPoint extends Vector {
* @param v is the second point. * @param v is the second point.
* @return the angle, in radians, between the two points. * @return the angle, in radians, between the two points.
*/ */
public double arcDistance(final GeoPoint v) { public double arcDistance(final Vector v) {
return Tools.safeAcos(dotProduct(v)/(magnitude() * v.magnitude())); return Tools.safeAcos(dotProduct(v)/(magnitude() * v.magnitude()));
} }

2
lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/PlanetModel.java
View File

@ -242,7 +242,7 @@ public class PlanetModel {
* @param pt1 is the first point. * @param pt1 is the first point.
* @param pt2 is the second point. * @param pt2 is the second point.
* @return the adjusted angle, when multiplied by the mean earth radius, yields a surface distance. This will differ * @return the adjusted angle, when multiplied by the mean earth radius, yields a surface distance. This will differ
* from GeoPoint.arcDistance() only when the planet model is not a sphere. @see {@link GeoPoint#arcDistance(GeoPoint)} * from GeoPoint.arcDistance() only when the planet model is not a sphere. @see {@link GeoPoint#arcDistance(Vector)}
*/ */
public double surfaceDistance(final GeoPoint pt1, final GeoPoint pt2) { public double surfaceDistance(final GeoPoint pt1, final GeoPoint pt2) {
final double L = pt2.getLongitude() - pt1.getLongitude(); final double L = pt2.getLongitude() - pt1.getLongitude();

7
solr/CHANGES.txt
View File

@ -179,6 +179,11 @@ Bug Fixes
* SOLR-8792: ZooKeeper ACL support fixed. (Esther Quansah, Ishan Chattopadhyaya, Steve Rowe) * SOLR-8792: ZooKeeper ACL support fixed. (Esther Quansah, Ishan Chattopadhyaya, Steve Rowe)
* SOLR-9064: Adds an explanation of the incoming stream to an UpdateStream's explanation (Dennis Gove)
* SOLR-9030: The 'downnode' overseer command can trip asserts in ZkStateWriter.
(Scott Blum, Mark Miller, shalin)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation. * SOLR-8722: Don't force a full ZkStateReader refresh on every Overseer operation.
@ -241,7 +246,7 @@ Other Changes
* SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan) * SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan)
* SOLR-9053: Upgrade commons-fileupload to 1.3.1, fixing a potential vulnerability (Jeff Field, janhoy) * SOLR-9053: Upgrade commons-fileupload to 1.3.1, fixing a potential vulnerability (Jeff Field, Mike Drob via janhoy)
* SOLR-9066 Make CountMetric return long instead of double (Kevin Risden) * SOLR-9066 Make CountMetric return long instead of double (Kevin Risden)

7
solr/core/src/java/org/apache/solr/cloud/Assign.java
View File

@ -233,8 +233,9 @@ public class Assign {
} }
DocCollection coll = clusterState.getCollection(collectionName); DocCollection coll = clusterState.getCollection(collectionName);
Integer maxShardsPerNode = coll.getInt(MAX_SHARDS_PER_NODE, 1); Integer maxShardsPerNode = coll.getInt(MAX_SHARDS_PER_NODE, 1);
for (String s : clusterState.getCollections()) { Map<String, DocCollection> collections = clusterState.getCollectionsMap();
DocCollection c = clusterState.getCollection(s); for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection c = entry.getValue();
//identify suitable nodes by checking the no:of cores in each of them //identify suitable nodes by checking the no:of cores in each of them
for (Slice slice : c.getSlices()) { for (Slice slice : c.getSlices()) {
Collection<Replica> replicas = slice.getReplicas(); Collection<Replica> replicas = slice.getReplicas();
@ -242,7 +243,7 @@ public class Assign {
ReplicaCount count = nodeNameVsShardCount.get(replica.getNodeName()); ReplicaCount count = nodeNameVsShardCount.get(replica.getNodeName());
if (count != null) { if (count != null) {
count.totalNodes++; // Used ot "weigh" whether this node should be used later. count.totalNodes++; // Used ot "weigh" whether this node should be used later.
if (s.equals(collectionName)) { if (entry.getKey().equals(collectionName)) {
count.thisCollectionNodes++; count.thisCollectionNodes++;
if (count.thisCollectionNodes >= maxShardsPerNode) nodeNameVsShardCount.remove(replica.getNodeName()); if (count.thisCollectionNodes >= maxShardsPerNode) nodeNameVsShardCount.remove(replica.getNodeName());
} }

21
solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java
View File

@ -162,10 +162,10 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
liveNodes = clusterState.getLiveNodes(); liveNodes = clusterState.getLiveNodes();
lastClusterStateVersion = clusterState.getZkClusterStateVersion(); lastClusterStateVersion = clusterState.getZkClusterStateVersion();
Set<String> collections = clusterState.getCollections(); Map<String, DocCollection> collections = clusterState.getCollectionsMap();
for (final String collection : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
log.debug("look at collection={}", collection); log.debug("look at collection={}", entry.getKey());
DocCollection docCollection = clusterState.getCollection(collection); DocCollection docCollection = entry.getValue();
if (!docCollection.getAutoAddReplicas()) { if (!docCollection.getAutoAddReplicas()) {
log.debug("Collection {} is not setup to use autoAddReplicas, skipping..", docCollection.getName()); log.debug("Collection {} is not setup to use autoAddReplicas, skipping..", docCollection.getName());
continue; continue;
@ -174,7 +174,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
log.debug("Skipping collection because it has no defined replicationFactor, name={}", docCollection.getName()); log.debug("Skipping collection because it has no defined replicationFactor, name={}", docCollection.getName());
continue; continue;
} }
log.debug("Found collection, name={} replicationFactor={}", collection, docCollection.getReplicationFactor()); log.debug("Found collection, name={} replicationFactor={}", entry.getKey(), docCollection.getReplicationFactor());
Collection<Slice> slices = docCollection.getSlices(); Collection<Slice> slices = docCollection.getSlices();
for (Slice slice : slices) { for (Slice slice : slices) {
@ -188,7 +188,7 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
if (downReplicas.size() > 0 && goodReplicas < docCollection.getReplicationFactor()) { if (downReplicas.size() > 0 && goodReplicas < docCollection.getReplicationFactor()) {
// badReplicaMap.put(collection, badReplicas); // badReplicaMap.put(collection, badReplicas);
processBadReplicas(collection, downReplicas); processBadReplicas(entry.getKey(), downReplicas);
} else if (goodReplicas > docCollection.getReplicationFactor()) { } else if (goodReplicas > docCollection.getReplicationFactor()) {
log.debug("There are too many replicas"); log.debug("There are too many replicas");
} }
@ -313,10 +313,11 @@ public class OverseerAutoReplicaFailoverThread implements Runnable, Closeable {
ClusterState clusterState = zkStateReader.getClusterState(); ClusterState clusterState = zkStateReader.getClusterState();
if (clusterState != null) { if (clusterState != null) {
Set<String> collections = clusterState.getCollections(); Map<String, DocCollection> collections = clusterState.getCollectionsMap();
for (String collection : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
log.debug("look at collection {} as possible create candidate", collection); String collection = entry.getKey();
DocCollection docCollection = clusterState.getCollection(collection); log.debug("look at collection {} as possible create candidate", collection);
DocCollection docCollection = entry.getValue();
// TODO - only operate on collections with sharedfs failover = true ?? // TODO - only operate on collections with sharedfs failover = true ??
Collection<Slice> slices = docCollection.getSlices(); Collection<Slice> slices = docCollection.getSlices();
for (Slice slice : slices) { for (Slice slice : slices) {

6
solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java
View File

@ -350,10 +350,10 @@ public class OverseerConfigSetMessageHandler implements OverseerMessageHandler {
throw new SolrException(ErrorCode.BAD_REQUEST, "ConfigSet does not exist to delete: " + configSetName); throw new SolrException(ErrorCode.BAD_REQUEST, "ConfigSet does not exist to delete: " + configSetName);
} }
for (String s : zkStateReader.getClusterState().getCollections()) { for (Map.Entry<String, DocCollection> entry : zkStateReader.getClusterState().getCollectionsMap().entrySet()) {
if (configSetName.equals(zkStateReader.readConfigName(s))) if (configSetName.equals(zkStateReader.readConfigName(entry.getKey())))
throw new SolrException(ErrorCode.BAD_REQUEST, throw new SolrException(ErrorCode.BAD_REQUEST,
"Can not delete ConfigSet as it is currently being used by collection [" + s + "]"); "Can not delete ConfigSet as it is currently being used by collection [" + entry.getKey() + "]");
} }
String propertyPath = ConfigSetProperties.DEFAULT_FILENAME; String propertyPath = ConfigSetProperties.DEFAULT_FILENAME;

12
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -689,14 +689,12 @@ public final class ZkController {
long now = System.nanoTime(); long now = System.nanoTime();
long timeout = now + TimeUnit.NANOSECONDS.convert(WAIT_DOWN_STATES_TIMEOUT_SECONDS, TimeUnit.SECONDS); long timeout = now + TimeUnit.NANOSECONDS.convert(WAIT_DOWN_STATES_TIMEOUT_SECONDS, TimeUnit.SECONDS);
boolean foundStates = true; boolean foundStates = true;
ClusterState clusterState = zkStateReader.getClusterState();
Set<String> collections = clusterState.getCollections();
while (System.nanoTime() < timeout) { while (System.nanoTime() < timeout) {
clusterState = zkStateReader.getClusterState(); ClusterState clusterState = zkStateReader.getClusterState();
collections = clusterState.getCollections(); Map<String, DocCollection> collections = clusterState.getCollectionsMap();
for (String collectionName : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection collection = clusterState.getCollection(collectionName); DocCollection collection = entry.getValue();
Collection<Slice> slices = collection.getSlices(); Collection<Slice> slices = collection.getSlices();
for (Slice slice : slices) { for (Slice slice : slices) {
Collection<Replica> replicas = slice.getReplicas(); Collection<Replica> replicas = slice.getReplicas();

13
solr/core/src/java/org/apache/solr/cloud/overseer/NodeMutator.java
View File

@ -49,14 +49,13 @@ public class NodeMutator {
log.info("DownNode state invoked for node: " + nodeName); log.info("DownNode state invoked for node: " + nodeName);
Set<String> collections = clusterState.getCollections(); Map<String, DocCollection> collections = clusterState.getCollectionsMap();
for (String collection : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection docCollection = clusterState.getCollection(collection); DocCollection docCollection = entry.getValue();
Map<String,Slice> slicesCopy = new LinkedHashMap<>(docCollection.getSlicesMap()); Map<String,Slice> slicesCopy = new LinkedHashMap<>(docCollection.getSlicesMap());
Set<Entry<String,Slice>> entries = slicesCopy.entrySet(); for (Entry<String,Slice> sliceEntry : slicesCopy.entrySet()) {
for (Entry<String,Slice> entry : entries) { Slice slice = docCollection.getSlice(sliceEntry.getKey());
Slice slice = docCollection.getSlice(entry.getKey());
Map<String,Replica> newReplicas = new HashMap<String,Replica>(); Map<String,Replica> newReplicas = new HashMap<String,Replica>();
Collection<Replica> replicas = slice.getReplicas(); Collection<Replica> replicas = slice.getReplicas();
@ -77,7 +76,7 @@ public class NodeMutator {
} }
zkWriteCommands.add(new ZkWriteCommand(collection, docCollection.copyWithSlices(slicesCopy))); zkWriteCommands.add(new ZkWriteCommand(entry.getKey(), docCollection.copyWithSlices(slicesCopy)));
} }
return zkWriteCommands; return zkWriteCommands;

9
solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
View File

@ -229,7 +229,6 @@ public class ZkStateWriter {
byte[] data = Utils.toJSON(singletonMap(c.getName(), c)); byte[] data = Utils.toJSON(singletonMap(c.getName(), c));
if (reader.getZkClient().exists(path, true)) { if (reader.getZkClient().exists(path, true)) {
log.info("going to update_collection {} version: {}", path, c.getZNodeVersion()); log.info("going to update_collection {} version: {}", path, c.getZNodeVersion());
assert c.getZNodeVersion() >= 0;
Stat stat = reader.getZkClient().setData(path, data, c.getZNodeVersion(), true); Stat stat = reader.getZkClient().setData(path, data, c.getZNodeVersion(), true);
DocCollection newCollection = new DocCollection(name, c.getSlicesMap(), c.getProperties(), c.getRouter(), stat.getVersion(), path); DocCollection newCollection = new DocCollection(name, c.getSlicesMap(), c.getProperties(), c.getRouter(), stat.getVersion(), path);
clusterState = clusterState.copyWith(name, newCollection); clusterState = clusterState.copyWith(name, newCollection);
@ -251,13 +250,9 @@ public class ZkStateWriter {
assert clusterState.getZkClusterStateVersion() >= 0; assert clusterState.getZkClusterStateVersion() >= 0;
byte[] data = Utils.toJSON(clusterState); byte[] data = Utils.toJSON(clusterState);
Stat stat = reader.getZkClient().setData(ZkStateReader.CLUSTER_STATE, data, clusterState.getZkClusterStateVersion(), true); Stat stat = reader.getZkClient().setData(ZkStateReader.CLUSTER_STATE, data, clusterState.getZkClusterStateVersion(), true);
Set<String> collectionNames = clusterState.getCollections(); Map<String, DocCollection> collections = clusterState.getCollectionsMap();
Map<String, DocCollection> collectionStates = new HashMap<>(collectionNames.size());
for (String c : collectionNames) {
collectionStates.put(c, clusterState.getCollection(c));
}
// use the reader's live nodes because our cluster state's live nodes may be stale // use the reader's live nodes because our cluster state's live nodes may be stale
clusterState = new ClusterState(stat.getVersion(), reader.getClusterState().getLiveNodes(), collectionStates); clusterState = new ClusterState(stat.getVersion(), reader.getClusterState().getLiveNodes(), collections);
isClusterStateModified = false; isClusterStateModified = false;
} }
lastUpdatedTime = System.nanoTime(); lastUpdatedTime = System.nanoTime();

5
solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
View File

@ -104,8 +104,9 @@ public class ReplicaAssigner {
validateTags(nodeVsTags); validateTags(nodeVsTags);
if (clusterState != null) { if (clusterState != null) {
for (String s : clusterState.getCollections()) { Map<String, DocCollection> collections = clusterState.getCollectionsMap();
DocCollection coll = clusterState.getCollection(s); for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection coll = entry.getValue();
for (Slice slice : coll.getSlices()) { for (Slice slice : coll.getSlices()) {
for (Replica replica : slice.getReplicas()) { for (Replica replica : slice.getReplicas()) {
AtomicInteger count = nodeVsCores.get(replica.getNodeName()); AtomicInteger count = nodeVsCores.get(replica.getNodeName());

2
solr/core/src/java/org/apache/solr/handler/SQLHandler.java
View File

@ -44,7 +44,6 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExplanation;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.sql.CalciteSolrDriver; import org.apache.solr.handler.sql.CalciteSolrDriver;
@ -252,7 +251,6 @@ public class SQLHandler extends RequestHandlerBase implements SolrCoreAware , Pe
} }
public void setStreamContext(StreamContext context) { public void setStreamContext(StreamContext context) {
} }
} }
} }

12
solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java
View File

@ -89,20 +89,22 @@ public class ClusterStatus {
byte[] bytes = Utils.toJSON(clusterState); byte[] bytes = Utils.toJSON(clusterState);
Map<String, Object> stateMap = (Map<String,Object>) Utils.fromJSON(bytes); Map<String, Object> stateMap = (Map<String,Object>) Utils.fromJSON(bytes);
Set<String> collections;
String routeKey = message.getStr(ShardParams._ROUTE_); String routeKey = message.getStr(ShardParams._ROUTE_);
String shard = message.getStr(ZkStateReader.SHARD_ID_PROP); String shard = message.getStr(ZkStateReader.SHARD_ID_PROP);
Map<String, DocCollection> collectionsMap = null;
if (collection == null) { if (collection == null) {
collections = new HashSet<>(clusterState.getCollections()); collectionsMap = clusterState.getCollectionsMap();
} else { } else {
collections = Collections.singleton(collection); collectionsMap = Collections.singletonMap(collection, clusterState.getCollectionOrNull(collection));
} }
NamedList<Object> collectionProps = new SimpleOrderedMap<>(); NamedList<Object> collectionProps = new SimpleOrderedMap<>();
for (String name : collections) { for (Map.Entry<String, DocCollection> entry : collectionsMap.entrySet()) {
Map<String, Object> collectionStatus; Map<String, Object> collectionStatus;
DocCollection clusterStateCollection = clusterState.getCollectionOrNull(name); String name = entry.getKey();
DocCollection clusterStateCollection = entry.getValue();
if (clusterStateCollection == null) { if (clusterStateCollection == null) {
if (collection != null) { if (collection != null) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Collection: " + name + " not found"); throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Collection: " + name + " not found");

7
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
View File

@ -679,11 +679,8 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
@Override @Override
Map<String, Object> call(SolrQueryRequest req, SolrQueryResponse rsp, CollectionsHandler handler) throws Exception { Map<String, Object> call(SolrQueryRequest req, SolrQueryResponse rsp, CollectionsHandler handler) throws Exception {
NamedList<Object> results = new NamedList<>(); NamedList<Object> results = new NamedList<>();
Set<String> collections = handler.coreContainer.getZkController().getZkStateReader().getClusterState().getCollections(); Map<String, DocCollection> collections = handler.coreContainer.getZkController().getZkStateReader().getClusterState().getCollectionsMap();
List<String> collectionList = new ArrayList<>(); List<String> collectionList = new ArrayList<>(collections.keySet());
for (String collection : collections) {
collectionList.add(collection);
}
results.add("collections", collectionList); results.add("collections", collectionList);
SolrResponse response = new OverseerSolrResponse(results); SolrResponse response = new OverseerSolrResponse(results);
rsp.getValues().addAll(response.getResponse()); rsp.getValues().addAll(response.getResponse());

8
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
View File

@ -815,15 +815,15 @@ public class HttpSolrCall {
private void getSlicesForCollections(ClusterState clusterState, private void getSlicesForCollections(ClusterState clusterState,
Collection<Slice> slices, boolean activeSlices) { Collection<Slice> slices, boolean activeSlices) {
if (activeSlices) { if (activeSlices) {
for (String collection : clusterState.getCollections()) { for (Map.Entry<String, DocCollection> entry : clusterState.getCollectionsMap().entrySet()) {
final Collection<Slice> activeCollectionSlices = clusterState.getActiveSlices(collection); final Collection<Slice> activeCollectionSlices = entry.getValue().getActiveSlices();
if (activeCollectionSlices != null) { if (activeCollectionSlices != null) {
slices.addAll(activeCollectionSlices); slices.addAll(activeCollectionSlices);
} }
} }
} else { } else {
for (String collection : clusterState.getCollections()) { for (Map.Entry<String, DocCollection> entry : clusterState.getCollectionsMap().entrySet()) {
final Collection<Slice> collectionSlices = clusterState.getSlices(collection); final Collection<Slice> collectionSlices = entry.getValue().getSlices();
if (collectionSlices != null) { if (collectionSlices != null) {
slices.addAll(collectionSlices); slices.addAll(collectionSlices);
} }

28
solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
View File

@ -57,7 +57,6 @@ import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.request.SolrQueryRequestBase;
import org.apache.solr.util.RTimer;
import org.apache.solr.util.RTimerTree; import org.apache.solr.util.RTimerTree;
import static org.apache.solr.common.params.CommonParams.PATH; import static org.apache.solr.common.params.CommonParams.PATH;
@ -564,21 +563,18 @@ public class SolrRequestParsers
upload.setSizeMax( ((long) uploadLimitKB) * 1024L ); upload.setSizeMax( ((long) uploadLimitKB) * 1024L );
// Parse the request // Parse the request
List items = upload.parseRequest(req); List<FileItem> items = upload.parseRequest(req);
Iterator iter = items.iterator(); for (FileItem item : items) {
while (iter.hasNext()) { // If it's a form field, put it in our parameter map
FileItem item = (FileItem) iter.next(); if (item.isFormField()) {
MultiMapSolrParams.addParam(
// If it's a form field, put it in our parameter map item.getFieldName().trim(),
if (item.isFormField()) { item.getString(), params.getMap() );
MultiMapSolrParams.addParam( }
item.getFieldName().trim(), // Add the stream
item.getString(), params.getMap() ); else {
} streams.add( new FileItemContentStream( item ) );
// Add the stream }
else {
streams.add( new FileItemContentStream( item ) );
}
} }
return params; return params;
} }

2
solr/core/src/java/org/apache/solr/util/SolrCLI.java
View File

@ -1883,7 +1883,7 @@ public class SolrCLI {
log.warn("Skipping safety checks, configuration directory "+configName+" will be deleted with impunity."); log.warn("Skipping safety checks, configuration directory "+configName+" will be deleted with impunity.");
} else { } else {
// need to scan all Collections to see if any are using the config // need to scan all Collections to see if any are using the config
Set<String> collections = zkStateReader.getClusterState().getCollections(); Set<String> collections = zkStateReader.getClusterState().getCollectionsMap().keySet();
// give a little note to the user if there are many collections in case it takes a while // give a little note to the user if there are many collections in case it takes a while
if (collections.size() > 50) if (collections.size() > 50)

10
solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
View File

@ -66,21 +66,21 @@ public class ClusterStateTest extends SolrTestCaseJ4 {
assertEquals("Provided liveNodes not used properly", 2, loadedClusterState assertEquals("Provided liveNodes not used properly", 2, loadedClusterState
.getLiveNodes().size()); .getLiveNodes().size());
assertEquals("No collections found", 2, loadedClusterState.getCollections().size()); assertEquals("No collections found", 2, loadedClusterState.getCollectionsMap().size());
assertEquals("Poperties not copied properly", replica.getStr("prop1"), loadedClusterState.getSlice("collection1", "shard1").getReplicasMap().get("node1").getStr("prop1")); assertEquals("Properties not copied properly", replica.getStr("prop1"), loadedClusterState.getSlice("collection1", "shard1").getReplicasMap().get("node1").getStr("prop1"));
assertEquals("Poperties not copied properly", replica.getStr("prop2"), loadedClusterState.getSlice("collection1", "shard1").getReplicasMap().get("node1").getStr("prop2")); assertEquals("Properties not copied properly", replica.getStr("prop2"), loadedClusterState.getSlice("collection1", "shard1").getReplicasMap().get("node1").getStr("prop2"));
loadedClusterState = ClusterState.load(-1, new byte[0], liveNodes); loadedClusterState = ClusterState.load(-1, new byte[0], liveNodes);
assertEquals("Provided liveNodes not used properly", 2, loadedClusterState assertEquals("Provided liveNodes not used properly", 2, loadedClusterState
.getLiveNodes().size()); .getLiveNodes().size());
assertEquals("Should not have collections", 0, loadedClusterState.getCollections().size()); assertEquals("Should not have collections", 0, loadedClusterState.getCollectionsMap().size());
loadedClusterState = ClusterState.load(-1, (byte[])null, liveNodes); loadedClusterState = ClusterState.load(-1, (byte[])null, liveNodes);
assertEquals("Provided liveNodes not used properly", 2, loadedClusterState assertEquals("Provided liveNodes not used properly", 2, loadedClusterState
.getLiveNodes().size()); .getLiveNodes().size());
assertEquals("Should not have collections", 0, loadedClusterState.getCollections().size()); assertEquals("Should not have collections", 0, loadedClusterState.getCollectionsMap().size());
} }
public static ZkStateReader getMockZkStateReader(final Set<String> collections) { public static ZkStateReader getMockZkStateReader(final Set<String> collections) {

2
solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
View File

@ -1088,7 +1088,7 @@ public class CollectionsAPIDistributedZkTest extends AbstractFullDistribZkTestBa
} }
} else { } else {
throw new IllegalArgumentException("Could not find collection in :" throw new IllegalArgumentException("Could not find collection in :"
+ clusterState.getCollections()); + clusterState.getCollectionsMap());
} }
} }

7
solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
View File

@ -525,7 +525,7 @@ public class OverseerTest extends SolrTestCaseJ4 {
int maxIterations = 100; int maxIterations = 100;
while (0 < maxIterations--) { while (0 < maxIterations--) {
final ClusterState state = stateReader.getClusterState(); final ClusterState state = stateReader.getClusterState();
Set<String> availableCollections = state.getCollections(); Set<String> availableCollections = state.getCollectionsMap().keySet();
int availableCount = 0; int availableCount = 0;
for(String requiredCollection: collections) { for(String requiredCollection: collections) {
if(availableCollections.contains(requiredCollection)) { if(availableCollections.contains(requiredCollection)) {
@ -911,8 +911,9 @@ public class OverseerTest extends SolrTestCaseJ4 {
ClusterState state = reader.getClusterState(); ClusterState state = reader.getClusterState();
int numFound = 0; int numFound = 0;
for (String c : state.getCollections()) { Map<String, DocCollection> collectionsMap = state.getCollectionsMap();
DocCollection collection = state.getCollection(c); for (Map.Entry<String, DocCollection> entry : collectionsMap.entrySet()) {
DocCollection collection = entry.getValue();
for (Slice slice : collection.getSlices()) { for (Slice slice : collection.getSlices()) {
if (slice.getReplicasMap().get("core_node1") != null) { if (slice.getReplicasMap().get("core_node1") != null) {
numFound++; numFound++;

12
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
View File

@ -51,6 +51,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParamete
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.common.cloud.ClusterState; import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.ZkCoreNodeProps; import org.apache.solr.common.cloud.ZkCoreNodeProps;
@ -329,16 +330,17 @@ public class CloudSolrStream extends TupleStream implements Expressible {
Collection<Slice> slices = clusterState.getActiveSlices(this.collection); Collection<Slice> slices = clusterState.getActiveSlices(this.collection);
if(slices == null) { if (slices == null) {
//Try case insensitive match //Try case insensitive match
for(String col : clusterState.getCollections()) { Map<String, DocCollection> collectionsMap = clusterState.getCollectionsMap();
if(col.equalsIgnoreCase(collection)) { for (Map.Entry<String, DocCollection> entry : collectionsMap.entrySet()) {
slices = clusterState.getActiveSlices(col); if (entry.getKey().equalsIgnoreCase(collection)) {
slices = entry.getValue().getActiveSlices();
break; break;
} }
} }
if(slices == null) { if (slices == null) {
throw new Exception("Collection not found:" + this.collection); throw new Exception("Collection not found:" + this.collection);
} }
} }

11
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
View File

@ -463,16 +463,17 @@ public class TopicStream extends CloudSolrStream implements Expressible {
Collection<Slice> slices = clusterState.getActiveSlices(this.collection); Collection<Slice> slices = clusterState.getActiveSlices(this.collection);
if(slices == null) { if (slices == null) {
//Try case insensitive match //Try case insensitive match
for(String col : clusterState.getCollections()) { Map<String, DocCollection> collectionsMap = clusterState.getCollectionsMap();
if(col.equalsIgnoreCase(collection)) { for (Map.Entry<String, DocCollection> entry : collectionsMap.entrySet()) {
slices = clusterState.getActiveSlices(col); if (entry.getKey().equalsIgnoreCase(collection)) {
slices = entry.getValue().getActiveSlices();
break; break;
} }
} }
if(slices == null) { if (slices == null) {
throw new Exception("Collection not found:" + this.collection); throw new Exception("Collection not found:" + this.collection);
} }
} }

1
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
View File

@ -188,6 +188,7 @@ public class UpdateStream extends TupleStream implements Expressible {
child.setImplementingClass(getClass().getName()); child.setImplementingClass(getClass().getName());
child.setExpressionType(ExpressionType.STREAM_DECORATOR); child.setExpressionType(ExpressionType.STREAM_DECORATOR);
child.setExpression(toExpression(factory, false).toString()); child.setExpression(toExpression(factory, false).toString());
child.addChild(tupleSource.toExplanation(factory));
explanation.addChild(child); explanation.addChild(child);

24
solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
View File

@ -218,7 +218,10 @@ public class ClusterState implements JSONWriter.Writable {
* {@link CollectionRef#get()} which can make a call to ZooKeeper. This is necessary * {@link CollectionRef#get()} which can make a call to ZooKeeper. This is necessary
* because the semantics of how collection list is loaded have changed in SOLR-6629. * because the semantics of how collection list is loaded have changed in SOLR-6629.
* Please see javadocs in {@link ZkStateReader#refreshCollectionList(Watcher)} * Please see javadocs in {@link ZkStateReader#refreshCollectionList(Watcher)}
*
* @deprecated use {@link #getCollectionsMap()} to avoid a second lookup for lazy collections
*/ */
@Deprecated
public Set<String> getCollections() { public Set<String> getCollections() {
Set<String> result = new HashSet<>(); Set<String> result = new HashSet<>();
for (Entry<String, CollectionRef> entry : collectionStates.entrySet()) { for (Entry<String, CollectionRef> entry : collectionStates.entrySet()) {
@ -229,6 +232,27 @@ public class ClusterState implements JSONWriter.Writable {
return result; return result;
} }
/**
* Get a map of collection name vs DocCollection objects
*
* Implementation note: This method resolves the collection reference by calling
* {@link CollectionRef#get()} which can make a call to ZooKeeper. This is necessary
* because the semantics of how collection list is loaded have changed in SOLR-6629.
* Please see javadocs in {@link ZkStateReader#refreshCollectionList(Watcher)}
*
* @return a map of collection name vs DocCollection object
*/
public Map<String, DocCollection> getCollectionsMap() {
Map<String, DocCollection> result = new HashMap<>(collectionStates.size());
for (Entry<String, CollectionRef> entry : collectionStates.entrySet()) {
DocCollection collection = entry.getValue().get();
if (collection != null) {
result.put(entry.getKey(), collection);
}
}
return result;
}
/** /**
* Get names of the currently live nodes. * Get names of the currently live nodes.
*/ */

23
solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java
View File

@ -21,6 +21,7 @@ import java.lang.invoke.MethodHandles;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -66,14 +67,14 @@ public class ClusterStateUtil {
success = true; success = true;
ClusterState clusterState = zkStateReader.getClusterState(); ClusterState clusterState = zkStateReader.getClusterState();
if (clusterState != null) { if (clusterState != null) {
Set<String> collections; Map<String, DocCollection> collections = null;
if (collection != null) { if (collection != null) {
collections = Collections.singleton(collection); collections = Collections.singletonMap(collection, clusterState.getCollection(collection));
} else { } else {
collections = clusterState.getCollections(); collections = clusterState.getCollectionsMap();
} }
for (String coll : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection docCollection = clusterState.getCollection(coll); DocCollection docCollection = entry.getValue();
Collection<Slice> slices = docCollection.getSlices(); Collection<Slice> slices = docCollection.getSlices();
for (Slice slice : slices) { for (Slice slice : slices) {
// only look at active shards // only look at active shards
@ -178,14 +179,14 @@ public class ClusterStateUtil {
success = true; success = true;
ClusterState clusterState = zkStateReader.getClusterState(); ClusterState clusterState = zkStateReader.getClusterState();
if (clusterState != null) { if (clusterState != null) {
Set<String> collections; Map<String, DocCollection> collections = null;
if (collection == null) { if (collection != null) {
collections = clusterState.getCollections(); collections = Collections.singletonMap(collection, clusterState.getCollection(collection));
} else { } else {
collections = Collections.singleton(collection); collections = clusterState.getCollectionsMap();
} }
for (String coll : collections) { for (Map.Entry<String, DocCollection> entry : collections.entrySet()) {
DocCollection docCollection = clusterState.getCollection(coll); DocCollection docCollection = entry.getValue();
Collection<Slice> slices = docCollection.getSlices(); Collection<Slice> slices = docCollection.getSlices();
for (Slice slice : slices) { for (Slice slice : slices) {
// only look at active shards // only look at active shards

10
solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java
View File

@ -41,7 +41,8 @@ public class DocCollection extends ZkNodeProps {
public static final String STATE_FORMAT = "stateFormat"; public static final String STATE_FORMAT = "stateFormat";
public static final String RULE = "rule"; public static final String RULE = "rule";
public static final String SNITCH = "snitch"; public static final String SNITCH = "snitch";
private int znodeVersion = -1; // sentinel
private final int znodeVersion;
private final String name; private final String name;
private final Map<String, Slice> slices; private final Map<String, Slice> slices;
@ -55,7 +56,7 @@ public class DocCollection extends ZkNodeProps {
public DocCollection(String name, Map<String, Slice> slices, Map<String, Object> props, DocRouter router) { public DocCollection(String name, Map<String, Slice> slices, Map<String, Object> props, DocRouter router) {
this(name, slices, props, router, -1, ZkStateReader.CLUSTER_STATE); this(name, slices, props, router, Integer.MAX_VALUE, ZkStateReader.CLUSTER_STATE);
} }
/** /**
@ -64,8 +65,9 @@ public class DocCollection extends ZkNodeProps {
* @param props The properties of the slice. This is used directly and a copy is not made. * @param props The properties of the slice. This is used directly and a copy is not made.
*/ */
public DocCollection(String name, Map<String, Slice> slices, Map<String, Object> props, DocRouter router, int zkVersion, String znode) { public DocCollection(String name, Map<String, Slice> slices, Map<String, Object> props, DocRouter router, int zkVersion, String znode) {
super(props==null ? props = new HashMap<String,Object>() : props); super(props==null ? props = new HashMap<>() : props);
this.znodeVersion = zkVersion; // -1 means any version in ZK CAS, so we choose Integer.MAX_VALUE instead to avoid accidental overwrites
this.znodeVersion = zkVersion == -1 ? Integer.MAX_VALUE : zkVersion;
this.name = name; this.name = name;
this.slices = slices; this.slices = slices;

6
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
View File

@ -520,7 +520,8 @@ public class ZkStateReader implements Closeable {
* In fact this is a clever way to avoid doing a ZK exists check on * In fact this is a clever way to avoid doing a ZK exists check on
* the /collections/collection_name/state.json znode * the /collections/collection_name/state.json znode
* Such an exists check is done in {@link ClusterState#hasCollection(String)} and * Such an exists check is done in {@link ClusterState#hasCollection(String)} and
* {@link ClusterState#getCollections()} method as a safeguard against exposing wrong collection names to the users * {@link ClusterState#getCollections()} and {@link ClusterState#getCollectionsMap()} methods
* have a safeguard against exposing wrong collection names to the users
*/ */
private void refreshCollectionList(Watcher watcher) throws KeeperException, InterruptedException { private void refreshCollectionList(Watcher watcher) throws KeeperException, InterruptedException {
synchronized (refreshCollectionListLock) { synchronized (refreshCollectionListLock) {
@ -715,8 +716,7 @@ public class ZkStateReader implements Closeable {
Map<String,Slice> slices = clusterState.getSlicesMap(collection); Map<String,Slice> slices = clusterState.getSlicesMap(collection);
if (slices == null) { if (slices == null) {
throw new ZooKeeperException(ErrorCode.BAD_REQUEST, throw new ZooKeeperException(ErrorCode.BAD_REQUEST,
"Could not find collection in zk: " + collection + " " "Could not find collection in zk: " + collection);
+ clusterState.getCollections());
} }
Slice replicas = slices.get(shardId); Slice replicas = slices.get(shardId);

2
solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
View File

@ -489,7 +489,7 @@ public class JdbcTest extends SolrCloudTestCase {
} }
List<String> collections = new ArrayList<>(); List<String> collections = new ArrayList<>();
collections.addAll(cluster.getSolrClient().getZkStateReader().getClusterState().getCollections()); collections.addAll(cluster.getSolrClient().getZkStateReader().getClusterState().getCollectionsMap().keySet());
Collections.sort(collections); Collections.sort(collections);
try(ResultSet rs = databaseMetaData.getTables(null, zkHost, "%", null)) { try(ResultSet rs = databaseMetaData.getTables(null, zkHost, "%", null)) {

6
solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
View File

@ -1353,7 +1353,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
if (slices == null) { if (slices == null) {
throw new RuntimeException("Could not find collection " throw new RuntimeException("Could not find collection "
+ DEFAULT_COLLECTION + " in " + clusterState.getCollections()); + DEFAULT_COLLECTION + " in " + clusterState.getCollectionsMap().keySet());
} }
for (CloudJettyRunner cjetty : cloudJettys) { for (CloudJettyRunner cjetty : cloudJettys) {
@ -1916,9 +1916,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTes
if (collection != null) { if (collection != null) {
cs = clusterState.getCollection(collection).toString(); cs = clusterState.getCollection(collection).toString();
} else { } else {
Map<String,DocCollection> map = new HashMap<>(); Map<String,DocCollection> map = clusterState.getCollectionsMap();
for (String coll : clusterState.getCollections())
map.put(coll, clusterState.getCollection(coll));
CharArr out = new CharArr(); CharArr out = new CharArr();
new JSONWriter(out, 2).write(map); new JSONWriter(out, 2).write(map);
cs = out.toString(); cs = out.toString();