Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E432A1067F for ; Tue, 1 Apr 2014 15:34:03 +0000 (UTC) Received: (qmail 80676 invoked by uid 500); 1 Apr 2014 15:34:02 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 80629 invoked by uid 500); 1 Apr 2014 15:34:00 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 80621 invoked by uid 99); 1 Apr 2014 15:34:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2014 15:34:00 +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; Tue, 01 Apr 2014 15:33:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54FE623889F1; Tue, 1 Apr 2014 15:33:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1583715 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Date: Tue, 01 Apr 2014 15:33:38 -0000 To: oak-commits@jackrabbit.apache.org From: reschke@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140401153338.54FE623889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: reschke Date: Tue Apr 1 15:33:37 2014 New Revision: 1583715 URL: http://svn.apache.org/r1583715 Log: OAK-1533 - add size column as debugging aid Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1583715&r1=1583714&r2=1583715&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java Tue Apr 1 15:33:37 2014 @@ -278,15 +278,15 @@ public class RDBDocumentStore implements // the code below likely will need to be extended for new database types if ("PostgreSQL".equals(dbtype)) { stmt.execute("create table " + tableName - + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, DATA varchar(16384), BDATA bytea)"); + + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, SIZE bigint, DATA varchar(16384), BDATA bytea)"); } else if ("DB2".equals(dbtype) || (dbtype != null && dbtype.startsWith("DB2/"))) { stmt.execute("create table " + tableName - + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, DATA varchar(16384), BDATA blob)"); + + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, SIZE bigint, DATA varchar(16384), BDATA blob)"); } else { stmt.execute("create table " + tableName - + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, DATA varchar(16384), BDATA blob)"); + + " (ID varchar(1000) not null primary key, MODIFIED bigint, MODCOUNT bigint, SIZE bigint, DATA varchar(16384), BDATA blob)"); } stmt.close(); @@ -651,7 +651,7 @@ public class RDBDocumentStore implements private boolean dbUpdate(Connection connection, String tableName, String id, Long modified, Long modcount, Long oldmodcount, String data) throws SQLException { - String t = "update " + tableName + " set MODIFIED = ?, MODCOUNT = ?, DATA = ?, BDATA = ? where ID = ?"; + String t = "update " + tableName + " set MODIFIED = ?, MODCOUNT = ?, SIZE = ?, DATA = ?, BDATA = ? where ID = ?"; if (oldmodcount != null) { t += " and MODCOUNT = ?"; } @@ -660,6 +660,7 @@ public class RDBDocumentStore implements int si = 1; stmt.setObject(si++, modified, Types.BIGINT); stmt.setObject(si++, modcount, Types.BIGINT); + stmt.setObject(si++, data.length(), Types.BIGINT); if (data.length() < DATALIMIT) { stmt.setString(si++, data); @@ -686,12 +687,13 @@ public class RDBDocumentStore implements private boolean dbInsert(Connection connection, String tableName, String id, Long modified, Long modcount, String data) throws SQLException { - PreparedStatement stmt = connection.prepareStatement("insert into " + tableName + " values(?, ?, ?, ?, ?)"); + PreparedStatement stmt = connection.prepareStatement("insert into " + tableName + " values(?, ?, ?, ?, ?, ?)"); try { int si = 1; stmt.setString(si++, id); stmt.setObject(si++, modified, Types.BIGINT); stmt.setObject(si++, modcount, Types.BIGINT); + stmt.setObject(si++, data.length(), Types.BIGINT); if (data.length() < DATALIMIT) { stmt.setString(si++, data); stmt.setBinaryStream(si++, null, 0);