Minor updates required by fixes in the consistency checker.

Cherry picked: 0b71131
systay · Dec 12, 2011 · 6ec596f · 6ec596f
1 parent 5ed0f28
commit 6ec596f
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 3 deletions.
diff --git a/kernel/src/main/java/org/neo4j/helpers/Args.java b/kernel/src/main/java/org/neo4j/helpers/Args.java
@@ -179,4 +179,61 @@ private void parseArgs( String[] args )
             }
         }
     }
+
+/*    public void printUntouched( PrintStream out )
+    {
+        boolean first = true;
+        for ( Map.Entry<String, String> parameter : map.entrySet() )
+        {
+            if ( touchedParameters.contains( parameter ) ) continue;
+            if ( first )
+            {
+                first = false;
+                out.println( "Untouched parameters:" );
+            }
+            out.println( "  " + parameter.getKey() + ":" + parameter.getValue() );
+        }
+        
+        first = true;
+        for ( int i = 0; i < orphans.size(); i++ )
+        {
+            if ( touchedOrphans.get( i ) ) continue;
+            if ( first )
+            {
+                first = false;
+                out.println( "Untouched orphans:" );
+            }
+            out.println( "(" + i + "):" + orphans.get( i ) );
+        }
+    }
+
+    public Map<String, String> getUntouchedParameters()
+    {
+        return null;
+    }
+
+    public Iterable<String> getUntouchedOrphans()
+    {
+        return null;
+    }*/
+
+    public static String jarUsage( Class<?> main, String... params )
+    {
+        StringBuilder usage = new StringBuilder( "USAGE: java [-cp ...] " );
+        try
+        {
+            String jar = main.getProtectionDomain().getCodeSource().getLocation().getPath();
+            usage.append( "-jar " ).append( jar );
+        }
+        catch ( Exception ex )
+        {
+            // ignore
+        }
+        usage.append( main.getCanonicalName() );
+        for ( String param : params )
+        {
+            usage.append( ' ' ).append( param );
+        }
+        return usage.toString();
+    }
 }
diff --git a/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/PropertyRecord.java b/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/PropertyRecord.java
@@ -157,7 +157,9 @@ public String toString()
     {
         StringBuilder buf = new StringBuilder();
         buf.append( "Property[" ).append( getId() ).append( ",used=" ).append( inUse() ).append( ",prev=" ).append(
-                prevProp ).append( ",next=" ).append( nextProp ).append( ", Value[" );
+                prevProp ).append( ",next=" ).append( nextProp );
+        if ( entityId != -1 ) buf.append( nodeIdSet ? ",node=" : ",rel=" ).append( entityId );
+        buf.append( ", Value[" );
         Iterator<PropertyBlock> itr = blockRecords.iterator();
         while ( itr.hasNext() )
         {

diff --git a/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreXaDataSource.java b/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreXaDataSource.java
@@ -144,8 +144,7 @@ public NeoStoreXaDataSource( Map<Object,Object> config ) throws IOException,
                 2 );
         for ( TransactionInterceptorProvider provider : Service.load( TransactionInterceptorProvider.class ) )
         {
-            Object conf = config.get( provider.getClass().getSimpleName()
-                                      + "." + provider.name() );
+            Object conf = config.get( TransactionInterceptorProvider.class.getSimpleName() + "." + provider.name() );
             if ( conf != null )
             {
                 providers.add( Pair.of( provider, conf ) );