Skip to content
This repository was archived by the owner on Jun 9, 2020. It is now read-only.

Commit d69398e

Browse files
committed
udpate to Neo4j 2.0.3
1 parent d065ebe commit d69398e

File tree

6 files changed

+87
-154
lines changed

6 files changed

+87
-154
lines changed

batch.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ neostore.nodestore.db.mapped_memory=200M
77
neostore.relationshipstore.db.mapped_memory=500M
88
neostore.propertystore.db.mapped_memory=200M
99
neostore.propertystore.db.strings.mapped_memory=200M
10-
batch_array_separator=,
10+
batch_array_separator=,
11+
#batch_import.csv.quotes=true
12+
#batch_import.csv.delim=,

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.neo4j</groupId>
44
<artifactId>batch-import</artifactId>
5-
<version>2.0.0</version>
5+
<version>2.0.3</version>
66
<name>Neo4j Batch Importer</name>
77
<properties>
88
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
9-
<neo4j.version>2.0.0</neo4j.version>
9+
<neo4j.version>2.0.3</neo4j.version>
1010
<license-text.header>GPL-3-header.txt</license-text.header>
1111
</properties>
1212
<repositories>

src/main/java/org/neo4j/batchimport/ParallelImporter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,4 @@ public int getMaxRelsPerNode() {
324324
public long getTotalNrOfRels() {
325325
return getRelsPerNode() * nodesToCreate;
326326
}
327-
}
327+
}

src/main/java/org/neo4j/kernel/impl/nioneo/store/PropertyBlock.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2002-2013 "Neo Technology,"
2+
* Copyright (c) 2002-2014 "Neo Technology,"
33
* Network Engine for Objects in Lund AB [http://neotechnology.com]
44
*
55
* This file is part of Neo4j.
@@ -27,6 +27,8 @@
2727
import java.util.LinkedList;
2828
import java.util.List;
2929

30+
import static org.neo4j.kernel.impl.util.Providers.singletonProvider;
31+
3032
public class PropertyBlock implements Cloneable
3133
{
3234
private static final long KEY_BITMASK = 0xFFFFFFL;
@@ -235,6 +237,6 @@ public boolean hasSameContentsAs( PropertyBlock other )
235237

236238
public DefinedProperty newPropertyData( PropertyStore propertyStore )
237239
{
238-
return getType().readProperty( getKeyIndexId(), this, propertyStore );
240+
return getType().readProperty( getKeyIndexId(), this, singletonProvider(propertyStore) );
239241
}
240242
}

0 commit comments

Comments
 (0)