INFO: A temporary staging dir for output will be used to avoid deletion of output files during 'git reset' Defect: KAFKA-1845 INFO: URL = https://issues.apache.org/jira/rest/api/2/issue/KAFKA-1845, Username = joestein, data = None, headers = {} INFO: Guessed branch as trunk INFO: URL = https://issues.apache.org/jira/browse/KAFKA-1845, Username = joestein, data = None, headers = {} INFO: URL = https://issues.apache.org/jira/secure/attachment/12697336/KAFKA-1845_2015-02-08_17%3A05%3A22.patch, Username = joestein, data = None, headers = {} INFO: Executing gradle 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/bootstrap.txt 2>&1 INFO: Executing ./gradlew clean 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/clean.txt 2>&1 INFO: Executing git checkout trunk Already on 'trunk' Your branch is up-to-date with 'origin/trunk'. INFO: Executing git clean -d -f Removing core/data/ Removing dev-utils/ Removing gradle/wrapper/ Removing system_test/out Removing system_test/replication_testsuite/testcase_1/config/ Removing system_test/replication_testsuite/testcase_1/dashboards/ Removing system_test/replication_testsuite/testcase_1/logs/ Removing system_test/testcase_to_run.json_1422433819 Removing system_test/testcase_to_run.json_1422435774 Removing system_test/testcase_to_run.json_1422467190 Removing system_test/testcase_to_run.json_1422467430 Removing system_test/testcase_to_run.json_1422467441 Removing system_test/testcase_to_run.json_1422467447 Removing system_test/testcase_to_run.json_1422480635 Removing system_test/testcase_to_run.json_1422481438 Removing system_test/testcase_to_run.json_1422974028 INFO: Executing git reset --hard HEAD HEAD is now at f1ba4ff KAFKA-1729; Add constructor to javaapi to allow constructing explicitly versioned offset commit requests; reviewed by Jun Rao INFO: Executing git fetch origin remote: Counting objects: 602, done. remote: Compressing objects: 100% (34/34), done. remote: Total 159 (delta 108), reused 158 (delta 107) Receiving objects: 100% (159/159), 54.65 KiB | 0 bytes/s, done. Resolving deltas: 100% (108/108), completed with 95 local objects. From https://git-wip-us.apache.org/repos/asf/kafka f1ba4ff..1c6d5bb trunk -> origin/trunk INFO: Executing git merge --ff-only origin/trunk Updating f1ba4ff..1c6d5bb Fast-forward README.md | 3 + build.gradle | 6 + checkstyle/checkstyle.xml | 83 +++++ checkstyle/import-control.xml | 100 ++++++ clients/src/main/java/org/apache/kafka/{common/utils => clients}/ClientUtils.java | 11 +- clients/src/main/java/org/apache/kafka/clients/ClusterConnectionStates.java | 9 +- clients/src/main/java/org/apache/kafka/clients/{producer/internals => }/Metadata.java | 2 +- clients/src/main/java/org/apache/kafka/clients/NetworkClient.java | 3 +- clients/src/main/java/org/apache/kafka/clients/consumer/CommitType.java | 12 + clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerConfig.java | 8 +- clients/src/main/java/org/apache/kafka/clients/consumer/ConsumerRecords.java | 40 +-- clients/src/main/java/org/apache/kafka/clients/consumer/KafkaConsumer.java | 43 ++- clients/src/main/java/org/apache/kafka/clients/consumer/internals/Heartbeat.java | 12 + clients/src/main/java/org/apache/kafka/clients/consumer/internals/NoOpConsumerRebalanceCallback.java | 4 +- clients/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java | 16 +- clients/src/main/java/org/apache/kafka/clients/producer/KafkaProducer.java | 25 +- clients/src/main/java/org/apache/kafka/clients/producer/Producer.java | 6 +- clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java | 10 +- clients/src/main/java/org/apache/kafka/clients/producer/internals/BufferPool.java | 8 +- clients/src/main/java/org/apache/kafka/clients/producer/internals/ProduceRequestResult.java | 1 - clients/src/main/java/org/apache/kafka/clients/producer/internals/RecordAccumulator.java | 40 +-- clients/src/main/java/org/apache/kafka/clients/producer/internals/Sender.java | 1 + clients/src/main/java/org/apache/kafka/clients/tools/ProducerPerformance.java | 8 +- clients/src/main/java/org/apache/kafka/common/Cluster.java | 4 +- clients/src/main/java/org/apache/kafka/common/MetricName.java | 4 +- clients/src/main/java/org/apache/kafka/common/PartitionInfo.java | 2 +- clients/src/main/java/org/apache/kafka/common/config/ConfigDef.java | 82 +++-- clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasAfterAppendException.java | 33 +- clients/src/main/java/org/apache/kafka/common/errors/NotEnoughReplicasException.java | 28 +- clients/src/main/java/org/apache/kafka/common/message/KafkaLZ4BlockInputStream.java | 233 ------------- clients/src/main/java/org/apache/kafka/common/message/KafkaLZ4BlockOutputStream.java | 387 ---------------------- clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java | 57 ++-- clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java | 12 +- clients/src/main/java/org/apache/kafka/common/metrics/stats/Rate.java | 2 +- clients/src/main/java/org/apache/kafka/common/network/NetworkReceive.java | 2 +- clients/src/main/java/org/apache/kafka/common/network/Selector.java | 9 +- clients/src/main/java/org/apache/kafka/common/protocol/ApiKeys.java | 12 +- clients/src/main/java/org/apache/kafka/common/protocol/Protocol.java | 590 ++++++++++++++++----------------- clients/src/main/java/org/apache/kafka/common/protocol/types/Struct.java | 2 +- clients/src/main/java/org/apache/kafka/common/record/ByteBufferOutputStream.java | 2 +- clients/src/main/java/org/apache/kafka/common/record/Compressor.java | 29 +- clients/src/main/java/org/apache/kafka/common/record/KafkaLZ4BlockInputStream.java | 234 +++++++++++++ clients/src/main/java/org/apache/kafka/common/record/KafkaLZ4BlockOutputStream.java | 392 ++++++++++++++++++++++ clients/src/main/java/org/apache/kafka/common/record/MemoryRecords.java | 36 +- clients/src/main/java/org/apache/kafka/common/requests/ConsumerMetadataRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/ConsumerMetadataResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/FetchRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/FetchResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/HeartbeatRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/HeartbeatResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/JoinGroupRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/JoinGroupResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/ListOffsetRequest.java | 4 +- clients/src/main/java/org/apache/kafka/common/requests/ListOffsetResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/MetadataRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/MetadataResponse.java | 8 +- clients/src/main/java/org/apache/kafka/common/requests/OffsetCommitRequest.java | 4 +- clients/src/main/java/org/apache/kafka/common/requests/OffsetCommitResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchRequest.java | 4 +- clients/src/main/java/org/apache/kafka/common/requests/OffsetFetchResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/ProduceRequest.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/ProduceResponse.java | 2 +- clients/src/main/java/org/apache/kafka/common/requests/RequestHeader.java | 8 +- clients/src/main/java/org/apache/kafka/common/requests/ResponseHeader.java | 4 +- clients/src/main/java/org/apache/kafka/common/utils/Crc32.java | 2338 +++++++++++++++----------------------------------------------------------------------------------------------------------------- clients/src/main/java/org/apache/kafka/common/utils/Utils.java | 44 +-- clients/src/test/java/org/apache/kafka/{common/utils => clients}/ClientUtilsTest.java | 2 +- clients/src/test/java/org/apache/kafka/clients/MockClient.java | 18 +- clients/src/test/java/org/apache/kafka/clients/NetworkClientTest.java | 17 +- clients/src/test/java/org/apache/kafka/clients/consumer/MockConsumerTest.java | 16 + clients/src/test/java/org/apache/kafka/clients/consumer/internals/SubscriptionStateTest.java | 16 + clients/src/test/java/org/apache/kafka/clients/producer/BufferPoolTest.java | 14 +- clients/src/test/java/org/apache/kafka/clients/producer/MetadataTest.java | 8 +- clients/src/test/java/org/apache/kafka/clients/producer/MockProducerTest.java | 1 + clients/src/test/java/org/apache/kafka/clients/producer/PartitionerTest.java | 2 +- clients/src/test/java/org/apache/kafka/clients/producer/RecordAccumulatorTest.java | 3 +- clients/src/test/java/org/apache/kafka/clients/producer/RecordSendTest.java | 5 +- clients/src/test/java/org/apache/kafka/clients/producer/SenderTest.java | 6 +- clients/src/test/java/org/apache/kafka/common/config/AbstractConfigTest.java | 106 +++--- clients/src/test/java/org/apache/kafka/common/config/ConfigDefTest.java | 5 +- clients/src/test/java/org/apache/kafka/common/metrics/FakeMetricsReporter.java | 32 ++ clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java | 4 +- clients/src/test/java/org/apache/kafka/common/metrics/stats/HistogramTest.java | 1 - clients/src/test/java/org/apache/kafka/common/network/SelectorTest.java | 1 - clients/src/test/java/org/apache/kafka/common/protocol/types/ProtocolSerializationTest.java | 14 +- clients/src/test/java/org/apache/kafka/common/record/MemoryRecordsTest.java | 2 +- clients/src/test/java/org/apache/kafka/common/record/RecordTest.java | 4 +- clients/src/test/java/org/apache/kafka/common/requests/RequestResponseTest.java | 23 +- clients/src/test/java/org/apache/kafka/common/serialization/SerializationTest.java | 4 +- clients/src/test/java/org/apache/kafka/common/utils/CrcTest.java | 8 +- clients/src/test/java/org/apache/kafka/test/Microbenchmarks.java | 1 - clients/src/test/java/org/apache/kafka/test/TestUtils.java | 16 +- core/src/main/scala/kafka/javaapi/consumer/ConsumerRebalanceListener.java | 3 - core/src/main/scala/kafka/message/CompressionFactory.scala | 2 +- core/src/main/scala/kafka/tools/KafkaMigrationTool.java | 12 +- core/src/main/scala/kafka/utils/Crc32.java | 40 +-- examples/src/main/java/kafka/examples/SimpleConsumerDemo.java | 9 +- 97 files changed, 1972 insertions(+), 3468 deletions(-) create mode 100644 checkstyle/checkstyle.xml create mode 100644 checkstyle/import-control.xml rename clients/src/main/java/org/apache/kafka/{common/utils => clients}/ClientUtils.java (86%) rename clients/src/main/java/org/apache/kafka/clients/{producer/internals => }/Metadata.java (99%) delete mode 100644 clients/src/main/java/org/apache/kafka/common/message/KafkaLZ4BlockInputStream.java delete mode 100644 clients/src/main/java/org/apache/kafka/common/message/KafkaLZ4BlockOutputStream.java create mode 100644 clients/src/main/java/org/apache/kafka/common/record/KafkaLZ4BlockInputStream.java create mode 100644 clients/src/main/java/org/apache/kafka/common/record/KafkaLZ4BlockOutputStream.java rename clients/src/test/java/org/apache/kafka/{common/utils => clients}/ClientUtilsTest.java (97%) create mode 100644 clients/src/test/java/org/apache/kafka/common/metrics/FakeMetricsReporter.java INFO: Executing git apply -p1 < /var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/KAFKA-1845.patch 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/apply.txt 2>&1 INFO: Executing grep '^+++.*/test' /var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/KAFKA-1845.patch 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/static-test.txt 2>&1 INFO: Executing gradle 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/bootstrap.txt 2>&1 INFO: Executing ./gradlew jarAll 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/install.txt 2>&1 INFO: Executing ./gradlew checkstyleMain 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/checkstyleMain.txt 2>&1 INFO: Executing ./gradlew checkstyleTest 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/checkstyleTest.txt 2>&1 INFO: Executing ./gradlew testAll 1>/var/folders/tx/rw6z1l3d5sq1lt2qynlwnfmm0000gn/T/tmpveeFir/test_unit.txt 2>&1 SUCCESS: Gradle bootstrap was successful SUCCESS: Clean was successful SUCCESS: Patch applied, but there has been warnings: {code}:233: space before tab in indent. if (trimmed.equalsIgnoreCase("true")) :234: space before tab in indent. return true; :235: space before tab in indent. else if (trimmed.equalsIgnoreCase("false")) :236: space before tab in indent. return false; :237: space before tab in indent. else warning: squelched 1 whitespace error warning: 6 lines add whitespace errors. {code} SUCCESS: Patch add/modify test case SUCCESS: Gradle bootstrap was successful SUCCESS: Patch compiled SUCCESS: Checked style for Main SUCCESS: Checked style for Test SUCCESS: All unit tests passed Removing core/data/ Removing core/src/test/scala/unit/kafka/server/KafkaConfigConfigDefTest.scala Removing gradle/wrapper/ HEAD is now at 1c6d5bb KAFKA-1915: Add checkstyle for java code. INFO: Moving output to patch-process