Commits on Sep 10, 2012
  1. Merged Cypher refactoring into master

    Conflicts:
    	cypher/CHANGES.txt
    	cypher/src/main/scala/org/neo4j/cypher/internal/commands/ComparablePredicate.scala
    	cypher/src/main/scala/org/neo4j/cypher/internal/commands/Expression.scala
    	cypher/src/main/scala/org/neo4j/cypher/internal/executionplan/builders/FilterBuilder.scala
    	cypher/src/main/scala/org/neo4j/cypher/internal/parser/v1_8/Expressions.scala
    	cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala
    	cypher/src/test/scala/org/neo4j/cypher/internal/executionplan/builders/SortBuilderTest.scala
    	cypher/src/test/scala/org/neo4j/cypher/internal/pipes/aggregation/CollectFunctionTest.scala
    	server/src/functionaltest/java/org/neo4j/server/rest/BatchOperationFunctionalTest.java
    	server/src/main/java/org/neo4j/server/rest/repr/OutputFormat.java
    	server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java
    committed Sep 10, 2012
  2. @jakewins

    Ignoring test for tonight

    jakewins committed Sep 10, 2012
  3. @jakewins

    Modified TestStartupTimeout to not trigger interrupt while database i…

    …s booting, because it seems that might put windows file channels in a totally borked state.
    jakewins committed Sep 10, 2012
  4. @jakewins
Commits on Sep 9, 2012
  1. @jakewins
  2. @jakewins
  3. @jakewins
  4. @tinwelint

    Imports

    tinwelint committed Sep 9, 2012
Commits on Sep 8, 2012
  1. @jakewins
  2. @jakewins
  3. @jakewins
Commits on Sep 7, 2012
  1. @jakewins
  2. @jakewins

    efactored the server startup healtchecks, combining it with the PreS…

    …tartupStoreUpgrader code. Checks and tasks performed before proper server
    
    start are now uniformly called PreFlightTasks. These can take arbitrary time to perform (eg. upgrades, recovery).
    
    After the preflight checks, the main server startup uses a timer thread to keep track of startup time. If startup takes longer than the configured timeout,
    the startup process is interrupted.
    
    This is all done within the main server process, which means we can remove the code in startup scripts that start a bootstrap JVM separately, as well
    as the code that keeps track of startup timeouts.
    jakewins committed Sep 7, 2012
  3. @jakewins
  4. @nawroth @jakewins

    Remove experimental.

    nawroth committed with jakewins Sep 7, 2012
  5. @jexp @jakewins

    Refactored Server Module/Webserver setup / reused ExecutionEngine in …

    …CypherService
    
    removed cyclic dependency server<->webserver and server<->neoservletcontainer
    moved creation of default injectables from neoservletcontainer into neo4j-server
    server is pushing default injectables into webserver
    only the thirdpartyjaxrs module has custom initialization
    default injectables are merged with per-extension injectables
    cypher service now gets execution-engine injected
    jexp committed with jakewins Aug 14, 2012
  6. @jakewins

    Revert "Fixes #841: Collect should ignore null values"

    This reverts commit f01240b.
    jakewins committed Sep 7, 2012
  7. @peterneubauer @jakewins

    maps containing lists, containing maps are now propertly serialized, …

    …fixes neo4j/gremlin-plugin#14
    peterneubauer committed with jakewins Aug 3, 2012
  8. @michaelklishin @jakewins
  9. @jakewins

    Merge pull request #843 from systay/841

    Fixes #841: Collect should ignore null values
    jakewins committed Sep 7, 2012
  10. @jakewins

    Merge pull request #847 from peterneubauer/plugins-doc

    better explaination of return types
    jakewins committed Sep 7, 2012
  11. @SepiaGroup @jakewins
  12. @peterneubauer
  13. @jakewins

    Merge pull request #711 from peterneubauer/graphity

    adding graphity to the domain examples
    jakewins committed Sep 7, 2012
  14. @jakewins

    Merge pull request #752 from digitalstain/deprecated-refnode

    Deprecates the Reference Node
    jakewins committed Sep 7, 2012
  15. @jakewins

    Fix for broken shell test

    jakewins committed Sep 7, 2012
  16. @miaoski @jakewins

    Landing Miaoskis PR714: Index API get-or-create semantics now work wi…

    …th the Batch API. Closes #690.
    miaoski committed with jakewins Jul 17, 2012
  17. @peterneubauer @jakewins
  18. @simpsonjulian @jakewins

    Bump version to 1.9

    simpsonjulian committed with jakewins Jun 28, 2012
Commits on Sep 6, 2012
  1. @apcj

    Ignore test on windows.

    Because this test depends on memory mapping that isn't recommended on Windows.
    apcj committed Sep 6, 2012
  2. @apcj

    Test for correct memory mapping of a file that is growing.

    When growing a store file, ensure that new regions at the end of the file are memory mapped, and there are no misses.
    apcj committed Sep 6, 2012
  3. @johan-neo

    Merge pull request #845 from thobe/pwp-mark-proper

    Improved adherance to the window locking protocol.
    johan-neo committed Sep 6, 2012
  4. @thobe

    Improved adherance to the window locking protocol.

    Before locking a LockableWindow it must be marked for use.
    The code path following an expansion of the available bricks now follows this protocol.
    
    Without this change it is possible (and quite likely) to get into a state where mapped memory is
    never reclaimed, with severely lowered I/O performance following (due to falling back to
    PersistanceRows).
    It is (in theory) also possible to get into a state where a window is freed even though some thread
    has marked it, although this has not been observed in a controlled environment yet.
    thobe committed Sep 6, 2012
Commits on Sep 5, 2012