-
Notifications
You must be signed in to change notification settings - Fork 191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
upgrade to Neo4j 3.2.2 #316
Conversation
final Set<Node> toDelete = StreamSupport.stream(getAllIndexInternalNodes().spliterator(), false) | ||
.filter(node -> !node.equals(getIndexRoot())) | ||
.collect(Collectors.toSet()); | ||
toDelete.stream().forEach(node -> deleteNode(node)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you change this to be eager (and use more memory) in order to improve concurrency behavior? Do you have a case where the non-eager version caused problems?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In 3.2.2 the old code had thrown an error, try to use Iterator.remove()
didn't work (UnsupportedOperationException or a similar one). Since the iterator approach fails, I came up with this one. Can you think of a smarter solution?
@@ -2022,8 +2022,7 @@ <h4 id="_search_within_geometry">Search within geometry</h4> | |||
<div class="listingblock"> | |||
<div class="title">Example:</div> | |||
<div class="content"> | |||
<pre class="highlight"><code class="language-java" data-lang="java">GeoPipeline pipeline = GeoPipeline | |||
.startWithinSearch(osmLayer, osmLayer.getGeometryFactory().toGeometry(new Envelope(10, 20, 50, 60)));</code></pre> | |||
<pre class="highlight"><code class="language-java" data-lang="java">Unresolved directive in dev/geo-pipes.txt - include::../../../src/test/java/org/neo4j/gis/spatial/pipes/GeoPipesTest.java[tags=search_within_geometry]</code></pre> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see a lot of Unresolved directive
errors in this file. Perhaps these changes should not be included in the PR?
<version>3.1.1</version> | ||
<scope>provided</scope> | ||
<exclusions> | ||
<exclusion> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to excluded everything? Do we need this change? Would it work to remove the dependency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've seen that all the neo4j 3.1.1 dependencies are pulled otherwise. The dependency is required since neo4j-graphviz has been removed from the product in 3.2.x as far as I know
@@ -544,7 +544,7 @@ private void insertManyNodesInBulk(String splitMode, int blockSize, int maxNodeR | |||
List<Node> slice = nodes.subList(i * blockSize, i * blockSize + blockSize); | |||
long startIndexing = System.currentTimeMillis(); | |||
try (Transaction tx = db.beginTx()) { | |||
layer.addAll(slice); | |||
layer.addAll(slice); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra whitespace added?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mistake
we are already on neo4j |
bumped the Neo4j version numbers and fixed unit test failures.