[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-20 Thread jeffjirsa
Github user jeffjirsa commented on the issue:

https://github.com/apache/cassandra/pull/98
  
Looks like this was committed as 0eebc6e6b7cd7fc801579e57701608e7bf155ee0 - 
please do close the PR when you can (the project is unable to close it for you, 
which is one of the reasons we tend not to use GH PRs). 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread MikkelTAndersen
Github user MikkelTAndersen commented on the issue:

https://github.com/apache/cassandra/pull/98
  
If anything is missing please let me know and I will fix it asap...

Den 13. mar. 2017 3.09 PM skrev "Mikkel Andersen" <
mikkel.t.ander...@gmail.com>:

> Thanks Benjamin - I added a test for list, set and map. its all in this
> patch
>
> On Mon, Mar 13, 2017 at 2:02 PM, Benjamin Lerer 
> wrote:
>
>> You can look into org.apache.cassandra.cql3.vali
>> dation.entities.SecondaryIndexTest for some examples. It is where you
>> test should go.
>>
>> Otherwise just generate a patch using: git format-patch and attach the
>> output to the JIRA ticket. I guess that the problem must be there since 
3.0
>> so the patch should be for this version.
>>
>> —
>> You are receiving this because you were mentioned.
>> Reply to this email directly, view it on GitHub
>> , or 
mute
>> the thread
>> 

>> .
>>
>
>
>
> --
> Venlig Hilsen
> Mikkel T. Andersen
> Skjoldborgvej 8
> 7100 Vejle
> Mobil: +45 40 26 79 26 <40%2026%2079%2026>
>



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread MikkelTAndersen
Github user MikkelTAndersen commented on the issue:

https://github.com/apache/cassandra/pull/98
  
I will see what you have already then : )

On Mon, Mar 13, 2017 at 1:44 PM, Benjamin Lerer 
wrote:

> @MikkelTAndersen  Could you also add
> some unit tests to your patch?
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> , or 
mute
> the thread
> 

> .
>



-- 
Venlig Hilsen
Mikkel T. Andersen
Skjoldborgvej 8
7100 Vejle
Mobil: +45 40 26 79 26



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread blerer
Github user blerer commented on the issue:

https://github.com/apache/cassandra/pull/98
  
@MikkelTAndersen Could you also add some unit tests to your patch?  


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread MikkelTAndersen
Github user MikkelTAndersen commented on the issue:

https://github.com/apache/cassandra/pull/98
  
Ahh sorry - it seems to complicated, its a simple null check - any chance
you can add it Alex ? I have attached the patch.

On Mon, Mar 13, 2017 at 1:38 PM, Alex Petrov 
wrote:

> Hi @MikkelTAndersen . Cassandra does
> not use pull requests for Apache Cassandra. Please use JIRA directly.
>
> You can get more information on the contribution process here
> https://wiki.apache.org/cassandra/HowToContribute
>
> —
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> , or 
mute
> the thread
> 

> .
>



-- 
Venlig Hilsen
Mikkel T. Andersen
Skjoldborgvej 8
7100 Vejle
Mobil: +45 40 26 79 26

From dac39d0268ba82b6be033e0c63ebd653ae0517cc Mon Sep 17 00:00:00 2001
From: Mikkel Andersen 
Date: Mon, 13 Mar 2017 10:21:27 +0100
Subject: [PATCH] added null check - see CASSANDRA-13246

---
 .../org/apache/cassandra/db/filter/RowFilter.java  | 22 
--
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java 
b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index bf65e96..c26c1ad 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -611,17 +611,19 @@ public abstract class RowFilter implements 
Iterable
 if (column.isComplex())
 {
 ComplexColumnData complexData = 
row.getComplexColumnData(column);
-for (Cell cell : complexData)
-{
-if (type.kind == CollectionType.Kind.SET)
-{
-if 
(type.nameComparator().compare(cell.path().get(0), value) == 0)
-return true;
-}
-else
+if (complexData != null) {
+for (Cell cell : complexData)
 {
-if 
(type.valueComparator().compare(cell.value(), value) == 0)
-return true;
+if (type.kind == CollectionType.Kind.SET)
+{
+if 
(type.nameComparator().compare(cell.path().get(0), value) == 0)
+return true;
+}
+else
+{
+if 
(type.valueComparator().compare(cell.value(), value) == 0)
+return true;
+}
 }
 }
 return false;
-- 
2.0.1

From 145087e3b5d748ce25e8792f91c249d2a05de3e5 Mon Sep 17 00:00:00 2001
From: Mikkel Andersen 
Date: Mon, 13 Mar 2017 10:22:53 +0100
Subject: [PATCH] fixed formatting

---
 src/java/org/apache/cassandra/db/filter/RowFilter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/db/filter/RowFilter.java 
b/src/java/org/apache/cassandra/db/filter/RowFilter.java
index c26c1ad..d3fc301 100644
--- a/src/java/org/apache/cassandra/db/filter/RowFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/RowFilter.java
@@ -611,7 +611,8 @@ public abstract class RowFilter implements 
Iterable
 if (column.isComplex())
 {
 ComplexColumnData complexData = 
row.getComplexColumnData(column);
-if (complexData != null) {
+if (complexData != null)
+{
 for (Cell cell : complexData)
 {
 if (type.kind == CollectionType.Kind.SET)
-- 
2.0.1




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact 

[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread ifesdjeen
Github user ifesdjeen commented on the issue:

https://github.com/apache/cassandra/pull/98
  
Hi @MikkelTAndersen. Cassandra does not use pull requests for Apache 
Cassandra. Please use JIRA directly.

You can get more information on the contribution process here 
https://wiki.apache.org/cassandra/HowToContribute


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] cassandra issue #98: Fix cassandra 13246

2017-03-13 Thread MikkelTAndersen
Github user MikkelTAndersen commented on the issue:

https://github.com/apache/cassandra/pull/98
  
This is a simple fix for when you query with CONTAINS and the collection is 
empty (which ends up as null in the database) ... this is a blocking issue for 
my company so would appreciate if it could get into the next release.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---