incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [5/6] git commit: Fixed typos in the Blur.thrift file as well.
Date Mon, 26 Aug 2013 11:28:58 GMT
Fixed typos in the Blur.thrift file as well.


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

Branch: refs/heads/master
Commit: 5d70bfa61746efdaccd3bf8b1190c87b489b56b9
Parents: 1e8bcff
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Aug 26 07:26:48 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Aug 26 07:26:48 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/thrift/generated/Blur.java  | 14 +--
 .../blur/thrift/generated/ColumnDefinition.java |  8 +-
 .../blur/thrift/generated/RowMutation.java      |  8 +-
 .../blur/thrift/generated/TableDescriptor.java  |  8 +-
 .../thrift/util/ExampleSpatialLoaderv2.java     | 96 ++++++++++++++++++++
 .../blur/thrift/util/OverloadSystemv2.java      | 61 +++++++++++++
 .../src/main/scripts/interface/Blur.thrift      | 12 +--
 .../main/scripts/interface/gen-html/Blur.html   | 12 +--
 .../org/apache/blur/thrift/generated/Blur.java  | 14 +--
 .../blur/thrift/generated/ColumnDefinition.java |  8 +-
 .../blur/thrift/generated/RowMutation.java      |  8 +-
 .../blur/thrift/generated/TableDescriptor.java  |  8 +-
 .../src/main/scripts/interface/gen-rb/blur.rb   |  2 +-
 .../main/scripts/interface/gen-rb/blur_types.rb |  6 +-
 14 files changed, 211 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
