incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/5] git commit: Removed 2 unsupported types.
Date Wed, 31 Oct 2012 01:14:49 GMT
Removed 2 unsupported types.


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

Branch: refs/heads/0.2-dev
Commit: 7d6b16086bb1c68082390b966ead3efd5f8b6d33
Parents: 022cc57
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Oct 30 21:11:49 2012 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Oct 30 21:11:49 2012 -0400

----------------------------------------------------------------------
 interface/Blur.thrift                              |    2 +-
 interface/gen-html/Blur.html                       |   12 +++----
 .../org/apache/blur/thrift/generated/TYPE.java     |   24 +++++---------
 interface/gen-perl/Blur/Types.pm                   |   12 +++----
 interface/gen-rb/blur_types.rb                     |   16 ++++-----
 .../org/apache/blur/thrift/generated/TYPE.java     |   24 +++++---------
 6 files changed, 36 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/interface/Blur.thrift b/interface/Blur.thrift
index dbf9eff..f023b3c 100644
--- a/interface/Blur.thrift
+++ b/interface/Blur.thrift
@@ -730,7 +730,7 @@ service Blur {
 }
 
 enum TYPE {
-  STRING, BOOL, SHORT, INT, LONG, FLOAT, DOUBLE, BINARY
+  STRING, INT, LONG, FLOAT, DOUBLE, BINARY
 }
 
 struct Attribute {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/interface/gen-html/Blur.html b/interface/gen-html/Blur.html
index 3178b9d..314359e 100644
--- a/interface/gen-html/Blur.html
+++ b/interface/gen-html/Blur.html
@@ -149,13 +149,11 @@ APPEND_COLUMN_VALUES - Append the columns in the Record mutation to
the Record t
 <div class="definition"><h3 id="Enum_TYPE">Enumeration: TYPE</h3>
 <br/><table class="table-bordered table-striped table-condensed">
 <tr><td><code>STRING</code></td><td><code>0</code></td></tr>
-<tr><td><code>BOOL</code></td><td><code>1</code></td></tr>
-<tr><td><code>SHORT</code></td><td><code>2</code></td></tr>
-<tr><td><code>INT</code></td><td><code>3</code></td></tr>
-<tr><td><code>LONG</code></td><td><code>4</code></td></tr>
-<tr><td><code>FLOAT</code></td><td><code>5</code></td></tr>
-<tr><td><code>DOUBLE</code></td><td><code>6</code></td></tr>
-<tr><td><code>BINARY</code></td><td><code>7</code></td></tr>
+<tr><td><code>INT</code></td><td><code>1</code></td></tr>
+<tr><td><code>LONG</code></td><td><code>2</code></td></tr>
+<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>
 </table></div>
 <div class="definition"><h3 id="Enum_SortType">Enumeration: SortType</h3>
 <br/><table class="table-bordered table-striped table-condensed">

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/interface/gen-java/org/apache/blur/thrift/generated/TYPE.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/TYPE.java b/interface/gen-java/org/apache/blur/thrift/generated/TYPE.java
index a35a804..d3f4818 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/TYPE.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/TYPE.java
@@ -32,13 +32,11 @@ import org.apache.thrift.TEnum;
 
 public enum TYPE implements org.apache.thrift.TEnum {
   STRING(0),
-  BOOL(1),
-  SHORT(2),
-  INT(3),
-  LONG(4),
-  FLOAT(5),
-  DOUBLE(6),
-  BINARY(7);
+  INT(1),
+  LONG(2),
+  FLOAT(3),
+  DOUBLE(4),
+  BINARY(5);
 
   private final int value;
 
@@ -62,18 +60,14 @@ public enum TYPE implements org.apache.thrift.TEnum {
       case 0:
         return STRING;
       case 1:
-        return BOOL;
-      case 2:
-        return SHORT;
-      case 3:
         return INT;
-      case 4:
+      case 2:
         return LONG;
-      case 5:
+      case 3:
         return FLOAT;
-      case 6:
+      case 4:
         return DOUBLE;
-      case 7:
+      case 5:
         return BINARY;
       default:
         return null;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/Types.pm b/interface/gen-perl/Blur/Types.pm
index 4e695d3..30f8f08 100644
--- a/interface/gen-perl/Blur/Types.pm
+++ b/interface/gen-perl/Blur/Types.pm
@@ -28,13 +28,11 @@ use constant REPLACE_COLUMNS => 2;
 use constant APPEND_COLUMN_VALUES => 3;
 package Blur::TYPE;
 use constant STRING => 0;
-use constant BOOL => 1;
-use constant SHORT => 2;
-use constant INT => 3;
-use constant LONG => 4;
-use constant FLOAT => 5;
-use constant DOUBLE => 6;
-use constant BINARY => 7;
+use constant INT => 1;
+use constant LONG => 2;
+use constant FLOAT => 3;
+use constant DOUBLE => 4;
+use constant BINARY => 5;
 package Blur::SortType;
 use constant SCORE => 0;
 use constant DOC => 1;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur_types.rb b/interface/gen-rb/blur_types.rb
index f896e0f..ce3a7c9 100644
--- a/interface/gen-rb/blur_types.rb
+++ b/interface/gen-rb/blur_types.rb
@@ -43,15 +43,13 @@ module Blur
 
   module TYPE
     STRING = 0
-    BOOL = 1
-    SHORT = 2
-    INT = 3
-    LONG = 4
-    FLOAT = 5
-    DOUBLE = 6
-    BINARY = 7
-    VALUE_MAP = {0 => "STRING", 1 => "BOOL", 2 => "SHORT", 3 => "INT", 4 =>
"LONG", 5 => "FLOAT", 6 => "DOUBLE", 7 => "BINARY"}
-    VALID_VALUES = Set.new([STRING, BOOL, SHORT, INT, LONG, FLOAT, DOUBLE, BINARY]).freeze
+    INT = 1
+    LONG = 2
+    FLOAT = 3
+    DOUBLE = 4
+    BINARY = 5
+    VALUE_MAP = {0 => "STRING", 1 => "INT", 2 => "LONG", 3 => "FLOAT", 4 =>
"DOUBLE", 5 => "BINARY"}
+    VALID_VALUES = Set.new([STRING, INT, LONG, FLOAT, DOUBLE, BINARY]).freeze
   end
 
   module SortType

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7d6b1608/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TYPE.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TYPE.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TYPE.java
index a35a804..d3f4818 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TYPE.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TYPE.java
@@ -32,13 +32,11 @@ import org.apache.thrift.TEnum;
 
 public enum TYPE implements org.apache.thrift.TEnum {
   STRING(0),
-  BOOL(1),
-  SHORT(2),
-  INT(3),
-  LONG(4),
-  FLOAT(5),
-  DOUBLE(6),
-  BINARY(7);
+  INT(1),
+  LONG(2),
+  FLOAT(3),
+  DOUBLE(4),
+  BINARY(5);
 
   private final int value;
 
@@ -62,18 +60,14 @@ public enum TYPE implements org.apache.thrift.TEnum {
       case 0:
         return STRING;
       case 1:
-        return BOOL;
-      case 2:
-        return SHORT;
-      case 3:
         return INT;
-      case 4:
+      case 2:
         return LONG;
-      case 5:
+      case 3:
         return FLOAT;
-      case 6:
+      case 4:
         return DOUBLE;
-      case 7:
+      case 5:
         return BINARY;
       default:
         return null;


Mime
View raw message