usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [21/35] git commit: Fixes bug with invalid scan range being build on shard scan
Date Wed, 01 Oct 2014 14:51:57 GMT
Fixes bug with invalid scan range being build on shard scan


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

Branch: refs/heads/two-dot-o-rebuildable-index
Commit: cbea83cd4d38935ae3f5342c97018cb0ea41e2fb
Parents: deef46b
Author: Todd Nine <toddnine@apache.org>
Authored: Mon Sep 29 12:01:38 2014 -0600
Committer: Todd Nine <toddnine@apache.org>
Committed: Mon Sep 29 12:01:38 2014 -0600

----------------------------------------------------------------------
 .../usergrid/mq/cassandra/io/AbstractSearch.java   | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/cbea83cd/stack/core/src/main/java/org/apache/usergrid/mq/cassandra/io/AbstractSearch.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/mq/cassandra/io/AbstractSearch.java
b/stack/core/src/main/java/org/apache/usergrid/mq/cassandra/io/AbstractSearch.java
index 48b7d3d..c3d2800 100644
--- a/stack/core/src/main/java/org/apache/usergrid/mq/cassandra/io/AbstractSearch.java
+++ b/stack/core/src/main/java/org/apache/usergrid/mq/cassandra/io/AbstractSearch.java
@@ -194,26 +194,15 @@ public abstract class AbstractSearch implements QueueSearch
             current_ts_shard = finish_ts_shard;
         }
 
-        while ( ( current_ts_shard >= start_ts_shard ) && ( current_ts_shard <=
finish_ts_shard ) )
-        {
-
-            UUID slice_start = MIN_TIME_UUID;
-            UUID slice_end = MAX_TIME_UUID;
 
-            if ( current_ts_shard == start_ts_shard )
-            {
-                slice_start = start;
-            }
 
-            if ( current_ts_shard == finish_ts_shard )
-            {
-                slice_end = finish_uuid;
-            }
+        while ( ( current_ts_shard >= start_ts_shard ) && ( current_ts_shard <=
finish_ts_shard ) )
+        {
 
             SliceQuery<ByteBuffer, UUID, ByteBuffer> q = createSliceQuery( ko, be,
ue, be );
             q.setColumnFamily( QUEUE_INBOX.getColumnFamily() );
             q.setKey( getQueueShardRowKey( queueId, current_ts_shard ) );
-            q.setRange( slice_start, slice_end, params.reversed, params.limit + 1 );
+            q.setRange( start, finish_uuid, params.reversed, params.limit + 1 );
 
             List<HColumn<UUID, ByteBuffer>> cassResults = q.execute().get().getColumns();
 


Mime
View raw message