incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/2] git commit: Fixed BLUR-255
Date Fri, 04 Oct 2013 17:28:36 GMT
Fixed BLUR-255


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

Branch: refs/heads/master
Commit: 619bcc802a7ce3116a5393bc5196ec1ba13cbcb0
Parents: 4d6f7ec
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Oct 4 13:27:00 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Oct 4 13:28:27 2013 -0400

----------------------------------------------------------------------
 .../org/apache/blur/thrift/generated/Blur.java  | 48 ++++++++++----------
 .../blur/thrift/generated/BlurQueryStatus.java  |  8 ++--
 .../blur/thrift/generated/BlurResults.java      |  8 ++--
 .../blur/thrift/generated/ColumnDefinition.java |  8 ++--
 .../apache/blur/thrift/generated/Metric.java    | 24 +++++-----
 .../apache/blur/thrift/generated/Schema.java    | 16 +++----
 .../apache/blur/thrift/generated/Selector.java  |  8 ++--
 .../blur/thrift/generated/TableDescriptor.java  | 28 +++++++-----
 .../main/scripts/interface/gen-html/Blur.html   |  3 +-
 .../org/apache/blur/thrift/generated/Blur.java  | 48 ++++++++++----------
 .../blur/thrift/generated/BlurQueryStatus.java  |  8 ++--
 .../blur/thrift/generated/BlurResults.java      |  8 ++--
 .../blur/thrift/generated/ColumnDefinition.java |  8 ++--
 .../apache/blur/thrift/generated/Metric.java    | 24 +++++-----
 .../apache/blur/thrift/generated/Schema.java    | 16 +++----
 .../apache/blur/thrift/generated/Selector.java  |  8 ++--
 .../blur/thrift/generated/TableDescriptor.java  | 28 +++++++-----
 .../main/scripts/interface/gen-rb/blur_types.rb |  3 +-
 .../src/main/scripts/interface/genAndReplace.sh | 10 +++-
 docs/Blur.html                                  | 19 +++++++-
 20 files changed, 182 insertions(+), 149 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 aacb956..f47f8a2 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
