Skip to content

Commit

Permalink
Renamed modules
Browse files Browse the repository at this point in the history
  • Loading branch information
pontusmelke committed Mar 15, 2016
1 parent 5195711 commit 0f1c743
Show file tree
Hide file tree
Showing 1,513 changed files with 6,595 additions and 6,425 deletions.
6 changes: 3 additions & 3 deletions community/cypher/acceptance/pom.xml
Expand Up @@ -154,7 +154,7 @@
<!-- neo4j-cypher -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-3.0</artifactId>
<artifactId>neo4j-cypher-compiler-3.1</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -200,15 +200,15 @@

<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-3.0</artifactId>
<artifactId>neo4j-cypher-compiler-3.1</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-frontend-3.0</artifactId>
<artifactId>neo4j-cypher-frontend-3.1</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.{CRS, CartesianPoint, GeographicPoint}
import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.{CRS, CartesianPoint, GeographicPoint}
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}

class FunctionsAcceptanceTest extends ExecutionEngineFunSuite with NewPlannerTestSupport {
Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.helpers.CollectionSupport
import org.neo4j.cypher.internal.compiler.v3_1.helpers.CollectionSupport
import org.neo4j.cypher.{CypherException, ExecutionEngineFunSuite, QueryStatisticsTestSupport}
import org.neo4j.graphdb.Node
import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine
Expand Down
Expand Up @@ -23,8 +23,8 @@ import java.io.{File, PrintWriter}
import java.net.{URLConnection, URLStreamHandler, URLStreamHandlerFactory, URL}
import org.neo4j.cypher._
import org.neo4j.cypher.internal.ExecutionEngine
import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
import org.neo4j.graphdb.factory.GraphDatabaseSettings
import org.neo4j.graphdb.security.URLAccessRule
Expand Down
Expand Up @@ -20,7 +20,7 @@
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher._
import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
import org.neo4j.graphdb._

import scala.collection.JavaConverters._
Expand Down
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.{NewPlannerTestSupport, QueryStatisticsTestSupport, ExecutionEngineFunSuite}
import org.scalatest.matchers.{MatchResult, Matcher}

Expand Down
Expand Up @@ -23,8 +23,8 @@ import java.nio.file.Files
import java.util

import org.neo4j.cypher._
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.idp.IDPSolverMonitor
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.idp.IDPSolverMonitor
import org.neo4j.cypher.internal.{ExecutionEngine, PlanDescription}
import org.neo4j.cypher.javacompat.internal.GraphDatabaseCypherService
import org.neo4j.graphdb.config.Setting
Expand Down
Expand Up @@ -20,7 +20,7 @@
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.ExecutionEngineFunSuite
import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult

class MergeIntoAcceptanceTest extends ExecutionEngineFunSuite{

Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CustomMatchers
import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CustomMatchers
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}

class OrderByAcceptanceTest extends ExecutionEngineFunSuite with CustomMatchers with NewPlannerTestSupport {
Expand Down
Expand Up @@ -19,9 +19,9 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression}
import org.neo4j.cypher.internal.frontend.v3_0.SemanticDirection
import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.{EstimatedRows, ExpandExpression}
import org.neo4j.cypher.internal.frontend.v3_1.SemanticDirection
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
import org.neo4j.graphdb.{Node, Relationship}
import org.scalatest.Matchers
Expand Down
Expand Up @@ -22,10 +22,10 @@ package org.neo4j.internal.cypher.acceptance
import java.io.PrintWriter

import org.neo4j.cypher._
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Planner
import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CreateTempFileTestSupport
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Planner
import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CreateTempFileTestSupport
import org.neo4j.cypher.internal.helpers.TxCounts
import org.neo4j.cypher.internal.frontend.v3_0.helpers.StringHelper.RichString
import org.neo4j.cypher.internal.frontend.v3_1.helpers.StringHelper.RichString
import org.neo4j.graphdb.Node
import org.neo4j.kernel.api.KernelTransaction
import org.neo4j.kernel.impl.transaction.log.TransactionIdStore
Expand Down
Expand Up @@ -21,7 +21,7 @@ package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.ExtendedExecutionResult
import org.neo4j.cypher.internal.compatibility.CompatibilityPlanDescriptionFor3_0
import org.neo4j.cypher.internal.compiler.v3_0._
import org.neo4j.cypher.internal.compiler.v3_1._
import org.neo4j.cypher.ExecutionEngineFunSuite
import org.scalatest.matchers.{MatchResult, Matcher}

Expand Down
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.{NewPlannerTestSupport, QueryStatisticsTestSupport, ExecutionEngineFunSuite}
import org.scalatest.matchers.{MatchResult, Matcher}

Expand Down
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_0.test_helpers.CustomMatchers
import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_1.test_helpers.CustomMatchers
import org.neo4j.cypher.{EntityNotFoundException, ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
import org.neo4j.graphdb._

Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.commands.expressions.PathImpl
import org.neo4j.cypher.internal.compiler.v3_1.commands.expressions.PathImpl
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, SyntaxException}
import org.neo4j.graphdb.Node

Expand Down
Expand Up @@ -19,8 +19,8 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.frontend.v3_0.notification.ExhaustiveShortestPathForbiddenNotification
import org.neo4j.cypher.internal.frontend.v3_0.{ExhaustiveShortestPathForbiddenException => InternalExhaustiveShortestPathForbiddenException, InputPosition}
import org.neo4j.cypher.internal.frontend.v3_1.notification.ExhaustiveShortestPathForbiddenNotification
import org.neo4j.cypher.internal.frontend.v3_1.{ExhaustiveShortestPathForbiddenException => InternalExhaustiveShortestPathForbiddenException, InputPosition}
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, ExhaustiveShortestPathForbiddenException}
import org.neo4j.graphdb.Node
import org.neo4j.graphdb.config.Setting
Expand Down
Expand Up @@ -23,10 +23,10 @@ import java.util

