From dev-return-41036-apmail-directory-dev-archive=directory.apache.org@directory.apache.org Tue May 22 09:49:19 2012 Return-Path: X-Original-To: apmail-directory-dev-archive@www.apache.org Delivered-To: apmail-directory-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2A61E9954 for ; Tue, 22 May 2012 09:49:19 +0000 (UTC) Received: (qmail 61594 invoked by uid 500); 22 May 2012 09:49:18 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 60066 invoked by uid 500); 22 May 2012 09:49:13 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 60020 invoked by uid 99); 22 May 2012 09:49:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2012 09:49:12 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of elecharny@gmail.com designates 209.85.217.178 as permitted sender) Received: from [209.85.217.178] (HELO mail-lb0-f178.google.com) (209.85.217.178) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2012 09:49:05 +0000 Received: by lbbgj10 with SMTP id gj10so5621260lbb.37 for ; Tue, 22 May 2012 02:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:reply-to:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=DFcfSRAozWvh7qwMytfgwnU+3YZcAU0ZJqwD2l98DDg=; b=dnLrc193aoSbwiJBsN1RVhPD/vuSdmMV5lp7B16tZEaly4y+/04lmN4mACVLYPKrcr 0boxhNWA3oLTvffUUqW9dqKvssp0cyHD+1HIo7Zh+vEnF0NNoxWBayqEQpDlwtKkDbjw vcJY5OKlRq4na5IfcR3tCNfJlrne36hA/P1mBj7Q8eUhVqP5rkw/IDRu2KbMEgB5ZHg4 ULqeOQ90HhDzz0w/N5P+/D/8KCDuj/5y31P95s0Tg5anDZshUja9DBDhFDu6x+NbIvyF TluGTHPGrd0DB0tlFtvR5iUV4uOyNNY254HWvFVnJxvA37z+If2ED2CBOTZDS8RGfcWc 1tYg== Received: by 10.152.48.37 with SMTP id i5mr16199621lan.36.1337680123890; Tue, 22 May 2012 02:48:43 -0700 (PDT) Received: from Emmanuels-MacBook-Pro.local (ran75-1-78-192-106-184.fbxo.proxad.net. [78.192.106.184]) by mx.google.com with ESMTPS id mo3sm30475706lab.2.2012.05.22.02.48.42 (version=SSLv3 cipher=OTHER); Tue, 22 May 2012 02:48:43 -0700 (PDT) Message-ID: <4FBB60FA.8060908@gmail.com> Date: Tue, 22 May 2012 11:48:42 +0200 From: =?UTF-8?B?RW1tYW51ZWwgTMOpY2hhcm55?= Reply-To: elecharny@apache.org User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:12.0) Gecko/20120428 Thunderbird/12.0.1 MIME-Version: 1.0 To: Apache Directory Developers List Subject: Txn/trunk merge : DefaultOperationExecutionManager issues Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Checked: Checked by ClamAV on apache.org Hi guys, I'm currently facing some interesting challenge on this class, as we have removed the OneLevel and SubLevel index from trunk. This has some direct impact on the txn branch code, as we have to update the code accordingly. Methods like add/delete... are storing the changes done on those index : // Update the OneLevel index Index oneLevelIdx = partition.getSystemIndex( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ); indexChange = new IndexChange( oneLevelIdx, parentId, id, IndexChange.Type.ADD, true ); changeContainer.addChange( indexChange ); We have to remove those lines, but we also have to modify the RDN Index update. I'm be working on that, it may take a bit of time. In any case, the merge is way more complex than any other we have already done on the server, although I do expect to have it done by the end of this week. SVN is not helping a lot here... :/ -- Regards, Cordialement, Emmanuel Lécharny www.iktek.com