Merge branch 'tinwelint-1.9-TestBrokenStoreRecovery-efsa' into 1.9-maint

neo4j · Mar 28, 2015 · 417a591 · 417a591
2 parents c2b1fb0 + 06eabec
commit 417a591
Show file tree

Hide file tree

Showing 229 changed files with 365 additions and 521 deletions.
diff --git a/advanced/NOTICE.txt b/advanced/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2012 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as “Neo Technology”)
    [http://neotechnology.com]
 

diff --git a/advanced/management/NOTICE.txt b/advanced/management/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/advanced/neo4j-advanced/NOTICE.txt b/advanced/neo4j-advanced/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/advanced/server-advanced/NOTICE.txt b/advanced/server-advanced/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/advanced/server-advanced/pom.xml b/advanced/server-advanced/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2002-2014 "Neo Technology,"
+  Copyright (c) 2002-2015 "Neo Technology,"
   Network Engine for Objects in Lund AB [http://neotechnology.com]
 
   This file is part of Neo4j.

diff --git a/community/NOTICE.txt b/community/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2012 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as “Neo Technology”)
    [http://neotechnology.com]
 

diff --git a/community/cypher/NOTICE.txt b/community/cypher/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/...ypher/src/main/scala/org/neo4j/cypher/internal/executionplan/builders/FilterBuilder.scala b/...ypher/src/main/scala/org/neo4j/cypher/internal/executionplan/builders/FilterBuilder.scala
@@ -19,26 +19,6 @@
  */
 package org.neo4j.cypher.internal.executionplan.builders
 
-/**
- * Copyright (c) 2002-2014 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.neo4j.cypher.internal.commands.Predicate
 import org.neo4j.cypher.internal.pipes.{FilterPipe, Pipe}
 import org.neo4j.cypher.internal.executionplan.{ExecutionPlanInProgress, PlanBuilder}

diff --git a/community/cypher/src/test/java/org/neo4j/cypher/internal/spi/QueryContextContract.java b/community/cypher/src/test/java/org/neo4j/cypher/internal/spi/QueryContextContract.java
@@ -17,44 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-///**
-//* Copyright (c) 2002-2014 "Neo Technology,"
-//* Network Engine for Objects in Lund AB [http://neotechnology.com]
-//*
-//* This file is part of Neo4j.
-//*
-//* Neo4j is free software: you can redistribute it and/or modify
-//* it under the terms of the GNU General Public License as published by
-//* the Free Software Foundation, either version 3 of the License, or
-//* (at your option) any later version.
-//*
-//* This program is distributed in the hope that it will be useful,
-//* but WITHOUT ANY WARRANTY; without even the implied warranty of
-//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//* GNU General Public License for more details.
-//*
-//* You should have received a copy of the GNU General Public License
-//* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//*/
-///**
-//* Copyright (c) 2002-2014 "Neo Technology,"
-//* Network Engine for Objects in Lund AB [http://neotechnology.com]
-//*
-//* This file is part of Neo4j.
-//*
-//* Neo4j is free software: you can redistribute it and/or modify
-//* it under the terms of the GNU General Public License as published by
-//* the Free Software Foundation, either version 3 of the License, or
-//* (at your option) any later version.
-//*
-//* This program is distributed in the hope that it will be useful,
-//* but WITHOUT ANY WARRANTY; without even the implied warranty of
-//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//* GNU General Public License for more details.
-//*
-//* You should have received a copy of the GNU General Public License
-//* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//*/
 //package org.neo4j.cypher.internal.spi;
 //
 //import static org.hamcrest.CoreMatchers.is;

diff --git a/...cypher/src/test/java/org/neo4j/cypher/internal/spi/gdsimpl/GDSQueryContextContractIT.java b/...cypher/src/test/java/org/neo4j/cypher/internal/spi/gdsimpl/GDSQueryContextContractIT.java
@@ -17,25 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-///**
-// * Copyright (c) 2002-2014 "Neo Technology,"
-// * Network Engine for Objects in Lund AB [http://neotechnology.com]
-// *
-// * This file is part of Neo4j.
-// *
-// * Neo4j is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-// */
 //package org.neo4j.cypher.internal.spi.gdsimpl;
 //
 //import org.junit.After;

diff --git a/...test/scala/org/neo4j/cypher/internal/executionplan/builders/ColumnFilterBuilderTest.scala b/...test/scala/org/neo4j/cypher/internal/executionplan/builders/ColumnFilterBuilderTest.scala
@@ -19,26 +19,6 @@
  */
 package org.neo4j.cypher.internal.executionplan.builders
 
-/**
- * Copyright (c) 2002-2014 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.junit.Test
 import org.junit.Assert._
 import org.neo4j.cypher.internal.executionplan.PartiallySolvedQuery

diff --git a/.../src/test/scala/org/neo4j/cypher/internal/executionplan/builders/ExtractBuilderTest.scala b/.../src/test/scala/org/neo4j/cypher/internal/executionplan/builders/ExtractBuilderTest.scala
@@ -19,26 +19,6 @@
  */
 package org.neo4j.cypher.internal.executionplan.builders
 
-/**
- * Copyright (c) 2002-2014 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.junit.Test
 import org.junit.Assert._
 import org.neo4j.cypher.internal.executionplan.{ExecutionPlanInProgress, PartiallySolvedQuery}

diff --git a/...c/test/scala/org/neo4j/cypher/internal/executionplan/builders/IndexQueryBuilderTest.scala b/...c/test/scala/org/neo4j/cypher/internal/executionplan/builders/IndexQueryBuilderTest.scala
@@ -19,26 +19,6 @@
  */
 package org.neo4j.cypher.internal.executionplan.builders
 
-/**
- * Copyright (c) 2002-2014 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.scalatest.Assertions
 import org.junit.Assert._
 import org.neo4j.cypher.internal.pipes.NullPipe

diff --git a/...er/src/test/scala/org/neo4j/cypher/internal/executionplan/builders/SliceBuilderTest.scala b/...er/src/test/scala/org/neo4j/cypher/internal/executionplan/builders/SliceBuilderTest.scala
@@ -19,26 +19,6 @@
  */
 package org.neo4j.cypher.internal.executionplan.builders
 
-/**
- * Copyright (c) 2002-2014 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 import org.junit.Test
 import org.junit.Assert._
 import org.neo4j.cypher.internal.executionplan.PartiallySolvedQuery

diff --git a/community/embedded-examples/NOTICE.txt b/community/embedded-examples/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/graph-algo/NOTICE.txt b/community/graph-algo/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/graph-matching/NOTICE.txt b/community/graph-matching/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/graphviz/NOTICE.txt b/community/graphviz/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/jmx/NOTICE.txt b/community/jmx/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/kernel/NOTICE.txt b/community/kernel/NOTICE.txt
@@ -1,5 +1,5 @@
 Neo4j
-Copyright © 2002-2014 Network Engine for Objects in Lund AB (referred to
+Copyright © 2002-2015 Network Engine for Objects in Lund AB (referred to
 in this notice as "Neo Technology")
    [http://neotechnology.com]
 

diff --git a/community/kernel/pom.xml b/community/kernel/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2002-2014 "Neo Technology,"
+  Copyright (c) 2002-2015 "Neo Technology,"
   Network Engine for Objects in Lund AB [http://neotechnology.com]
 
   This file is part of Neo4j.

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java b/community/kernel/src/main/java/org/neo4j/kernel/StandardExpander.java
@@ -17,25 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- * Copyright (c) 2002-2011 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 package org.neo4j.kernel;
 
 import static java.util.Arrays.asList;

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorImpl.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorImpl.java
@@ -166,7 +166,8 @@ private void assertIdWithinCapacity( long id )
     {
         if ( id > max || id < 0  )
         {
-            throw new UnderlyingStorageException( "Id capacity exceeded" );
+            throw new UnderlyingStorageException(
+                    "Id capacity exceeded: " + id + " is not within bounds [0; " + max + "] for " + fileName );
         }
     }
 

diff --git a/.../test/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorRebuildFailureEmulationTest.java b/.../test/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorRebuildFailureEmulationTest.java
@@ -19,10 +19,6 @@
  */
 package org.neo4j.kernel.impl.nioneo.store;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +27,10 @@
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.neo4j.graphdb.DynamicRelationshipType;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Node;
@@ -55,7 +55,9 @@
 import org.neo4j.test.subprocess.SubProcessTestRunner;
 import org.neo4j.tooling.GlobalGraphOperations;
 
+import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 @RunWith(Suite.class)
@@ -125,7 +127,7 @@ private void performTest() throws Exception
         }
         catch ( UnderlyingStorageException expected )
         {
-            assertEquals( "Id capacity exceeded", expected.getMessage() );
+            assertThat( expected.getMessage(), startsWith( "Id capacity exceeded" ) );
         }
         finally
         {