cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk bb8283850 -> 5b95ebdaf
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b95ebda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b95ebda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b95ebda
Branch: refs/heads/trunk
Commit: 5b95ebdafdc742d80ae6b2408387c179677f7572
Parents: bb82838
Author: Dave Brosius
Authored: Sun Jan 22 21:36:37 2017 -0500
Committer: Dave Brosius
Committed: Sun Jan 22 21:36:37 2017 -0500
--
src/java/org/apache/cassandra/config/Config.java | 2 +-
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
src/java/org/apache/cassandra/cql3/Maps.java | 2 +-
src/java/org/apache/cassandra/cql3/UserTypes.java | 1 -
.../org/apache/cassandra/cql3/statements/ParsedStatement.java | 2 +-
src/java/org/apache/cassandra/db/Keyspace.java| 1 -
src/java/org/apache/cassandra/db/ReadQuery.java | 2 +-
src/java/org/apache/cassandra/db/RowIndexEntry.java | 5 +
.../org/apache/cassandra/db/commitlog/CommitLogReader.java| 2 +-
src/java/org/apache/cassandra/dht/IPartitioner.java | 2 +-
.../index/sasi/analyzer/StandardTokenizerInterface.java | 2 +-
src/java/org/apache/cassandra/net/BackPressureStrategy.java | 3 ++-
.../org/apache/cassandra/net/RateBasedBackPressureState.java | 7 +++
src/java/org/apache/cassandra/utils/SlidingTimeRate.java | 3 ++-
14 files changed, 16 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b95ebda/src/java/org/apache/cassandra/config/Config.java
--
diff --git a/src/java/org/apache/cassandra/config/Config.java
b/src/java/org/apache/cassandra/config/Config.java
index 6fb999e..ab5a2de 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -96,7 +96,7 @@ public class Config
public volatile long truncate_request_timeout_in_ms = 6L;
/**
- * @deprecated use {@link this#streaming_keep_alive_period_in_secs} instead
+ * @deprecated use {@link #streaming_keep_alive_period_in_secs} instead
*/
@Deprecated
public int streaming_socket_timeout_in_ms = 8640; //24 hours
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b95ebda/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 5aa7065..9f1838f 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -2016,7 +2016,7 @@ public class DatabaseDescriptor
}
/**
- * @deprecated use {@link this#getStreamingKeepAlivePeriod()} instead
+ * @deprecated use {@link #getStreamingKeepAlivePeriod()} instead
* @return streaming_socket_timeout_in_ms property
*/
@Deprecated
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b95ebda/src/java/org/apache/cassandra/cql3/Maps.java
--
diff --git a/src/java/org/apache/cassandra/cql3/Maps.java
b/src/java/org/apache/cassandra/cql3/Maps.java
index 6189285..c98b829 100644
--- a/src/java/org/apache/cassandra/cql3/Maps.java
+++ b/src/java/org/apache/cassandra/cql3/Maps.java
@@ -81,7 +81,7 @@ public abstract class Maps
/**
* Create a String representation of the list containing the
specified elements.
*
- * @param elements the list elements
+ * @param entries the list elements
* @return a String representation of the list
*/
public static String mapToString(List> entries)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b95ebda/src/java/org/apache/cassandra/cql3/UserTypes.java
--
diff --git a/src/java/org/apache/cassandra/cql3/UserTypes.java
b/src/java/org/apache/cassandra/cql3/UserTypes.java
index ae62177..c8ddad0 100644
--- a/src/java/org/apache/cassandra/cql3/UserTypes.java
+++ b/src/java/org/apache/cassandra/cql3/UserTypes.java
@@ -96,7 +96,6 @@ public abstract class UserTypes
* the user type entries.
*
* @param items items associated to the user type entries
- * @param mapper the mapper used to user type the items to the {@code
String} representation of the map entries
* @return a {@code String} representation of the user type
*/
public static String userTypeToString(Map items)
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk f01aedcfb -> 143a7d959
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/143a7d95
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/143a7d95
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/143a7d95
Branch: refs/heads/trunk
Commit: 143a7d9590d12e8ff61cd008d4247312b0165f27
Parents: f01aedc
Author: Dave Brosius
Authored: Sun Aug 7 01:00:16 2016 -0400
Committer: Dave Brosius
Committed: Sun Aug 7 01:00:16 2016 -0400
--
interface/cassandra.thrift| 2 +-
.../org/apache/cassandra/cql3/selection/Selection.java| 2 --
.../apache/cassandra/db/aggregation/GroupingState.java| 3 ++-
.../org/apache/cassandra/db/commitlog/IntervalSet.java| 4 ++--
.../cassandra/db/compaction/CompactionController.java | 2 +-
.../apache/cassandra/db/filter/ClusteringIndexFilter.java | 9 +++--
src/java/org/apache/cassandra/db/filter/ColumnFilter.java | 4 ++--
.../apache/cassandra/db/partitions/PartitionUpdate.java | 4 ++--
.../db/rows/LazilyInitializedUnfilteredRowIterator.java | 2 +-
src/java/org/apache/cassandra/db/rows/Row.java| 10 --
.../cassandra/db/rows/WrappingUnfilteredRowIterator.java | 2 +-
.../org/apache/cassandra/db/view/ViewUpdateGenerator.java | 2 +-
src/java/org/apache/cassandra/index/Index.java| 8
.../org/apache/cassandra/index/SecondaryIndexManager.java | 4 ++--
.../cassandra/service/pager/AggregationQueryPager.java| 4 ++--
.../org/apache/cassandra/utils/concurrent/OpOrder.java| 2 +-
16 files changed, 29 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/143a7d95/interface/cassandra.thrift
--
diff --git a/interface/cassandra.thrift b/interface/cassandra.thrift
index f5041c8..2970cff 100644
--- a/interface/cassandra.thrift
+++ b/interface/cassandra.thrift
@@ -648,7 +648,7 @@ service Cassandra {
throws (1:InvalidRequestException ire,
2:UnavailableException ue, 3:TimedOutException te),
/**
-Perform a get_count in parallel on the given list keys. The return
value maps keys to the count found.
+Perform a get_count in parallel on the given {@code List} keys.
The return value maps keys to the count found.
*/
map multiget_count(1:required list keys,
2:required ColumnParent column_parent,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/143a7d95/src/java/org/apache/cassandra/cql3/selection/Selection.java
--
diff --git a/src/java/org/apache/cassandra/cql3/selection/Selection.java
b/src/java/org/apache/cassandra/cql3/selection/Selection.java
index 20fad4d..2081f8a 100644
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@ -407,8 +407,6 @@ public abstract class Selection
/**
* Builds the ResultSet
- *
- * @param protocolVersion the protocol version
*/
public ResultSet build()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/143a7d95/src/java/org/apache/cassandra/db/aggregation/GroupingState.java
--
diff --git a/src/java/org/apache/cassandra/db/aggregation/GroupingState.java
b/src/java/org/apache/cassandra/db/aggregation/GroupingState.java
index ff529a6..ba5ae28 100644
--- a/src/java/org/apache/cassandra/db/aggregation/GroupingState.java
+++ b/src/java/org/apache/cassandra/db/aggregation/GroupingState.java
@@ -35,7 +35,8 @@ import org.apache.cassandra.utils.ByteBufferUtil;
*
*
* {@code GroupingState} is only used for internal paging. When a new page is
requested by a client the initial state
- * will always be empty.
+ * will always be empty.
+ *
* If the state has a partition key but no clustering, it means that the
previous group ended at the end of the
* previous partition. If the clustering is not null it means that we are in
the middle of a group.
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/143a7d95/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
--
diff --git a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
index bd0ea22..8d3ec82 100644
--- a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
+++ b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
@@ -15,7 +15,7 @@ import org.apache.cassandra.io.util.Da
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk 4754cddfb -> 79c5bc314
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79c5bc31
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79c5bc31
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79c5bc31
Branch: refs/heads/trunk
Commit: 79c5bc314b09e8cbcc353798945f67b409301999
Parents: 4754cdd
Author: Dave Brosius
Authored: Sat Jun 18 21:53:25 2016 -0400
Committer: Dave Brosius
Committed: Sat Jun 18 21:53:25 2016 -0400
--
src/java/org/apache/cassandra/db/filter/RowFilter.java | 2 +-
.../org/apache/cassandra/db/rows/UnfilteredSerializer.java | 6 +++---
src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java | 2 +-
src/java/org/apache/cassandra/db/view/View.java| 3 ---
.../org/apache/cassandra/hadoop/cql3/CqlBulkOutputFormat.java | 4 ++--
src/java/org/apache/cassandra/index/Index.java | 4 ++--
.../org/apache/cassandra/index/IndexNotAvailableException.java | 2 +-
src/java/org/apache/cassandra/index/SecondaryIndexManager.java | 2 +-
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
src/java/org/apache/cassandra/metrics/HintsServiceMetrics.java | 2 +-
src/java/org/apache/cassandra/utils/concurrent/Ref.java| 3 ++-
11 files changed, 15 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c5bc31/src/java/org/apache/cassandra/db/filter/RowFilter.java
--
diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java
b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index e187e3d..6626275 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -1011,7 +1011,7 @@ public abstract class RowFilter implements
Iterable
* registered before sending or receiving any messages containing
expressions of that type.
* Use of custom filtering expressions in a mixed version cluster should
be handled with caution
* as the order in which types are registered is significant: if
continuity of use during upgrades
- * is important, new types should registered last & obsoleted types should
still be registered (
+ * is important, new types should registered last and obsoleted types
should still be registered (
* or dummy implementations registered in their place) to preserve
consistent identifiers across
* the cluster).
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c5bc31/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
index e28528c..890806c 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredSerializer.java
@@ -48,7 +48,7 @@ import org.apache.cassandra.io.util.DataOutputPlus;
* where:
*
* {@code } is the row clustering as serialized by
- * {@link Clustering.serializer} (note that static row are an
+ * {@link org.apache.cassandra.db.Clustering.Serializer} (note that
static row are an
* exception and don't have this).
* {@code } are the sizes of the whole unfiltered on disk and
* of the previous unfiltered. This is only present for sstables and
@@ -60,7 +60,7 @@ import org.apache.cassandra.io.util.DataOutputPlus;
* by the flags and if present, it conists of both the deletion
* timestamp and local deletion time.
* {@code } are the columns present in the row encoded by
- * {@link Columns.serializer#serializeSubset}. It is absent if the
row
+ * {@link
org.apache.cassandra.db.Columns.Serializer#serializeSubset}. It is absent if
the row
* contains all the columns of the {@code SerializationHeader} (which
* is then indicated by a flag).
* {@code } is the data for each of the column present
@@ -80,7 +80,7 @@ import org.apache.cassandra.io.util.DataOutputPlus;
*
*
* {@code } is {@code } where {@code } is
- * the marker bound as serialized by {@link
ClusteringBoundOrBoundary.serializer}
+ * the marker bound as serialized by {@link
org.apache.cassandra.db.ClusteringBoundOrBoundary.Serializer}
* and {@code } is the marker deletion time.
*
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/79c5bc31/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk df5f22843 -> fe7eee006
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe7eee00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe7eee00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe7eee00
Branch: refs/heads/trunk
Commit: fe7eee00661272bb29608e8e2cf5dea6a7511cef
Parents: df5f228
Author: Dave Brosius
Authored: Mon May 2 23:06:04 2016 -0400
Committer: Dave Brosius
Committed: Mon May 2 23:06:04 2016 -0400
--
.../apache/cassandra/auth/jmx/AuthenticationProxy.java | 2 +-
.../org/apache/cassandra/concurrent/ExecutorLocal.java | 2 +-
.../org/apache/cassandra/db/marshal/AbstractType.java | 2 +-
.../org/apache/cassandra/db/rows/RowDiffListener.java | 2 +-
src/java/org/apache/cassandra/db/view/ViewManager.java | 4 ++--
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
.../cassandra/io/sstable/format/SSTableReader.java | 2 +-
.../io/util/RewindableDataInputStreamPlus.java | 12 ++--
.../apache/cassandra/service/StorageServiceMBean.java | 6 +++---
9 files changed, 17 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe7eee00/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java
--
diff --git a/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java
b/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java
index 67c9d8c..1fe6b63 100644
--- a/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java
+++ b/src/java/org/apache/cassandra/auth/jmx/AuthenticationProxy.java
@@ -76,7 +76,7 @@ public final class AuthenticationProxy implements
JMXAuthenticator
*
* @param credentials optionally these credentials may be supplied by the
JMX user.
*Out of the box, the JDK's
{@code}RMIServerImpl{@code} is capable
- *of supplying a two element String[], containing
username & password.
+ *of supplying a two element String[], containing
username and password.
*If present, these credentials will be made available
to configured
*{@code}LoginModule{@code}s via
{@code}JMXCallbackHandler{@code}.
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe7eee00/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java
--
diff --git a/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java
b/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java
index 47826f3..367dc7c 100644
--- a/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java
+++ b/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java
@@ -27,7 +27,7 @@ public interface ExecutorLocal
ExecutorLocal[] all = { Tracing.instance, ClientWarn.instance };
/**
- * This is called when scheduling the task, and also before calling {@link
ExecutorLocal#set(T)} when running on a
+ * This is called when scheduling the task, and also before calling {@link
#set(Object)} when running on a
* executor thread.
*
* @return The thread-local value that we want to copy across executor
boundaries; may be null if not set.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe7eee00/src/java/org/apache/cassandra/db/marshal/AbstractType.java
--
diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractType.java
b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
index 7a67433..fc4ec3b 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
@@ -336,7 +336,7 @@ public abstract class AbstractType implements
Comparator
* Returns an AbstractType instance that is equivalent to this one, but
with all nested UDTs explicitly frozen and
* all collections in UDTs explicitly frozen.
*
- * This is only necessary for 2.x -> 3.x schema migrations, and can be
removed in Cassandra 4.0.
+ * This is only necessary for {@code 2.x -> 3.x} schema migrations, and
can be removed in Cassandra 4.0.
*
* See CASSANDRA-11609
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe7eee00/src/java/org/apache/cassandra/db/rows/RowDiffListener.java
--
diff --git a/src/java/org/apache/cassandra/db/rows/RowDiffListener.java
b/src/java/org/apache/cassandra/db/rows/RowDiffListener.java
index f209bfc..8586a97 100644
--- a/src/java/org/apache/cassandra/db/rows/RowDiffLis
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk bc6ea03d1 -> 6536c05b4
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6536c05b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6536c05b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6536c05b
Branch: refs/heads/trunk
Commit: 6536c05b48b08de9048f68967a5f69d17d56d6fd
Parents: bc6ea03
Author: Dave Brosius
Authored: Mon Dec 28 15:15:15 2015 -0500
Committer: Dave Brosius
Committed: Mon Dec 28 15:15:15 2015 -0500
--
.../org/apache/cassandra/db/partitions/CachedPartition.java| 6 +++---
.../db/rows/LazilyInitializedUnfilteredRowIterator.java| 2 +-
.../org/apache/cassandra/db/rows/RangeTombstoneMarker.java | 3 ++-
src/java/org/apache/cassandra/db/rows/Unfiltered.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 2 +-
.../org/apache/cassandra/io/sstable/format/SSTableReader.java | 1 -
src/java/org/apache/cassandra/io/util/RandomAccessReader.java | 4 ++--
src/java/org/apache/cassandra/repair/Validator.java| 2 +-
src/java/org/apache/cassandra/schema/Indexes.java | 4 ++--
src/java/org/apache/cassandra/service/StorageServiceMBean.java | 2 +-
.../org/apache/cassandra/thrift/CustomTThreadPoolServer.java | 4 ++--
src/java/org/apache/cassandra/utils/ByteBufferUtil.java| 1 -
src/java/org/apache/cassandra/utils/CassandraVersion.java | 6 --
13 files changed, 20 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6536c05b/src/java/org/apache/cassandra/db/partitions/CachedPartition.java
--
diff --git a/src/java/org/apache/cassandra/db/partitions/CachedPartition.java
b/src/java/org/apache/cassandra/db/partitions/CachedPartition.java
index 33e6ecc..0cbaba0 100644
--- a/src/java/org/apache/cassandra/db/partitions/CachedPartition.java
+++ b/src/java/org/apache/cassandra/db/partitions/CachedPartition.java
@@ -45,7 +45,7 @@ public interface CachedPartition extends Partition,
IRowCacheEntry
/**
* The number of rows that were live at the time the partition was cached.
*
- * See {@link ColumnFamilyStore#isFilterFullyCoveredBy} to see why we need
this.
+ * See {@link
org.apache.cassandra.db.ColumnFamilyStore#isFilterFullyCoveredBy} to see why we
need this.
*
* @return the number of rows in this partition that were live at the time
the
* partition was cached (this can be different from the number of live
rows now
@@ -58,7 +58,7 @@ public interface CachedPartition extends Partition,
IRowCacheEntry
* non-deleted cell.
*
* Note that this is generally not a very meaningful number, but this is
used by
- * {@link DataLimits#hasEnoughLiveData} as an optimization.
+ * {@link org.apache.cassandra.db.filter.DataLimits#hasEnoughLiveData} as
an optimization.
*
* @return the number of row that have at least one non-expiring
non-deleted cell.
*/
@@ -86,7 +86,7 @@ public interface CachedPartition extends Partition,
IRowCacheEntry
* The number of cells in this cached partition that are neither tombstone
nor expiring.
*
* Note that this is generally not a very meaningful number, but this is
used by
- * {@link DataLimits#hasEnoughLiveData} as an optimization.
+ * {@link org.apache.cassandra.db.filter.DataLimits#hasEnoughLiveData} as
an optimization.
*
* @return the number of cells that are neither tombstones nor expiring.
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6536c05b/src/java/org/apache/cassandra/db/rows/LazilyInitializedUnfilteredRowIterator.java
--
diff --git
a/src/java/org/apache/cassandra/db/rows/LazilyInitializedUnfilteredRowIterator.java
b/src/java/org/apache/cassandra/db/rows/LazilyInitializedUnfilteredRowIterator.java
index 8ba4394..1bf78dd 100644
---
a/src/java/org/apache/cassandra/db/rows/LazilyInitializedUnfilteredRowIterator.java
+++
b/src/java/org/apache/cassandra/db/rows/LazilyInitializedUnfilteredRowIterator.java
@@ -27,7 +27,7 @@ import org.apache.cassandra.db.*;
*
* This is used during partition range queries when we know the partition key
but want
* to defer the initialization of the rest of the UnfilteredRowIterator until
we need those informations.
- * See {@link BigTableScanner#KeyScanningIterator} for instance.
+ * See {@link
org.apache.cassandra.io.sstable.format.big.BigTableScanner#KeyScanningIterator}
for instance.
*/
public abstract class LazilyInitializedUnfilteredRowIterator extends
AbstractIterator implements UnfilteredRowIterator
{
http://git
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk d06dbbbf7 -> 246f07b68
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/246f07b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/246f07b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/246f07b6
Branch: refs/heads/trunk
Commit: 246f07b6806f48deb371a4a8ec47131c0f0a606d
Parents: d06dbbb
Author: Dave Brosius
Authored: Mon Apr 27 00:28:53 2015 -0400
Committer: Dave Brosius
Committed: Mon Apr 27 00:28:53 2015 -0400
--
src/java/org/apache/cassandra/auth/IRoleManager.java| 2 +-
src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +-
src/java/org/apache/cassandra/config/Schema.java| 2 +-
.../cassandra/cql3/restrictions/MultiColumnRestriction.java | 2 +-
src/java/org/apache/cassandra/db/Directories.java | 4 +++-
.../org/apache/cassandra/io/sstable/format/SSTableReader.java | 5 -
.../cassandra/io/util/UnbufferedDataOutputStreamPlus.java | 3 ++-
.../org/apache/cassandra/metrics/CassandraMetricsRegistry.java | 3 ++-
src/java/org/apache/cassandra/repair/messages/RepairOption.java | 1 +
.../org/apache/cassandra/thrift/CustomTThreadPoolServer.java| 2 +-
src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
.../org/apache/cassandra/transport/messages/AuthResponse.java | 2 +-
12 files changed, 19 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/246f07b6/src/java/org/apache/cassandra/auth/IRoleManager.java
--
diff --git a/src/java/org/apache/cassandra/auth/IRoleManager.java
b/src/java/org/apache/cassandra/auth/IRoleManager.java
index a8befde..5afc7f3 100644
--- a/src/java/org/apache/cassandra/auth/IRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/IRoleManager.java
@@ -27,7 +27,7 @@ import
org.apache.cassandra.exceptions.RequestValidationException;
/**
* Responsible for managing roles (which also includes what
* used to be known as users), including creation, deletion,
- * alteration and the granting & revoking of roles to other
+ * alteration and the granting and revoking of roles to other
* roles.
*/
public interface IRoleManager
http://git-wip-us.apache.org/repos/asf/cassandra/blob/246f07b6/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
--
diff --git a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
index 2ab2316..6803e21 100644
--- a/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
+++ b/src/java/org/apache/cassandra/auth/PasswordAuthenticator.java
@@ -48,7 +48,7 @@ import static
org.apache.cassandra.auth.CassandraRoleManager.consistencyForRole;
* Since 3.0, the management of roles (creation, modification,
* querying etc is the responsibility of IRoleManager. Use of
* PasswordAuthenticator requires the use of CassandraRoleManager
- * for storage & retrieval of encryted passwords.
+ * for storage and retrieval of encrypted passwords.
*/
public class PasswordAuthenticator implements IAuthenticator
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/246f07b6/src/java/org/apache/cassandra/config/Schema.java
--
diff --git a/src/java/org/apache/cassandra/config/Schema.java
b/src/java/org/apache/cassandra/config/Schema.java
index af1b502..5429f07 100644
--- a/src/java/org/apache/cassandra/config/Schema.java
+++ b/src/java/org/apache/cassandra/config/Schema.java
@@ -204,7 +204,7 @@ public class Schema
}
/**
- * Given a keyspace name & column family name, get the column family
+ * Given a keyspace name and column family name, get the column family
* meta data. If the keyspace name or column family name is not valid
* this function returns null.
*
http://git-wip-us.apache.org/repos/asf/cassandra/blob/246f07b6/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
--
diff --git
a/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
b/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
index 3a755f0..6d3ffab 100644
---
a/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
+++
b/src/java/org/apache/cassandra/cql3/restrictions/MultiColumnRestriction.java
@@ -85,7 +85,7 @@ public abstract class MultiColumnRestriction extends
AbstractRestriction
* Returns the names of the columns that are specified within this
Restricti
cassandra git commit: minor javadoc fixes
Repository: cassandra
Updated Branches:
refs/heads/trunk 5d3c2c985 -> 222ea9583
minor javadoc fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/222ea958
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/222ea958
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/222ea958
Branch: refs/heads/trunk
Commit: 222ea958352dc191a3684e23e526c2289c24582d
Parents: 5d3c2c9
Author: Dave Brosius
Authored: Wed Jan 21 21:40:21 2015 -0500
Committer: Dave Brosius
Committed: Wed Jan 21 21:40:21 2015 -0500
--
build.xml| 1 -
src/java/org/apache/cassandra/auth/IAuthorizer.java | 4 ++--
.../org/apache/cassandra/cql3/MultiColumnRelation.java | 4
src/java/org/apache/cassandra/cql3/Tuples.java | 4
.../cassandra/cql3/statements/RequestValidations.java| 6 ++
src/java/org/apache/cassandra/db/AbstractNativeCell.java | 4
src/java/org/apache/cassandra/db/AtomicBTreeColumns.java | 3 ++-
.../cassandra/db/compaction/CompactionManager.java | 6 --
src/java/org/apache/cassandra/gms/IFailureDetector.java | 4 ++--
src/java/org/apache/cassandra/gms/VersionedValue.java| 8 ++--
.../cassandra/hadoop/cql3/CqlBulkRecordWriter.java | 1 +
.../apache/cassandra/hadoop/cql3/CqlRecordReader.java| 8 ++--
src/java/org/apache/cassandra/io/sstable/Component.java | 2 ++
.../cassandra/io/util/FastByteArrayOutputStream.java | 2 +-
.../org/apache/cassandra/locator/CloudstackSnitch.java | 2 ++
.../cassandra/locator/NetworkTopologyStrategy.java | 6 --
.../org/apache/cassandra/locator/PropertyFileSnitch.java | 3 ++-
src/java/org/apache/cassandra/service/StorageProxy.java | 7 +--
src/java/org/apache/cassandra/tools/SSTableExport.java | 1 -
src/java/org/apache/cassandra/tools/SSTableImport.java | 1 -
.../apache/cassandra/tools/SSTableRepairedAtSetter.java | 3 ++-
.../org/apache/cassandra/utils/concurrent/OpOrder.java | 2 ++
src/java/org/apache/cassandra/utils/obs/OpenBitSet.java | 11 ---
23 files changed, 65 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/222ea958/build.xml
--
diff --git a/build.xml b/build.xml
index fccd009..353eefd 100644
--- a/build.xml
+++ b/build.xml
@@ -447,7 +447,6 @@
artifactId="cassandra-parent"
version="${version}"/>
-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/222ea958/src/java/org/apache/cassandra/auth/IAuthorizer.java
--
diff --git a/src/java/org/apache/cassandra/auth/IAuthorizer.java
b/src/java/org/apache/cassandra/auth/IAuthorizer.java
index 7e3240a..0aaebcf 100644
--- a/src/java/org/apache/cassandra/auth/IAuthorizer.java
+++ b/src/java/org/apache/cassandra/auth/IAuthorizer.java
@@ -48,8 +48,8 @@ public interface IAuthorizer
*
* @param performer User who grants the permissions.
* @param permissions Set of permissions to grant.
- * @param to Name of the role to which the permissions are to be granted.
* @param resource Resource on which to grant the permissions.
+ * @param grantee name of the role to which the permissions are to be
granted.
*
* @throws RequestValidationException
* @throws RequestExecutionException
@@ -80,7 +80,7 @@ public interface IAuthorizer
*matching ones.
* @param resource The resource on which permissions are requested. Can be
null, in which case permissions on all
* resources should be returned.
- * @param of The name of the role whose permissions are requested. Can be
null, in which case permissions of every
+ * @param grantee The name of the role whose permissions are requested.
Can be null, in which case permissions of every
* role should be returned.
*
* @return All of the matching permission that the requesting user is
authorized to know about.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/222ea958/src/java/org/apache/cassandra/cql3/MultiColumnRelation.java
--
diff --git a/src/java/org/apache/cassandra/cql3/MultiColumnRelation.java
b/src/java/org/apache/cassandra/cql3/MultiColumnRelation.java
index d754968..7e7a901 100644
--- a/src/java/org/apache/cassandra/cql3/MultiColumnRelation.java
+++ b/src/java/org/apache/cassandra/cql3/MultiColumnRelation.java
@@ -36,10 +36,12 @@ import static
org.apache.cassandra.cql3.statements.RequestValidations.invalidReq
/**
* A relation using the tuple notat
