incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [10/14] git commit: Small changes to RPC and the addDocuments method is now implemented.
Date Sun, 04 Nov 2012 02:17:15 GMT
Small changes to RPC and the addDocuments method is now implemented.


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

Branch: refs/heads/0.2-dev
Commit: beb7527a94df30e6d894cbe4157d0b9693e910a7
Parents: 40e6079
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Wed Oct 31 21:18:52 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Wed Oct 31 21:18:52 2012 -0400

----------------------------------------------------------------------
 interface/Blur.thrift                              |   16 +-
 interface/gen-html/Blur.html                       |   23 +-
 interface/gen-html/index.html                      |    3 -
 .../org/apache/blur/thrift/generated/Field.java    |    6 +-
 .../org/apache/blur/thrift/generated/Lucene.java   | 4810 ++++-----------
 .../org/apache/blur/thrift/generated/TYPE.java     |    5 +-
 interface/gen-perl/Blur/Lucene.pm                  |  810 +---
 interface/gen-perl/Blur/Types.pm                   |    3 +-
 interface/gen-rb/blur_types.rb                     |    7 +-
 interface/gen-rb/lucene.rb                         |  233 +-
 .../org/apache/blur/manager/writer/BlurIndex.java  |    5 +-
 .../blur/manager/writer/BlurIndexReader.java       |    7 +
 .../apache/blur/manager/writer/BlurNRTIndex.java   |    8 +-
 .../blur/manager/writer/TransactionRecorder.java   |    9 +
 .../org/apache/blur/thrift/BlurShardServer.java    |   44 +-
 .../main/java/org/apache/blur/utils/BlurUtil.java  |   82 +-
 .../org/apache/blur/thrift/generated/Field.java    |    6 +-
 .../org/apache/blur/thrift/generated/Lucene.java   | 4810 ++++-----------
 .../org/apache/blur/thrift/generated/TYPE.java     |    5 +-
 19 files changed, 2563 insertions(+), 8329 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/beb7527a/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/interface/Blur.thrift b/interface/Blur.thrift
