Fix (maybe? not yet tested) for n^2 query construction

hoffrocket · agirbal · commit 60d714eeea91 · 2010-12-05T22:08:58.000-08:00
diff --git a/src/main/com/mongodb/util/StringRangeSet.java b/src/main/com/mongodb/util/StringRangeSet.java
@@ -0,0 +1,107 @@
+/**
+ *      Copyright (C) 2010 10gen Inc.
+ *  
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+package com.mongodb.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+public class StringRangeSet implements Set<String> {
+  private final int size;
+  public StringRangeSet(int size){
+    this.size = size;
+  }
+  public int size(){
+      return size;
+  }
+
+  public Iterator<String> iterator(){
+      return new Iterator<String>(){
+        int index = 0;
+        @Override
+        public boolean hasNext() {
+          return index < size;
+        }
+
+        @Override
+        public String next() {
+          return String.valueOf(index++);
+        }
+
+        @Override
+        public void remove() {
+          throw new UnsupportedOperationException();
+        }
+        
+      };
+  }
+  @Override
+  public boolean add(String e) {
+    throw new UnsupportedOperationException();
+  }
+  @Override
+  public boolean addAll(Collection<? extends String> c) {
+    throw new UnsupportedOperationException();
+  }
+  @Override
+  public void clear() {
+    throw new UnsupportedOperationException();
+  }
+  
+  @Override
+  public boolean contains(Object o) {
+    int t = Integer.valueOf(String.valueOf(o));
+    return t >= 0 && t < size;
+  }
+  @Override
+  public boolean containsAll(Collection<?> c) {
+    for (Object o : c) {
+      if (!contains(o)){
+        return false;
+      }
+    }
+    return true;
+  }
+  @Override
+  public boolean isEmpty() {
+    return false;
+  }
+  @Override
+  public boolean remove(Object o) {
+    throw new UnsupportedOperationException();
+  }
+  @Override
+  public boolean removeAll(Collection<?> c) {
+    throw new UnsupportedOperationException();
+  }
+  @Override
+  public boolean retainAll(Collection<?> c) {
+    throw new UnsupportedOperationException();
+  }
+  @Override
+  public Object[] toArray() {
+    String[] array = new String[size()];
+    for (int i = 0; i < size; i++){
+      array[i] = String.valueOf(i+1);
+    }
+    return array;
+  }
+  @Override
+  public <T> T[] toArray(T[] a) {
+    throw new UnsupportedOperationException();
+  }
+  
+}
diff --git a/src/main/org/bson/types/BasicBSONList.java b/src/main/org/bson/types/BasicBSONList.java
@@ -19,9 +19,11 @@
 package org.bson.types;
 
 import com.mongodb.util.OrderedSet;
+import com.mongodb.util.StringRangeSet;
 
 import org.bson.*;
 
+
 import java.util.*;
 
 /** 
@@ -132,10 +134,7 @@ public boolean containsField( String key ){
     }
 
     public Set<String> keySet(){
-        Set<String> s = new OrderedSet<String>();
-        for ( int i=0; i<size(); i++ )
-            s.add( String.valueOf( i ) );
-        return s;
+      return new StringRangeSet(size());
     }
 
     public Map toMap() {
diff --git a/src/test/com/mongodb/util/StringRangeSetTest.java b/src/test/com/mongodb/util/StringRangeSetTest.java
@@ -0,0 +1,35 @@
+/**
+ *      Copyright (C) 2010 10gen Inc.
+ *  
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+
+package com.mongodb.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.testng.annotations.Test;
+
+public class StringRangeSetTest extends com.mongodb.util.TestCase {
+  
+  @org.testng.annotations.Test
+  public void rangeOfSizeProducesCorrectIteration(){
+    StringRangeSet set = new StringRangeSet(3);
+    assertEquals(Arrays.asList("0","1","2"), new ArrayList<String>(set));
+  }
+  
+  public static void main( String args[] ){
+    (new StringRangeSetTest()).runConsole();
+  }
+}
diff --git a/testng.xml b/testng.xml
@@ -4,6 +4,7 @@
 
   <test name="main tests">
     <classes>
+      <class name="com.mongodb.util.StringRangeSetTest"/>
       <class name="com.mongodb.util.SimplePoolTest"/>
       <class name="com.mongodb.util.JSONTest"/>
 
