Return-Path: 
 <commits-return-33728-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
X-Original-To: apmail-directory-commits-archive@www.apache.org
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 014C89E84
	for <apmail-directory-commits-archive@www.apache.org>;
 Mon, 27 Feb 2012 15:07:26 +0000 (UTC)
Received: (qmail 38898 invoked by uid 500); 27 Feb 2012 15:07:25 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 38862 invoked by uid 500); 27 Feb 2012 15:07:25 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 38855 invoked by uid 99); 27 Feb 2012 15:07:25 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 15:07:25 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 15:07:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 62EAE23889B3
	for <commits@directory.apache.org>; Mon, 27 Feb 2012 15:07:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1294176 [3/3] - in /directory/apacheds/trunk:
 server-integ/src/test/java/org/apache/directory/server/operations/search/
 xdbm-partition/src/main/java/org/apache/directory/server/xdbm/
 xdbm-partition/src/test/java/org/apache/directory/server...
Date: Mon, 27 Feb 2012 15:07:00 -0000
To: commits@directory.apache.org
From: elecharny@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120227150700.62EAE23889B3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java?rev=1294176&r1=1294175&r2=1294176&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java Mon Feb 27 15:06:59 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.server.xdbm;
 
@@ -27,6 +27,7 @@ import java.io.ObjectOutput;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 
 
@@ -176,30 +177,102 @@ public class ParentIdAndRdn<ID extends C
 
         return true;
     }
