Permalink
Commits on Mar 30, 2015
  1. Retire master branch.

    benbc committed Mar 30, 2015
  2. Merge pull request #4311 from tinwelint/2.2-CharReadable-charset

    Ability to specify input encoding in import tool
    alexaverbuch committed Mar 30, 2015
  3. Merge pull request #4292 from boggle/2.2-cleanup

    Cypher related minor cleanup
    systay committed Mar 30, 2015
  4. Merge pull request #4305 from davidegrohmann/2.2-fix-input-pos-after-…

    …preparse
    
    Fix input position in syntax and semantic exceptions
    systay committed Mar 30, 2015
  5. Merge pull request #4297 from cleishm/cypher-versions-2.2

    Update 2.1 Cypher Compiler to 2.1.7
    systay committed Mar 30, 2015
Commits on Mar 29, 2015
  1. Merge pull request #4310 from tinwelint/2.2-bip-prop-enc-aioob

    Fixes an issues with growing property block array in property encoder step
    tinwelint committed Mar 29, 2015
  2. Merge branch '2.1-maint'

    digitalstain committed Mar 29, 2015
  3. Ensures NSDS heals the KernelHealth after successful startup

    KernelHealth is a component that keeps state of the last kernel
     panic and prohibits database writes until it is resolved. So
     far this state was never reset even though it could happen that
     internal restarts (in the case of HA) might lead to recovery and
     resolution of the panic cause. This patch makes sure that after
     a successful startup cycle on NSDS the kernel health is restored.
    digitalstain committed Mar 29, 2015
  4. Extracts and uses an NeoStoreDataSourceRule resource for tests

    Setting up a NeoStoreDataSource for testing can be complicated. This
     patch introduces a JUnit @Rule for that purpose and uses it in
     TestNeoStore
    digitalstain committed Mar 29, 2015
  5. Fixes an issues with growing property block array in property encoder…

    … step
    
    of import tool. Should only occur on really small datasets (< 5) however.
    tinwelint committed Mar 29, 2015
  6. Fix input position in syntax and semantic exceptions

    Previously the errors were reporting the wrong position due to the
    fact that part of the string input was consumed by a pre-parser, now
    we make sure to consider the pre-parsed offset when reporting errors.
    davidegrohmann committed Mar 26, 2015
Commits on Mar 28, 2015
  1. Merge branch '2.1-maint'

    Conflicts:
    	community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestCrashWithRebuildSlow.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestBrokenStoreRecovery.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestApplyTransactions.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestTxEntries.java
    	community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java
    digitalstain committed Mar 28, 2015
  2. Merge branch '1.9-maint' into 2.0-maint

    Conflicts:
    	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestBrokenStoreRecovery.java
    	community/kernel/src/test/java/org/neo4j/test/EphemeralFileSystemRule.java
    digitalstain committed Mar 28, 2015
Commits on Mar 27, 2015
  1. Merge remote-tracking branch 'upstream/2.1-maint'

    Made this a null-erge, nothing changed. I have no idea how to implement
    this for 2.2, it'll have to a re-implementation of the original author.
    
    Conflicts:
    	community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/CommunityLockClient.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/LockTransaction.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TransactionImpl.java
    	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TransactionStateFactory.java
    	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
    	enterprise/ha/src/main/java/org/neo4j/kernel/ha/lock/SlaveLocksClient.java
    tinwelint committed Mar 27, 2015
  2. Merge pull request #4248 from martinfurmanski/2.1-debug-locks

    Keep track of transactions and threads associated with locks.
    tinwelint committed Mar 27, 2015
  3. Merge pull request #4300 from tinwelint/2.2-import-bad-rel-prop-fix

    Fixes an import issue where relationships could get wrong sets of properties
    tinwelint committed Mar 27, 2015
  4. Merge pull request #4299 from tinwelint/2.2-csv-dont-store-empty-array

    Will not store empty arrays from CSV input in entities during import
    tinwelint committed Mar 27, 2015
  5. For some reason SwitchToMaster is listed as "JNI Global" GC root in V…

    …isualVM, thus making it impossible to GC the entire database. This causes OOMs during testing when we create/destroy databases within one JVM session. Fix is to clear all references in STM on shutdown.
    rickardoberg committed with tinwelint Mar 26, 2015
  6. Fixes import issue where relationships could get wrong sets of proper…

    …ties
    
    this would happen on batches where there were skipped relationships. Any
    relationships after skipped relationships in that batch would have their
    sets of properties shifted the number of steps there were skipped
    relationships at that position. So the import would create a consistent
    database, just semantically incorrect.
    tinwelint committed Mar 27, 2015
  7. Will not store empty arrays from CSV input in entities during import

    since that's just overhead. Querying will (or at least is able to)
    handle absence of such values anyway.
    tinwelint committed Mar 27, 2015
Commits on Mar 26, 2015
  1. Likely fix for flaky HAClusterStartupIT

    adding a "sync" call before starting each test because the logic of most
    of the tests depend on it. Without it the outcome would depend on the
    order in which the instances happened to start up the second time.
    tinwelint committed Mar 26, 2015
  2. Merge pull request #4271 from oskarhane/2.2-fix-document-state

    Reset loaded document on script execution.
    apcj committed Mar 26, 2015
  3. Merge pull request #4276 from oskarhane/2.2-ga-fixes

    2.2 Browser fixes
    apcj committed Mar 26, 2015
  4. Merge pull request #4289 from oskarhane/2.2-fix-empty-results

    Fix empty results in rows view.
    apcj committed Mar 26, 2015
  5. Merge pull request #4291 from apcj/shutdown-failed-start

    Always shutdown on failed attempt to start server.
    apcj committed Mar 26, 2015
  6. Fix empty results in rows view.

    - Add text to hint the user why there's nothing to show.
    It could be that nothing was returned or the returned
    results were empty.
    
    - Add `(empty)` holder to show that a returned node has no properties
    OR that a returned string has no length (it exists, but is empty).
    oskarhane committed Mar 26, 2015