[1/3] cassandra git commit: Fix javadoc in AggregateFcts

2016-04-19 Thread blerer
Repository: cassandra
Updated Branches:
  refs/heads/trunk 391cae615 -> 30bfa07a4


Fix javadoc in AggregateFcts


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60997c2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60997c2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60997c2d

Branch: refs/heads/trunk
Commit: 60997c2dedc23a80dcc15fe6b1e2e7769ad2d383
Parents: 97a43ff
Author: Benjamin Lerer 
Authored: Tue Apr 19 17:46:21 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 19 17:46:21 2016 +0200

--
 .../org/apache/cassandra/cql3/functions/AggregateFcts.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60997c2d/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--
diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java 
b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
index 77be525..cca6156 100644
--- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
@@ -240,7 +240,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for byte values (tinyint).
  */
 public static final AggregateFunction sumFunctionForByte =
 new NativeAggregateFunction("sum", ByteType.instance, 
ByteType.instance)
@@ -276,7 +276,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for byte values (tinyint).
  */
 public static final AggregateFunction avgFunctionForByte =
 new NativeAggregateFunction("avg", ByteType.instance, 
ByteType.instance)
@@ -318,7 +318,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for short values (smallint).
  */
 public static final AggregateFunction sumFunctionForShort =
 new NativeAggregateFunction("sum", ShortType.instance, 
ShortType.instance)
@@ -354,7 +354,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for for short values (smallint).
  */
 public static final AggregateFunction avgFunctionForShort =
 new NativeAggregateFunction("avg", ShortType.instance, 
ShortType.instance)



[1/2] cassandra git commit: Fix javadoc in AggregateFcts

2016-04-19 Thread blerer
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 f85a20f79 -> 0e96d3e52


Fix javadoc in AggregateFcts


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60997c2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60997c2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60997c2d

Branch: refs/heads/cassandra-3.0
Commit: 60997c2dedc23a80dcc15fe6b1e2e7769ad2d383
Parents: 97a43ff
Author: Benjamin Lerer 
Authored: Tue Apr 19 17:46:21 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 19 17:46:21 2016 +0200

--
 .../org/apache/cassandra/cql3/functions/AggregateFcts.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60997c2d/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--
diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java 
b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
index 77be525..cca6156 100644
--- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
@@ -240,7 +240,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for byte values (tinyint).
  */
 public static final AggregateFunction sumFunctionForByte =
 new NativeAggregateFunction("sum", ByteType.instance, 
ByteType.instance)
@@ -276,7 +276,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for byte values (tinyint).
  */
 public static final AggregateFunction avgFunctionForByte =
 new NativeAggregateFunction("avg", ByteType.instance, 
ByteType.instance)
@@ -318,7 +318,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for short values (smallint).
  */
 public static final AggregateFunction sumFunctionForShort =
 new NativeAggregateFunction("sum", ShortType.instance, 
ShortType.instance)
@@ -354,7 +354,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for for short values (smallint).
  */
 public static final AggregateFunction avgFunctionForShort =
 new NativeAggregateFunction("avg", ShortType.instance, 
ShortType.instance)



cassandra git commit: Fix javadoc in AggregateFcts

2016-04-19 Thread blerer
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 97a43 -> 60997c2de


Fix javadoc in AggregateFcts


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/60997c2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60997c2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60997c2d

Branch: refs/heads/cassandra-2.2
Commit: 60997c2dedc23a80dcc15fe6b1e2e7769ad2d383
Parents: 97a43ff
Author: Benjamin Lerer 
Authored: Tue Apr 19 17:46:21 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 19 17:46:21 2016 +0200

--
 .../org/apache/cassandra/cql3/functions/AggregateFcts.java   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/60997c2d/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
--
diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java 
b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
index 77be525..cca6156 100644
--- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
@@ -240,7 +240,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for byte values (tinyint).
  */
 public static final AggregateFunction sumFunctionForByte =
 new NativeAggregateFunction("sum", ByteType.instance, 
ByteType.instance)
@@ -276,7 +276,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for byte values (tinyint).
  */
 public static final AggregateFunction avgFunctionForByte =
 new NativeAggregateFunction("avg", ByteType.instance, 
ByteType.instance)
@@ -318,7 +318,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * The SUM function for int32 values.
+ * The SUM function for short values (smallint).
  */
 public static final AggregateFunction sumFunctionForShort =
 new NativeAggregateFunction("sum", ShortType.instance, 
ShortType.instance)
@@ -354,7 +354,7 @@ public abstract class AggregateFcts
 };
 
 /**
- * AVG function for int32 values.
+ * AVG function for for short values (smallint).
  */
 public static final AggregateFunction avgFunctionForShort =
 new NativeAggregateFunction("avg", ShortType.instance, 
ShortType.instance)