-
-
+    
+    
     /**
      * {@inheritDoc}
      */
     public int compareTo( ParentIdAndRdn<ID> that )
     {
-        int val = this.rdns.length - that.rdns.length;
+        int val = rdns.length - that.rdns.length;
 
         if ( val != 0 )
         {
             return val;
         }
-
-        for ( int i = 0; i < this.rdns.length; i++ )
+        
+        // Handle the special case where we only have one RDN
+        // But we may have more than one Ava.
+        if ( rdns.length == 1 )
+        {
+            Rdn thisRdn = rdns[0];
+            Rdn thatRdn = that.rdns[0];
+            
+            // Check the AVAs now
+            // If we only have one, no need to create an Array
+            if ( thisRdn.size() == 1 )
+            {
+                if ( thatRdn.size() > 1 )
+                {
+                    return -1;
+                }
+                
+                Ava thisAva = thisRdn.getAva();
+                
+                val = thisAva.compareTo( thatRdn.getAva() );
+                
+                if ( val != 0 )
+                {
+                    return val;
+                }
+            }
+            else
+            {
+                if ( thisRdn.size() > thatRdn.size() )
+                {
+                    return 1;
+                }
+                else if ( thatRdn.size() > thisRdn.size() )
+                {
+                    return -1;
+                }
+                
+                Ava[] thisAvas = new Ava[thisRdn.size()];
+                int pos = 0;
+                
+                for ( Ava ava : thisRdn )
+                {
+                    thisAvas[pos++] = ava;
+                }
+                
+                Arrays.sort( thisAvas );
+
+                Ava[] thatAvas = new Ava[thatRdn.size()];
+                pos = 0;
+                
+                for ( Ava ava : thatRdn )
+                {
+                    thatAvas[pos++] = ava;
+                }
+                
+                Arrays.sort( thatAvas );
+                
+                for ( int i = 0; i < thisAvas.length; i++ )
+                {
+                    val = thisAvas[i].compareTo( thatAvas[i] );
+
+                    if ( val != 0 )
+                    {
+                        return val;
+                    }
+                }
+            }
+        }
+        else
         {
-            val = this.rdns[i].getNormName().compareTo( that.rdns[i].getNormName() );
-
-            if ( val != 0 )
+            // if we have more than one RDN, then it's a context entry.
+            // Atm, do a string comparison
+            for ( int i = 0; i < rdns.length; i++ )
             {
-                return val;
+                val = rdns[i].getNormName().compareTo( that.rdns[i].getNormName() );
+                
+                if ( val != 0 )
+                {
+                    return val;
+                }
             }
         }
-
+        
         val = this.getParentId().compareTo( that.getParentId() );
 
         return val;

Added: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java?rev=1294176&view=auto
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java (added)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java Mon Feb 27 15:06:59 2012
@@ -0,0 +1,134 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ * 
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ * 
+ */
+package org.apache.directory.server.xdbm;
+
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import org.apache.directory.server.xdbm.impl.avl.AvlPartitionTest;
+import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
+import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.exception.Exceptions;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ * Tests the {@link ParentIdAndRdn} class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ParentIdAndRdnTest
+{
+    private static final Logger LOG = LoggerFactory.getLogger( ParentIdAndRdnTest.class );
+
+    private static SchemaManager schemaManager = null;
+
+
+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        String workingDirectory = System.getProperty( "workingDirectory" );
+
+        if ( workingDirectory == null )
+        {
+            String path = AvlPartitionTest.class.getResource( "" ).getPath();
+            int targetPos = path.indexOf( "target" );
+            workingDirectory = path.substring( 0, targetPos + 6 );
+        }
+
+        File schemaRepository = new File( workingDirectory, "schema" );
+        SchemaLdifExtractor extractor = new DefaultSchemaLdifExtractor( new File( workingDirectory ) );
+        extractor.extractOrCopy( true );
+        LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+
+        schemaManager = new DefaultSchemaManager( loader );
+
+        boolean loaded = schemaManager.loadAllEnabled();
+
+        if ( !loaded )
+        {
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
+        }
+    }
+
+
+    @Test
+    public void testCompareEquals() throws LdapInvalidDnException
+    {
+        ParentIdAndRdn<Long> rdn1 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "cn=test" ) );
+        ParentIdAndRdn<Long> rdn2 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "CN=test2" ) );
+        ParentIdAndRdn<Long> rdn3 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "ou=test" ) );
+        ParentIdAndRdn<Long> rdn4 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "2.5.4.11=test2" ) );
+        ParentIdAndRdn<Long> rdn5 = new ParentIdAndRdn<Long>( 1L, new Rdn( schemaManager, "CommonName= Test " ) );
+        ParentIdAndRdn<Long> rdn6 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "cn=test+sn=small" ) );
+        ParentIdAndRdn<Long> rdn7 = new ParentIdAndRdn<Long>( 2L, new Rdn( schemaManager, "2.5.4.4= Small + 2.5.4.3 = TEST " ) );
+        
+        // First rdn
+        assertEquals( 0, rdn1.compareTo( rdn1 ) );
+        assertEquals( -1, rdn1.compareTo( rdn2 ) );
+        assertEquals( 2, rdn1.compareTo( rdn3 ) );
+        assertEquals( 2, rdn1.compareTo( rdn4 ) );
+        assertEquals( 1, rdn1.compareTo( rdn5 ) );
+        
+        // Second rdn
+        assertEquals( 1, rdn2.compareTo( rdn1 ) );
+        assertEquals( 0, rdn2.compareTo( rdn2 ) );
+        assertEquals( 2, rdn2.compareTo( rdn3 ) );
+        assertEquals( 2, rdn2.compareTo( rdn4 ) );
+        assertEquals( 1, rdn2.compareTo( rdn5 ) );
+        
+        // Third rdn
+        assertEquals( -2, rdn3.compareTo( rdn1 ) );
+        assertEquals( -2, rdn3.compareTo( rdn2 ) );
+        assertEquals( 0, rdn3.compareTo( rdn3 ) );
+        assertEquals( -1, rdn3.compareTo( rdn4 ) );
+        assertEquals( -2, rdn3.compareTo( rdn5 ) );
+        
+        // Forth rdn
+        assertEquals( -2, rdn4.compareTo( rdn1 ) );
+        assertEquals( -2, rdn4.compareTo( rdn2 ) );
+        assertEquals( 1, rdn4.compareTo( rdn3 ) );
+        assertEquals( 0, rdn4.compareTo( rdn4 ) );
+        assertEquals( -2, rdn4.compareTo( rdn5 ) );
+        
+        // Fifth rdn
+        assertEquals( -1, rdn5.compareTo( rdn1 ) );
+        assertEquals( -1, rdn5.compareTo( rdn2 ) );
+        assertEquals( 2, rdn5.compareTo( rdn3 ) );
+        assertEquals( 2, rdn5.compareTo( rdn4 ) );
+        assertEquals( 0, rdn5.compareTo( rdn5 ) );
+
+        // Sixth rdn
+        assertEquals( 0, rdn6.compareTo( rdn7 ) );
+        assertEquals( 0, rdn7.compareTo( rdn6 ) );
+        assertEquals( -1, rdn1.compareTo( rdn6 ) );
+        assertEquals( -1, rdn1.compareTo( rdn7 ) );
+    }
+}