Merge oficial/master into trunk-AVRO-1723 Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/bafac8d9 Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/bafac8d9 Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/bafac8d9
Branch: refs/heads/master Commit: bafac8d9d80bfcf8207f42629862617442a01481 Parents: c396434 27cb9e2 Author: Zoltan Farkas <[email protected]> Authored: Sat Sep 17 10:15:29 2016 -0400 Committer: Zoltan Farkas <[email protected]> Committed: Sat Sep 17 10:15:29 2016 -0400 ---------------------------------------------------------------------- .editorconfig | 34 + .gitignore | 4 +- CHANGES.txt | 106 +++ build.sh | 308 +++---- doc/.gitignore | 1 + doc/build.xml | 4 +- .../src/main/java/example/GenericMain.java | 68 +- .../src/main/java/example/SpecificMain.java | 70 +- .../java/example/MapReduceAvroWordCount.java | 2 +- doc/src/content/xdocs/mr.xml | 16 +- doc/src/content/xdocs/site.xml | 10 +- doc/src/content/xdocs/spec.xml | 84 +- doc/src/content/xdocs/tabs.xml | 4 +- doc/src/skinconf.xml | 92 +-- lang/c++/.gitignore | 3 + lang/c++/MainPage.dox | 35 +- lang/c++/api/Encoder.hh | 7 +- lang/c++/build.sh | 89 ++- lang/c++/impl/json/JsonDom.cc | 4 +- lang/c++/impl/json/JsonDom.hh | 5 +- lang/c++/impl/json/JsonIO.cc | 19 - lang/c++/impl/json/JsonIO.hh | 78 +- lang/c++/impl/parsing/JsonCodec.cc | 97 +-- lang/c++/test/AvrogencppTests.cc | 8 +- lang/c++/test/CodecTests.cc | 14 +- lang/c++/test/SchemaTests.cc | 6 +- lang/c++/test/buffertest.cc | 42 +- lang/c/build.sh | 92 +-- lang/c/version.sh | 42 +- lang/csharp/.gitignore | 3 + lang/csharp/build.sh | 61 +- lang/java/.gitignore | 3 + .../src/main/avro/order-service.avpr | 42 +- .../main/java/service/SimpleOrderService.java | 2 +- .../SimpleOrderServiceIntegrationTest.java | 64 +- lang/java/avro/pom.xml | 5 + .../org/apache/avro/AvroRemoteException.java | 4 +- .../main/java/org/apache/avro/Conversions.java | 116 ++- .../java/org/apache/avro/JsonProperties.java | 10 +- .../main/java/org/apache/avro/LogicalTypes.java | 1 + .../src/main/java/org/apache/avro/Protocol.java | 40 +- .../src/main/java/org/apache/avro/Schema.java | 54 +- .../java/org/apache/avro/SchemaBuilder.java | 310 ++++---- .../apache/avro/SchemaValidationStrategy.java | 2 +- .../java/org/apache/avro/SchemaValidator.java | 2 +- .../org/apache/avro/SchemaValidatorBuilder.java | 6 +- .../apache/avro/UnresolvedUnionException.java | 2 +- .../java/org/apache/avro/ValidateCanBeRead.java | 4 +- .../java/org/apache/avro/ValidateCanRead.java | 4 +- .../org/apache/avro/ValidateMutualRead.java | 6 +- .../java/org/apache/avro/data/ErrorBuilder.java | 16 +- .../main/java/org/apache/avro/data/Json.java | 4 +- .../org/apache/avro/data/RecordBuilder.java | 2 +- .../org/apache/avro/data/RecordBuilderBase.java | 58 +- .../java/org/apache/avro/file/BZip2Codec.java | 4 +- .../main/java/org/apache/avro/file/Codec.java | 6 +- .../java/org/apache/avro/file/CodecFactory.java | 12 +- .../org/apache/avro/file/DataFileConstants.java | 2 +- .../org/apache/avro/file/DataFileReader.java | 10 +- .../org/apache/avro/file/DataFileReader12.java | 8 +- .../org/apache/avro/file/DataFileStream.java | 28 +- .../org/apache/avro/file/DataFileWriter.java | 28 +- .../java/org/apache/avro/file/DeflateCodec.java | 16 +- .../java/org/apache/avro/file/FileReader.java | 2 +- .../java/org/apache/avro/file/NullCodec.java | 2 +- .../java/org/apache/avro/file/SnappyCodec.java | 6 +- .../org/apache/avro/generic/GenericArray.java | 2 +- .../org/apache/avro/generic/GenericData.java | 79 +- .../apache/avro/generic/GenericDatumReader.java | 70 +- .../apache/avro/generic/GenericDatumWriter.java | 69 +- .../avro/generic/GenericRecordBuilder.java | 50 +- .../java/org/apache/avro/io/BinaryData.java | 8 +- .../java/org/apache/avro/io/BinaryDecoder.java | 30 +- .../java/org/apache/avro/io/BinaryEncoder.java | 20 +- .../apache/avro/io/BlockingBinaryEncoder.java | 26 +- .../apache/avro/io/BufferedBinaryEncoder.java | 16 +- .../main/java/org/apache/avro/io/Decoder.java | 10 +- .../java/org/apache/avro/io/DecoderFactory.java | 36 +- .../org/apache/avro/io/DirectBinaryDecoder.java | 10 +- .../org/apache/avro/io/DirectBinaryEncoder.java | 8 +- .../main/java/org/apache/avro/io/Encoder.java | 24 +- .../java/org/apache/avro/io/EncoderFactory.java | 46 +- .../java/org/apache/avro/io/JsonDecoder.java | 47 +- .../java/org/apache/avro/io/JsonEncoder.java | 16 +- .../java/org/apache/avro/io/ParsingDecoder.java | 4 +- .../java/org/apache/avro/io/ParsingEncoder.java | 6 +- .../org/apache/avro/io/ResolvingDecoder.java | 18 +- .../org/apache/avro/io/ValidatingDecoder.java | 14 +- .../org/apache/avro/io/ValidatingEncoder.java | 8 +- .../java/org/apache/avro/io/parsing/Parser.java | 12 +- .../io/parsing/ResolvingGrammarGenerator.java | 26 +- .../org/apache/avro/io/parsing/SkipParser.java | 2 +- .../java/org/apache/avro/io/parsing/Symbol.java | 94 ++- .../io/parsing/ValidatingGrammarGenerator.java | 6 +- .../apache/avro/message/BadHeaderException.java | 34 + .../avro/message/BinaryMessageDecoder.java | 190 +++++ .../avro/message/BinaryMessageEncoder.java | 122 +++ .../org/apache/avro/message/MessageDecoder.java | 159 ++++ .../org/apache/avro/message/MessageEncoder.java | 50 ++ .../avro/message/MissingSchemaException.java | 35 + .../apache/avro/message/RawMessageDecoder.java | 101 +++ .../apache/avro/message/RawMessageEncoder.java | 129 +++ .../org/apache/avro/message/SchemaStore.java | 63 ++ .../java/org/apache/avro/reflect/AvroAlias.java | 2 +- .../org/apache/avro/reflect/CustomEncoding.java | 6 +- .../org/apache/avro/reflect/FieldAccess.java | 2 +- .../apache/avro/reflect/FieldAccessReflect.java | 8 +- .../apache/avro/reflect/FieldAccessUnsafe.java | 14 +- .../org/apache/avro/reflect/FieldAccessor.java | 8 +- .../org/apache/avro/reflect/ReflectData.java | 86 +- .../apache/avro/reflect/ReflectDatumReader.java | 4 +- .../apache/avro/reflect/ReflectDatumWriter.java | 12 +- .../org/apache/avro/reflect/ReflectionUtil.java | 4 +- .../org/apache/avro/specific/AvroGenerated.java | 4 +- .../org/apache/avro/specific/SpecificData.java | 37 +- .../avro/specific/SpecificDatumReader.java | 26 +- .../avro/specific/SpecificDatumWriter.java | 29 +- .../avro/specific/SpecificErrorBuilderBase.java | 22 +- .../avro/specific/SpecificExceptionBase.java | 4 +- .../org/apache/avro/specific/SpecificFixed.java | 4 +- .../avro/specific/SpecificRecordBase.java | 12 +- .../specific/SpecificRecordBuilderBase.java | 8 +- .../avro/util/ByteBufferOutputStream.java | 4 +- .../avro/util/ReusableByteArrayInputStream.java | 35 + .../util/ReusableByteBufferInputStream.java | 89 +++ .../main/java/org/apache/avro/util/Utf8.java | 2 +- .../apache/avro/util/WeakIdentityHashMap.java | 6 +- .../apache/avro/util/internal/JacksonUtils.java | 2 + .../test/java/org/apache/avro/AvroTestUtil.java | 12 +- .../org/apache/avro/FooBarSpecificRecord.java | 64 +- .../org/apache/avro/GenerateBlockingData.java | 10 +- .../test/java/org/apache/avro/RandomData.java | 4 +- .../test/java/org/apache/avro/TestDataFile.java | 2 +- .../org/apache/avro/TestDataFileConcat.java | 6 +- .../org/apache/avro/TestDataFileCustomSync.java | 2 +- .../test/java/org/apache/avro/TestProtocol.java | 8 +- .../test/java/org/apache/avro/TestSchema.java | 6 +- .../java/org/apache/avro/TestSchemaBuilder.java | 90 +-- .../apache/avro/TestSchemaNormalization.java | 2 +- .../org/apache/avro/TestSchemaValidation.java | 17 + .../src/test/java/org/apache/avro/TypeEnum.java | 6 +- .../apache/avro/data/RecordBuilderBaseTest.java | 28 +- .../org/apache/avro/file/TestBZip2Codec.java | 22 +- .../apache/avro/generic/TestGenericData.java | 40 +- .../avro/generic/TestGenericDatumWriter.java | 18 +- .../avro/generic/TestGenericLogicalTypes.java | 61 ++ .../avro/generic/TestGenericRecordBuilder.java | 22 +- .../org/apache/avro/io/LegacyBinaryEncoder.java | 24 +- .../org/apache/avro/io/TestBinaryDecoder.java | 58 +- .../avro/io/TestBinaryEncoderFidelity.java | 12 +- .../java/org/apache/avro/io/TestBlockingIO.java | 18 +- .../org/apache/avro/io/TestBlockingIO2.java | 8 +- .../java/org/apache/avro/io/TestEncoders.java | 16 +- .../org/apache/avro/io/TestJsonDecoder.java | 21 +- .../org/apache/avro/io/TestResolvingIO.java | 10 +- .../avro/io/TestResolvingIOResolving.java | 4 +- .../org/apache/avro/io/TestValidatingIO.java | 46 +- .../parsing/TestResolvingGrammarGenerator.java | 8 +- .../parsing/TestResolvingGrammarGenerator2.java | 2 +- .../avro/message/TestBinaryMessageEncoding.java | 279 +++++++ .../org/apache/avro/reflect/TestByteBuffer.java | 4 +- .../avro/reflect/TestNonStringMapKeys.java | 32 +- .../org/apache/avro/reflect/TestReflect.java | 126 +-- .../apache/avro/reflect/TestReflectData.java | 53 ++ .../apache/avro/reflect/TestReflectionUtil.java | 4 +- .../specific/TestRecordWithLogicalTypes.java | 796 +++++++++++++++++++ .../specific/TestRecordWithoutLogicalTypes.java | 573 +++++++++++++ .../avro/specific/TestSpecificLogicalTypes.java | 240 ++++++ .../specific/TestSpecificToFromByteArray.java | 119 +++ .../java/org/apache/avro/util/CaseFinder.java | 2 +- .../java/org/apache/avro/util/TestUtf8.java | 4 +- .../resources/record_with_logical_types.avsc | 45 ++ lang/java/checkstyle.xml | 67 +- lang/java/compiler/pom.xml | 16 + .../avro/compiler/specific/ProtocolTask.java | 14 +- .../compiler/specific/SpecificCompiler.java | 219 ++++- .../javacc/org/apache/avro/compiler/idl/idl.jj | 25 + .../specific/templates/java/classic/enum.vm | 6 +- .../specific/templates/java/classic/fixed.vm | 12 +- .../specific/templates/java/classic/record.vm | 119 ++- .../compiler/src/test/idl/input/mr_events.avdl | 7 +- .../compiler/src/test/idl/input/simple.avdl | 2 + .../compiler/src/test/idl/output/mr_events.avpr | 11 +- .../compiler/src/test/idl/output/simple.avpr | 10 +- .../test/idl/putOnClassPath/OnTheClasspath.avdl | 6 +- .../test/idl/putOnClassPath/nestedtypes.avdl | 4 +- .../avro/compiler/TestSpecificCompiler.java | 202 ----- .../org/apache/avro/compiler/idl/TestIdl.java | 4 +- .../compiler/specific/TestSpecificCompiler.java | 523 ++++++++++++ .../logical_types_with_multiple_fields.avsc | 30 + .../main/java/org/apache/avro/GuavaClasses.java | 8 + .../java/org/apache/avro/ipc/CallFuture.java | 32 +- .../main/java/org/apache/avro/ipc/Callback.java | 6 +- .../org/apache/avro/ipc/DatagramServer.java | 2 +- .../org/apache/avro/ipc/HttpTransceiver.java | 6 +- .../java/org/apache/avro/ipc/NettyServer.java | 20 +- .../org/apache/avro/ipc/NettyTransceiver.java | 158 ++-- .../apache/avro/ipc/NettyTransportCodec.java | 40 +- .../java/org/apache/avro/ipc/RPCContext.java | 60 +- .../java/org/apache/avro/ipc/RPCPlugin.java | 16 +- .../java/org/apache/avro/ipc/Requestor.java | 68 +- .../java/org/apache/avro/ipc/Responder.java | 18 +- .../apache/avro/ipc/SaslSocketTransceiver.java | 8 +- .../main/java/org/apache/avro/ipc/Server.java | 4 +- .../java/org/apache/avro/ipc/SocketServer.java | 4 +- .../org/apache/avro/ipc/SocketTransceiver.java | 2 +- .../java/org/apache/avro/ipc/Transceiver.java | 8 +- .../avro/ipc/generic/GenericResponder.java | 2 +- .../avro/ipc/reflect/ReflectRequestor.java | 18 +- .../avro/ipc/reflect/ReflectResponder.java | 2 +- .../avro/ipc/specific/SpecificRequestor.java | 8 +- .../avro/ipc/specific/SpecificResponder.java | 2 +- .../org/apache/avro/ipc/stats/Histogram.java | 22 +- .../apache/avro/ipc/stats/StaticServlet.java | 4 +- .../org/apache/avro/ipc/stats/StatsPlugin.java | 38 +- .../org/apache/avro/ipc/stats/StatsServer.java | 18 +- .../org/apache/avro/ipc/stats/StatsServlet.java | 94 +-- .../org/apache/avro/DataFileInteropTest.java | 18 +- .../java/org/apache/avro/RPCMetaTestPlugin.java | 82 +- .../test/java/org/apache/avro/RandomData.java | 4 +- .../test/java/org/apache/avro/TestCompare.java | 2 +- .../org/apache/avro/TestDataFileSpecific.java | 2 +- .../org/apache/avro/TestProtocolDatagram.java | 2 +- .../org/apache/avro/TestProtocolGeneric.java | 4 +- .../apache/avro/TestProtocolGenericMeta.java | 4 +- .../java/org/apache/avro/TestProtocolHttp.java | 4 +- .../java/org/apache/avro/TestProtocolHttps.java | 4 +- .../java/org/apache/avro/TestProtocolNetty.java | 4 +- .../org/apache/avro/TestProtocolParsing.java | 34 +- .../org/apache/avro/TestProtocolReflect.java | 2 +- .../apache/avro/TestProtocolReflectMeta.java | 2 +- .../org/apache/avro/TestProtocolSpecific.java | 26 +- .../apache/avro/TestProtocolSpecificMeta.java | 6 +- .../test/java/org/apache/avro/TestSchema.java | 64 +- .../compiler/specific/TestSpecificCompiler.java | 207 ++--- .../org/apache/avro/generic/TestDeepCopy.java | 22 +- .../src/test/java/org/apache/avro/io/Perf.java | 190 ++--- .../apache/avro/ipc/TestLocalTransceiver.java | 2 +- .../org/apache/avro/ipc/TestNettyServer.java | 28 +- .../ipc/TestNettyServerConcurrentExecution.java | 72 +- .../avro/ipc/TestNettyServerWithCallbacks.java | 140 ++-- .../ipc/TestNettyServerWithCompression.java | 2 +- .../apache/avro/ipc/TestNettyServerWithSSL.java | 4 +- .../apache/avro/ipc/TestRpcPluginOrdering.java | 14 +- .../org/apache/avro/ipc/TestSaslAnonymous.java | 4 +- .../org/apache/avro/ipc/TestSaslDigestMd5.java | 4 +- .../apache/avro/ipc/stats/TestHistogram.java | 18 +- .../ipc/stats/TestStatsPluginAndServlet.java | 10 +- .../apache/avro/specific/TestSpecificData.java | 2 +- .../avro/specific/TestSpecificDatumReader.java | 8 +- .../avro/specific/TestSpecificErrorBuilder.java | 14 +- .../specific/TestSpecificRecordBuilder.java | 36 +- lang/java/mapred/pom.xml | 4 +- .../avro/hadoop/file/HadoopCodecFactory.java | 8 +- .../avro/hadoop/file/SortedKeyValueFile.java | 2 +- .../apache/avro/hadoop/io/AvroSequenceFile.java | 2 +- .../avro/mapred/AvroAsTextInputFormat.java | 4 +- .../avro/mapred/AvroAsTextRecordReader.java | 10 +- .../org/apache/avro/mapred/AvroInputFormat.java | 6 +- .../java/org/apache/avro/mapred/AvroJob.java | 6 +- .../apache/avro/mapred/AvroMultipleOutputs.java | 52 +- .../apache/avro/mapred/AvroOutputFormat.java | 22 +- .../apache/avro/mapred/AvroRecordReader.java | 10 +- .../apache/avro/mapred/AvroSerialization.java | 18 +- .../avro/mapred/AvroTextOutputFormat.java | 14 +- .../apache/avro/mapred/AvroUtf8InputFormat.java | 8 +- .../org/apache/avro/mapred/AvroWrapper.java | 4 +- .../org/apache/avro/mapred/HadoopCombiner.java | 2 +- .../org/apache/avro/mapred/HadoopMapper.java | 6 +- .../apache/avro/mapred/HadoopReducerBase.java | 8 +- .../main/java/org/apache/avro/mapred/Pair.java | 10 +- .../apache/avro/mapred/SequenceFileReader.java | 6 +- .../avro/mapred/SequenceFileRecordReader.java | 2 +- .../apache/avro/mapred/tether/TetherData.java | 2 +- .../avro/mapred/tether/TetherInputFormat.java | 2 +- .../apache/avro/mapred/tether/TetherJob.java | 14 +- .../avro/mapred/tether/TetherKeyComparator.java | 2 +- .../mapred/tether/TetherKeySerialization.java | 12 +- .../avro/mapred/tether/TetherMapRunner.java | 6 +- .../avro/mapred/tether/TetherOutputFormat.java | 2 +- .../avro/mapred/tether/TetherPartitioner.java | 2 +- .../avro/mapred/tether/TetherRecordReader.java | 10 +- .../avro/mapred/tether/TetherReducer.java | 2 +- .../avro/mapred/tether/TetheredProcess.java | 4 +- .../avro/mapreduce/AvroKeyRecordWriter.java | 6 +- .../mapreduce/AvroKeyValueRecordWriter.java | 6 +- .../avro/mapreduce/AvroMultipleOutputs.java | 108 +-- .../avro/mapreduce/AvroOutputFormatBase.java | 6 +- .../hadoop/file/TestHadoopCodecFactory.java | 10 +- .../apache/avro/mapred/TestAvroInputFormat.java | 16 +- .../avro/mapred/TestAvroMultipleOutputs.java | 96 +-- .../avro/mapred/TestAvroOutputFormat.java | 52 +- .../avro/mapred/TestAvroTextOutputFormat.java | 10 +- .../apache/avro/mapred/TestAvroTextSort.java | 12 +- .../org/apache/avro/mapred/TestGenericJob.java | 18 +- .../org/apache/avro/mapred/TestReflectJob.java | 18 +- .../avro/mapred/TestSequenceFileReader.java | 26 +- .../org/apache/avro/mapred/TestWeather.java | 20 +- .../org/apache/avro/mapred/TestWordCount.java | 50 +- .../org/apache/avro/mapred/WordCountUtil.java | 8 +- .../apache/avro/mapred/tether/TetherTask.java | 4 +- .../avro/mapred/tether/WordCountTask.java | 6 +- .../avro/mapreduce/TestAvroKeyRecordWriter.java | 18 +- .../mapreduce/TestAvroKeyValueRecordWriter.java | 24 +- .../avro/mapreduce/TestAvroMultipleOutputs.java | 28 +- .../TestAvroMultipleOutputsSyncable.java | 26 +- lang/java/maven-plugin/pom.xml | 2 +- .../org/apache/avro/mojo/AbstractAvroMojo.java | 23 +- .../org/apache/avro/mojo/IDLProtocolMojo.java | 9 +- .../java/org/apache/avro/mojo/ProtocolMojo.java | 9 +- .../java/org/apache/avro/mojo/SchemaMojo.java | 17 +- .../apache/avro/mojo/AbstractAvroMojoTest.java | 2 +- .../apache/avro/mojo/TestIDLProtocolMojo.java | 2 +- .../org/apache/avro/mojo/TestProtocolMojo.java | 2 +- .../org/apache/avro/mojo/TestSchemaMojo.java | 2 +- .../src/test/resources/unit/idl/pom.xml | 6 +- .../src/test/resources/unit/protocol/pom.xml | 6 +- .../src/test/resources/unit/schema/pom.xml | 8 +- lang/java/pom.xml | 80 +- .../org/apache/avro/protobuf/ProtobufData.java | 8 +- .../avro/protobuf/ProtobufDatumReader.java | 4 +- .../avro/protobuf/ProtobufDatumWriter.java | 10 +- .../java/org/apache/avro/protobuf/Test.java | 28 +- .../org/apache/avro/protobuf/TestProtobuf.java | 2 +- lang/java/suppressions.xml | 26 + .../java/org/apache/avro/thrift/ThriftData.java | 2 +- .../apache/avro/thrift/ThriftDatumWriter.java | 6 +- .../java/org/apache/avro/thrift/test/E.java | 2 +- .../java/org/apache/avro/thrift/test/Error.java | 6 +- .../java/org/apache/avro/thrift/test/Foo.java | 28 +- .../org/apache/avro/thrift/test/FooOrBar.java | 4 +- .../org/apache/avro/thrift/test/Nested.java | 6 +- .../java/org/apache/avro/thrift/test/Test.java | 80 +- lang/java/tools/pom.xml | 2 +- .../avro/tool/BinaryFragmentToJsonTool.java | 4 +- .../main/java/org/apache/avro/tool/CatTool.java | 38 +- .../apache/avro/tool/DataFileGetMetaTool.java | 6 +- .../apache/avro/tool/DataFileRepairTool.java | 10 +- .../org/apache/avro/tool/DataFileWriteTool.java | 2 +- .../java/org/apache/avro/tool/FromTextTool.java | 14 +- .../main/java/org/apache/avro/tool/IdlTool.java | 2 +- .../avro/tool/JsonToBinaryFragmentTool.java | 12 +- .../org/apache/avro/tool/RpcReceiveTool.java | 12 +- .../java/org/apache/avro/tool/RpcSendTool.java | 4 +- .../apache/avro/tool/SpecificCompilerTool.java | 39 +- .../java/org/apache/avro/tool/ToTextTool.java | 10 +- .../apache/avro/tool/TrevniMetadataTool.java | 2 +- .../org/apache/avro/tool/TrevniToJsonTool.java | 6 +- .../java/org/apache/avro/tool/TrevniUtil.java | 10 +- .../main/java/org/apache/avro/tool/Util.java | 74 +- .../avro/examples/baseball/Player.java | 79 +- .../avro/examples/baseball/Position.java | 6 +- .../tools/src/test/compiler/output/Player.java | 79 +- .../src/test/compiler/output/Position.java | 6 +- .../java/org/apache/avro/tool/TestCatTool.java | 36 +- .../avro/tool/TestCreateRandomFileTool.java | 8 +- .../org/apache/avro/tool/TestDataFileTools.java | 46 +- .../tool/TestJsonToFromBinaryFragmentTools.java | 12 +- .../avro/tool/TestRpcReceiveAndSendTools.java | 8 +- .../org/apache/avro/tool/TestTextFileTools.java | 10 +- .../org/apache/avro/tool/TestToTrevniTool.java | 2 +- lang/java/trevni/avro/pom.xml | 4 - .../apache/trevni/avro/AvroColumnReader.java | 20 +- .../apache/trevni/avro/AvroColumnWriter.java | 12 +- .../org/apache/trevni/avro/AvroColumnator.java | 14 +- .../trevni/avro/AvroTrevniInputFormat.java | 10 +- .../trevni/avro/AvroTrevniOutputFormat.java | 4 +- .../mapreduce/AvroTrevniKeyInputFormat.java | 10 +- .../mapreduce/AvroTrevniKeyOutputFormat.java | 8 +- .../mapreduce/AvroTrevniKeyRecordReader.java | 4 +- .../AvroTrevniKeyValueInputFormat.java | 8 +- .../AvroTrevniKeyValueOutputFormat.java | 16 +- .../AvroTrevniKeyValueRecordReader.java | 2 +- .../AvroTrevniKeyValueRecordWriter.java | 22 +- .../mapreduce/AvroTrevniRecordReaderBase.java | 16 +- .../mapreduce/AvroTrevniRecordWriterBase.java | 30 +- .../java/org/apache/trevni/avro/RandomData.java | 6 +- .../trevni/avro/TestMetadataFiltering.java | 10 +- .../org/apache/trevni/avro/TestShredder.java | 38 +- .../org/apache/trevni/avro/TestWordCount.java | 32 +- .../org/apache/trevni/avro/WordCountUtil.java | 8 +- .../avro/mapreduce/TestKeyValueWordCount.java | 48 +- .../trevni/avro/mapreduce/TestKeyWordCount.java | 62 +- lang/java/trevni/checkstyle.xml | 59 -- lang/java/trevni/core/pom.xml | 11 +- .../main/java/org/apache/trevni/BZip2Codec.java | 10 +- .../java/org/apache/trevni/BlockDescriptor.java | 4 +- .../org/apache/trevni/ColumnDescriptor.java | 2 +- .../org/apache/trevni/ColumnFileReader.java | 2 +- .../org/apache/trevni/ColumnFileWriter.java | 4 +- .../org/apache/trevni/ColumnOutputBuffer.java | 4 +- .../java/org/apache/trevni/ColumnValues.java | 2 +- .../java/org/apache/trevni/DeflateCodec.java | 6 +- .../java/org/apache/trevni/InputBuffer.java | 6 +- .../main/java/org/apache/trevni/MetaData.java | 2 +- .../java/org/apache/trevni/OutputBuffer.java | 6 +- .../main/java/org/apache/trevni/ValueType.java | 2 +- .../java/org/apache/trevni/TestBZip2Codec.java | 26 +- .../java/org/apache/trevni/TestIOBuffers.java | 44 +- .../java/org/apache/trevni/TestInputBytes.java | 2 +- .../test/java/org/apache/trevni/TestUtil.java | 2 +- lang/js/.gitignore | 2 + lang/js/build.sh | 2 +- lang/perl/.gitignore | 1 + lang/php/.gitignore | 1 + lang/py/.gitignore | 3 + lang/py/build.xml | 12 +- lang/py/ivysettings.xml | 4 +- lang/py3/.gitignore | 6 + lang/py3/avro/datafile.py | 14 +- lang/py3/avro/io.py | 3 +- lang/py3/avro/ipc.py | 20 +- lang/py3/avro/schema.py | 3 +- lang/py3/scripts/avro | 0 lang/ruby/.gitignore | 4 + lang/ruby/build.sh | 1 + lang/ruby/lib/avro/data_file.rb | 19 +- lang/ruby/lib/avro/io.rb | 4 + lang/ruby/lib/avro/schema.rb | 6 +- lang/ruby/test/test_io.rb | 32 + lang/ruby/test/test_schema.rb | 17 + pom.xml | 42 +- share/githooks/commit-msg | 58 ++ share/test/interop/bin/test_rpc_interop.sh | 54 +- share/test/schemas/simple.avpr | 2 +- share/test/schemas/specialtypes.avdl | 8 + 426 files changed, 8803 insertions(+), 4111 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/bafac8d9/.gitignore ---------------------------------------------------------------------- diff --cc .gitignore index 0388781,d5b1b74..6f884ed --- a/.gitignore +++ b/.gitignore @@@ -11,5 -13,3 +13,5 @@@ targe /build test-output /dist +/lang/java/compiler/nbactions.xml - /lang/java/compiler/nb-configuration.xml ++/lang/java/compiler/nb-configuration.xml http://git-wip-us.apache.org/repos/asf/avro/blob/bafac8d9/lang/java/compiler/src/main/javacc/org/apache/avro/compiler/idl/idl.jj ----------------------------------------------------------------------
