Return-Path: X-Original-To: apmail-avro-commits-archive@www.apache.org Delivered-To: apmail-avro-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 E3CCE10ACD for ; Thu, 12 Dec 2013 23:07:06 +0000 (UTC) Received: (qmail 31413 invoked by uid 500); 12 Dec 2013 23:07:06 -0000 Delivered-To: apmail-avro-commits-archive@avro.apache.org Received: (qmail 31343 invoked by uid 500); 12 Dec 2013 23:07:06 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 31331 invoked by uid 99); 12 Dec 2013 23:07:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Dec 2013 23:07:06 +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; Thu, 12 Dec 2013 23:07:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C1C84238889B; Thu, 12 Dec 2013 23:06:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1550578 - in /avro/trunk: ./ lang/c++/api/ lang/c++/impl/ lang/csharp/src/apache/main/File/ lang/java/avro/src/main/java/org/apache/avro/file/ lang/php/lib/avro/ lang/py/src/avro/ lang/ruby/lib/avro/ Date: Thu, 12 Dec 2013 23:06:41 -0000 To: commits@avro.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131212230641.C1C84238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Thu Dec 12 23:06:40 2013 New Revision: 1550578 URL: http://svn.apache.org/r1550578 Log: AVRO-1398. Increase default sync interval from 16k to 64k. Contributed by Rob Turner. Modified: avro/trunk/CHANGES.txt avro/trunk/lang/c++/api/DataFile.hh avro/trunk/lang/c++/impl/DataFile.cc avro/trunk/lang/csharp/src/apache/main/File/DataFileConstants.cs avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/DataFileConstants.java avro/trunk/lang/php/lib/avro/data_file.php avro/trunk/lang/py/src/avro/datafile.py avro/trunk/lang/ruby/lib/avro/data_file.rb Modified: avro/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/CHANGES.txt (original) +++ avro/trunk/CHANGES.txt Thu Dec 12 23:06:40 2013 @@ -32,6 +32,9 @@ Trunk (not yet released) AVRO-1397. Java: Improve error message when missing field has no default. (David Carr via cutting) + AVRO-1398. Increase default sync interval from 16k to 64k. + (Rob Turner via cutting) + BUG FIXES AVRO-1368. Fix SpecificDatumWriter to, when writing a string Modified: avro/trunk/lang/c++/api/DataFile.hh URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/api/DataFile.hh?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/c++/api/DataFile.hh (original) +++ avro/trunk/lang/c++/api/DataFile.hh Thu Dec 12 23:06:40 2013 @@ -124,7 +124,7 @@ public: * Constructs a new data file. */ DataFileWriter(const char* filename, const ValidSchema& schema, - size_t syncInterval = 16 * 1024) : + size_t syncInterval = 64 * 1024) : base_(new DataFileWriterBase(filename, schema, syncInterval)) { } /** Modified: avro/trunk/lang/c++/impl/DataFile.cc URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/impl/DataFile.cc?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/c++/impl/DataFile.cc (original) +++ avro/trunk/lang/c++/impl/DataFile.cc Thu Dec 12 23:06:40 2013 @@ -40,7 +40,7 @@ const string AVRO_NULL_CODEC("null"); const size_t minSyncInterval = 32; const size_t maxSyncInterval = 1u << 30; -const size_t defaultSyncInterval = 16 * 1024; +const size_t defaultSyncInterval = 64 * 1024; static string toString(const ValidSchema& schema) { Modified: avro/trunk/lang/csharp/src/apache/main/File/DataFileConstants.cs URL: http://svn.apache.org/viewvc/avro/trunk/lang/csharp/src/apache/main/File/DataFileConstants.cs?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/csharp/src/apache/main/File/DataFileConstants.cs (original) +++ avro/trunk/lang/csharp/src/apache/main/File/DataFileConstants.cs Thu Dec 12 23:06:40 2013 @@ -41,6 +41,6 @@ namespace Avro.File public const int DeflateCodecHash = 0; public const int SyncSize = 16; - public const int DefaultSyncInterval = 1000 * SyncSize; + public const int DefaultSyncInterval = 4000 * SyncSize; } } Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/DataFileConstants.java URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/DataFileConstants.java?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/DataFileConstants.java (original) +++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/DataFileConstants.java Thu Dec 12 23:06:40 2013 @@ -30,7 +30,7 @@ public class DataFileConstants { }; public static final long FOOTER_BLOCK = -1; public static final int SYNC_SIZE = 16; - public static final int DEFAULT_SYNC_INTERVAL = 1000*SYNC_SIZE; + public static final int DEFAULT_SYNC_INTERVAL = 4000*SYNC_SIZE; public static final String SCHEMA = "avro.schema"; public static final String CODEC = "avro.codec"; Modified: avro/trunk/lang/php/lib/avro/data_file.php URL: http://svn.apache.org/viewvc/avro/trunk/lang/php/lib/avro/data_file.php?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/php/lib/avro/data_file.php (original) +++ avro/trunk/lang/php/lib/avro/data_file.php Thu Dec 12 23:06:40 2013 @@ -44,10 +44,10 @@ class AvroDataIO const SYNC_SIZE = 16; /** - * @var int count of items per block, arbitrarily set to 1000 * SYNC_SIZE + * @var int count of items per block, arbitrarily set to 4000 * SYNC_SIZE * @todo make this value configurable */ - const SYNC_INTERVAL = 16000; + const SYNC_INTERVAL = 64000; /** * @var string map key for datafile metadata codec value Modified: avro/trunk/lang/py/src/avro/datafile.py URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/src/avro/datafile.py?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/py/src/avro/datafile.py (original) +++ avro/trunk/lang/py/src/avro/datafile.py Thu Dec 12 23:06:40 2013 @@ -36,7 +36,7 @@ VERSION = 1 MAGIC = 'Obj' + chr(VERSION) MAGIC_SIZE = len(MAGIC) SYNC_SIZE = 16 -SYNC_INTERVAL = 1000 * SYNC_SIZE # TODO(hammer): make configurable +SYNC_INTERVAL = 4000 * SYNC_SIZE # TODO(hammer): make configurable META_SCHEMA = schema.parse("""\ {"type": "record", "name": "org.apache.avro.file.Header", "fields" : [ Modified: avro/trunk/lang/ruby/lib/avro/data_file.rb URL: http://svn.apache.org/viewvc/avro/trunk/lang/ruby/lib/avro/data_file.rb?rev=1550578&r1=1550577&r2=1550578&view=diff ============================================================================== --- avro/trunk/lang/ruby/lib/avro/data_file.rb (original) +++ avro/trunk/lang/ruby/lib/avro/data_file.rb Thu Dec 12 23:06:40 2013 @@ -22,7 +22,7 @@ module Avro MAGIC = "Obj" + [VERSION].pack('c') MAGIC_SIZE = MAGIC.size SYNC_SIZE = 16 - SYNC_INTERVAL = 1000 * SYNC_SIZE + SYNC_INTERVAL = 4000 * SYNC_SIZE META_SCHEMA = Schema.parse('{"type": "map", "values": "bytes"}') VALID_ENCODINGS = ['binary'] # not used yet