import org.neo4j.cypher.internal.RewindableExecutionResult
import org.neo4j.cypher.internal.compatibility.ExecutionResultWrapperFor3_0
import org.neo4j.cypher.internal.compiler.v3_0.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.Rows
import org.neo4j.cypher.internal.frontend.v3_0.InternalException
import org.neo4j.cypher.internal.compiler.v3_1.executionplan.InternalExecutionResult
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.Rows
import org.neo4j.cypher.internal.frontend.v3_1.InternalException
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
import org.neo4j.graphalgo.impl.path.ShortestPath
import org.neo4j.graphalgo.impl.path.ShortestPath.DataMonitor
Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
import org.neo4j.cypher.internal.compiler.v3_1.pipes.{IndexSeekByRange, UniqueIndexSeekByRange}
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport, QueryStatisticsTestSupport}
import org.neo4j.graphdb.{Node, ResourceIterator}

Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.{ExecutionEngineFunSuite, NewPlannerTestSupport}
import org.scalatest.matchers.{MatchResult, Matcher}

Expand Down
Expand Up @@ -19,10 +19,10 @@
*/
package org.neo4j.internal.cypher.acceptance

import org.neo4j.cypher.internal.compiler.v3_0.IDPPlannerName
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription.Arguments.KeyNames
import org.neo4j.cypher.internal.compiler.v3_0.planner.logical.plans.{NodeHashJoin, NodeIndexSeek}
import org.neo4j.cypher.internal.compiler.v3_1.IDPPlannerName
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription.Arguments.KeyNames
import org.neo4j.cypher.internal.compiler.v3_1.planner.logical.plans.{NodeHashJoin, NodeIndexSeek}
import org.neo4j.cypher.{ExecutionEngineFunSuite, HintException, IndexHintException, NewPlannerTestSupport, SyntaxException, _}
import org.neo4j.graphdb.schema.Schema
import org.neo4j.graphdb.{QueryExecutionException, Result}
Expand Down
2 changes: 1 addition & 1 deletion community/cypher/compatibility-suite/pom.xml
Expand Up @@ -172,7 +172,7 @@
<!-- neo4j-cypher -->
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-3.0</artifactId>
<artifactId>neo4j-cypher-compiler-3.1</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
Expand Down
Expand Up @@ -20,7 +20,7 @@
package cypher.cucumber.reporter

import com.novus.salat.annotations.{Ignore, Key, Persist}
import org.neo4j.cypher.internal.compiler.v3_0.ast.QueryTag
import org.neo4j.cypher.internal.compiler.v3_1.ast.QueryTag

import scala.annotation.meta.getter

Expand Down
Expand Up @@ -19,7 +19,7 @@
*/
package cypher.cucumber.reporter

