spark git commit: [MINOR] Minor update for document

2015-05-05 Thread srowen
Repository: spark
Updated Branches:
  refs/heads/branch-1.4 ff8b44995 -> d28832299


[MINOR] Minor update for document

Two minor doc errors in `BytesToBytesMap` and `UnsafeRow`.

Author: Liang-Chi Hsieh 

Closes #5906 from viirya/minor_doc and squashes the following commits:

27f9089 [Liang-Chi Hsieh] Minor update for doc.

(cherry picked from commit b83091ae4589feea78b056827bc3b7659d271e41)
Signed-off-by: Sean Owen 


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

Branch: refs/heads/branch-1.4
Commit: d28832299a12bc6f30df765294770a4da3bf2e07
Parents: ff8b449
Author: Liang-Chi Hsieh 
Authored: Tue May 5 14:44:02 2015 +0100
Committer: Sean Owen 
Committed: Tue May 5 14:44:10 2015 +0100

--
 .../org/apache/spark/sql/catalyst/expressions/UnsafeRow.java | 2 +-
 .../main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/d2883229/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
--
diff --git 
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
 
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
index 0a358ed..bb546b3 100644
--- 
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
+++ 
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
@@ -145,7 +145,7 @@ public final class UnsafeRow implements MutableRow {
 
   private void assertIndexIsValid(int index) {
 assert index >= 0 : "index (" + index + ") should >= 0";
-assert index < numFields : "index (" + index + ") should <= " + numFields;
+assert index < numFields : "index (" + index + ") should < " + numFields;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/spark/blob/d2883229/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
--
diff --git 
a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java 
b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
index 4e5ebc4..19d6a16 100644
--- a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
+++ b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
@@ -351,9 +351,9 @@ public final class BytesToBytesMap {
  * As an example usage, here's the proper way to store a new key:
  * 
  * 
- *   Location loc = map.lookup(keyBaseOffset, keyBaseObject, 
keyLengthInBytes);
+ *   Location loc = map.lookup(keyBaseObject, keyBaseOffset, 
keyLengthInBytes);
  *   if (!loc.isDefined()) {
- * loc.putNewKey(keyBaseOffset, keyBaseObject, keyLengthInBytes, ...)
+ * loc.putNewKey(keyBaseObject, keyBaseOffset, keyLengthInBytes, ...)
  *   }
  * 
  * 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org



spark git commit: [MINOR] Minor update for document

2015-05-05 Thread srowen
Repository: spark
Updated Branches:
  refs/heads/master d49735800 -> b83091ae4


[MINOR] Minor update for document

Two minor doc errors in `BytesToBytesMap` and `UnsafeRow`.

Author: Liang-Chi Hsieh 

Closes #5906 from viirya/minor_doc and squashes the following commits:

27f9089 [Liang-Chi Hsieh] Minor update for doc.


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

Branch: refs/heads/master
Commit: b83091ae4589feea78b056827bc3b7659d271e41
Parents: d497358
Author: Liang-Chi Hsieh 
Authored: Tue May 5 14:44:02 2015 +0100
Committer: Sean Owen 
Committed: Tue May 5 14:44:02 2015 +0100

--
 .../org/apache/spark/sql/catalyst/expressions/UnsafeRow.java | 2 +-
 .../main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/b83091ae/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
--
diff --git 
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
 
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
index 0a358ed..bb546b3 100644
--- 
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
+++ 
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/UnsafeRow.java
@@ -145,7 +145,7 @@ public final class UnsafeRow implements MutableRow {
 
   private void assertIndexIsValid(int index) {
 assert index >= 0 : "index (" + index + ") should >= 0";
-assert index < numFields : "index (" + index + ") should <= " + numFields;
+assert index < numFields : "index (" + index + ") should < " + numFields;
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/spark/blob/b83091ae/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
--
diff --git 
a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java 
b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
index 4e5ebc4..19d6a16 100644
--- a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
+++ b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
@@ -351,9 +351,9 @@ public final class BytesToBytesMap {
  * As an example usage, here's the proper way to store a new key:
  * 
  * 
- *   Location loc = map.lookup(keyBaseOffset, keyBaseObject, 
keyLengthInBytes);
+ *   Location loc = map.lookup(keyBaseObject, keyBaseOffset, 
keyLengthInBytes);
  *   if (!loc.isDefined()) {
- * loc.putNewKey(keyBaseOffset, keyBaseObject, keyLengthInBytes, ...)
+ * loc.putNewKey(keyBaseObject, keyBaseOffset, keyLengthInBytes, ...)
  *   }
  * 
  * 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org