index f023b3c..6dffc8d 100644
--- a/interface/Blur.thrift
+++ b/interface/Blur.thrift
@@ -730,7 +730,7 @@ service Blur {
 }
 
 enum TYPE {
-  STRING, INT, LONG, FLOAT, DOUBLE, BINARY
+  STRING, INT, LONG, FLOAT, DOUBLE, BINARY, TEXT
 }
 
 struct Attribute {
@@ -840,7 +840,7 @@ struct Field {
   1:string name,
   2:binary value,
   3:TYPE type,
-  4:double boost
+  4:double boost = 1.0
 }
 
 struct Document {
@@ -859,14 +859,10 @@ service Lucene extends Blur {
   list<Document> doc(1:Session session, 2:list<DocLocation> docLocations, 4:set<string>
fields) throws (1:BlurException e)
   void closeReadSession(1:Session session) throws (1:BlurException e)
   
-  Session openWriteSession(1:string table) throws (1:BlurException e)
-  void addDocuments(1:Session session, 2:i32 shardIndex, 3:list<Document> document)
throws (1:BlurException e)
-  void deleteDocumentsByQueries(1:Session session, 2:i32 shardIndex, 3:list<QueryArgs>
queries) throws (1:BlurException e)
-  void deleteDocuments(1:Session session, 2:i32 shardIndex, 3:list<Term> terms) throws
(1:BlurException e)
-  void updateDocuments(1:Session session, 2:i32 shardIndex, 3:list<Term> terms, 4:list<Document>
document) throws (1:BlurException e)
-  
-  void commit(1:Session session) throws (1:BlurException e)
-  void rollback(1:Session session) throws (1:BlurException e)
+  void addDocuments(1:string table, 2:i32 shardIndex, 3:list<Document> documents) throws
(1:BlurException e)
+  void deleteDocumentsByQueries(1:string table, 2:i32 shardIndex, 3:list<QueryArgs>
queries) throws (1:BlurException e)
+  void deleteDocuments(1:string table, 2:i32 shardIndex, 3:list<Term> terms) throws
(1:BlurException e)
+  void updateDocuments(1:string table, 2:i32 shardIndex, 3:list<Term> terms, 4:list<Document>
documents) throws (1:BlurException e)
   
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/beb7527a/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/interface/gen-html/Blur.html b/interface/gen-html/Blur.html
index 314359e..5ff955e 100644
--- a/interface/gen-html/Blur.html
+++ b/interface/gen-html/Blur.html
@@ -43,13 +43,10 @@
 <ul>
 <li><a href="Blur.html#Fn_Lucene_addDocuments">addDocuments</a></li>
 <li><a href="Blur.html#Fn_Lucene_closeReadSession">closeReadSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_commit">commit</a></li>
 <li><a href="Blur.html#Fn_Lucene_deleteDocuments">deleteDocuments</a></li>
 <li><a href="Blur.html#Fn_Lucene_deleteDocumentsByQueries">deleteDocumentsByQueries</a></li>
 <li><a href="Blur.html#Fn_Lucene_doc">doc</a></li>
 <li><a href="Blur.html#Fn_Lucene_openReadSession">openReadSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_openWriteSession">openWriteSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_rollback">rollback</a></li>
 <li><a href="Blur.html#Fn_Lucene_search">search</a></li>
 <li><a href="Blur.html#Fn_Lucene_updateDocuments">updateDocuments</a></li>
 </ul>
@@ -154,6 +151,7 @@ APPEND_COLUMN_VALUES - Append the columns in the Record mutation to the
Record t
 <tr><td><code>FLOAT</code></td><td><code>3</code></td></tr>
 <tr><td><code>DOUBLE</code></td><td><code>4</code></td></tr>
 <tr><td><code>BINARY</code></td><td><code>5</code></td></tr>
+<tr><td><code>TEXT</code></td><td><code>6</code></td></tr>
 </table></div>
 <div class="definition"><h3 id="Enum_SortType">Enumeration: SortType</h3>
 <br/><table class="table-bordered table-striped table-condensed">
@@ -505,7 +503,7 @@ updates through MapReduce are allowed and in fact they are only allowed
if the t
 <tr><td>1</td><td>name</td><td><code>string</code></td><td></td><td>default</td><td></td></tr>
 <tr><td>2</td><td>value</td><td><code>binary</code></td><td></td><td>default</td><td></td></tr>
 <tr><td>3</td><td>type</td><td><code><a href="Blur.html#Enum_TYPE">TYPE</a></code></td><td></td><td>default</td><td></td></tr>
-<tr><td>4</td><td>boost</td><td><code>double</code></td><td></td><td>default</td><td></td></tr>
+<tr><td>4</td><td>boost</td><td><code>double</code></td><td></td><td>default</td><td>1</td></tr>
 </table><br/></div><div class="definition"><h3 id="Struct_Document">Struct:
Document</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>fields</td><td><code>list&lt;<code><a
href="Blur.html#Struct_Field">Field</a></code>&gt;</code></td><td></td><td>default</td><td></td></tr>
@@ -651,34 +649,25 @@ updates through MapReduce are allowed and in fact they are only allowed
if the t
 </pre></div><div class="definition"><h4 id="Fn_Lucene_closeReadSession">Function:
Lucene.closeReadSession</h4>
 <pre><code>void</code> closeReadSession(<code><a href="Blur.html#Struct_Session">Session</a></code>
session)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Lucene_openWriteSession">Function:
Lucene.openWriteSession</h4>
-<pre><code><a href="Blur.html#Struct_Session">Session</a></code>
openWriteSession(<code>string</code> table)
-    throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre></div><div class="definition"><h4 id="Fn_Lucene_addDocuments">Function:
Lucene.addDocuments</h4>
-<pre><code>void</code> addDocuments(<code><a href="Blur.html#Struct_Session">Session</a></code>
session,
+<pre><code>void</code> addDocuments(<code>string</code> table,
                   <code>i32</code> shardIndex,
                   <code>list&lt;<code><a href="Blur.html#Struct_Document">Document</a></code>&gt;</code>
document)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre></div><div class="definition"><h4 id="Fn_Lucene_deleteDocumentsByQueries">Function:
Lucene.deleteDocumentsByQueries</h4>
-<pre><code>void</code> deleteDocumentsByQueries(<code><a href="Blur.html#Struct_Session">Session</a></code>
session,
+<pre><code>void</code> deleteDocumentsByQueries(<code>string</code>
table,
                               <code>i32</code> shardIndex,
                               <code>list&lt;<code><a href="Blur.html#Struct_QueryArgs">QueryArgs</a></code>&gt;</code>
queries)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre></div><div class="definition"><h4 id="Fn_Lucene_deleteDocuments">Function:
Lucene.deleteDocuments</h4>
-<pre><code>void</code> deleteDocuments(<code><a href="Blur.html#Struct_Session">Session</a></code>
session,
+<pre><code>void</code> deleteDocuments(<code>string</code>
table,
                      <code>i32</code> shardIndex,
                      <code>list&lt;<code><a href="Blur.html#Struct_Term">Term</a></code>&gt;</code>
terms)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre></div><div class="definition"><h4 id="Fn_Lucene_updateDocuments">Function:
Lucene.updateDocuments</h4>
-<pre><code>void</code> updateDocuments(<code><a href="Blur.html#Struct_Session">Session</a></code>
session,
+<pre><code>void</code> updateDocuments(<code>string</code>
table,
                      <code>i32</code> shardIndex,
                      <code>list&lt;<code><a href="Blur.html#Struct_Term">Term</a></code>&gt;</code>
terms,
                      <code>list&lt;<code><a href="Blur.html#Struct_Document">Document</a></code>&gt;</code>
document)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Lucene_commit">Function:
Lucene.commit</h4>
-<pre><code>void</code> commit(<code><a href="Blur.html#Struct_Session">Session</a></code>
session)
-    throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Lucene_rollback">Function:
Lucene.rollback</h4>
-<pre><code>void</code> rollback(<code><a href="Blur.html#Struct_Session">Session</a></code>
session)
-    throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre></div></div></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/beb7527a/interface/gen-html/index.html
----------------------------------------------------------------------
diff --git a/interface/gen-html/index.html b/interface/gen-html/index.html
index 23ae8e9..109981c 100644
--- a/interface/gen-html/index.html
+++ b/interface/gen-html/index.html
@@ -39,13 +39,10 @@
 <ul>
 <li><a href="Blur.html#Fn_Lucene_addDocuments">addDocuments</a></li>
 <li><a href="Blur.html#Fn_Lucene_closeReadSession">closeReadSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_commit">commit</a></li>
 <li><a href="Blur.html#Fn_Lucene_deleteDocuments">deleteDocuments</a></li>
 <li><a href="Blur.html#Fn_Lucene_deleteDocumentsByQueries">deleteDocumentsByQueries</a></li>
 <li><a href="Blur.html#Fn_Lucene_doc">doc</a></li>
 <li><a href="Blur.html#Fn_Lucene_openReadSession">openReadSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_openWriteSession">openWriteSession</a></li>
-<li><a href="Blur.html#Fn_Lucene_rollback">rollback</a></li>
 <li><a href="Blur.html#Fn_Lucene_search">search</a></li>
 <li><a href="Blur.html#Fn_Lucene_updateDocuments">updateDocuments</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/beb7527a/interface/gen-java/org/apache/blur/thrift/generated/Field.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Field.java b/interface/gen-java/org/apache/blur/thrift/generated/Field.java
index e2a556d..7d51828 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/Field.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/Field.java
@@ -162,6 +162,8 @@ public class Field implements org.apache.thrift.TBase<Field, Field._Fields>,
jav
   }
 
   public Field() {
+    this.boost = 1;
+
   }
 
   public Field(
@@ -205,8 +207,8 @@ public class Field implements org.apache.thrift.TBase<Field, Field._Fields>,
jav
     this.name = null;
     this.value = null;
     this.type = null;
-    setBoostIsSet(false);
-    this.boost = 0.0;
+    this.boost = 1;
+
   }
 
   public String getName() {


Mime
View raw message