import org.neo4j.cypher.internal.compiler.v3_0.ast.QueryTagger
import org.neo4j.cypher.internal.compiler.v3_1.ast.QueryTagger

import scala.collection.mutable

Expand Down
Expand Up @@ -8,11 +8,11 @@
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>neo4j-cypher-compiler-3.0</artifactId>
<artifactId>neo4j-cypher-compiler-3.1</artifactId>
<packaging>jar</packaging>
<version>3.1.0-SNAPSHOT</version>
<name>Neo4j - Cypher Compiler 3.0</name>
<description>Compiler for Cypher 3.0</description>
<name>Neo4j - Cypher Compiler 3.1</name>
<description>Compiler for Cypher 3.1</description>
<url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>

<scm>
Expand Down Expand Up @@ -133,7 +133,7 @@
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-frontend-3.0</artifactId>
<artifactId>neo4j-cypher-frontend-3.1</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -148,7 +148,7 @@

<dependency>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-frontend-3.0</artifactId>
<artifactId>neo4j-cypher-frontend-3.1</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
Expand Up @@ -17,7 +17,7 @@
* 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.compiler.v3_0;
package org.neo4j.cypher.internal.compiler.v3_1;

public interface CompilationPhaseTracer
{
Expand Down
Expand Up @@ -17,9 +17,9 @@
* 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.compiler.v3_0.codegen;
package org.neo4j.cypher.internal.compiler.v3_1.codegen;

import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id;
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id;

public interface QueryExecutionTracer
{
Expand Down
Expand Up @@ -17,13 +17,13 @@
* 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.compiler.v3_0.codegen;
package org.neo4j.cypher.internal.compiler.v3_1.codegen;

import java.util.HashMap;
import java.util.Map;
import java.util.NoSuchElementException;

import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultRow;
import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultRow;
import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;
import org.neo4j.graphdb.Relationship;
Expand Down
Expand Up @@ -17,14 +17,14 @@
* 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.compiler.v3_0.codegen.profiling;
package org.neo4j.cypher.internal.compiler.v3_1.codegen.profiling;

import java.util.HashMap;
import java.util.Map;

import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionEvent;
import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionTracer;
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.Id;
import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionEvent;
import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionTracer;
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.Id;

public class ProfilingTracer implements QueryExecutionTracer
{
Expand Down
Expand Up @@ -17,15 +17,15 @@
* 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.compiler.v3_0.executionplan;
package org.neo4j.cypher.internal.compiler.v3_1.executionplan;

import java.util.Map;

import org.neo4j.cypher.internal.compiler.v3_0.ExecutionMode;
import org.neo4j.cypher.internal.compiler.v3_0.TaskCloser;
import org.neo4j.cypher.internal.compiler.v3_0.codegen.QueryExecutionTracer;
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription;
import org.neo4j.cypher.internal.compiler.v3_0.spi.QueryContext;
import org.neo4j.cypher.internal.compiler.v3_1.ExecutionMode;
import org.neo4j.cypher.internal.compiler.v3_1.TaskCloser;
import org.neo4j.cypher.internal.compiler.v3_1.codegen.QueryExecutionTracer;
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription;
import org.neo4j.cypher.internal.compiler.v3_1.spi.QueryContext;

public interface GeneratedQuery
{
Expand Down
Expand Up @@ -17,13 +17,13 @@
* 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.compiler.v3_0.executionplan;
package org.neo4j.cypher.internal.compiler.v3_1.executionplan;

import java.util.List;

import org.neo4j.cypher.internal.compiler.v3_0.ExecutionMode;
import org.neo4j.cypher.internal.compiler.v3_0.planDescription.InternalPlanDescription;
import org.neo4j.cypher.internal.compiler.v3_0.spi.InternalResultVisitor;
import org.neo4j.cypher.internal.compiler.v3_1.ExecutionMode;
import org.neo4j.cypher.internal.compiler.v3_1.planDescription.InternalPlanDescription;
import org.neo4j.cypher.internal.compiler.v3_1.spi.InternalResultVisitor;

public interface GeneratedQueryExecution
{
Expand Down
Expand Up @@ -17,7 +17,7 @@
* 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.compiler.v3_0.spi;
package org.neo4j.cypher.internal.compiler.v3_1.spi;

import org.neo4j.graphdb.Node;
import org.neo4j.graphdb.Path;
Expand Down

0 comments on commit 0f1c743

Please sign in to comment.