Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 7900E11868 for ; Fri, 6 Jun 2014 13:14:55 +0000 (UTC) Received: (qmail 64782 invoked by uid 500); 6 Jun 2014 13:14:55 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 64712 invoked by uid 500); 6 Jun 2014 13:14:55 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 64705 invoked by uid 99); 6 Jun 2014 13:14:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jun 2014 13:14:55 +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; Fri, 06 Jun 2014 13:14:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CC86323888E2; Fri, 6 Jun 2014 13:14:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1600880 - in /jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data: CachingDataStore.java LocalCache.java Date: Fri, 06 Jun 2014 13:14:30 -0000 To: commits@jackrabbit.apache.org From: chetanm@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140606131430.CC86323888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chetanm Date: Fri Jun 6 13:14:30 2014 New Revision: 1600880 URL: http://svn.apache.org/r1600880 Log: JCR-3786 - Incompatible CachingDataStore's path & FileDataStore's path configuration Applying patch from Shashank Modified: jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java Modified: jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java?rev=1600880&r1=1600879&r2=1600880&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java (original) +++ jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/CachingDataStore.java Fri Jun 6 13:14:30 2014 @@ -219,13 +219,10 @@ public abstract class CachingDataStore e try { if (path == null) { path = homeDir + "/repository/datastore"; - tmpDir = new File(homeDir, "/repository/s3tmp"); - } else { - // cache is moved from 'path' to 'path'/repository/datastore - tmpDir = new File(path, "/repository/s3tmp"); - path = path + "/repository/datastore"; } - LOG.info("path=[{}], tmpPath=[{}]", path, tmpDir.getPath()); + // create tmp inside path + tmpDir = new File(path, "tmp"); + LOG.info("path=[{}], tmpPath=[{}]", path, tmpDir.getAbsolutePath()); directory = new File(path); mkdirs(directory); if (!mkdirs(tmpDir)) { Modified: jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java?rev=1600880&r1=1600879&r2=1600880&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java (original) +++ jackrabbit/trunk/jackrabbit-data/src/main/java/org/apache/jackrabbit/core/data/LocalCache.java Fri Jun 6 13:14:30 2014 @@ -572,12 +572,20 @@ public class LocalCache { LOG.debug("Time taken to sort [{}] took [{}] sec", allFiles.size(), ((t2 - t1) / 1000)); String dataStorePath = directory.getAbsolutePath(); + String tmpPath = tmp.getAbsolutePath(); + LOG.debug("tmp path [{}]", tmpPath); long time = System.currentTimeMillis(); int count = 0; for (File f : allFiles) { if (f.exists()) { count++; String name = f.getPath(); + String filePath = f.getAbsolutePath(); + // skipped any temp file + if(filePath.startsWith(tmpPath) ) { + LOG.info ("tmp file [{}] skipped ", filePath); + continue; + } if (name.startsWith(dataStorePath)) { name = name.substring(dataStorePath.length()); }