index 3fc53fc..ba3a3d8 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Blur.java
@@ -128,7 +128,7 @@ public class Blur {
     public Schema schema(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
-     * Parses the given query and return the string represents the query.
+     * Parses the given query and returns the string that represents the query.
      * @return string representation of the parsed query.
      * 
      * @param table the table name.
@@ -202,7 +202,7 @@ public class Blur {
     public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
-     * Mutates a Row given the RowMutation the is provided.
+     * Mutates a Row given the RowMutation that is provided.
      * 
      * @param mutation the RowMutation.
      */
@@ -255,7 +255,7 @@ public class Blur {
      * 
      * @param columnName the column name.
      * 
-     * @param startWith the term to start with assuming that you paging through the term
list.
+     * @param startWith the term to start with assuming that you are paging through the term
list.
      * 
      * @param size the number to fetch at once.
      */
@@ -21569,7 +21569,7 @@ public class Blur {
      */
     public String columnName; // required
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public String startWith; // required
     /**
@@ -21592,7 +21592,7 @@ public class Blur {
        */
       COLUMN_NAME((short)3, "columnName"),
       /**
-       * the term to start with assuming that you paging through the term list.
+       * the term to start with assuming that you are paging through the term list.
        */
       START_WITH((short)4, "startWith"),
       /**
@@ -21826,14 +21826,14 @@ public class Blur {
     }
 
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public String getStartWith() {
       return this.startWith;
     }
 
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public terms_args setStartWith(String startWith) {
       this.startWith = startWith;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
index db89334..2628a9b 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -69,7 +69,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public String family; // required
   /**
@@ -106,7 +106,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
-     * Required. The family the this column existing within.
+     * Required. The family that this column exists within.
      */
     FAMILY((short)1, "family"),
     /**
@@ -300,14 +300,14 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public String getFamily() {
     return this.family;
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public ColumnDefinition setFamily(String family) {
     this.family = family;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
index 17bfadf..9ed33cd 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
@@ -69,7 +69,7 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public String table; // required
   /**
@@ -98,7 +98,7 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
-     * The that that the row mutation is to act upon.
+     * The table that the row mutation is to act upon.
      */
     TABLE((short)1, "table"),
     /**
@@ -283,14 +283,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public String getTable() {
     return this.table;
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public RowMutation setTable(String table) {
     this.table = table;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 33baab0..213ceec 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -106,7 +106,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
    */
   public boolean blockCaching; // required
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public Set<String> blockCachingFileTypes; // required
   /**
@@ -170,7 +170,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
      */
     BLOCK_CACHING((short)10, "blockCaching"),
     /**
-     * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+     * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
      */
     BLOCK_CACHING_FILE_TYPES((short)11, "blockCachingFileTypes"),
     /**
@@ -722,14 +722,14 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   }
 
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public Set<String> getBlockCachingFileTypes() {
     return this.blockCachingFileTypes;
   }
 
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public TableDescriptor setBlockCachingFileTypes(Set<String> blockCachingFileTypes)
{
     this.blockCachingFileTypes = blockCachingFileTypes;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/util/ExampleSpatialLoaderv2.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/ExampleSpatialLoaderv2.java
b/blur-thrift/src/main/java/org/apache/blur/thrift/util/ExampleSpatialLoaderv2.java
new file mode 100644
index 0000000..32dd439
--- /dev/null
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/ExampleSpatialLoaderv2.java
@@ -0,0 +1,96 @@
+package org.apache.blur.thrift.util;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
+import org.apache.blur.thrift.BlurClient;
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
+import org.apache.blur.thrift.generated.Column;
+import org.apache.blur.thrift.generated.Record;
+import org.apache.blur.thrift.generated.RecordMutation;
+import org.apache.blur.thrift.generated.RecordMutationType;
+import org.apache.blur.thrift.generated.RowMutation;
+import org.apache.blur.thrift.generated.RowMutationType;
+
+public class ExampleSpatialLoaderv2 {
+
+  public static void main(String[] args) throws IOException, BlurException, TException {
+    Iface client = BlurClient.getClient(args[0]);
+    String tableName = args[1];
+    BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(
+        "/Users/amccurry/Downloads/zipcode/zipcode.csv")));
+    String line;
+    List<String> header = new ArrayList<String>();
+    List<RowMutation> batch = new ArrayList<RowMutation>();
+    int count = 0;
+    int total = 0;
+    int max = 1000;
+    while ((line = reader.readLine()) != null) {
+      if (count >= max) {
+        System.out.println(total);
+        count = 0;
+      }
+      line = line.trim();
+      if (line.isEmpty()) {
+        continue;
+      }
+      String[] split = line.split("\",\"");
+      if (header.isEmpty()) {
+        for (String s : split) {
+          header.add(trim(s));
+        }
+      } else {
+        Record record = new Record();
+        String zip = trim(split[0]);
+        record.setRecordId(zip);
+        record.setFamily("zip");
+        record.addToColumns(new Column("zip", zip));
+        record.addToColumns(new Column("city", trim(split[1])));
+        record.addToColumns(new Column("state", trim(split[2])));
+        record.addToColumns(new Column("location", trim(split[3]) + "," + trim(split[4])));
+        record.addToColumns(new Column("timezone", trim(split[5])));
+        record.addToColumns(new Column("dst", trim(split[6])));
+
+        RowMutation mutation = new RowMutation();
+        mutation.setTable(tableName);
+        mutation.setRowId(zip);
+        mutation.setRowMutationType(RowMutationType.REPLACE_ROW);
+        List<RecordMutation> recordMutations = new ArrayList<RecordMutation>();
+        RecordMutation recordMutation = new RecordMutation();
+        recordMutation.setRecord(record);
+        recordMutation.setRecordMutationType(RecordMutationType.REPLACE_ENTIRE_RECORD);
+        recordMutations.add(recordMutation);
+        mutation.setRecordMutations(recordMutations);
+
+        // zip=99950
+        // city=Ketchikan
+        // state=AK
+        // latitude=55.875767
+        // longitude=-131.46633
+        // timezone=-9
+        // dst=1
+        batch.add(mutation);
+        count++;
+        total++;
+        if (batch.size() > 100) {
+          client.mutateBatch(batch);
+          batch.clear();
+        }
+      }
+    }
+    if (batch.size() > 0) {
+      client.mutateBatch(batch);
+    }
+  }
+
+  private static String trim(String s) {
+    return s.replace("\"", "");
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/blur-thrift/src/main/java/org/apache/blur/thrift/util/OverloadSystemv2.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/OverloadSystemv2.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/OverloadSystemv2.java
new file mode 100644
index 0000000..e872d95
--- /dev/null
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/OverloadSystemv2.java
@@ -0,0 +1,61 @@
+package org.apache.blur.thrift.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
+import org.apache.blur.thrift.BlurClient;
+import org.apache.blur.thrift.generated.Blur.Iface;
+import org.apache.blur.thrift.generated.BlurException;
+import org.apache.blur.thrift.generated.BlurQuery;
+import org.apache.blur.thrift.generated.BlurResults;
+import org.apache.blur.thrift.generated.Selector;
+import org.apache.blur.thrift.generated.Query;
+
+public class OverloadSystemv2 {
+
+  public static void main(String[] args) throws InterruptedException, ExecutionException
{
+
+    ExecutorService service = Executors.newFixedThreadPool(100);
+    final Iface client = BlurClient.getClient("blur-vm:40010");
+
+    while (true) {
+      List<Future<Void>> futures = new ArrayList<Future<Void>>();
+      for (int i = 0; i < 100; i++) {
+        futures.add(service.submit(new Callable<Void>() {
+          @Override
+          public Void call() throws Exception {
+            BlurQuery blurQuery = new BlurQuery();
+            Query query = new Query();
+            query.setQuery("fam0.col0:*a* fam0.col0:*b* fam0.col0:*d* fam0.col0:*e* fam1.col0:*a*
fam1.col0:*b* fam1.col0:*d* fam1.col0:*e*");
+            blurQuery.setQuery(query);
+            blurQuery.setUseCacheIfPresent(false);
+            blurQuery.setCacheResult(false);
+            blurQuery.setSelector(new Selector());
+            blurQuery.setStart(0);
+            blurQuery.setStart(100);
+            try {
+              BlurResults results = client.query("testtable", blurQuery);
+              System.out.println(results.getTotalResults());
+            } catch (BlurException e) {
+              e.printStackTrace();
+            } catch (TException e) {
+              e.printStackTrace();
+            }
+            return null;
+          }
+        }));
+
+      }
+      for (Future<Void> future : futures) {
+        future.get();
+      }
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index a67285e..d9f401a 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -499,7 +499,7 @@ struct RecordMutation {
  */
 struct RowMutation {
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   1:string table,
   /**
@@ -605,7 +605,7 @@ struct TableStats {
  */
 struct ColumnDefinition {
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   1:string family,
   /**
@@ -687,7 +687,7 @@ struct TableDescriptor {
    */
   10:bool blockCaching = 1,
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   11:set<string> blockCachingFileTypes,
   /**
@@ -822,7 +822,7 @@ service Blur {
   ) throws (1:BlurException ex)
 
   /**
-   * Parses the given query and return the string represents the query.
+   * Parses the given query and returns the string that represents the query.
    * @return string representation of the parsed query.
    */
   string parseQuery(
@@ -895,7 +895,7 @@ service Blur {
   ) throws (1:BlurException ex)
 
   /**
-   * Mutates a Row given the RowMutation the is provided.
+   * Mutates a Row given the RowMutation that is provided.
    */
   void mutate(
     /** the RowMutation.*/
@@ -954,7 +954,7 @@ service Blur {
     2:string columnFamily, 
     /** the column name. */
     3:string columnName,
-    /** the term to start with assuming that you paging through the term list. */
+    /** the term to start with assuming that you are paging through the term list. */
     4:string startWith, 
     /** the number to fetch at once. */
     5:i16 size

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index 28d52f3..bd3edfe 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -372,7 +372,7 @@ with the query options.
 </table><br/>The RowMutation defines how the given Record is to be mutated.
 <br/></div><div class="definition"><h3 id="Struct_RowMutation">Struct:
RowMutation</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default
value</th></thead>
-<tr><td>1</td><td>table</td><td><code>string</code></td><td>The
that that the row mutation is to act upon.
+<tr><td>1</td><td>table</td><td><code>string</code></td><td>The
table that the row mutation is to act upon.
 </td><td>default</td><td></td></tr>
 <tr><td>2</td><td>rowId</td><td><code>string</code></td><td>The
row id that the row mutation is to act upon.
 </td><td>default</td><td></td></tr>
@@ -428,7 +428,7 @@ shards that are complete, etc.
 </table><br/>TableStats holds the statistics for a given table.
 <br/></div><div class="definition"><h3 id="Struct_ColumnDefinition">Struct:
ColumnDefinition</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default
value</th></thead>
-<tr><td>1</td><td>family</td><td><code>string</code></td><td>Required.
The family the this column existing within.
+<tr><td>1</td><td>family</td><td><code>string</code></td><td>Required.
The family that this column exists within.
 </td><td>default</td><td></td></tr>
 <tr><td>2</td><td>columnName</td><td><code>string</code></td><td>Required.
The column name.
 </td><td>default</td><td></td></tr>
@@ -474,7 +474,7 @@ NOTE: This will index the column as a full text field in a default field,
so tha
 </td><td>default</td><td></td></tr>
 <tr><td>10</td><td>blockCaching</td><td><code>bool</code></td><td>Should
block cache be enable or disabled for this table.
 </td><td>default</td><td>1</td></tr>
-<tr><td>11</td><td>blockCachingFileTypes</td><td><code>set&lt;<code>string</code>&gt;</code></td><td>The
files extensions that you would like to allow block cache to to cache.  If null (default)
everything is cached.
+<tr><td>11</td><td>blockCachingFileTypes</td><td><code>set&lt;<code>string</code>&gt;</code></td><td>The
files extensions that you would like to allow block cache to cache.  If null (default) everything
is cached.
 </td><td>default</td><td></td></tr>
 <tr><td>12</td><td>readOnly</td><td><code>bool</code></td><td>If
a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
 updates through MapReduce are allowed and in fact they are only allowed if the table is in
readOnly mode.
@@ -582,7 +582,7 @@ shards servers.  Each of the methods are documented.
 <pre><code>string</code> parseQuery(<code>string</code> table,
                   <code><a href="Blur.html#Struct_Query">Query</a></code>
query)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>Parses the given query and return the string represents the query.
+</pre>Parses the given query and returns the string that represents the query.
 @return string representation of the parsed query.
 <br/><br/><h4 id="Parameters_Blur_parseQuery">Parameters</h4>
 <table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the
table name.
@@ -650,7 +650,7 @@ the shard server, if any.
 </table></div><div class="definition"><h4 id="Fn_Blur_mutate">Function:
Blur.mutate</h4>
 <pre><code>void</code> mutate(<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code>
mutation)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>Mutates a Row given the RowMutation the is provided.
+</pre>Mutates a Row given the RowMutation that is provided.
 <br/><br/><h4 id="Parameters_Blur_mutate">Parameters</h4>
 <table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>mutation</td><td>the
RowMutation.
 </td></tr>
@@ -709,7 +709,7 @@ string and text field types.
 </td></tr>
 <tr><td>columnName</td><td>the column name.
 </td></tr>
-<tr><td>startWith</td><td>the term to start with assuming that you
paging through the term list.
+<tr><td>startWith</td><td>the term to start with assuming that you
are paging through the term list.
 </td></tr>
 <tr><td>size</td><td>the number to fetch at once.
 </td></tr>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
index 3fc53fc..ba3a3d8 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
@@ -128,7 +128,7 @@ public class Blur {
     public Schema schema(String table) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
-     * Parses the given query and return the string represents the query.
+     * Parses the given query and returns the string that represents the query.
      * @return string representation of the parsed query.
      * 
      * @param table the table name.
@@ -202,7 +202,7 @@ public class Blur {
     public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
-     * Mutates a Row given the RowMutation the is provided.
+     * Mutates a Row given the RowMutation that is provided.
      * 
      * @param mutation the RowMutation.
      */
@@ -255,7 +255,7 @@ public class Blur {
      * 
      * @param columnName the column name.
      * 
-     * @param startWith the term to start with assuming that you paging through the term
list.
+     * @param startWith the term to start with assuming that you are paging through the term
list.
      * 
      * @param size the number to fetch at once.
      */
@@ -21569,7 +21569,7 @@ public class Blur {
      */
     public String columnName; // required
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public String startWith; // required
     /**
@@ -21592,7 +21592,7 @@ public class Blur {
        */
       COLUMN_NAME((short)3, "columnName"),
       /**
-       * the term to start with assuming that you paging through the term list.
+       * the term to start with assuming that you are paging through the term list.
        */
       START_WITH((short)4, "startWith"),
       /**
@@ -21826,14 +21826,14 @@ public class Blur {
     }
 
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public String getStartWith() {
       return this.startWith;
     }
 
     /**
-     * the term to start with assuming that you paging through the term list.
+     * the term to start with assuming that you are paging through the term list.
      */
     public terms_args setStartWith(String startWith) {
       this.startWith = startWith;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
index db89334..2628a9b 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -69,7 +69,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public String family; // required
   /**
@@ -106,7 +106,7 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
-     * Required. The family the this column existing within.
+     * Required. The family that this column exists within.
      */
     FAMILY((short)1, "family"),
     /**
@@ -300,14 +300,14 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public String getFamily() {
     return this.family;
   }
 
   /**
-   * Required. The family the this column existing within.
+   * Required. The family that this column exists within.
    */
   public ColumnDefinition setFamily(String family) {
     this.family = family;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
index 17bfadf..9ed33cd 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/RowMutation.java
@@ -69,7 +69,7 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public String table; // required
   /**
@@ -98,7 +98,7 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
-     * The that that the row mutation is to act upon.
+     * The table that the row mutation is to act upon.
      */
     TABLE((short)1, "table"),
     /**
@@ -283,14 +283,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public String getTable() {
     return this.table;
   }
 
   /**
-   * The that that the row mutation is to act upon.
+   * The table that the row mutation is to act upon.
    */
   public RowMutation setTable(String table) {
     this.table = table;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
index 33baab0..213ceec 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -106,7 +106,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
    */
   public boolean blockCaching; // required
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public Set<String> blockCachingFileTypes; // required
   /**
@@ -170,7 +170,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
      */
     BLOCK_CACHING((short)10, "blockCaching"),
     /**
-     * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+     * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
      */
     BLOCK_CACHING_FILE_TYPES((short)11, "blockCachingFileTypes"),
     /**
@@ -722,14 +722,14 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   }
 
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public Set<String> getBlockCachingFileTypes() {
     return this.blockCachingFileTypes;
   }
 
   /**
-   * The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+   * The files extensions that you would like to allow block cache to cache.  If null (default)
everything is cached.
    */
   public TableDescriptor setBlockCachingFileTypes(Set<String> blockCachingFileTypes)
{
     this.blockCachingFileTypes = blockCachingFileTypes;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-rb/blur.rb
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-rb/blur.rb b/distribution/src/main/scripts/interface/gen-rb/blur.rb
index d39b967..a3d9027 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur.rb
@@ -1663,7 +1663,7 @@ module Blur
         COLUMNFAMILY => {:type => ::Thrift::Types::STRING, :name => 'columnFamily'},
         # the column name.
         COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
-        # the term to start with assuming that you paging through the term list.
+        # the term to start with assuming that you are paging through the term list.
         STARTWITH => {:type => ::Thrift::Types::STRING, :name => 'startWith'},
         # the number to fetch at once.
         SIZE => {:type => ::Thrift::Types::I16, :name => 'size'}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/5d70bfa6/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
index 70f1082..63394e2 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
@@ -525,7 +525,7 @@ module Blur
     WAITTOBEVISIBLE = 6
 
     FIELDS = {
-      # The that that the row mutation is to act upon.
+      # The table that the row mutation is to act upon.
       TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
       # The row id that the row mutation is to act upon.
       ROWID => {:type => ::Thrift::Types::STRING, :name => 'rowId'},
@@ -657,7 +657,7 @@ module Blur
     PROPERTIES = 6
 
     FIELDS = {
-      # Required. The family the this column existing within.
+      # Required. The family that this column exists within.
       FAMILY => {:type => ::Thrift::Types::STRING, :name => 'family'},
       # Required. The column name.
       COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
@@ -744,7 +744,7 @@ module Blur
       SIMILARITYCLASS => {:type => ::Thrift::Types::STRING, :name => 'similarityClass'},
       # Should block cache be enable or disabled for this table.
       BLOCKCACHING => {:type => ::Thrift::Types::BOOL, :name => 'blockCaching',
:default => true},
-      # The files extensions that you would like to allow block cache to to cache.  If null
(default) everything is cached.
+      # The files extensions that you would like to allow block cache to cache.  If null
(default) everything is cached.
       BLOCKCACHINGFILETYPES => {:type => ::Thrift::Types::SET, :name => 'blockCachingFileTypes',
:element => {:type => ::Thrift::Types::STRING}},
       # If a table is set to be readonly, that means that mutates through Thrift are NOT
allowed.  However
 # updates through MapReduce are allowed and in fact they are only allowed if the table is
in readOnly mode.


Mime
View raw message