diff --git a/CHANGES.txt b/CHANGES.txt index d627473498..26cee74c6d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997) * Allow only one concurrent call to StatusLogger (CASSANDRA-12182) * Refactoring to specialised functional interfaces (CASSANDRA-13982) * Speculative retry should allow more friendly params (CASSANDRA-13876) diff --git a/build.xml b/build.xml index 35f137520e..1608fbabce 100644 --- a/build.xml +++ b/build.xml @@ -360,7 +360,7 @@ - + @@ -419,7 +419,7 @@ - + diff --git a/lib/airline-0.7.jar b/lib/airline-0.7.jar deleted file mode 100644 index b5a7b01cbe..0000000000 Binary files a/lib/airline-0.7.jar and /dev/null differ diff --git a/lib/airline-0.8.jar b/lib/airline-0.8.jar new file mode 100644 index 0000000000..a34c945b0f Binary files /dev/null and b/lib/airline-0.8.jar differ diff --git a/lib/guava-18.0.jar b/lib/guava-18.0.jar deleted file mode 100644 index 8f89e49018..0000000000 Binary files a/lib/guava-18.0.jar and /dev/null differ diff --git a/lib/guava-23.3-jre.jar b/lib/guava-23.3-jre.jar new file mode 100644 index 0000000000..b13e275fcf Binary files /dev/null and b/lib/guava-23.3-jre.jar differ diff --git a/lib/j2objc-annotations-1.3.jar b/lib/j2objc-annotations-1.3.jar new file mode 100644 index 0000000000..a429c7219d Binary files /dev/null and b/lib/j2objc-annotations-1.3.jar differ diff --git a/lib/licenses/airline-0.6.txt b/lib/licenses/airline-0.8.txt similarity index 100% rename from lib/licenses/airline-0.6.txt rename to lib/licenses/airline-0.8.txt diff --git a/lib/licenses/guava-18.0.txt b/lib/licenses/guava-23.3-jre.txt similarity index 100% rename from lib/licenses/guava-18.0.txt rename to lib/licenses/guava-23.3-jre.txt diff --git a/lib/licenses/j2objc-annotations-1.3.txt b/lib/licenses/j2objc-annotations-1.3.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/lib/licenses/j2objc-annotations-1.3.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java index f8b9eac921..d0654bd3dc 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -100,7 +100,7 @@ public class RepairJob extends AbstractFuture implements Runnable } // When all snapshot complete, send validation requests - validations = Futures.transform(allSnapshotTasks, new AsyncFunction, List>() + validations = Futures.transformAsync(allSnapshotTasks, new AsyncFunction, List>() { public ListenableFuture> apply(List endpoints) { @@ -118,7 +118,7 @@ public class RepairJob extends AbstractFuture implements Runnable } // When all validations complete, submit sync tasks - ListenableFuture> syncResults = Futures.transform(validations, new AsyncFunction, List>() + ListenableFuture> syncResults = Futures.transformAsync(validations, new AsyncFunction, List>() { public ListenableFuture> apply(List trees) { diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java index 9e37ada866..2b67a3c252 100644 --- a/src/java/org/apache/cassandra/repair/RepairRunnable.java +++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java @@ -330,7 +330,7 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti // run anticompaction if necessary and send finish notice back to client final Collection> successfulRanges = new ArrayList<>(); final AtomicBoolean hasFailure = new AtomicBoolean(); - ListenableFuture repairResult = Futures.transform(allSessions, new AsyncFunction, Object>() + ListenableFuture repairResult = Futures.transformAsync(allSessions, new AsyncFunction, Object>() { @SuppressWarnings("unchecked") public ListenableFuture apply(List results) @@ -354,8 +354,8 @@ public class RepairRunnable extends WrappedRunnable implements ProgressEventNoti } return Futures.immediateFuture(null); } - }); - Futures.addCallback(repairResult, new RepairCompleteCallback(parentSession, successfulRanges, startTime, traceState, hasFailure, executor)); + }, MoreExecutors.directExecutor()); + Futures.addCallback(repairResult, new RepairCompleteCallback(parentSession, successfulRanges, startTime, traceState, hasFailure, executor), MoreExecutors.directExecutor()); } /** diff --git a/src/java/org/apache/cassandra/repair/Validator.java b/src/java/org/apache/cassandra/repair/Validator.java index 9000dd9164..9803638e95 100644 --- a/src/java/org/apache/cassandra/repair/Validator.java +++ b/src/java/org/apache/cassandra/repair/Validator.java @@ -18,6 +18,7 @@ package org.apache.cassandra.repair; import java.net.InetAddress; +import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; @@ -219,6 +220,12 @@ public class Validator implements Runnable return underlying.putBytes(bytes, offset, length); } + public Hasher putBytes(ByteBuffer byteBuffer) + { + count += byteBuffer.remaining(); + return underlying.putBytes(byteBuffer); + } + public Hasher putShort(short i) { count += Short.BYTES; diff --git a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java index d0ec7fdd80..ba0025f2f0 100644 --- a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java +++ b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSession.java @@ -33,6 +33,7 @@ import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import org.apache.commons.lang3.time.DurationFormatUtils; import org.slf4j.Logger; @@ -267,7 +268,7 @@ public class CoordinatorSession extends ConsistentSession ListenableFuture prepareResult = prepare(); // run repair sessions normally - ListenableFuture> repairSessionResults = Futures.transform(prepareResult, new AsyncFunction>() + ListenableFuture> repairSessionResults = Futures.transformAsync(prepareResult, new AsyncFunction>() { public ListenableFuture> apply(Boolean success) throws Exception { @@ -287,10 +288,10 @@ public class CoordinatorSession extends ConsistentSession } } - }); + }, MoreExecutors.directExecutor()); // mark propose finalization - ListenableFuture proposeFuture = Futures.transform(repairSessionResults, new AsyncFunction, Boolean>() + ListenableFuture proposeFuture = Futures.transformAsync(repairSessionResults, new AsyncFunction, Boolean>() { public ListenableFuture apply(List results) throws Exception { @@ -309,7 +310,7 @@ public class CoordinatorSession extends ConsistentSession return finalizePropose(); } } - }); + }, MoreExecutors.directExecutor()); // commit repaired data Futures.addCallback(proposeFuture, new FutureCallback() diff --git a/src/java/org/apache/cassandra/repair/consistent/PendingAntiCompaction.java b/src/java/org/apache/cassandra/repair/consistent/PendingAntiCompaction.java index e37fb19f2b..70251f65fe 100644 --- a/src/java/org/apache/cassandra/repair/consistent/PendingAntiCompaction.java +++ b/src/java/org/apache/cassandra/repair/consistent/PendingAntiCompaction.java @@ -31,6 +31,7 @@ import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; +import com.google.common.util.concurrent.MoreExecutors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -194,7 +195,7 @@ public class PendingAntiCompaction tasks.add(task); } ListenableFuture> acquisitionResults = Futures.successfulAsList(tasks); - ListenableFuture compactionResult = Futures.transform(acquisitionResults, new AcquisitionCallback(prsId, ranges)); + ListenableFuture compactionResult = Futures.transformAsync(acquisitionResults, new AcquisitionCallback(prsId, ranges), MoreExecutors.directExecutor()); return compactionResult; } } diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index 62352ad690..ef3ffebb3c 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -261,7 +261,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai failureDetector.unregisterFailureDetectionEventListener(task); gossiper.unregister(task); } - }, MoreExecutors.sameThreadExecutor()); + }, MoreExecutors.directExecutor()); } public synchronized void terminateSessions()