Repository: cassandra Updated Branches: refs/heads/trunk 9f1485623 -> 73dcdbdf2
Remove now unused depency on snaptree Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1828b929 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1828b929 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1828b929 Branch: refs/heads/trunk Commit: 1828b929c2ea11b3a39373cf50dcdb17eecf10d0 Parents: 9f14856 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Feb 17 17:23:04 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Feb 17 17:23:04 2014 +0100 ---------------------------------------------------------------------- NOTICE.txt | 4 - build.xml | 1 - lib/licenses/snaptree-0.1.txt | 776 ------------------- lib/snaptree-0.1.jar | Bin 55066 -> 0 bytes .../apache/cassandra/utils/LongBTreeTest.java | 26 +- 5 files changed, 6 insertions(+), 801 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1828b929/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt index b093f8e..03cf45a 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -37,10 +37,6 @@ Streaming compression support provided by ning-compress (https://github.com/ning/compress) Copyright 2009-2010 Ning, Inc. -Alternative map implementation provided by SnapTree -(https://github.com/nbronson/snaptree) -Written by Nathan G. Bronson et al. - CQL Native transport uses Netty (https://netty.io/) Copyright (C) 2011 The Netty Project http://git-wip-us.apache.org/repos/asf/cassandra/blob/1828b929/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 7b7535e..1a8de44 100644 --- a/build.xml +++ b/build.xml @@ -384,7 +384,6 @@ <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" /> <dependency groupId="com.yammer.metrics" artifactId="metrics-core" version="2.2.0" /> <dependency groupId="com.addthis.metrics" artifactId="reporter-config" version="2.1.0" /> - <dependency groupId="edu.stanford.ppl" artifactId="snaptree" version="0.1" /> <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" /> <dependency groupId="io.airlift" artifactId="airline" version="0.6" /> <dependency groupId="io.netty" artifactId="netty" version="3.6.6.Final" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/1828b929/lib/licenses/snaptree-0.1.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/snaptree-0.1.txt b/lib/licenses/snaptree-0.1.txt deleted file mode 100644 index 07324c5..0000000 --- a/lib/licenses/snaptree-0.1.txt +++ /dev/null @@ -1,776 +0,0 @@ - - - -<!DOCTYPE html> -<html> - <head> - <meta charset='utf-8'> - <meta http-equiv="X-UA-Compatible" content="chrome=1"> - <title>doc/LICENSE at master from nbronson/snaptree - GitHub</title> - <link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub" /> - <link rel="fluid-icon" href="https://github.com/fluidicon.png"; title="GitHub" /> - - - - - <meta content="authenticity_token" name="csrf-param" /> -<meta content="kCKdrZvsCWGNIGaBTKBWlG4gYXwI636kkFF5Jfbr//c=" name="csrf-token" /> - - <link href="https://a248.e.akamai.net/assets.github.com/stylesheets/bundles/github-ce4abc8fb736cacb557664dcd8194a5486c74f6b.css"; media="screen" rel="stylesheet" type="text/css" /> - - - <script src="https://a248.e.akamai.net/assets.github.com/javascripts/bundles/jquery-6c2aad85e5c2becfaac6d62ce0f290d10fa1725e.js"; type="text/javascript"></script> - <script src="https://a248.e.akamai.net/assets.github.com/javascripts/bundles/github-724a1478428e953614c0459ba27f5d900fc109be.js"; type="text/javascript"></script> - - - <link rel='permalink' href='/nbronson/snaptree/blob/b198f84b0c927f6b5cdef080552fc26aa004d3ee/doc/LICENSE'> - - - <meta name="description" content="snaptree - Concurrent TreeMap w/ efficient support for clone() and consistent iteration" /> - <link href="https://github.com/nbronson/snaptree/commits/master.atom"; rel="alternate" title="Recent Commits to snaptree:master" type="application/atom+xml" /> - - </head> - - - <body class="logged_out page-blob vis-public env-production "> - - - - - - <div id="header" class="true clearfix"> - <div class="container" class="clearfix"> - <a class="site-logo" href="https://github.com";> - <!--[if IE]> - <img alt="GitHub" class="github-logo" src="https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7.png?1323882717"; /> - <img alt="GitHub" class="github-logo-hover" src="https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7-hover.png?1324325359"; /> - <![endif]--> - <img alt="GitHub" class="github-logo-4x" height="30" src="https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x.png?1323882717"; /> - <img alt="GitHub" class="github-logo-4x-hover" height="30" src="https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x-hover.png?1324325359"; /> - </a> - - <!-- - make sure to use fully qualified URLs here since this nav - is used on error pages on other domains - --> - <ul class="top-nav logged_out"> - <li class="pricing"><a href="https://github.com/plans";>Signup and Pricing</a></li> - <li class="explore"><a href="https://github.com/explore";>Explore GitHub</a></li> - <li class="features"><a href="https://github.com/features";>Features</a></li> - <li class="blog"><a href="https://github.com/blog";>Blog</a></li> - <li class="login"><a href="https://github.com/login?return_to=%2Fnbronson%2Fsnaptree%2Fblob%2Fmaster%2Fdoc%2FLICENSE";>Login</a></li> - </ul> - - - </div> - </div> - - - - <div class="site"> - <div class="container"> - <div class="pagehead repohead instapaper_ignore readability-menu"> - - - <div class="title-actions-bar"> - <h1> - <a href="/nbronson">nbronson</a> / - <strong><a href="/nbronson/snaptree" class="js-current-repository">snaptree</a></strong> - </h1> - - - - - <ul class="pagehead-actions"> - - - <li><a href="/login?return_to=%2Fnbronson%2Fsnaptree" class="minibutton btn-watch watch-button entice tooltipped leftwards" rel="nofollow" title="You must be logged in to use this feature"><span><span class="icon"></span>Watch</span></a></li> - <li><a href="/login?return_to=%2Fnbronson%2Fsnaptree" class="minibutton btn-fork fork-button entice tooltipped leftwards" rel="nofollow" title="You must be logged in to use this feature"><span><span class="icon"></span>Fork</span></a></li> - - - <li class="repostats"> - <ul class="repo-stats"> - <li class="watchers "> - <a href="/nbronson/snaptree/watchers" title="Watchers" class="tooltipped downwards"> - 25 - </a> - </li> - <li class="forks"> - <a href="/nbronson/snaptree/network" title="Forks" class="tooltipped downwards"> - 2 - </a> - </li> - </ul> - </li> - </ul> - - </div> - - - - <ul class="tabs"> - <li><a href="/nbronson/snaptree" class="selected" highlight="repo_sourcerepo_downloadsrepo_commitsrepo_tagsrepo_branches">Code</a></li> - <li><a href="/nbronson/snaptree/network" highlight="repo_networkrepo_fork_queue">Network</a> - <li><a href="/nbronson/snaptree/pulls" highlight="repo_pulls">Pull Requests <span class='counter'>0</span></a></li> - - <li><a href="/nbronson/snaptree/issues" highlight="repo_issues">Issues <span class='counter'>0</span></a></li> - - - <li><a href="/nbronson/snaptree/graphs" highlight="repo_graphsrepo_contributors">Stats & Graphs</a></li> - - </ul> - - -<div class="frame frame-center tree-finder" style="display:none" - data-tree-list-url="/nbronson/snaptree/tree-list/b198f84b0c927f6b5cdef080552fc26aa004d3ee" - data-blob-url-prefix="/nbronson/snaptree/blob/b198f84b0c927f6b5cdef080552fc26aa004d3ee" - > - - <div class="breadcrumb"> - <b><a href="/nbronson/snaptree">snaptree</a></b> / - <input class="tree-finder-input js-navigation-enable" type="text" name="query" autocomplete="off" spellcheck="false"> - </div> - - <div class="octotip"> - <p> - <a href="/nbronson/snaptree/dismiss-tree-finder-help" class="dismiss js-dismiss-tree-list-help" title="Hide this notice forever" rel="nofollow">Dismiss</a> - <strong>Octotip:</strong> You've activated the <em>file finder</em> - by pressing <span class="kbd">t</span> Start typing to filter the - file list. Use <span class="kbd badmono">â</span> and - <span class="kbd badmono">â</span> to navigate, - <span class="kbd">enter</span> to view files. - </p> - </div> - - <table class="tree-browser" cellpadding="0" cellspacing="0"> - <tr class="js-header"><th> </th><th>name</th></tr> - <tr class="js-no-results no-results" style="display: none"> - <th colspan="2">No matching files</th> - </tr> - <tbody class="js-results-list js-navigation-container" data-navigation-enable-mouse> - </tbody> - </table> -</div> - -<div id="jump-to-line" style="display:none"> - <h2>Jump to Line</h2> - <form> - <input class="textfield" type="text"> - <div class="full-button"> - <button type="submit" class="classy"> - <span>Go</span> - </button> - </div> - </form> -</div> - - -<div class="subnav-bar"> - - <ul class="actions"> - - <li class="switcher"> - - <div class="context-menu-container js-menu-container"> - <span class="text">Current branch:</span> - <a href="#" - class="minibutton bigger switcher context-menu-button js-menu-target js-commitish-button btn-branch repo-tree" - data-master-branch="master" - data-ref="master"> - <span><span class="icon"></span>master</span> - </a> - - <div class="context-pane commitish-context js-menu-content"> - <a href="javascript:;" class="close js-menu-close"></a> - <div class="title">Switch Branches/Tags</div> - <div class="body pane-selector commitish-selector js-filterable-commitishes"> - <div class="filterbar"> - <div class="placeholder-field js-placeholder-field"> - <label class="placeholder" for="context-commitish-filter-field" data-placeholder-mode="sticky">Filter branches/tags</label> - <input type="text" id="context-commitish-filter-field" class="commitish-filter" /> - </div> - - <ul class="tabs"> - <li><a href="#" data-filter="branches" class="selected">Branches</a></li> - <li><a href="#" data-filter="tags">Tags</a></li> - </ul> - </div> - - <div class="commitish-item branch-commitish selector-item"> - <h4> - <a href="/nbronson/snaptree/blob/master/doc/LICENSE" data-name="master">master</a> - </h4> - </div> - - - <div class="no-results" style="display:none">Nothing to show</div> - </div> - </div><!-- /.commitish-context-context --> - </div> - - </li> - </ul> - - <ul class="subnav"> - <li><a href="/nbronson/snaptree" class="selected" highlight="repo_source">Files</a></li> - <li><a href="/nbronson/snaptree/commits/master" highlight="repo_commits">Commits</a></li> - <li><a href="/nbronson/snaptree/branches" class="" highlight="repo_branches" rel="nofollow">Branches <span class="counter">1</span></a></li> - <li><a href="/nbronson/snaptree/tags" class="blank" highlight="repo_tags">Tags <span class="counter">0</span></a></li> - <li><a href="/nbronson/snaptree/downloads" class="blank" highlight="repo_downloads">Downloads <span class="counter">0</span></a></li> - </ul> - -</div> - - - - - - - - - </div><!-- /.repohead --> - - - - - - - - <p class="last-commit">Latest commit to the <strong>master</strong> branch</p> - -<div class="commit commit-tease js-details-container"> - <p class="commit-title "> - <a href="/nbronson/snaptree/commit/b198f84b0c927f6b5cdef080552fc26aa004d3ee" class="message">update to new IDEA install</a> - - </p> - <div class="commit-meta"> - <a href="/nbronson/snaptree/commit/b198f84b0c927f6b5cdef080552fc26aa004d3ee" class="sha-block">commit <span class="sha">b198f84b0c</span></a> - - <div class="authorship"> - <img class="gravatar" height="20" src="https://secure.gravatar.com/avatar/9e4674291aec6ad9f6c0a7e219d522c0?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"; width="20" /> - <span class="author-name"><a href="/nbronson">nbronson</a></span> - authored <time class="js-relative-date" datetime="2011-11-16T09:38:04-08:00" title="2011-11-16 09:38:04">November 16, 2011</time> - - </div> - </div> -</div> - - - <div id="slider"> - - <div class="breadcrumb" data-path="doc/LICENSE/"> - <b><a href="/nbronson/snaptree/tree/b198f84b0c927f6b5cdef080552fc26aa004d3ee" class="js-rewrite-sha">snaptree</a></b> / <a href="/nbronson/snaptree/tree/b198f84b0c927f6b5cdef080552fc26aa004d3ee/doc" class="js-rewrite-sha">doc</a> / LICENSE <span style="display:none" id="clippy_4738" class="clippy-text">doc/LICENSE</span> - - <object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" - width="110" - height="14" - class="clippy" - id="clippy" > - <param name="movie" value="https://a248.e.akamai.net/assets.github.com/flash/clippy.swf?1261951368?v5"/> - <param name="allowScriptAccess" value="always" /> - <param name="quality" value="high" /> - <param name="scale" value="noscale" /> - <param NAME="FlashVars" value="id=clippy_4738&copied=copied!&copyto=copy to clipboard"> - <param name="bgcolor" value="#FFFFFF"> - <param name="wmode" value="opaque"> - <embed src="https://a248.e.akamai.net/assets.github.com/flash/clippy.swf?1261951368?v5"; - width="110" - height="14" - name="clippy" - quality="high" - allowScriptAccess="always" - type="application/x-shockwave-flash" - pluginspage="http://www.macromedia.com/go/getflashplayer"; - FlashVars="id=clippy_4738&copied=copied!&copyto=copy to clipboard" - bgcolor="#FFFFFF" - wmode="opaque" - /> - </object> - - - </div> - - <div class="frames"> - <div class="frame frame-center" data-path="doc/LICENSE/" data-permalink-url="/nbronson/snaptree/blob/b198f84b0c927f6b5cdef080552fc26aa004d3ee/doc/LICENSE" data-title="doc/LICENSE at master from nbronson/snaptree - GitHub" data-type="blob"> - <ul class="big-actions"> - <li><a class="file-edit-link minibutton js-rewrite-sha" href="/nbronson/snaptree/edit/b198f84b0c927f6b5cdef080552fc26aa004d3ee/doc/LICENSE" data-method="post" rel="nofollow"><span>Edit this file</span></a></li> - </ul> - - <div id="files"> - <div class="file"> - <div class="meta"> - <div class="info"> - <span class="icon"><img alt="Txt" height="16" src="https://a248.e.akamai.net/assets.github.com/images/icons/txt.png?1252203928"; width="16" /></span> - <span class="mode" title="File Mode">100644</span> - <span>36 lines (27 sloc)</span> - <span>1.715 kb</span> - </div> - <ul class="actions"> - <li><a href="/nbronson/snaptree/raw/master/doc/LICENSE" id="raw-url">raw</a></li> - <li><a href="/nbronson/snaptree/blame/master/doc/LICENSE">blame</a></li> - <li><a href="/nbronson/snaptree/commits/master/doc/LICENSE" rel="nofollow">history</a></li> - </ul> - </div> - <div class="data type-text"> - <table cellpadding="0" cellspacing="0" class="lines"> - <tr> - <td> - <pre class="line_numbers"><span id="L1" rel="#L1">1</span> -<span id="L2" rel="#L2">2</span> -<span id="L3" rel="#L3">3</span> -<span id="L4" rel="#L4">4</span> -<span id="L5" rel="#L5">5</span> -<span id="L6" rel="#L6">6</span> -<span id="L7" rel="#L7">7</span> -<span id="L8" rel="#L8">8</span> -<span id="L9" rel="#L9">9</span> -<span id="L10" rel="#L10">10</span> -<span id="L11" rel="#L11">11</span> -<span id="L12" rel="#L12">12</span> -<span id="L13" rel="#L13">13</span> -<span id="L14" rel="#L14">14</span> -<span id="L15" rel="#L15">15</span> -<span id="L16" rel="#L16">16</span> -<span id="L17" rel="#L17">17</span> -<span id="L18" rel="#L18">18</span> -<span id="L19" rel="#L19">19</span> -<span id="L20" rel="#L20">20</span> -<span id="L21" rel="#L21">21</span> -<span id="L22" rel="#L22">22</span> -<span id="L23" rel="#L23">23</span> -<span id="L24" rel="#L24">24</span> -<span id="L25" rel="#L25">25</span> -<span id="L26" rel="#L26">26</span> -<span id="L27" rel="#L27">27</span> -<span id="L28" rel="#L28">28</span> -<span id="L29" rel="#L29">29</span> -<span id="L30" rel="#L30">30</span> -<span id="L31" rel="#L31">31</span> -<span id="L32" rel="#L32">32</span> -<span id="L33" rel="#L33">33</span> -<span id="L34" rel="#L34">34</span> -<span id="L35" rel="#L35">35</span> -<span id="L36" rel="#L36">36</span> -</pre> - </td> - <td width="100%"> - <div class="highlight"><pre><div class='line' id='LC1'>SNAPTREE LICENSE</div><div class='line' id='LC2'><br/></div><div class='line' id='LC3'>Copyright (c) 2009 Stanford University, unless otherwise specified.</div><div class='line' id='LC4'>All rights reserved.</div><div class='line' id='LC5'><br/></div><div class='line' id='LC6'>This software was developed by the Pervasive Parallelism Laboratory of</div><div class='line' id='LC7'>Stanford University, California, USA.</div><div class='line' id='LC8'><br/></div><div class='line' id='LC9'>Permission to use, copy, modify, and distribute this software in source</div><div class='line' id='LC10'>or binary form for any purpose with or without fee is hereby granted,</div><div class='line' id='LC11'>provided that the following conditions are met:</div><div class='line' id='LC12'><br/></div><div class='line' id='LC13'> 1. Redistributions of source code must retain the above copyright</div><div class='line' id ='LC14'> notice, this list of conditions and the following disclaimer.</div><div class='line' id='LC15'><br/></div><div class='line' id='LC16'> 2. Redistributions in binary form must reproduce the above copyright</div><div class='line' id='LC17'> notice, this list of conditions and the following disclaimer in the</div><div class='line' id='LC18'> documentation and/or other materials provided with the distribution.</div><div class='line' id='LC19'><br/></div><div class='line' id='LC20'> 3. Neither the name of Stanford University nor the names of its</div><div class='line' id='LC21'> contributors may be used to endorse or promote products derived</div><div class='line' id='LC22'> from this software without specific prior written permission.</div><div class='line' id='LC23'><br/>< /div><div class='line' id='LC24'><br/></div><div class='line' id='LC25'>THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND</div><div class='line' id='LC26'>ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE</div><div class='line' id='LC27'>IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE</div><div class='line' id='LC28'>ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE</div><div class='line' id='LC29'>FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL</div><div class='line' id='LC30'>DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR</div><div class='line' id='LC31'>SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER</div><div class='line' id='LC32'>CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT</div><div class='line' id='LC33'>LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WA Y</div><div class='line' id='LC34'>OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF</div><div class='line' id='LC35'>SUCH DAMAGE.</div><div class='line' id='LC36'><br/></div></pre></div> - </td> - </tr> - </table> - </div> - - </div> - </div> - </div> - </div> - - </div> - -<div class="frame frame-loading" style="display:none;" data-tree-list-url="/nbronson/snaptree/tree-list/b198f84b0c927f6b5cdef080552fc26aa004d3ee" data-blob-url-prefix="/nbronson/snaptree/blob/b198f84b0c927f6b5cdef080552fc26aa004d3ee"> - <img src="https://a248.e.akamai.net/assets.github.com/images/modules/ajax/big_spinner_336699.gif?1315937507"; height="32" width="32"> -</div> - - </div> - </div> - - <!-- footer --> - <div id="footer" > - - <div class="upper_footer"> - <div class="container" class="clearfix"> - - <!--[if IE]><h4 id="blacktocat_ie">GitHub Links</h4><![endif]--> - <![if !IE]><h4 id="blacktocat">GitHub Links</h4><![endif]> - - <ul class="footer_nav"> - <h4>GitHub</h4> - <li><a href="https://github.com/about";>About</a></li> - <li><a href="https://github.com/blog";>Blog</a></li> - <li><a href="https://github.com/features";>Features</a></li> - <li><a href="https://github.com/contact";>Contact & Support</a></li> - <li><a href="https://github.com/training";>Training</a></li> - <li><a href="http://enterprise.github.com/";>GitHub Enterprise</a></li> - <li><a href="http://status.github.com/";>Site Status</a></li> - </ul> - - <ul class="footer_nav"> - <h4>Tools</h4> - <li><a href="http://get.gaug.es/";>Gauges: Analyze web traffic</a></li> - <li><a href="http://speakerdeck.com";>Speakerdeck: Presentations</a></li> - <li><a href="https://gist.github.com";>Gist: Code snippets</a></li> - <li><a href="http://mac.github.com/";>GitHub for Mac</a></li> - <li><a href="http://mobile.github.com/";>Issues for iPhone</a></li> - <li><a href="http://jobs.github.com/";>Job Board</a></li> - </ul> - - <ul class="footer_nav"> - <h4>Extras</h4> - <li><a href="http://shop.github.com/";>GitHub Shop</a></li> - <li><a href="http://octodex.github.com/";>The Octodex</a></li> - </ul> - - <ul class="footer_nav"> - <h4>Documentation</h4> - <li><a href="http://help.github.com/";>GitHub Help</a></li> - <li><a href="http://developer.github.com/";>Developer API</a></li> - <li><a href="http://github.github.com/github-flavored-markdown/";>GitHub Flavored Markdown</a></li> - <li><a href="http://pages.github.com/";>GitHub Pages</a></li> - </ul> - - </div><!-- /.site --> - </div><!-- /.upper_footer --> - -<div class="lower_footer"> - <div class="container" class="clearfix"> - <!--[if IE]><div id="legal_ie"><![endif]--> - <![if !IE]><div id="legal"><![endif]> - <ul> - <li><a href="https://github.com/site/terms";>Terms of Service</a></li> - <li><a href="https://github.com/site/privacy";>Privacy</a></li> - <li><a href="https://github.com/security";>Security</a></li> - </ul> - - <p>© 2011 <span id="_rrt" title="0.07115s from fe10.rs.github.com">GitHub</span> Inc. All rights reserved.</p> - </div><!-- /#legal or /#legal_ie--> - - <div class="sponsor"> - <a href="http://www.rackspace.com"; class="logo"> - <img alt="Dedicated Server" height="36" src="https://a248.e.akamai.net/assets.github.com/images/modules/footer/rackspace_logo.png?v2"; width="38" /> - </a> - Powered by the <a href="http://www.rackspace.com ">Dedicated - Servers</a> and<br/> <a href="http://www.rackspacecloud.com";>Cloud - Computing</a> of Rackspace Hosting<span>®</span> - </div> - </div><!-- /.site --> -</div><!-- /.lower_footer --> - - </div><!-- /#footer --> - - - -<div id="keyboard_shortcuts_pane" class="instapaper_ignore readability-extra" style="display:none"> - <h2>Keyboard Shortcuts <small><a href="#" class="js-see-all-keyboard-shortcuts">(see all)</a></small></h2> - - <div class="columns threecols"> - <div class="column first"> - <h3>Site wide shortcuts</h3> - <dl class="keyboard-mappings"> - <dt>s</dt> - <dd>Focus site search</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>?</dt> - <dd>Bring up this help dialog</dd> - </dl> - </div><!-- /.column.first --> - - <div class="column middle" style='display:none'> - <h3>Commit list</h3> - <dl class="keyboard-mappings"> - <dt>j</dt> - <dd>Move selection down</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>k</dt> - <dd>Move selection up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>c <em>or</em> o <em>or</em> enter</dt> - <dd>Open commit</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>y</dt> - <dd>Expand URL to its canonical form</dd> - </dl> - </div><!-- /.column.first --> - - <div class="column last" style='display:none'> - <h3>Pull request list</h3> - <dl class="keyboard-mappings"> - <dt>j</dt> - <dd>Move selection down</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>k</dt> - <dd>Move selection up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>o <em>or</em> enter</dt> - <dd>Open issue</dd> - </dl> - </div><!-- /.columns.last --> - - </div><!-- /.columns.equacols --> - - <div style='display:none'> - <div class="rule"></div> - - <h3>Issues</h3> - - <div class="columns threecols"> - <div class="column first"> - <dl class="keyboard-mappings"> - <dt>j</dt> - <dd>Move selection down</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>k</dt> - <dd>Move selection up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>x</dt> - <dd>Toggle selection</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>o <em>or</em> enter</dt> - <dd>Open issue</dd> - </dl> - </div><!-- /.column.first --> - <div class="column middle"> - <dl class="keyboard-mappings"> - <dt>I</dt> - <dd>Mark selection as read</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>U</dt> - <dd>Mark selection as unread</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>e</dt> - <dd>Close selection</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>y</dt> - <dd>Remove selection from view</dd> - </dl> - </div><!-- /.column.middle --> - <div class="column last"> - <dl class="keyboard-mappings"> - <dt>c</dt> - <dd>Create issue</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>l</dt> - <dd>Create label</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>i</dt> - <dd>Back to inbox</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>u</dt> - <dd>Back to issues</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>/</dt> - <dd>Focus issues search</dd> - </dl> - </div> - </div> - </div> - - <div style='display:none'> - <div class="rule"></div> - - <h3>Issues Dashboard</h3> - - <div class="columns threecols"> - <div class="column first"> - <dl class="keyboard-mappings"> - <dt>j</dt> - <dd>Move selection down</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>k</dt> - <dd>Move selection up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>o <em>or</em> enter</dt> - <dd>Open issue</dd> - </dl> - </div><!-- /.column.first --> - </div> - </div> - - <div style='display:none'> - <div class="rule"></div> - - <h3>Network Graph</h3> - <div class="columns equacols"> - <div class="column first"> - <dl class="keyboard-mappings"> - <dt><span class="badmono">â</span> <em>or</em> h</dt> - <dd>Scroll left</dd> - </dl> - <dl class="keyboard-mappings"> - <dt><span class="badmono">â</span> <em>or</em> l</dt> - <dd>Scroll right</dd> - </dl> - <dl class="keyboard-mappings"> - <dt><span class="badmono">â</span> <em>or</em> k</dt> - <dd>Scroll up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt><span class="badmono">â</span> <em>or</em> j</dt> - <dd>Scroll down</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>t</dt> - <dd>Toggle visibility of head labels</dd> - </dl> - </div><!-- /.column.first --> - <div class="column last"> - <dl class="keyboard-mappings"> - <dt>shift <span class="badmono">â</span> <em>or</em> shift h</dt> - <dd>Scroll all the way left</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>shift <span class="badmono">â</span> <em>or</em> shift l</dt> - <dd>Scroll all the way right</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>shift <span class="badmono">â</span> <em>or</em> shift k</dt> - <dd>Scroll all the way up</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>shift <span class="badmono">â</span> <em>or</em> shift j</dt> - <dd>Scroll all the way down</dd> - </dl> - </div><!-- /.column.last --> - </div> - </div> - - <div > - <div class="rule"></div> - <div class="columns threecols"> - <div class="column first" > - <h3>Source Code Browsing</h3> - <dl class="keyboard-mappings"> - <dt>t</dt> - <dd>Activates the file finder</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>l</dt> - <dd>Jump to line</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>w</dt> - <dd>Switch branch/tag</dd> - </dl> - <dl class="keyboard-mappings"> - <dt>y</dt> - <dd>Expand URL to its canonical form</dd> - </dl> - </div> - </div> - </div> -</div> - - <div id="markdown-help" class="instapaper_ignore readability-extra"> - <h2>Markdown Cheat Sheet</h2> - - <div class="cheatsheet-content"> - - <div class="mod"> - <div class="col"> - <h3>Format Text</h3> - <p>Headers</p> - <pre> -# This is an <h1> tag -## This is an <h2> tag -###### This is an <h6> tag</pre> - <p>Text styles</p> - <pre> -*This text will be italic* -_This will also be italic_ -**This text will be bold** -__This will also be bold__ - -*You **can** combine them* -</pre> - </div> - <div class="col"> - <h3>Lists</h3> - <p>Unordered</p> - <pre> -* Item 1 -* Item 2 - * Item 2a - * Item 2b</pre> - <p>Ordered</p> - <pre> -1. Item 1 -2. Item 2 -3. Item 3 - * Item 3a - * Item 3b</pre> - </div> - <div class="col"> - <h3>Miscellaneous</h3> - <p>Images</p> - <pre> - -Format:  -</pre> - <p>Links</p> - <pre> -http://github.com - automatic! -[GitHub](http://github.com)</pre> -<p>Blockquotes</p> - <pre> -As Kanye West said: - -> We're living the future so -> the present is our past. -</pre> - </div> - </div> - <div class="rule"></div> - - <h3>Code Examples in Markdown</h3> - <div class="col"> - <p>Syntax highlighting with <a href="http://github.github.com/github-flavored-markdown/"; title="GitHub Flavored Markdown" target="_blank">GFM</a></p> - <pre> -```javascript -function fancyAlert(arg) { - if(arg) { - $.facebox({div:'#foo'}) - } -} -```</pre> - </div> - <div class="col"> - <p>Or, indent your code 4 spaces</p> - <pre> -Here is a Python code example -without syntax highlighting: - - def foo: - if not bar: - return true</pre> - </div> - <div class="col"> - <p>Inline code for comments</p> - <pre> -I think you should use an -`<addr>` element here instead.</pre> - </div> - </div> - - </div> -</div> - - - <div class="context-overlay"></div> - - <div class="ajax-error-message"> - <p><span class="icon"></span> Something went wrong with that request. Please try again. <a href="javascript:;" class="ajax-error-dismiss">Dismiss</a></p> - </div> - - - - - </body> -</html> - http://git-wip-us.apache.org/repos/asf/cassandra/blob/1828b929/lib/snaptree-0.1.jar ---------------------------------------------------------------------- diff --git a/lib/snaptree-0.1.jar b/lib/snaptree-0.1.jar deleted file mode 100644 index a5d2c85..0000000 Binary files a/lib/snaptree-0.1.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/1828b929/test/long/org/apache/cassandra/utils/LongBTreeTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/utils/LongBTreeTest.java b/test/long/org/apache/cassandra/utils/LongBTreeTest.java index 8f0b2e0..55126ad 100644 --- a/test/long/org/apache/cassandra/utils/LongBTreeTest.java +++ b/test/long/org/apache/cassandra/utils/LongBTreeTest.java @@ -1,6 +1,4 @@ -package org.apache.cassandra.utils; /* - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -8,28 +6,19 @@ package org.apache.cassandra.utils; * to you 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. - * */ +package org.apache.cassandra.utils; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.NavigableSet; -import java.util.Random; -import java.util.TreeMap; -import java.util.TreeSet; +import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; @@ -46,7 +35,6 @@ import com.yammer.metrics.Metrics; import com.yammer.metrics.core.Timer; import com.yammer.metrics.core.TimerContext; import com.yammer.metrics.stats.Snapshot; -import edu.stanford.ppl.concurrent.SnapTreeMap; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.utils.btree.BTree; import org.apache.cassandra.utils.btree.BTreeSet; @@ -161,12 +149,11 @@ public class LongBTreeTest { ListenableFutureTask<List<ListenableFuture<?>>> f = ListenableFutureTask.create(new Callable<List<ListenableFuture<?>>>() { - @Override public List<ListenableFuture<?>> call() { final List<ListenableFuture<?>> r = new ArrayList<>(); - SnapTreeMap<Integer, Integer> canon = new SnapTreeMap<>(); + NavigableMap<Integer, Integer> canon = new TreeMap<>(); Object[] btree = BTree.empty(); final TreeMap<Integer, Integer> buffer = new TreeMap<>(); final Random rnd = new Random(); @@ -188,7 +175,6 @@ public class LongBTreeTest } TimerContext ctxt; ctxt = TREE_TIMER.time(); - canon = canon.clone(); canon.putAll(buffer); ctxt.stop(); ctxt = BTREE_TIMER.time(); @@ -198,7 +184,7 @@ public class LongBTreeTest if (quickEquality) testEqual("", BTree.<Integer>slice(btree, true), canon.keySet().iterator()); else - r.addAll(testAllSlices("RND", btree, canon.keySet())); + r.addAll(testAllSlices("RND", btree, canon.navigableKeySet())); if (!BTree.isWellFormed(btree)) System.out.println("ERROR: Not well formed");
![https://github.com/fluidicon.png"](https://github.com/fluidicon.png"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7.png?1323882717"](https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7.png?1323882717"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7-hover.png?1324325359"](https://a248.e.akamai.net/assets.github.com/images/modules/header/logov7-hover.png?1324325359"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x.png?1323882717"](https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x.png?1323882717"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x-hover.png?1324325359"](https://a248.e.akamai.net/assets.github.com/images/modules/header/log...@4x-hover.png?1324325359"){kind=link}
![https://secure.gravatar.com/avatar/9e4674291aec6ad9f6c0a7e219d522c0?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"](https://secure.gravatar.com/avatar/9e4674291aec6ad9f6c0a7e219d522c0?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/icons/txt.png?1252203928"](https://a248.e.akamai.net/assets.github.com/images/icons/txt.png?1252203928"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/ajax/big_spinner_336699.gif?1315937507"](https://a248.e.akamai.net/assets.github.com/images/modules/ajax/big_spinner_336699.gif?1315937507"){kind=link}
![https://a248.e.akamai.net/assets.github.com/images/modules/footer/rackspace_logo.png?v2"](https://a248.e.akamai.net/assets.github.com/images/modules/footer/rackspace_logo.png?v2"){kind=link}