@@ -15351,8 +15351,8 @@ public class Blur {
                   struct.success = new HashMap<String,List<String>>(2*_map214.size);
                   for (int _i215 = 0; _i215 < _map214.size; ++_i215)
                   {
-                    String _key216; // required
-                    List<String> _val217; // optional
+                    String _key216; // optional
+                    List<String> _val217; // required
                     _key216 = iprot.readString();
                     {
                       org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list218 = iprot.readListBegin();
@@ -15479,8 +15479,8 @@ public class Blur {
             struct.success = new HashMap<String,List<String>>(2*_map225.size);
             for (int _i226 = 0; _i226 < _map225.size; ++_i226)
             {
-              String _key227; // required
-              List<String> _val228; // optional
+              String _key227; // optional
+              List<String> _val228; // required
               _key227 = iprot.readString();
               {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list229 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
@@ -27166,8 +27166,8 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map280.size);
                   for (int _i281 = 0; _i281 < _map280.size; ++_i281)
                   {
-                    String _key282; // required
-                    String _val283; // optional
+                    String _key282; // optional
+                    String _val283; // required
                     _key282 = iprot.readString();
                     _val283 = iprot.readString();
                     struct.success.put(_key282, _val283);
@@ -27271,8 +27271,8 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map286.size);
             for (int _i287 = 0; _i287 < _map286.size; ++_i287)
             {
-              String _key288; // required
-              String _val289; // optional
+              String _key288; // optional
+              String _val289; // required
               _key288 = iprot.readString();
               _val289 = iprot.readString();
               struct.success.put(_key288, _val289);
@@ -28064,16 +28064,16 @@ public class Blur {
                   struct.success = new HashMap<String,Map<String,ShardState>>(2*_map290.size);
                   for (int _i291 = 0; _i291 < _map290.size; ++_i291)
                   {
-                    String _key292; // required
-                    Map<String,ShardState> _val293; // optional
+                    String _key292; // optional
+                    Map<String,ShardState> _val293; // required
                     _key292 = iprot.readString();
                     {
                       org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map294 = iprot.readMapBegin();
                       _val293 = new HashMap<String,ShardState>(2*_map294.size);
                       for (int _i295 = 0; _i295 < _map294.size; ++_i295)
                       {
-                        String _key296; // required
-                        ShardState _val297; // optional
+                        String _key296; // optional
+                        ShardState _val297; // required
                         _key296 = iprot.readString();
                         _val297 = ShardState.findByValue(iprot.readI32());
                         _val293.put(_key296, _val297);
@@ -28196,16 +28196,16 @@ public class Blur {
             struct.success = new HashMap<String,Map<String,ShardState>>(2*_map302.size);
             for (int _i303 = 0; _i303 < _map302.size; ++_i303)
             {
-              String _key304; // required
-              Map<String,ShardState> _val305; // optional
+              String _key304; // optional
+              Map<String,ShardState> _val305; // required
               _key304 = iprot.readString();
               {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map306 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, iprot.readI32());
                 _val305 = new HashMap<String,ShardState>(2*_map306.size);
                 for (int _i307 = 0; _i307 < _map306.size; ++_i307)
                 {
-                  String _key308; // required
-                  ShardState _val309; // optional
+                  String _key308; // optional
+                  ShardState _val309; // required
                   _key308 = iprot.readString();
                   _val309 = ShardState.findByValue(iprot.readI32());
                   _val305.put(_key308, _val309);
@@ -29689,8 +29689,8 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map310.size);
                   for (int _i311 = 0; _i311 < _map310.size; ++_i311)
                   {
-                    String _key312; // required
-                    String _val313; // optional
+                    String _key312; // optional
+                    String _val313; // required
                     _key312 = iprot.readString();
                     _val313 = iprot.readString();
                     struct.success.put(_key312, _val313);
@@ -29794,8 +29794,8 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map316.size);
             for (int _i317 = 0; _i317 < _map316.size; ++_i317)
             {
-              String _key318; // required
-              String _val319; // optional
+              String _key318; // optional
+              String _val319; // required
               _key318 = iprot.readString();
               _val319 = iprot.readString();
               struct.success.put(_key318, _val319);
@@ -30626,8 +30626,8 @@ public class Blur {
                   struct.success = new HashMap<String,Metric>(2*_map328.size);
                   for (int _i329 = 0; _i329 < _map328.size; ++_i329)
                   {
-                    String _key330; // required
-                    Metric _val331; // optional
+                    String _key330; // optional
+                    Metric _val331; // required
                     _key330 = iprot.readString();
                     _val331 = new Metric();
                     _val331.read(iprot);
@@ -30732,8 +30732,8 @@ public class Blur {
             struct.success = new HashMap<String,Metric>(2*_map334.size);
             for (int _i335 = 0; _i335 < _map334.size; ++_i335)
             {
-              String _key336; // required
-              Metric _val337; // optional
+              String _key336; // optional
+              Metric _val337; // required
               _key336 = iprot.readString();
               _val337 = new Metric();
               _val337.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index fe104ab..afd0a7d 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -958,8 +958,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.cpuTimes = new HashMap<String,CpuTime>(2*_map92.size);
                 for (int _i93 = 0; _i93 < _map92.size; ++_i93)
                 {
-                  String _key94; // required
-                  CpuTime _val95; // optional
+                  String _key94; // optional
+                  CpuTime _val95; // required
                   _key94 = iprot.readString();
                   _val95 = new CpuTime();
                   _val95.read(iprot);
@@ -1151,8 +1151,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.cpuTimes = new HashMap<String,CpuTime>(2*_map98.size);
           for (int _i99 = 0; _i99 < _map98.size; ++_i99)
           {
-            String _key100; // required
-            CpuTime _val101; // optional
+            String _key100; // optional
+            CpuTime _val101; // required
             _key100 = iprot.readString();
             _val101 = new CpuTime();
             _val101.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
index bfb9bfe..1d2cca8 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
@@ -900,8 +900,8 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
                 struct.shardInfo = new HashMap<String,Long>(2*_map50.size);
                 for (int _i51 = 0; _i51 < _map50.size; ++_i51)
                 {
-                  String _key52; // required
-                  long _val53; // optional
+                  String _key52; // optional
+                  long _val53; // required
                   _key52 = iprot.readString();
                   _val53 = iprot.readI64();
                   struct.shardInfo.put(_key52, _val53);
@@ -1146,8 +1146,8 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           struct.shardInfo = new HashMap<String,Long>(2*_map71.size);
           for (int _i72 = 0; _i72 < _map71.size; ++_i72)
           {
-            String _key73; // required
-            long _val74; // optional
+            String _key73; // optional
+            long _val74; // required
             _key73 = iprot.readString();
             _val74 = iprot.readI64();
             struct.shardInfo.put(_key73, _val74);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 2628a9b..9b0b2ad 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
@@ -907,8 +907,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
                 struct.properties = new HashMap<String,String>(2*_map102.size);
                 for (int _i103 = 0; _i103 < _map102.size; ++_i103)
                 {
-                  String _key104; // required
-                  String _val105; // optional
+                  String _key104; // optional
+                  String _val105; // required
                   _key104 = iprot.readString();
                   _val105 = iprot.readString();
                   struct.properties.put(_key104, _val105);
@@ -1065,8 +1065,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           struct.properties = new HashMap<String,String>(2*_map108.size);
           for (int _i109 = 0; _i109 < _map108.size; ++_i109)
           {
-            String _key110; // required
-            String _val111; // optional
+            String _key110; // optional
+            String _val111; // required
             _key110 = iprot.readString();
             _val111 = iprot.readString();
             struct.properties.put(_key110, _val111);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
index d98dea1..ce9b7d6 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Metric.java
@@ -707,8 +707,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.strMap = new HashMap<String,String>(2*_map168.size);
                 for (int _i169 = 0; _i169 < _map168.size; ++_i169)
                 {
-                  String _key170; // required
-                  String _val171; // optional
+                  String _key170; // optional
+                  String _val171; // required
                   _key170 = iprot.readString();
                   _val171 = iprot.readString();
                   struct.strMap.put(_key170, _val171);
@@ -727,8 +727,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.longMap = new HashMap<String,Long>(2*_map172.size);
                 for (int _i173 = 0; _i173 < _map172.size; ++_i173)
                 {
-                  String _key174; // required
-                  long _val175; // optional
+                  String _key174; // optional
+                  long _val175; // required
                   _key174 = iprot.readString();
                   _val175 = iprot.readI64();
                   struct.longMap.put(_key174, _val175);
@@ -747,8 +747,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.doubleMap = new HashMap<String,Double>(2*_map176.size);
                 for (int _i177 = 0; _i177 < _map176.size; ++_i177)
                 {
-                  String _key178; // required
-                  double _val179; // optional
+                  String _key178; // optional
+                  double _val179; // required
                   _key178 = iprot.readString();
                   _val179 = iprot.readDouble();
                   struct.doubleMap.put(_key178, _val179);
@@ -899,8 +899,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.strMap = new HashMap<String,String>(2*_map186.size);
           for (int _i187 = 0; _i187 < _map186.size; ++_i187)
           {
-            String _key188; // required
-            String _val189; // optional
+            String _key188; // optional
+            String _val189; // required
             _key188 = iprot.readString();
             _val189 = iprot.readString();
             struct.strMap.put(_key188, _val189);
@@ -914,8 +914,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.longMap = new HashMap<String,Long>(2*_map190.size);
           for (int _i191 = 0; _i191 < _map190.size; ++_i191)
           {
-            String _key192; // required
-            long _val193; // optional
+            String _key192; // optional
+            long _val193; // required
             _key192 = iprot.readString();
             _val193 = iprot.readI64();
             struct.longMap.put(_key192, _val193);
@@ -929,8 +929,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.doubleMap = new HashMap<String,Double>(2*_map194.size);
           for (int _i195 = 0; _i195 < _map194.size; ++_i195)
           {
-            String _key196; // required
-            double _val197; // optional
+            String _key196; // optional
+            double _val197; // required
             _key196 = iprot.readString();
             _val197 = iprot.readDouble();
             struct.doubleMap.put(_key196, _val197);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
index 5d14c60..53fb329 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
@@ -492,16 +492,16 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
                 struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map112.size);
                 for (int _i113 = 0; _i113 < _map112.size; ++_i113)
                 {
-                  String _key114; // required
-                  Map<String,ColumnDefinition> _val115; // optional
+                  String _key114; // optional
+                  Map<String,ColumnDefinition> _val115; // required
                   _key114 = iprot.readString();
                   {
                     org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map116 = iprot.readMapBegin();
                     _val115 = new HashMap<String,ColumnDefinition>(2*_map116.size);
                     for (int _i117 = 0; _i117 < _map116.size; ++_i117)
                     {
-                      String _key118; // required
-                      ColumnDefinition _val119; // optional
+                      String _key118; // optional
+                      ColumnDefinition _val119; // required
                       _key118 = iprot.readString();
                       _val119 = new ColumnDefinition();
                       _val119.read(iprot);
@@ -620,16 +620,16 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
           struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map124.size);
           for (int _i125 = 0; _i125 < _map124.size; ++_i125)
           {
-            String _key126; // required
-            Map<String,ColumnDefinition> _val127; // optional
+            String _key126; // optional
+            Map<String,ColumnDefinition> _val127; // required
             _key126 = iprot.readString();
             {
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map128 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
               _val127 = new HashMap<String,ColumnDefinition>(2*_map128.size);
               for (int _i129 = 0; _i129 < _map128.size; ++_i129)
               {
-                String _key130; // required
-                ColumnDefinition _val131; // optional
+                String _key130; // optional
+                ColumnDefinition _val131; // required
                 _key130 = iprot.readString();
                 _val131 = new ColumnDefinition();
                 _val131.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
index 9213e99..b5d6a04 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
@@ -1195,8 +1195,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
                 struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map19.size);
                 for (int _i20 = 0; _i20 < _map19.size; ++_i20)
                 {
-                  String _key21; // required
-                  Set<String> _val22; // optional
+                  String _key21; // optional
+                  Set<String> _val22; // required
                   _key21 = iprot.readString();
                   {
                     org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set23 = iprot.readSetBegin();
@@ -1452,8 +1452,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map35.size);
           for (int _i36 = 0; _i36 < _map35.size; ++_i36)
           {
-            String _key37; // required
-            Set<String> _val38; // optional
+            String _key37; // optional
+            Set<String> _val38; // required
             _key37 = iprot.readString();
             {
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set39 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 213ceec..1bd2d22 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
@@ -115,7 +115,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
    */
   public boolean readOnly; // required
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public List<String> preCacheCols; // required
   /**
@@ -179,7 +180,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
      */
     READ_ONLY((short)12, "readOnly"),
     /**
-     * This map sets what column families and columns to prefetch into block cache on shard open.
+     * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+     * be family dot column, "family.column".
      */
     PRE_CACHE_COLS((short)13, "preCacheCols"),
     /**
@@ -798,14 +800,16 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   }
 
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public List<String> getPreCacheCols() {
     return this.preCacheCols;
   }
 
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public TableDescriptor setPreCacheCols(List<String> preCacheCols) {
     this.preCacheCols = preCacheCols;
@@ -1795,8 +1799,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.tableProperties = new HashMap<String,String>(2*_map138.size);
                 for (int _i139 = 0; _i139 < _map138.size; ++_i139)
                 {
-                  String _key140; // required
-                  String _val141; // optional
+                  String _key140; // optional
+                  String _val141; // required
                   _key140 = iprot.readString();
                   _val141 = iprot.readString();
                   struct.tableProperties.put(_key140, _val141);
@@ -1839,8 +1843,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map142.size);
                 for (int _i143 = 0; _i143 < _map142.size; ++_i143)
                 {
-                  String _key144; // required
-                  String _val145; // optional
+                  String _key144; // optional
+                  String _val145; // required
                   _key144 = iprot.readString();
                   _val145 = iprot.readString();
                   struct.defaultMissingFieldProps.put(_key144, _val145);
@@ -2165,8 +2169,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.tableProperties = new HashMap<String,String>(2*_map160.size);
           for (int _i161 = 0; _i161 < _map160.size; ++_i161)
           {
-            String _key162; // required
-            String _val163; // optional
+            String _key162; // optional
+            String _val163; // required
             _key162 = iprot.readString();
             _val163 = iprot.readString();
             struct.tableProperties.put(_key162, _val163);
@@ -2192,8 +2196,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map164.size);
           for (int _i165 = 0; _i165 < _map164.size; ++_i165)
           {
-            String _key166; // required
-            String _val167; // optional
+            String _key166; // optional
+            String _val167; // required
             _key166 = iprot.readString();
             _val167 = iprot.readString();
             struct.defaultMissingFieldProps.put(_key166, _val167);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 648f052..917fdf6 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -479,7 +479,8 @@ NOTE: This will index the column as a full text field in a default field, so tha
 <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.
 </td><td>default</td><td>0</td></tr>
-<tr><td>13</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This map sets what column families and columns to prefetch into block cache on shard open.
+<tr><td>13</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This is a list of fields to prefetch into the blockcache.  The format of the entries should
+be family dot column, "family.column".
 </td><td>default</td><td></td></tr>
 <tr><td>14</td><td>tableProperties</td><td><code>map&lt;<code>string</code>, <code>string</code>&gt;</code></td><td>The table properties that can modify the default behavior of the table.  TODO: Document all options.
 </td><td>default</td><td></td></tr>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 aacb956..f47f8a2 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
@@ -15351,8 +15351,8 @@ public class Blur {
                   struct.success = new HashMap<String,List<String>>(2*_map214.size);
                   for (int _i215 = 0; _i215 < _map214.size; ++_i215)
                   {
-                    String _key216; // required
-                    List<String> _val217; // optional
+                    String _key216; // optional
+                    List<String> _val217; // required
                     _key216 = iprot.readString();
                     {
                       org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list218 = iprot.readListBegin();
@@ -15479,8 +15479,8 @@ public class Blur {
             struct.success = new HashMap<String,List<String>>(2*_map225.size);
             for (int _i226 = 0; _i226 < _map225.size; ++_i226)
             {
-              String _key227; // required
-              List<String> _val228; // optional
+              String _key227; // optional
+              List<String> _val228; // required
               _key227 = iprot.readString();
               {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list229 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
@@ -27166,8 +27166,8 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map280.size);
                   for (int _i281 = 0; _i281 < _map280.size; ++_i281)
                   {
-                    String _key282; // required
-                    String _val283; // optional
+                    String _key282; // optional
+                    String _val283; // required
                     _key282 = iprot.readString();
                     _val283 = iprot.readString();
                     struct.success.put(_key282, _val283);
@@ -27271,8 +27271,8 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map286.size);
             for (int _i287 = 0; _i287 < _map286.size; ++_i287)
             {
-              String _key288; // required
-              String _val289; // optional
+              String _key288; // optional
+              String _val289; // required
               _key288 = iprot.readString();
               _val289 = iprot.readString();
               struct.success.put(_key288, _val289);
@@ -28064,16 +28064,16 @@ public class Blur {
                   struct.success = new HashMap<String,Map<String,ShardState>>(2*_map290.size);
                   for (int _i291 = 0; _i291 < _map290.size; ++_i291)
                   {
-                    String _key292; // required
-                    Map<String,ShardState> _val293; // optional
+                    String _key292; // optional
+                    Map<String,ShardState> _val293; // required
                     _key292 = iprot.readString();
                     {
                       org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map294 = iprot.readMapBegin();
                       _val293 = new HashMap<String,ShardState>(2*_map294.size);
                       for (int _i295 = 0; _i295 < _map294.size; ++_i295)
                       {
-                        String _key296; // required
-                        ShardState _val297; // optional
+                        String _key296; // optional
+                        ShardState _val297; // required
                         _key296 = iprot.readString();
                         _val297 = ShardState.findByValue(iprot.readI32());
                         _val293.put(_key296, _val297);
@@ -28196,16 +28196,16 @@ public class Blur {
             struct.success = new HashMap<String,Map<String,ShardState>>(2*_map302.size);
             for (int _i303 = 0; _i303 < _map302.size; ++_i303)
             {
-              String _key304; // required
-              Map<String,ShardState> _val305; // optional
+              String _key304; // optional
+              Map<String,ShardState> _val305; // required
               _key304 = iprot.readString();
               {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map306 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, iprot.readI32());
                 _val305 = new HashMap<String,ShardState>(2*_map306.size);
                 for (int _i307 = 0; _i307 < _map306.size; ++_i307)
                 {
-                  String _key308; // required
-                  ShardState _val309; // optional
+                  String _key308; // optional
+                  ShardState _val309; // required
                   _key308 = iprot.readString();
                   _val309 = ShardState.findByValue(iprot.readI32());
                   _val305.put(_key308, _val309);
@@ -29689,8 +29689,8 @@ public class Blur {
                   struct.success = new HashMap<String,String>(2*_map310.size);
                   for (int _i311 = 0; _i311 < _map310.size; ++_i311)
                   {
-                    String _key312; // required
-                    String _val313; // optional
+                    String _key312; // optional
+                    String _val313; // required
                     _key312 = iprot.readString();
                     _val313 = iprot.readString();
                     struct.success.put(_key312, _val313);
@@ -29794,8 +29794,8 @@ public class Blur {
             struct.success = new HashMap<String,String>(2*_map316.size);
             for (int _i317 = 0; _i317 < _map316.size; ++_i317)
             {
-              String _key318; // required
-              String _val319; // optional
+              String _key318; // optional
+              String _val319; // required
               _key318 = iprot.readString();
               _val319 = iprot.readString();
               struct.success.put(_key318, _val319);
@@ -30626,8 +30626,8 @@ public class Blur {
                   struct.success = new HashMap<String,Metric>(2*_map328.size);
                   for (int _i329 = 0; _i329 < _map328.size; ++_i329)
                   {
-                    String _key330; // required
-                    Metric _val331; // optional
+                    String _key330; // optional
+                    Metric _val331; // required
                     _key330 = iprot.readString();
                     _val331 = new Metric();
                     _val331.read(iprot);
@@ -30732,8 +30732,8 @@ public class Blur {
             struct.success = new HashMap<String,Metric>(2*_map334.size);
             for (int _i335 = 0; _i335 < _map334.size; ++_i335)
             {
-              String _key336; // required
-              Metric _val337; // optional
+              String _key336; // optional
+              Metric _val337; // required
               _key336 = iprot.readString();
               _val337 = new Metric();
               _val337.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
index fe104ab..afd0a7d 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java
@@ -958,8 +958,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.cpuTimes = new HashMap<String,CpuTime>(2*_map92.size);
                 for (int _i93 = 0; _i93 < _map92.size; ++_i93)
                 {
-                  String _key94; // required
-                  CpuTime _val95; // optional
+                  String _key94; // optional
+                  CpuTime _val95; // required
                   _key94 = iprot.readString();
                   _val95 = new CpuTime();
                   _val95.read(iprot);
@@ -1151,8 +1151,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.cpuTimes = new HashMap<String,CpuTime>(2*_map98.size);
           for (int _i99 = 0; _i99 < _map98.size; ++_i99)
           {
-            String _key100; // required
-            CpuTime _val101; // optional
+            String _key100; // optional
+            CpuTime _val101; // required
             _key100 = iprot.readString();
             _val101 = new CpuTime();
             _val101.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
index bfb9bfe..1d2cca8 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurResults.java
@@ -900,8 +900,8 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
                 struct.shardInfo = new HashMap<String,Long>(2*_map50.size);
                 for (int _i51 = 0; _i51 < _map50.size; ++_i51)
                 {
-                  String _key52; // required
-                  long _val53; // optional
+                  String _key52; // optional
+                  long _val53; // required
                   _key52 = iprot.readString();
                   _val53 = iprot.readI64();
                   struct.shardInfo.put(_key52, _val53);
@@ -1146,8 +1146,8 @@ public class BlurResults implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           struct.shardInfo = new HashMap<String,Long>(2*_map71.size);
           for (int _i72 = 0; _i72 < _map71.size; ++_i72)
           {
-            String _key73; // required
-            long _val74; // optional
+            String _key73; // optional
+            long _val74; // required
             _key73 = iprot.readString();
             _val74 = iprot.readI64();
             struct.shardInfo.put(_key73, _val74);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 2628a9b..9b0b2ad 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
@@ -907,8 +907,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
                 struct.properties = new HashMap<String,String>(2*_map102.size);
                 for (int _i103 = 0; _i103 < _map102.size; ++_i103)
                 {
-                  String _key104; // required
-                  String _val105; // optional
+                  String _key104; // optional
+                  String _val105; // required
                   _key104 = iprot.readString();
                   _val105 = iprot.readString();
                   struct.properties.put(_key104, _val105);
@@ -1065,8 +1065,8 @@ public class ColumnDefinition implements org.apache.blur.thirdparty.thrift_0_9_0
           struct.properties = new HashMap<String,String>(2*_map108.size);
           for (int _i109 = 0; _i109 < _map108.size; ++_i109)
           {
-            String _key110; // required
-            String _val111; // optional
+            String _key110; // optional
+            String _val111; // required
             _key110 = iprot.readString();
             _val111 = iprot.readString();
             struct.properties.put(_key110, _val111);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
index d98dea1..ce9b7d6 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Metric.java
@@ -707,8 +707,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.strMap = new HashMap<String,String>(2*_map168.size);
                 for (int _i169 = 0; _i169 < _map168.size; ++_i169)
                 {
-                  String _key170; // required
-                  String _val171; // optional
+                  String _key170; // optional
+                  String _val171; // required
                   _key170 = iprot.readString();
                   _val171 = iprot.readString();
                   struct.strMap.put(_key170, _val171);
@@ -727,8 +727,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.longMap = new HashMap<String,Long>(2*_map172.size);
                 for (int _i173 = 0; _i173 < _map172.size; ++_i173)
                 {
-                  String _key174; // required
-                  long _val175; // optional
+                  String _key174; // optional
+                  long _val175; // required
                   _key174 = iprot.readString();
                   _val175 = iprot.readI64();
                   struct.longMap.put(_key174, _val175);
@@ -747,8 +747,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
                 struct.doubleMap = new HashMap<String,Double>(2*_map176.size);
                 for (int _i177 = 0; _i177 < _map176.size; ++_i177)
                 {
-                  String _key178; // required
-                  double _val179; // optional
+                  String _key178; // optional
+                  double _val179; // required
                   _key178 = iprot.readString();
                   _val179 = iprot.readDouble();
                   struct.doubleMap.put(_key178, _val179);
@@ -899,8 +899,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.strMap = new HashMap<String,String>(2*_map186.size);
           for (int _i187 = 0; _i187 < _map186.size; ++_i187)
           {
-            String _key188; // required
-            String _val189; // optional
+            String _key188; // optional
+            String _val189; // required
             _key188 = iprot.readString();
             _val189 = iprot.readString();
             struct.strMap.put(_key188, _val189);
@@ -914,8 +914,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.longMap = new HashMap<String,Long>(2*_map190.size);
           for (int _i191 = 0; _i191 < _map190.size; ++_i191)
           {
-            String _key192; // required
-            long _val193; // optional
+            String _key192; // optional
+            long _val193; // required
             _key192 = iprot.readString();
             _val193 = iprot.readI64();
             struct.longMap.put(_key192, _val193);
@@ -929,8 +929,8 @@ public class Metric implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Met
           struct.doubleMap = new HashMap<String,Double>(2*_map194.size);
           for (int _i195 = 0; _i195 < _map194.size; ++_i195)
           {
-            String _key196; // required
-            double _val197; // optional
+            String _key196; // optional
+            double _val197; // required
             _key196 = iprot.readString();
             _val197 = iprot.readDouble();
             struct.doubleMap.put(_key196, _val197);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
index 5d14c60..53fb329 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
@@ -492,16 +492,16 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
                 struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map112.size);
                 for (int _i113 = 0; _i113 < _map112.size; ++_i113)
                 {
-                  String _key114; // required
-                  Map<String,ColumnDefinition> _val115; // optional
+                  String _key114; // optional
+                  Map<String,ColumnDefinition> _val115; // required
                   _key114 = iprot.readString();
                   {
                     org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map116 = iprot.readMapBegin();
                     _val115 = new HashMap<String,ColumnDefinition>(2*_map116.size);
                     for (int _i117 = 0; _i117 < _map116.size; ++_i117)
                     {
-                      String _key118; // required
-                      ColumnDefinition _val119; // optional
+                      String _key118; // optional
+                      ColumnDefinition _val119; // required
                       _key118 = iprot.readString();
                       _val119 = new ColumnDefinition();
                       _val119.read(iprot);
@@ -620,16 +620,16 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
           struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map124.size);
           for (int _i125 = 0; _i125 < _map124.size; ++_i125)
           {
-            String _key126; // required
-            Map<String,ColumnDefinition> _val127; // optional
+            String _key126; // optional
+            Map<String,ColumnDefinition> _val127; // required
             _key126 = iprot.readString();
             {
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map128 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
               _val127 = new HashMap<String,ColumnDefinition>(2*_map128.size);
               for (int _i129 = 0; _i129 < _map128.size; ++_i129)
               {
-                String _key130; // required
-                ColumnDefinition _val131; // optional
+                String _key130; // optional
+                ColumnDefinition _val131; // required
                 _key130 = iprot.readString();
                 _val131 = new ColumnDefinition();
                 _val131.read(iprot);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
index 9213e99..b5d6a04 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java
@@ -1195,8 +1195,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
                 struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map19.size);
                 for (int _i20 = 0; _i20 < _map19.size; ++_i20)
                 {
-                  String _key21; // required
-                  Set<String> _val22; // optional
+                  String _key21; // optional
+                  Set<String> _val22; // required
                   _key21 = iprot.readString();
                   {
                     org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set23 = iprot.readSetBegin();
@@ -1452,8 +1452,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map35.size);
           for (int _i36 = 0; _i36 < _map35.size; ++_i36)
           {
-            String _key37; // required
-            Set<String> _val38; // optional
+            String _key37; // optional
+            Set<String> _val38; // required
             _key37 = iprot.readString();
             {
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set39 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 213ceec..1bd2d22 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
@@ -115,7 +115,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
    */
   public boolean readOnly; // required
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public List<String> preCacheCols; // required
   /**
@@ -179,7 +180,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
      */
     READ_ONLY((short)12, "readOnly"),
     /**
-     * This map sets what column families and columns to prefetch into block cache on shard open.
+     * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+     * be family dot column, "family.column".
      */
     PRE_CACHE_COLS((short)13, "preCacheCols"),
     /**
@@ -798,14 +800,16 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   }
 
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public List<String> getPreCacheCols() {
     return this.preCacheCols;
   }
 
   /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
+   * This is a list of fields to prefetch into the blockcache.  The format of the entries should
+   * be family dot column, "family.column".
    */
   public TableDescriptor setPreCacheCols(List<String> preCacheCols) {
     this.preCacheCols = preCacheCols;
@@ -1795,8 +1799,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.tableProperties = new HashMap<String,String>(2*_map138.size);
                 for (int _i139 = 0; _i139 < _map138.size; ++_i139)
                 {
-                  String _key140; // required
-                  String _val141; // optional
+                  String _key140; // optional
+                  String _val141; // required
                   _key140 = iprot.readString();
                   _val141 = iprot.readString();
                   struct.tableProperties.put(_key140, _val141);
@@ -1839,8 +1843,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
                 struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map142.size);
                 for (int _i143 = 0; _i143 < _map142.size; ++_i143)
                 {
-                  String _key144; // required
-                  String _val145; // optional
+                  String _key144; // optional
+                  String _val145; // required
                   _key144 = iprot.readString();
                   _val145 = iprot.readString();
                   struct.defaultMissingFieldProps.put(_key144, _val145);
@@ -2165,8 +2169,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.tableProperties = new HashMap<String,String>(2*_map160.size);
           for (int _i161 = 0; _i161 < _map160.size; ++_i161)
           {
-            String _key162; // required
-            String _val163; // optional
+            String _key162; // optional
+            String _val163; // required
             _key162 = iprot.readString();
             _val163 = iprot.readString();
             struct.tableProperties.put(_key162, _val163);
@@ -2192,8 +2196,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map164.size);
           for (int _i165 = 0; _i165 < _map164.size; ++_i165)
           {
-            String _key166; // required
-            String _val167; // optional
+            String _key166; // optional
+            String _val167; // required
             _key166 = iprot.readString();
             _val167 = iprot.readString();
             struct.defaultMissingFieldProps.put(_key166, _val167);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/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 40547a1..fb8592f 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
@@ -749,7 +749,8 @@ module Blur
       # 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.
       READONLY => {:type => ::Thrift::Types::BOOL, :name => 'readOnly', :default => false},
-      # This map sets what column families and columns to prefetch into block cache on shard open.
+      # This is a list of fields to prefetch into the blockcache.  The format of the entries should
+# be family dot column, "family.column".
       PRECACHECOLS => {:type => ::Thrift::Types::LIST, :name => 'preCacheCols', :element => {:type => ::Thrift::Types::STRING}},
       # The table properties that can modify the default behavior of the table.  TODO: Document all options.
       TABLEPROPERTIES => {:type => ::Thrift::Types::MAP, :name => 'tableProperties', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/distribution/src/main/scripts/interface/genAndReplace.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/genAndReplace.sh b/distribution/src/main/scripts/interface/genAndReplace.sh
index 0ae73f4..d6881a4 100755
--- a/distribution/src/main/scripts/interface/genAndReplace.sh
+++ b/distribution/src/main/scripts/interface/genAndReplace.sh
@@ -15,8 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cdir=`dirname "$0"`
+cdir=`cd "$cdir"; pwd`
 
-
+cd $cdir
 rm ../../../../../blur-thrift/src/main/java/org/apache/blur/thrift/generated/*
 rm -r gen-java/ gen-perl/ gen-rb/ gen-html/
 thrift --gen html --gen perl --gen java --gen rb --gen js Blur.thrift
@@ -28,5 +30,9 @@ for f in gen-java/org/apache/blur/thrift/generated/*.java; do
   rm $f.new1 $f.new2 $f.new3 $f
   mv $f.new4 $f
 done
-java -cp ../../../../../blur-util/target/blur-util-*.jar org.apache.blur.doc.CreateBlurApiHtmlPage gen-html/Blur.html ../../../../../docs/Blur.html
+GEN_HTML=$cdir/gen-html/Blur.html
+OUTPUT_HTML=$cdir/../../../../../docs/Blur.html
+cd ../../../../../blur-util
+mvn exec:java -Dexec.mainClass="org.apache.blur.doc.CreateBlurApiHtmlPage" -Dexec.args="$GEN_HTML $OUTPUT_HTML"
+cd $cdir
 cp -r gen-java/* ../../../../../blur-thrift/src/main/java/

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/619bcc80/docs/Blur.html
----------------------------------------------------------------------
diff --git a/docs/Blur.html b/docs/Blur.html
index 10b2753..c89ef01 100644
--- a/docs/Blur.html
+++ b/docs/Blur.html
@@ -538,7 +538,8 @@ NOTE: This will index the column as a full text field in a default field, so tha
 <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.
 </td><td>default</td><td>0</td></tr>
-<tr><td>13</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This map sets what column families and columns to prefetch into block cache on shard open.
+<tr><td>13</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This is a list of fields to prefetch into the blockcache.  The format of the entries should
+be family dot column, "family.column".
 </td><td>default</td><td></td></tr>
 <tr><td>14</td><td>tableProperties</td><td><code>map&lt;<code>string</code>, <code>string</code>&gt;</code></td><td>The table properties that can modify the default behavior of the table.  TODO: Document all options.
 </td><td>default</td><td></td></tr>
@@ -964,6 +965,22 @@ throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 <br/>
 <br/>
 <br/>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+-->
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 <script src="resources/js/jquery-2.0.3.min.js"></script>
 <!-- Include all compiled plugins (below), or include individual files as needed -->


Mime
View raw message