incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [12/17] Fixed BLUR-205
Date Fri, 16 Aug 2013 20:09:11 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/distribution/src/main/scripts/interface/gen-js/Blur_types.js
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-js/Blur_types.js b/distribution/src/main/scripts/interface/gen-js/Blur_types.js
index 157a326..e606bd0 100644
--- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js
+++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js
@@ -2321,20 +2321,36 @@ TableStats.prototype.write = function(output) {
   return;
 };
 
-Schema = function(args) {
-  this.table = null;
-  this.columnFamilies = null;
+ColumnDefinition = function(args) {
+  this.family = null;
+  this.columnName = null;
+  this.subColumnName = null;
+  this.fieldLessIndexed = null;
+  this.fieldType = null;
+  this.properties = null;
   if (args) {
-    if (args.table !== undefined) {
-      this.table = args.table;
+    if (args.family !== undefined) {
+      this.family = args.family;
     }
-    if (args.columnFamilies !== undefined) {
-      this.columnFamilies = args.columnFamilies;
+    if (args.columnName !== undefined) {
+      this.columnName = args.columnName;
+    }
+    if (args.subColumnName !== undefined) {
+      this.subColumnName = args.subColumnName;
+    }
+    if (args.fieldLessIndexed !== undefined) {
+      this.fieldLessIndexed = args.fieldLessIndexed;
+    }
+    if (args.fieldType !== undefined) {
+      this.fieldType = args.fieldType;
+    }
+    if (args.properties !== undefined) {
+      this.properties = args.properties;
     }
   }
 };
-Schema.prototype = {};
-Schema.prototype.read = function(input) {
+ColumnDefinition.prototype = {};
+ColumnDefinition.prototype.read = function(input) {
   input.readStructBegin();
   while (true)
   {
@@ -2349,16 +2365,44 @@ Schema.prototype.read = function(input) {
     {
       case 1:
       if (ftype == Thrift.Type.STRING) {
-        this.table = input.readString().value;
+        this.family = input.readString().value;
       } else {
         input.skip(ftype);
       }
       break;
       case 2:
+      if (ftype == Thrift.Type.STRING) {
+        this.columnName = input.readString().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      case 3:
+      if (ftype == Thrift.Type.STRING) {
+        this.subColumnName = input.readString().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      case 4:
+      if (ftype == Thrift.Type.BOOL) {
+        this.fieldLessIndexed = input.readBool().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      case 5:
+      if (ftype == Thrift.Type.STRING) {
+        this.fieldType = input.readString().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      case 6:
       if (ftype == Thrift.Type.MAP) {
         var _size102 = 0;
         var _rtmp3106;
-        this.columnFamilies = {};
+        this.properties = {};
         var _ktype103 = 0;
         var _vtype104 = 0;
         _rtmp3106 = input.readMapBegin();
@@ -2375,21 +2419,149 @@ Schema.prototype.read = function(input) {
           var key108 = null;
           var val109 = null;
           key108 = input.readString().value;
-          var _size110 = 0;
-          var _rtmp3114;
-          val109 = [];
-          var _etype113 = 0;
-          _rtmp3114 = input.readSetBegin();
-          _etype113 = _rtmp3114.etype;
-          _size110 = _rtmp3114.size;
-          for (var _i115 = 0; _i115 < _size110; ++_i115)
+          val109 = input.readString().value;
+          this.properties[key108] = val109;
+        }
+        input.readMapEnd();
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      default:
+        input.skip(ftype);
+    }
+    input.readFieldEnd();
+  }
+  input.readStructEnd();
+  return;
+};
+
+ColumnDefinition.prototype.write = function(output) {
+  output.writeStructBegin('ColumnDefinition');
+  if (this.family !== null && this.family !== undefined) {
+    output.writeFieldBegin('family', Thrift.Type.STRING, 1);
+    output.writeString(this.family);
+    output.writeFieldEnd();
+  }
+  if (this.columnName !== null && this.columnName !== undefined) {
+    output.writeFieldBegin('columnName', Thrift.Type.STRING, 2);
+    output.writeString(this.columnName);
+    output.writeFieldEnd();
+  }
+  if (this.subColumnName !== null && this.subColumnName !== undefined) {
+    output.writeFieldBegin('subColumnName', Thrift.Type.STRING, 3);
+    output.writeString(this.subColumnName);
+    output.writeFieldEnd();
+  }
+  if (this.fieldLessIndexed !== null && this.fieldLessIndexed !== undefined) {
+    output.writeFieldBegin('fieldLessIndexed', Thrift.Type.BOOL, 4);
+    output.writeBool(this.fieldLessIndexed);
+    output.writeFieldEnd();
+  }
+  if (this.fieldType !== null && this.fieldType !== undefined) {
+    output.writeFieldBegin('fieldType', Thrift.Type.STRING, 5);
+    output.writeString(this.fieldType);
+    output.writeFieldEnd();
+  }
+  if (this.properties !== null && this.properties !== undefined) {
+    output.writeFieldBegin('properties', Thrift.Type.MAP, 6);
+    output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.properties));
+    for (var kiter110 in this.properties)
+    {
+      if (this.properties.hasOwnProperty(kiter110))
+      {
+        var viter111 = this.properties[kiter110];
+        output.writeString(kiter110);
+        output.writeString(viter111);
+      }
+    }
+    output.writeMapEnd();
+    output.writeFieldEnd();
+  }
+  output.writeFieldStop();
+  output.writeStructEnd();
+  return;
+};
+
+Schema = function(args) {
+  this.table = null;
+  this.families = null;
+  if (args) {
+    if (args.table !== undefined) {
+      this.table = args.table;
+    }
+    if (args.families !== undefined) {
+      this.families = args.families;
+    }
+  }
+};
+Schema.prototype = {};
+Schema.prototype.read = function(input) {
+  input.readStructBegin();
+  while (true)
+  {
+    var ret = input.readFieldBegin();
+    var fname = ret.fname;
+    var ftype = ret.ftype;
+    var fid = ret.fid;
+    if (ftype == Thrift.Type.STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+      if (ftype == Thrift.Type.STRING) {
+        this.table = input.readString().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
+      case 2:
+      if (ftype == Thrift.Type.MAP) {
+        var _size112 = 0;
+        var _rtmp3116;
+        this.families = {};
+        var _ktype113 = 0;
+        var _vtype114 = 0;
+        _rtmp3116 = input.readMapBegin();
+        _ktype113 = _rtmp3116.ktype;
+        _vtype114 = _rtmp3116.vtype;
+        _size112 = _rtmp3116.size;
+        for (var _i117 = 0; _i117 < _size112; ++_i117)
+        {
+          if (_i117 > 0 ) {
+            if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
+              input.rstack.pop();
+            }
+          }
+          var key118 = null;
+          var val119 = null;
+          key118 = input.readString().value;
+          var _size120 = 0;
+          var _rtmp3124;
+          val119 = {};
+          var _ktype121 = 0;
+          var _vtype122 = 0;
+          _rtmp3124 = input.readMapBegin();
+          _ktype121 = _rtmp3124.ktype;
+          _vtype122 = _rtmp3124.vtype;
+          _size120 = _rtmp3124.size;
+          for (var _i125 = 0; _i125 < _size120; ++_i125)
           {
-            var elem116 = null;
-            elem116 = input.readString().value;
-            val109.push(elem116);
+            if (_i125 > 0 ) {
+              if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
+                input.rstack.pop();
+              }
+            }
+            var key126 = null;
+            var val127 = null;
+            key126 = input.readString().value;
+            val127 = new ColumnDefinition();
+            val127.read(input);
+            val119[key126] = val127;
           }
-          input.readSetEnd();
-          this.columnFamilies[key108] = val109;
+          input.readMapEnd();
+          this.families[key118] = val119;
         }
         input.readMapEnd();
       } else {
@@ -2412,25 +2584,26 @@ Schema.prototype.write = function(output) {
     output.writeString(this.table);
     output.writeFieldEnd();
   }
-  if (this.columnFamilies !== null && this.columnFamilies !== undefined) {
-    output.writeFieldBegin('columnFamilies', Thrift.Type.MAP, 2);
-    output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.SET, Thrift.objectLength(this.columnFamilies));
-    for (var kiter117 in this.columnFamilies)
+  if (this.families !== null && this.families !== undefined) {
+    output.writeFieldBegin('families', Thrift.Type.MAP, 2);
+    output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.MAP, Thrift.objectLength(this.families));
+    for (var kiter128 in this.families)
     {
-      if (this.columnFamilies.hasOwnProperty(kiter117))
+      if (this.families.hasOwnProperty(kiter128))
       {
-        var viter118 = this.columnFamilies[kiter117];
-        output.writeString(kiter117);
-        output.writeSetBegin(Thrift.Type.STRING, viter118.length);
-        for (var iter119 in viter118)
+        var viter129 = this.families[kiter128];
+        output.writeString(kiter128);
+        output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRUCT, Thrift.objectLength(viter129));
+        for (var kiter130 in viter129)
         {
-          if (viter118.hasOwnProperty(iter119))
+          if (viter129.hasOwnProperty(kiter130))
           {
-            iter119 = viter118[iter119];
-            output.writeString(iter119);
+            var viter131 = viter129[kiter130];
+            output.writeString(kiter130);
+            viter131.write(output);
           }
         }
-        output.writeSetEnd();
+        output.writeMapEnd();
       }
     }
     output.writeMapEnd();
@@ -2570,18 +2743,18 @@ TableDescriptor.prototype.read = function(input) {
       break;
       case 11:
       if (ftype == Thrift.Type.SET) {
-        var _size120 = 0;
-        var _rtmp3124;
+        var _size132 = 0;
+        var _rtmp3136;
         this.blockCachingFileTypes = [];
-        var _etype123 = 0;
-        _rtmp3124 = input.readSetBegin();
-        _etype123 = _rtmp3124.etype;
-        _size120 = _rtmp3124.size;
-        for (var _i125 = 0; _i125 < _size120; ++_i125)
+        var _etype135 = 0;
+        _rtmp3136 = input.readSetBegin();
+        _etype135 = _rtmp3136.etype;
+        _size132 = _rtmp3136.size;
+        for (var _i137 = 0; _i137 < _size132; ++_i137)
         {
-          var elem126 = null;
-          elem126 = input.readString().value;
-          this.blockCachingFileTypes.push(elem126);
+          var elem138 = null;
+          elem138 = input.readString().value;
+          this.blockCachingFileTypes.push(elem138);
         }
         input.readSetEnd();
       } else {
@@ -2597,18 +2770,18 @@ TableDescriptor.prototype.read = function(input) {
       break;
       case 13:
       if (ftype == Thrift.Type.LIST) {
-        var _size127 = 0;
-        var _rtmp3131;
+        var _size139 = 0;
+        var _rtmp3143;
         this.preCacheCols = [];
-        var _etype130 = 0;
-        _rtmp3131 = input.readListBegin();
-        _etype130 = _rtmp3131.etype;
-        _size127 = _rtmp3131.size;
-        for (var _i132 = 0; _i132 < _size127; ++_i132)
+        var _etype142 = 0;
+        _rtmp3143 = input.readListBegin();
+        _etype142 = _rtmp3143.etype;
+        _size139 = _rtmp3143.size;
+        for (var _i144 = 0; _i144 < _size139; ++_i144)
         {
-          var elem133 = null;
-          elem133 = input.readString().value;
-          this.preCacheCols.push(elem133);
+          var elem145 = null;
+          elem145 = input.readString().value;
+          this.preCacheCols.push(elem145);
         }
         input.readListEnd();
       } else {
@@ -2617,27 +2790,27 @@ TableDescriptor.prototype.read = function(input) {
       break;
       case 14:
       if (ftype == Thrift.Type.MAP) {
-        var _size134 = 0;
-        var _rtmp3138;
+        var _size146 = 0;
+        var _rtmp3150;
         this.tableProperties = {};
-        var _ktype135 = 0;
-        var _vtype136 = 0;
-        _rtmp3138 = input.readMapBegin();
-        _ktype135 = _rtmp3138.ktype;
-        _vtype136 = _rtmp3138.vtype;
-        _size134 = _rtmp3138.size;
-        for (var _i139 = 0; _i139 < _size134; ++_i139)
+        var _ktype147 = 0;
+        var _vtype148 = 0;
+        _rtmp3150 = input.readMapBegin();
+        _ktype147 = _rtmp3150.ktype;
+        _vtype148 = _rtmp3150.vtype;
+        _size146 = _rtmp3150.size;
+        for (var _i151 = 0; _i151 < _size146; ++_i151)
         {
-          if (_i139 > 0 ) {
+          if (_i151 > 0 ) {
             if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
               input.rstack.pop();
             }
           }
-          var key140 = null;
-          var val141 = null;
-          key140 = input.readString().value;
-          val141 = input.readString().value;
-          this.tableProperties[key140] = val141;
+          var key152 = null;
+          var val153 = null;
+          key152 = input.readString().value;
+          val153 = input.readString().value;
+          this.tableProperties[key152] = val153;
         }
         input.readMapEnd();
       } else {
@@ -2667,27 +2840,27 @@ TableDescriptor.prototype.read = function(input) {
       break;
       case 18:
       if (ftype == Thrift.Type.MAP) {
-        var _size142 = 0;
-        var _rtmp3146;
+        var _size154 = 0;
+        var _rtmp3158;
         this.defaultMissingFieldProps = {};
-        var _ktype143 = 0;
-        var _vtype144 = 0;
-        _rtmp3146 = input.readMapBegin();
-        _ktype143 = _rtmp3146.ktype;
-        _vtype144 = _rtmp3146.vtype;
-        _size142 = _rtmp3146.size;
-        for (var _i147 = 0; _i147 < _size142; ++_i147)
+        var _ktype155 = 0;
+        var _vtype156 = 0;
+        _rtmp3158 = input.readMapBegin();
+        _ktype155 = _rtmp3158.ktype;
+        _vtype156 = _rtmp3158.vtype;
+        _size154 = _rtmp3158.size;
+        for (var _i159 = 0; _i159 < _size154; ++_i159)
         {
-          if (_i147 > 0 ) {
+          if (_i159 > 0 ) {
             if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
               input.rstack.pop();
             }
           }
-          var key148 = null;
-          var val149 = null;
-          key148 = input.readString().value;
-          val149 = input.readString().value;
-          this.defaultMissingFieldProps[key148] = val149;
+          var key160 = null;
+          var val161 = null;
+          key160 = input.readString().value;
+          val161 = input.readString().value;
+          this.defaultMissingFieldProps[key160] = val161;
         }
         input.readMapEnd();
       } else {
@@ -2743,12 +2916,12 @@ TableDescriptor.prototype.write = function(output) {
   if (this.blockCachingFileTypes !== null && this.blockCachingFileTypes !== undefined) {
     output.writeFieldBegin('blockCachingFileTypes', Thrift.Type.SET, 11);
     output.writeSetBegin(Thrift.Type.STRING, this.blockCachingFileTypes.length);
-    for (var iter150 in this.blockCachingFileTypes)
+    for (var iter162 in this.blockCachingFileTypes)
     {
-      if (this.blockCachingFileTypes.hasOwnProperty(iter150))
+      if (this.blockCachingFileTypes.hasOwnProperty(iter162))
       {
-        iter150 = this.blockCachingFileTypes[iter150];
-        output.writeString(iter150);
+        iter162 = this.blockCachingFileTypes[iter162];
+        output.writeString(iter162);
       }
     }
     output.writeSetEnd();
@@ -2762,12 +2935,12 @@ TableDescriptor.prototype.write = function(output) {
   if (this.preCacheCols !== null && this.preCacheCols !== undefined) {
     output.writeFieldBegin('preCacheCols', Thrift.Type.LIST, 13);
     output.writeListBegin(Thrift.Type.STRING, this.preCacheCols.length);
-    for (var iter151 in this.preCacheCols)
+    for (var iter163 in this.preCacheCols)
     {
-      if (this.preCacheCols.hasOwnProperty(iter151))
+      if (this.preCacheCols.hasOwnProperty(iter163))
       {
-        iter151 = this.preCacheCols[iter151];
-        output.writeString(iter151);
+        iter163 = this.preCacheCols[iter163];
+        output.writeString(iter163);
       }
     }
     output.writeListEnd();
@@ -2776,13 +2949,13 @@ TableDescriptor.prototype.write = function(output) {
   if (this.tableProperties !== null && this.tableProperties !== undefined) {
     output.writeFieldBegin('tableProperties', Thrift.Type.MAP, 14);
     output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.tableProperties));
-    for (var kiter152 in this.tableProperties)
+    for (var kiter164 in this.tableProperties)
     {
-      if (this.tableProperties.hasOwnProperty(kiter152))
+      if (this.tableProperties.hasOwnProperty(kiter164))
       {
-        var viter153 = this.tableProperties[kiter152];
-        output.writeString(kiter152);
-        output.writeString(viter153);
+        var viter165 = this.tableProperties[kiter164];
+        output.writeString(kiter164);
+        output.writeString(viter165);
       }
     }
     output.writeMapEnd();
@@ -2806,13 +2979,13 @@ TableDescriptor.prototype.write = function(output) {
   if (this.defaultMissingFieldProps !== null && this.defaultMissingFieldProps !== undefined) {
     output.writeFieldBegin('defaultMissingFieldProps', Thrift.Type.MAP, 18);
     output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.defaultMissingFieldProps));
-    for (var kiter154 in this.defaultMissingFieldProps)
+    for (var kiter166 in this.defaultMissingFieldProps)
     {
-      if (this.defaultMissingFieldProps.hasOwnProperty(kiter154))
+      if (this.defaultMissingFieldProps.hasOwnProperty(kiter166))
       {
-        var viter155 = this.defaultMissingFieldProps[kiter154];
-        output.writeString(kiter154);
-        output.writeString(viter155);
+        var viter167 = this.defaultMissingFieldProps[kiter166];
+        output.writeString(kiter166);
+        output.writeString(viter167);
       }
     }
     output.writeMapEnd();
@@ -2866,27 +3039,27 @@ Metric.prototype.read = function(input) {
       break;
       case 2:
       if (ftype == Thrift.Type.MAP) {
-        var _size156 = 0;
-        var _rtmp3160;
+        var _size168 = 0;
+        var _rtmp3172;
         this.strMap = {};
-        var _ktype157 = 0;
-        var _vtype158 = 0;
-        _rtmp3160 = input.readMapBegin();
-        _ktype157 = _rtmp3160.ktype;
-        _vtype158 = _rtmp3160.vtype;
-        _size156 = _rtmp3160.size;
-        for (var _i161 = 0; _i161 < _size156; ++_i161)
+        var _ktype169 = 0;
+        var _vtype170 = 0;
+        _rtmp3172 = input.readMapBegin();
+        _ktype169 = _rtmp3172.ktype;
+        _vtype170 = _rtmp3172.vtype;
+        _size168 = _rtmp3172.size;
+        for (var _i173 = 0; _i173 < _size168; ++_i173)
         {
-          if (_i161 > 0 ) {
+          if (_i173 > 0 ) {
             if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
               input.rstack.pop();
             }
           }
-          var key162 = null;
-          var val163 = null;
-          key162 = input.readString().value;
-          val163 = input.readString().value;
-          this.strMap[key162] = val163;
+          var key174 = null;
+          var val175 = null;
+          key174 = input.readString().value;
+          val175 = input.readString().value;
+          this.strMap[key174] = val175;
         }
         input.readMapEnd();
       } else {
@@ -2895,27 +3068,27 @@ Metric.prototype.read = function(input) {
       break;
       case 3:
       if (ftype == Thrift.Type.MAP) {
-        var _size164 = 0;
-        var _rtmp3168;
+        var _size176 = 0;
+        var _rtmp3180;
         this.longMap = {};
-        var _ktype165 = 0;
-        var _vtype166 = 0;
-        _rtmp3168 = input.readMapBegin();
-        _ktype165 = _rtmp3168.ktype;
-        _vtype166 = _rtmp3168.vtype;
-        _size164 = _rtmp3168.size;
-        for (var _i169 = 0; _i169 < _size164; ++_i169)
+        var _ktype177 = 0;
+        var _vtype178 = 0;
+        _rtmp3180 = input.readMapBegin();
+        _ktype177 = _rtmp3180.ktype;
+        _vtype178 = _rtmp3180.vtype;
+        _size176 = _rtmp3180.size;
+        for (var _i181 = 0; _i181 < _size176; ++_i181)
         {
-          if (_i169 > 0 ) {
+          if (_i181 > 0 ) {
             if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
               input.rstack.pop();
             }
           }
-          var key170 = null;
-          var val171 = null;
-          key170 = input.readString().value;
-          val171 = input.readI64().value;
-          this.longMap[key170] = val171;
+          var key182 = null;
+          var val183 = null;
+          key182 = input.readString().value;
+          val183 = input.readI64().value;
+          this.longMap[key182] = val183;
         }
         input.readMapEnd();
       } else {
@@ -2924,27 +3097,27 @@ Metric.prototype.read = function(input) {
       break;
       case 4:
       if (ftype == Thrift.Type.MAP) {
-        var _size172 = 0;
-        var _rtmp3176;
+        var _size184 = 0;
+        var _rtmp3188;
         this.doubleMap = {};
-        var _ktype173 = 0;
-        var _vtype174 = 0;
-        _rtmp3176 = input.readMapBegin();
-        _ktype173 = _rtmp3176.ktype;
-        _vtype174 = _rtmp3176.vtype;
-        _size172 = _rtmp3176.size;
-        for (var _i177 = 0; _i177 < _size172; ++_i177)
+        var _ktype185 = 0;
+        var _vtype186 = 0;
+        _rtmp3188 = input.readMapBegin();
+        _ktype185 = _rtmp3188.ktype;
+        _vtype186 = _rtmp3188.vtype;
+        _size184 = _rtmp3188.size;
+        for (var _i189 = 0; _i189 < _size184; ++_i189)
         {
-          if (_i177 > 0 ) {
+          if (_i189 > 0 ) {
             if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
               input.rstack.pop();
             }
           }
-          var key178 = null;
-          var val179 = null;
-          key178 = input.readString().value;
-          val179 = input.readDouble().value;
-          this.doubleMap[key178] = val179;
+          var key190 = null;
+          var val191 = null;
+          key190 = input.readString().value;
+          val191 = input.readDouble().value;
+          this.doubleMap[key190] = val191;
         }
         input.readMapEnd();
       } else {
@@ -2970,13 +3143,13 @@ Metric.prototype.write = function(output) {
   if (this.strMap !== null && this.strMap !== undefined) {
     output.writeFieldBegin('strMap', Thrift.Type.MAP, 2);
     output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.strMap));
-    for (var kiter180 in this.strMap)
+    for (var kiter192 in this.strMap)
     {
-      if (this.strMap.hasOwnProperty(kiter180))
+      if (this.strMap.hasOwnProperty(kiter192))
       {
-        var viter181 = this.strMap[kiter180];
-        output.writeString(kiter180);
-        output.writeString(viter181);
+        var viter193 = this.strMap[kiter192];
+        output.writeString(kiter192);
+        output.writeString(viter193);
       }
     }
     output.writeMapEnd();
@@ -2985,13 +3158,13 @@ Metric.prototype.write = function(output) {
   if (this.longMap !== null && this.longMap !== undefined) {
     output.writeFieldBegin('longMap', Thrift.Type.MAP, 3);
     output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.I64, Thrift.objectLength(this.longMap));
-    for (var kiter182 in this.longMap)
+    for (var kiter194 in this.longMap)
     {
-      if (this.longMap.hasOwnProperty(kiter182))
+      if (this.longMap.hasOwnProperty(kiter194))
       {
-        var viter183 = this.longMap[kiter182];
-        output.writeString(kiter182);
-        output.writeI64(viter183);
+        var viter195 = this.longMap[kiter194];
+        output.writeString(kiter194);
+        output.writeI64(viter195);
       }
     }
     output.writeMapEnd();
@@ -3000,175 +3173,13 @@ Metric.prototype.write = function(output) {
   if (this.doubleMap !== null && this.doubleMap !== undefined) {
     output.writeFieldBegin('doubleMap', Thrift.Type.MAP, 4);
     output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.DOUBLE, Thrift.objectLength(this.doubleMap));
-    for (var kiter184 in this.doubleMap)
-    {
-      if (this.doubleMap.hasOwnProperty(kiter184))
-      {
-        var viter185 = this.doubleMap[kiter184];
-        output.writeString(kiter184);
-        output.writeDouble(viter185);
-      }
-    }
-    output.writeMapEnd();
-    output.writeFieldEnd();
-  }
-  output.writeFieldStop();
-  output.writeStructEnd();
-  return;
-};
-
-ColumnDefinition = function(args) {
-  this.family = null;
-  this.columnName = null;
-  this.subColumnName = null;
-  this.fieldLessIndexing = null;
-  this.fieldType = null;
-  this.properties = null;
-  if (args) {
-    if (args.family !== undefined) {
-      this.family = args.family;
-    }
-    if (args.columnName !== undefined) {
-      this.columnName = args.columnName;
-    }
-    if (args.subColumnName !== undefined) {
-      this.subColumnName = args.subColumnName;
-    }
-    if (args.fieldLessIndexing !== undefined) {
-      this.fieldLessIndexing = args.fieldLessIndexing;
-    }
-    if (args.fieldType !== undefined) {
-      this.fieldType = args.fieldType;
-    }
-    if (args.properties !== undefined) {
-      this.properties = args.properties;
-    }
-  }
-};
-ColumnDefinition.prototype = {};
-ColumnDefinition.prototype.read = function(input) {
-  input.readStructBegin();
-  while (true)
-  {
-    var ret = input.readFieldBegin();
-    var fname = ret.fname;
-    var ftype = ret.ftype;
-    var fid = ret.fid;
-    if (ftype == Thrift.Type.STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-      if (ftype == Thrift.Type.STRING) {
-        this.family = input.readString().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 2:
-      if (ftype == Thrift.Type.STRING) {
-        this.columnName = input.readString().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 3:
-      if (ftype == Thrift.Type.STRING) {
-        this.subColumnName = input.readString().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 4:
-      if (ftype == Thrift.Type.BOOL) {
-        this.fieldLessIndexing = input.readBool().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 5:
-      if (ftype == Thrift.Type.STRING) {
-        this.fieldType = input.readString().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 6:
-      if (ftype == Thrift.Type.MAP) {
-        var _size186 = 0;
-        var _rtmp3190;
-        this.properties = {};
-        var _ktype187 = 0;
-        var _vtype188 = 0;
-        _rtmp3190 = input.readMapBegin();
-        _ktype187 = _rtmp3190.ktype;
-        _vtype188 = _rtmp3190.vtype;
-        _size186 = _rtmp3190.size;
-        for (var _i191 = 0; _i191 < _size186; ++_i191)
-        {
-          if (_i191 > 0 ) {
-            if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {
-              input.rstack.pop();
-            }
-          }
-          var key192 = null;
-          var val193 = null;
-          key192 = input.readString().value;
-          val193 = input.readString().value;
-          this.properties[key192] = val193;
-        }
-        input.readMapEnd();
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      default:
-        input.skip(ftype);
-    }
-    input.readFieldEnd();
-  }
-  input.readStructEnd();
-  return;
-};
-
-ColumnDefinition.prototype.write = function(output) {
-  output.writeStructBegin('ColumnDefinition');
-  if (this.family !== null && this.family !== undefined) {
-    output.writeFieldBegin('family', Thrift.Type.STRING, 1);
-    output.writeString(this.family);
-    output.writeFieldEnd();
-  }
-  if (this.columnName !== null && this.columnName !== undefined) {
-    output.writeFieldBegin('columnName', Thrift.Type.STRING, 2);
-    output.writeString(this.columnName);
-    output.writeFieldEnd();
-  }
-  if (this.subColumnName !== null && this.subColumnName !== undefined) {
-    output.writeFieldBegin('subColumnName', Thrift.Type.STRING, 3);
-    output.writeString(this.subColumnName);
-    output.writeFieldEnd();
-  }
-  if (this.fieldLessIndexing !== null && this.fieldLessIndexing !== undefined) {
-    output.writeFieldBegin('fieldLessIndexing', Thrift.Type.BOOL, 4);
-    output.writeBool(this.fieldLessIndexing);
-    output.writeFieldEnd();
-  }
-  if (this.fieldType !== null && this.fieldType !== undefined) {
-    output.writeFieldBegin('fieldType', Thrift.Type.STRING, 5);
-    output.writeString(this.fieldType);
-    output.writeFieldEnd();
-  }
-  if (this.properties !== null && this.properties !== undefined) {
-    output.writeFieldBegin('properties', Thrift.Type.MAP, 6);
-    output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.properties));
-    for (var kiter194 in this.properties)
+    for (var kiter196 in this.doubleMap)
     {
-      if (this.properties.hasOwnProperty(kiter194))
+      if (this.doubleMap.hasOwnProperty(kiter196))
       {
-        var viter195 = this.properties[kiter194];
-        output.writeString(kiter194);
-        output.writeString(viter195);
+        var viter197 = this.doubleMap[kiter196];
+        output.writeString(kiter196);
+        output.writeDouble(viter197);
       }
     }
     output.writeMapEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
index c78e3e8..e6e6c1c 100644
--- a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
+++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
@@ -100,15 +100,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size174 = 0;
+          my $_size176 = 0;
           $self->{success} = [];
-          my $_etype177 = 0;
-          $xfer += $input->readListBegin(\$_etype177, \$_size174);
-          for (my $_i178 = 0; $_i178 < $_size174; ++$_i178)
+          my $_etype179 = 0;
+          $xfer += $input->readListBegin(\$_etype179, \$_size176);
+          for (my $_i180 = 0; $_i180 < $_size176; ++$_i180)
           {
-            my $elem179 = undef;
-            $xfer += $input->readString(\$elem179);
-            push(@{$self->{success}},$elem179);
+            my $elem181 = undef;
+            $xfer += $input->readString(\$elem181);
+            push(@{$self->{success}},$elem181);
           }
           $xfer += $input->readListEnd();
         }
@@ -140,9 +140,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter180 (@{$self->{success}}) 
+        foreach my $iter182 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter180);
+          $xfer += $output->writeString($iter182);
         }
       }
       $xfer += $output->writeListEnd();
@@ -265,15 +265,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size181 = 0;
+          my $_size183 = 0;
           $self->{success} = [];
-          my $_etype184 = 0;
-          $xfer += $input->readListBegin(\$_etype184, \$_size181);
-          for (my $_i185 = 0; $_i185 < $_size181; ++$_i185)
+          my $_etype186 = 0;
+          $xfer += $input->readListBegin(\$_etype186, \$_size183);
+          for (my $_i187 = 0; $_i187 < $_size183; ++$_i187)
           {
-            my $elem186 = undef;
-            $xfer += $input->readString(\$elem186);
-            push(@{$self->{success}},$elem186);
+            my $elem188 = undef;
+            $xfer += $input->readString(\$elem188);
+            push(@{$self->{success}},$elem188);
           }
           $xfer += $input->readListEnd();
         }
@@ -305,9 +305,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter187 (@{$self->{success}}) 
+        foreach my $iter189 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter187);
+          $xfer += $output->writeString($iter189);
         }
       }
       $xfer += $output->writeListEnd();
@@ -412,15 +412,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size188 = 0;
+          my $_size190 = 0;
           $self->{success} = [];
-          my $_etype191 = 0;
-          $xfer += $input->readListBegin(\$_etype191, \$_size188);
-          for (my $_i192 = 0; $_i192 < $_size188; ++$_i192)
+          my $_etype193 = 0;
+          $xfer += $input->readListBegin(\$_etype193, \$_size190);
+          for (my $_i194 = 0; $_i194 < $_size190; ++$_i194)
           {
-            my $elem193 = undef;
-            $xfer += $input->readString(\$elem193);
-            push(@{$self->{success}},$elem193);
+            my $elem195 = undef;
+            $xfer += $input->readString(\$elem195);
+            push(@{$self->{success}},$elem195);
           }
           $xfer += $input->readListEnd();
         }
@@ -452,9 +452,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter194 (@{$self->{success}}) 
+        foreach my $iter196 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter194);
+          $xfer += $output->writeString($iter196);
         }
       }
       $xfer += $output->writeListEnd();
@@ -577,18 +577,18 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size195 = 0;
+          my $_size197 = 0;
           $self->{success} = {};
-          my $_ktype196 = 0;
-          my $_vtype197 = 0;
-          $xfer += $input->readMapBegin(\$_ktype196, \$_vtype197, \$_size195);
-          for (my $_i199 = 0; $_i199 < $_size195; ++$_i199)
+          my $_ktype198 = 0;
+          my $_vtype199 = 0;
+          $xfer += $input->readMapBegin(\$_ktype198, \$_vtype199, \$_size197);
+          for (my $_i201 = 0; $_i201 < $_size197; ++$_i201)
           {
-            my $key200 = '';
-            my $val201 = '';
-            $xfer += $input->readString(\$key200);
-            $xfer += $input->readString(\$val201);
-            $self->{success}->{$key200} = $val201;
+            my $key202 = '';
+            my $val203 = '';
+            $xfer += $input->readString(\$key202);
+            $xfer += $input->readString(\$val203);
+            $self->{success}->{$key202} = $val203;
           }
           $xfer += $input->readMapEnd();
         }
@@ -620,10 +620,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{success}}));
       {
-        while( my ($kiter202,$viter203) = each %{$self->{success}}) 
+        while( my ($kiter204,$viter205) = each %{$self->{success}}) 
         {
-          $xfer += $output->writeString($kiter202);
-          $xfer += $output->writeString($viter203);
+          $xfer += $output->writeString($kiter204);
+          $xfer += $output->writeString($viter205);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -746,33 +746,33 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size204 = 0;
+          my $_size206 = 0;
           $self->{success} = {};
-          my $_ktype205 = 0;
-          my $_vtype206 = 0;
-          $xfer += $input->readMapBegin(\$_ktype205, \$_vtype206, \$_size204);
-          for (my $_i208 = 0; $_i208 < $_size204; ++$_i208)
+          my $_ktype207 = 0;
+          my $_vtype208 = 0;
+          $xfer += $input->readMapBegin(\$_ktype207, \$_vtype208, \$_size206);
+          for (my $_i210 = 0; $_i210 < $_size206; ++$_i210)
           {
-            my $key209 = '';
-            my $val210 = [];
-            $xfer += $input->readString(\$key209);
+            my $key211 = '';
+            my $val212 = [];
+            $xfer += $input->readString(\$key211);
             {
-              my $_size211 = 0;
-              $val210 = {};
-              my $_ktype212 = 0;
-              my $_vtype213 = 0;
-              $xfer += $input->readMapBegin(\$_ktype212, \$_vtype213, \$_size211);
-              for (my $_i215 = 0; $_i215 < $_size211; ++$_i215)
+              my $_size213 = 0;
+              $val212 = {};
+              my $_ktype214 = 0;
+              my $_vtype215 = 0;
+              $xfer += $input->readMapBegin(\$_ktype214, \$_vtype215, \$_size213);
+              for (my $_i217 = 0; $_i217 < $_size213; ++$_i217)
               {
-                my $key216 = '';
-                my $val217 = 0;
-                $xfer += $input->readString(\$key216);
-                $xfer += $input->readI32(\$val217);
-                $val210->{$key216} = $val217;
+                my $key218 = '';
+                my $val219 = 0;
+                $xfer += $input->readString(\$key218);
+                $xfer += $input->readI32(\$val219);
+                $val212->{$key218} = $val219;
               }
               $xfer += $input->readMapEnd();
             }
-            $self->{success}->{$key209} = $val210;
+            $self->{success}->{$key211} = $val212;
           }
           $xfer += $input->readMapEnd();
         }
@@ -804,16 +804,16 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::MAP, scalar(keys %{$self->{success}}));
       {
-        while( my ($kiter218,$viter219) = each %{$self->{success}}) 
+        while( my ($kiter220,$viter221) = each %{$self->{success}}) 
         {
-          $xfer += $output->writeString($kiter218);
+          $xfer += $output->writeString($kiter220);
           {
-            $xfer += $output->writeMapBegin(TType::STRING, TType::I32, scalar(keys %{${viter219}}));
+            $xfer += $output->writeMapBegin(TType::STRING, TType::I32, scalar(keys %{${viter221}}));
             {
-              while( my ($kiter220,$viter221) = each %{${viter219}}) 
+              while( my ($kiter222,$viter223) = each %{${viter221}}) 
               {
-                $xfer += $output->writeString($kiter220);
-                $xfer += $output->writeI32($viter221);
+                $xfer += $output->writeString($kiter222);
+                $xfer += $output->writeI32($viter223);
               }
             }
             $xfer += $output->writeMapEnd();
@@ -922,15 +922,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size222 = 0;
+          my $_size224 = 0;
           $self->{success} = [];
-          my $_etype225 = 0;
-          $xfer += $input->readListBegin(\$_etype225, \$_size222);
-          for (my $_i226 = 0; $_i226 < $_size222; ++$_i226)
+          my $_etype227 = 0;
+          $xfer += $input->readListBegin(\$_etype227, \$_size224);
+          for (my $_i228 = 0; $_i228 < $_size224; ++$_i228)
           {
-            my $elem227 = undef;
-            $xfer += $input->readString(\$elem227);
-            push(@{$self->{success}},$elem227);
+            my $elem229 = undef;
+            $xfer += $input->readString(\$elem229);
+            push(@{$self->{success}},$elem229);
           }
           $xfer += $input->readListEnd();
         }
@@ -962,9 +962,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter228 (@{$self->{success}}) 
+        foreach my $iter230 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter228);
+          $xfer += $output->writeString($iter230);
         }
       }
       $xfer += $output->writeListEnd();
@@ -1087,15 +1087,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size229 = 0;
+          my $_size231 = 0;
           $self->{success} = [];
-          my $_etype232 = 0;
-          $xfer += $input->readListBegin(\$_etype232, \$_size229);
-          for (my $_i233 = 0; $_i233 < $_size229; ++$_i233)
+          my $_etype234 = 0;
+          $xfer += $input->readListBegin(\$_etype234, \$_size231);
+          for (my $_i235 = 0; $_i235 < $_size231; ++$_i235)
           {
-            my $elem234 = undef;
-            $xfer += $input->readString(\$elem234);
-            push(@{$self->{success}},$elem234);
+            my $elem236 = undef;
+            $xfer += $input->readString(\$elem236);
+            push(@{$self->{success}},$elem236);
           }
           $xfer += $input->readListEnd();
         }
@@ -1127,9 +1127,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter235 (@{$self->{success}}) 
+        foreach my $iter237 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter235);
+          $xfer += $output->writeString($iter237);
         }
       }
       $xfer += $output->writeListEnd();
@@ -1862,15 +1862,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size236 = 0;
+          my $_size238 = 0;
           $self->{success} = [];
-          my $_etype239 = 0;
-          $xfer += $input->readListBegin(\$_etype239, \$_size236);
-          for (my $_i240 = 0; $_i240 < $_size236; ++$_i240)
+          my $_etype241 = 0;
+          $xfer += $input->readListBegin(\$_etype241, \$_size238);
+          for (my $_i242 = 0; $_i242 < $_size238; ++$_i242)
           {
-            my $elem241 = undef;
-            $xfer += $input->readI64(\$elem241);
-            push(@{$self->{success}},$elem241);
+            my $elem243 = undef;
+            $xfer += $input->readI64(\$elem243);
+            push(@{$self->{success}},$elem243);
           }
           $xfer += $input->readListEnd();
         }
@@ -1902,9 +1902,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::I64, scalar(@{$self->{success}}));
       {
-        foreach my $iter242 (@{$self->{success}}) 
+        foreach my $iter244 (@{$self->{success}}) 
         {
-          $xfer += $output->writeI64($iter242);
+          $xfer += $output->writeI64($iter244);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2537,15 +2537,15 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size243 = 0;
+          my $_size245 = 0;
           $self->{success} = [];
-          my $_etype246 = 0;
-          $xfer += $input->readListBegin(\$_etype246, \$_size243);
-          for (my $_i247 = 0; $_i247 < $_size243; ++$_i247)
+          my $_etype248 = 0;
+          $xfer += $input->readListBegin(\$_etype248, \$_size245);
+          for (my $_i249 = 0; $_i249 < $_size245; ++$_i249)
           {
-            my $elem248 = undef;
-            $xfer += $input->readString(\$elem248);
-            push(@{$self->{success}},$elem248);
+            my $elem250 = undef;
+            $xfer += $input->readString(\$elem250);
+            push(@{$self->{success}},$elem250);
           }
           $xfer += $input->readListEnd();
         }
@@ -2577,9 +2577,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{success}}));
       {
-        foreach my $iter249 (@{$self->{success}}) 
+        foreach my $iter251 (@{$self->{success}}) 
         {
-          $xfer += $output->writeString($iter249);
+          $xfer += $output->writeString($iter251);
         }
       }
       $xfer += $output->writeListEnd();
@@ -3114,16 +3114,16 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size250 = 0;
+          my $_size252 = 0;
           $self->{mutations} = [];
-          my $_etype253 = 0;
-          $xfer += $input->readListBegin(\$_etype253, \$_size250);
-          for (my $_i254 = 0; $_i254 < $_size250; ++$_i254)
+          my $_etype255 = 0;
+          $xfer += $input->readListBegin(\$_etype255, \$_size252);
+          for (my $_i256 = 0; $_i256 < $_size252; ++$_i256)
           {
-            my $elem255 = undef;
-            $elem255 = new Blur::RowMutation();
-            $xfer += $elem255->read($input);
-            push(@{$self->{mutations}},$elem255);
+            my $elem257 = undef;
+            $elem257 = new Blur::RowMutation();
+            $xfer += $elem257->read($input);
+            push(@{$self->{mutations}},$elem257);
           }
           $xfer += $input->readListEnd();
         }
@@ -3148,9 +3148,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{mutations}}));
       {
-        foreach my $iter256 (@{$self->{mutations}}) 
+        foreach my $iter258 (@{$self->{mutations}}) 
         {
-          $xfer += ${iter256}->write($output);
+          $xfer += ${iter258}->write($output);
         }
       }
       $xfer += $output->writeListEnd();
@@ -4295,18 +4295,18 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size257 = 0;
+          my $_size259 = 0;
           $self->{success} = {};
-          my $_ktype258 = 0;
-          my $_vtype259 = 0;
-          $xfer += $input->readMapBegin(\$_ktype258, \$_vtype259, \$_size257);
-          for (my $_i261 = 0; $_i261 < $_size257; ++$_i261)
+          my $_ktype260 = 0;
+          my $_vtype261 = 0;
+          $xfer += $input->readMapBegin(\$_ktype260, \$_vtype261, \$_size259);
+          for (my $_i263 = 0; $_i263 < $_size259; ++$_i263)
           {
-            my $key262 = '';
-            my $val263 = '';
-            $xfer += $input->readString(\$key262);
-            $xfer += $input->readString(\$val263);
-            $self->{success}->{$key262} = $val263;
+            my $key264 = '';
+            my $val265 = '';
+            $xfer += $input->readString(\$key264);
+            $xfer += $input->readString(\$val265);
+            $self->{success}->{$key264} = $val265;
           }
           $xfer += $input->readMapEnd();
         }
@@ -4338,10 +4338,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{success}}));
       {
-        while( my ($kiter264,$viter265) = each %{$self->{success}}) 
+        while( my ($kiter266,$viter267) = each %{$self->{success}}) 
         {
-          $xfer += $output->writeString($kiter264);
-          $xfer += $output->writeString($viter265);
+          $xfer += $output->writeString($kiter266);
+          $xfer += $output->writeString($viter267);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -4396,15 +4396,15 @@ sub read {
     {
       /^1$/ && do{      if ($ftype == TType::SET) {
         {
-          my $_size266 = 0;
+          my $_size268 = 0;
           $self->{metrics} = {};
-          my $_etype269 = 0;
-          $xfer += $input->readSetBegin(\$_etype269, \$_size266);
-          for (my $_i270 = 0; $_i270 < $_size266; ++$_i270)
+          my $_etype271 = 0;
+          $xfer += $input->readSetBegin(\$_etype271, \$_size268);
+          for (my $_i272 = 0; $_i272 < $_size268; ++$_i272)
           {
-            my $elem271 = undef;
-            $xfer += $input->readString(\$elem271);
-            $self->{metrics}->{$elem271} = 1;
+            my $elem273 = undef;
+            $xfer += $input->readString(\$elem273);
+            $self->{metrics}->{$elem273} = 1;
           }
           $xfer += $input->readSetEnd();
         }
@@ -4429,9 +4429,9 @@ sub write {
     {
       $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{metrics}}));
       {
-        foreach my $iter272 (@{$self->{metrics}})
+        foreach my $iter274 (@{$self->{metrics}})
         {
-          $xfer += $output->writeString($iter272);
+          $xfer += $output->writeString($iter274);
         }
       }
       $xfer += $output->writeSetEnd();
@@ -4485,19 +4485,19 @@ sub read {
     {
       /^0$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size273 = 0;
+          my $_size275 = 0;
           $self->{success} = {};
-          my $_ktype274 = 0;
-          my $_vtype275 = 0;
-          $xfer += $input->readMapBegin(\$_ktype274, \$_vtype275, \$_size273);
-          for (my $_i277 = 0; $_i277 < $_size273; ++$_i277)
+          my $_ktype276 = 0;
+          my $_vtype277 = 0;
+          $xfer += $input->readMapBegin(\$_ktype276, \$_vtype277, \$_size275);
+          for (my $_i279 = 0; $_i279 < $_size275; ++$_i279)
           {
-            my $key278 = '';
-            my $val279 = new Blur::Metric();
-            $xfer += $input->readString(\$key278);
-            $val279 = new Blur::Metric();
-            $xfer += $val279->read($input);
-            $self->{success}->{$key278} = $val279;
+            my $key280 = '';
+            my $val281 = new Blur::Metric();
+            $xfer += $input->readString(\$key280);
+            $val281 = new Blur::Metric();
+            $xfer += $val281->read($input);
+            $self->{success}->{$key280} = $val281;
           }
           $xfer += $input->readMapEnd();
         }
@@ -4529,10 +4529,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{$self->{success}}));
       {
-        while( my ($kiter280,$viter281) = each %{$self->{success}}) 
+        while( my ($kiter282,$viter283) = each %{$self->{success}}) 
         {
-          $xfer += $output->writeString($kiter280);
-          $xfer += ${viter281}->write($output);
+          $xfer += $output->writeString($kiter282);
+          $xfer += ${viter283}->write($output);
         }
       }
       $xfer += $output->writeMapEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
index 4d82782..536e317 100644
--- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
+++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
@@ -2488,29 +2488,45 @@ sub write {
   return $xfer;
 }
 
-package Blur::Schema;
+package Blur::ColumnDefinition;
 use base qw(Class::Accessor);
-Blur::Schema->mk_accessors( qw( table columnFamilies ) );
+Blur::ColumnDefinition->mk_accessors( qw( family columnName subColumnName fieldLessIndexed fieldType properties ) );
 
 sub new {
   my $classname = shift;
   my $self      = {};
   my $vals      = shift || {};
-  $self->{table} = undef;
-  $self->{columnFamilies} = undef;
+  $self->{family} = undef;
+  $self->{columnName} = undef;
+  $self->{subColumnName} = undef;
+  $self->{fieldLessIndexed} = undef;
+  $self->{fieldType} = undef;
+  $self->{properties} = undef;
   if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{table}) {
-      $self->{table} = $vals->{table};
+    if (defined $vals->{family}) {
+      $self->{family} = $vals->{family};
+    }
+    if (defined $vals->{columnName}) {
+      $self->{columnName} = $vals->{columnName};
+    }
+    if (defined $vals->{subColumnName}) {
+      $self->{subColumnName} = $vals->{subColumnName};
+    }
+    if (defined $vals->{fieldLessIndexed}) {
+      $self->{fieldLessIndexed} = $vals->{fieldLessIndexed};
     }
-    if (defined $vals->{columnFamilies}) {
-      $self->{columnFamilies} = $vals->{columnFamilies};
+    if (defined $vals->{fieldType}) {
+      $self->{fieldType} = $vals->{fieldType};
+    }
+    if (defined $vals->{properties}) {
+      $self->{properties} = $vals->{properties};
     }
   }
   return bless ($self, $classname);
 }
 
 sub getName {
-  return 'Schema';
+  return 'ColumnDefinition';
 }
 
 sub read {
@@ -2529,37 +2545,189 @@ sub read {
     SWITCH: for($fid)
     {
       /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{table});
+        $xfer += $input->readString(\$self->{family});
       } else {
         $xfer += $input->skip($ftype);
       }
       last; };
-      /^2$/ && do{      if ($ftype == TType::MAP) {
+      /^2$/ && do{      if ($ftype == TType::STRING) {
+        $xfer += $input->readString(\$self->{columnName});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+      /^3$/ && do{      if ($ftype == TType::STRING) {
+        $xfer += $input->readString(\$self->{subColumnName});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+      /^4$/ && do{      if ($ftype == TType::BOOL) {
+        $xfer += $input->readBool(\$self->{fieldLessIndexed});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+      /^5$/ && do{      if ($ftype == TType::STRING) {
+        $xfer += $input->readString(\$self->{fieldType});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+      /^6$/ && do{      if ($ftype == TType::MAP) {
         {
           my $_size90 = 0;
-          $self->{columnFamilies} = {};
+          $self->{properties} = {};
           my $_ktype91 = 0;
           my $_vtype92 = 0;
           $xfer += $input->readMapBegin(\$_ktype91, \$_vtype92, \$_size90);
           for (my $_i94 = 0; $_i94 < $_size90; ++$_i94)
           {
             my $key95 = '';
-            my $val96 = [];
+            my $val96 = '';
             $xfer += $input->readString(\$key95);
+            $xfer += $input->readString(\$val96);
+            $self->{properties}->{$key95} = $val96;
+          }
+          $xfer += $input->readMapEnd();
+        }
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+        $xfer += $input->skip($ftype);
+    }
+    $xfer += $input->readFieldEnd();
+  }
+  $xfer += $input->readStructEnd();
+  return $xfer;
+}
+
+sub write {
+  my ($self, $output) = @_;
+  my $xfer   = 0;
+  $xfer += $output->writeStructBegin('ColumnDefinition');
+  if (defined $self->{family}) {
+    $xfer += $output->writeFieldBegin('family', TType::STRING, 1);
+    $xfer += $output->writeString($self->{family});
+    $xfer += $output->writeFieldEnd();
+  }
+  if (defined $self->{columnName}) {
+    $xfer += $output->writeFieldBegin('columnName', TType::STRING, 2);
+    $xfer += $output->writeString($self->{columnName});
+    $xfer += $output->writeFieldEnd();
+  }
+  if (defined $self->{subColumnName}) {
+    $xfer += $output->writeFieldBegin('subColumnName', TType::STRING, 3);
+    $xfer += $output->writeString($self->{subColumnName});
+    $xfer += $output->writeFieldEnd();
+  }
+  if (defined $self->{fieldLessIndexed}) {
+    $xfer += $output->writeFieldBegin('fieldLessIndexed', TType::BOOL, 4);
+    $xfer += $output->writeBool($self->{fieldLessIndexed});
+    $xfer += $output->writeFieldEnd();
+  }
+  if (defined $self->{fieldType}) {
+    $xfer += $output->writeFieldBegin('fieldType', TType::STRING, 5);
+    $xfer += $output->writeString($self->{fieldType});
+    $xfer += $output->writeFieldEnd();
+  }
+  if (defined $self->{properties}) {
+    $xfer += $output->writeFieldBegin('properties', TType::MAP, 6);
+    {
+      $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{properties}}));
+      {
+        while( my ($kiter97,$viter98) = each %{$self->{properties}}) 
+        {
+          $xfer += $output->writeString($kiter97);
+          $xfer += $output->writeString($viter98);
+        }
+      }
+      $xfer += $output->writeMapEnd();
+    }
+    $xfer += $output->writeFieldEnd();
+  }
+  $xfer += $output->writeFieldStop();
+  $xfer += $output->writeStructEnd();
+  return $xfer;
+}
+
+package Blur::Schema;
+use base qw(Class::Accessor);
+Blur::Schema->mk_accessors( qw( table families ) );
+
+sub new {
+  my $classname = shift;
+  my $self      = {};
+  my $vals      = shift || {};
+  $self->{table} = undef;
+  $self->{families} = undef;
+  if (UNIVERSAL::isa($vals,'HASH')) {
+    if (defined $vals->{table}) {
+      $self->{table} = $vals->{table};
+    }
+    if (defined $vals->{families}) {
+      $self->{families} = $vals->{families};
+    }
+  }
+  return bless ($self, $classname);
+}
+
+sub getName {
+  return 'Schema';
+}
+
+sub read {
+  my ($self, $input) = @_;
+  my $xfer  = 0;
+  my $fname;
+  my $ftype = 0;
+  my $fid   = 0;
+  $xfer += $input->readStructBegin(\$fname);
+  while (1) 
+  {
+    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
+    if ($ftype == TType::STOP) {
+      last;
+    }
+    SWITCH: for($fid)
+    {
+      /^1$/ && do{      if ($ftype == TType::STRING) {
+        $xfer += $input->readString(\$self->{table});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
+      /^2$/ && do{      if ($ftype == TType::MAP) {
+        {
+          my $_size99 = 0;
+          $self->{families} = {};
+          my $_ktype100 = 0;
+          my $_vtype101 = 0;
+          $xfer += $input->readMapBegin(\$_ktype100, \$_vtype101, \$_size99);
+          for (my $_i103 = 0; $_i103 < $_size99; ++$_i103)
+          {
+            my $key104 = '';
+            my $val105 = [];
+            $xfer += $input->readString(\$key104);
             {
-              my $_size97 = 0;
-              $val96 = {};
-              my $_etype100 = 0;
-              $xfer += $input->readSetBegin(\$_etype100, \$_size97);
-              for (my $_i101 = 0; $_i101 < $_size97; ++$_i101)
+              my $_size106 = 0;
+              $val105 = {};
+              my $_ktype107 = 0;
+              my $_vtype108 = 0;
+              $xfer += $input->readMapBegin(\$_ktype107, \$_vtype108, \$_size106);
+              for (my $_i110 = 0; $_i110 < $_size106; ++$_i110)
               {
-                my $elem102 = undef;
-                $xfer += $input->readString(\$elem102);
-                $val96->{$elem102} = 1;
+                my $key111 = '';
+                my $val112 = new Blur::ColumnDefinition();
+                $xfer += $input->readString(\$key111);
+                $val112 = new Blur::ColumnDefinition();
+                $xfer += $val112->read($input);
+                $val105->{$key111} = $val112;
               }
-              $xfer += $input->readSetEnd();
+              $xfer += $input->readMapEnd();
             }
-            $self->{columnFamilies}->{$key95} = $val96;
+            $self->{families}->{$key104} = $val105;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2584,23 +2752,24 @@ sub write {
     $xfer += $output->writeString($self->{table});
     $xfer += $output->writeFieldEnd();
   }
-  if (defined $self->{columnFamilies}) {
-    $xfer += $output->writeFieldBegin('columnFamilies', TType::MAP, 2);
+  if (defined $self->{families}) {
+    $xfer += $output->writeFieldBegin('families', TType::MAP, 2);
     {
-      $xfer += $output->writeMapBegin(TType::STRING, TType::SET, scalar(keys %{$self->{columnFamilies}}));
+      $xfer += $output->writeMapBegin(TType::STRING, TType::MAP, scalar(keys %{$self->{families}}));
       {
-        while( my ($kiter103,$viter104) = each %{$self->{columnFamilies}}) 
+        while( my ($kiter113,$viter114) = each %{$self->{families}}) 
         {
-          $xfer += $output->writeString($kiter103);
+          $xfer += $output->writeString($kiter113);
           {
-            $xfer += $output->writeSetBegin(TType::STRING, scalar(@{${viter104}}));
+            $xfer += $output->writeMapBegin(TType::STRING, TType::STRUCT, scalar(keys %{${viter114}}));
             {
-              foreach my $iter105 (@{${viter104}})
+              while( my ($kiter115,$viter116) = each %{${viter114}}) 
               {
-                $xfer += $output->writeString($iter105);
+                $xfer += $output->writeString($kiter115);
+                $xfer += ${viter116}->write($output);
               }
             }
-            $xfer += $output->writeSetEnd();
+            $xfer += $output->writeMapEnd();
           }
         }
       }
@@ -2749,15 +2918,15 @@ sub read {
       last; };
       /^11$/ && do{      if ($ftype == TType::SET) {
         {
-          my $_size106 = 0;
+          my $_size117 = 0;
           $self->{blockCachingFileTypes} = {};
-          my $_etype109 = 0;
-          $xfer += $input->readSetBegin(\$_etype109, \$_size106);
-          for (my $_i110 = 0; $_i110 < $_size106; ++$_i110)
+          my $_etype120 = 0;
+          $xfer += $input->readSetBegin(\$_etype120, \$_size117);
+          for (my $_i121 = 0; $_i121 < $_size117; ++$_i121)
           {
-            my $elem111 = undef;
-            $xfer += $input->readString(\$elem111);
-            $self->{blockCachingFileTypes}->{$elem111} = 1;
+            my $elem122 = undef;
+            $xfer += $input->readString(\$elem122);
+            $self->{blockCachingFileTypes}->{$elem122} = 1;
           }
           $xfer += $input->readSetEnd();
         }
@@ -2773,15 +2942,15 @@ sub read {
       last; };
       /^13$/ && do{      if ($ftype == TType::LIST) {
         {
-          my $_size112 = 0;
+          my $_size123 = 0;
           $self->{preCacheCols} = [];
-          my $_etype115 = 0;
-          $xfer += $input->readListBegin(\$_etype115, \$_size112);
-          for (my $_i116 = 0; $_i116 < $_size112; ++$_i116)
+          my $_etype126 = 0;
+          $xfer += $input->readListBegin(\$_etype126, \$_size123);
+          for (my $_i127 = 0; $_i127 < $_size123; ++$_i127)
           {
-            my $elem117 = undef;
-            $xfer += $input->readString(\$elem117);
-            push(@{$self->{preCacheCols}},$elem117);
+            my $elem128 = undef;
+            $xfer += $input->readString(\$elem128);
+            push(@{$self->{preCacheCols}},$elem128);
           }
           $xfer += $input->readListEnd();
         }
@@ -2791,18 +2960,18 @@ sub read {
       last; };
       /^14$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size118 = 0;
+          my $_size129 = 0;
           $self->{tableProperties} = {};
-          my $_ktype119 = 0;
-          my $_vtype120 = 0;
-          $xfer += $input->readMapBegin(\$_ktype119, \$_vtype120, \$_size118);
-          for (my $_i122 = 0; $_i122 < $_size118; ++$_i122)
+          my $_ktype130 = 0;
+          my $_vtype131 = 0;
+          $xfer += $input->readMapBegin(\$_ktype130, \$_vtype131, \$_size129);
+          for (my $_i133 = 0; $_i133 < $_size129; ++$_i133)
           {
-            my $key123 = '';
-            my $val124 = '';
-            $xfer += $input->readString(\$key123);
-            $xfer += $input->readString(\$val124);
-            $self->{tableProperties}->{$key123} = $val124;
+            my $key134 = '';
+            my $val135 = '';
+            $xfer += $input->readString(\$key134);
+            $xfer += $input->readString(\$val135);
+            $self->{tableProperties}->{$key134} = $val135;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2830,18 +2999,18 @@ sub read {
       last; };
       /^18$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size125 = 0;
+          my $_size136 = 0;
           $self->{defaultMissingFieldProps} = {};
-          my $_ktype126 = 0;
-          my $_vtype127 = 0;
-          $xfer += $input->readMapBegin(\$_ktype126, \$_vtype127, \$_size125);
-          for (my $_i129 = 0; $_i129 < $_size125; ++$_i129)
+          my $_ktype137 = 0;
+          my $_vtype138 = 0;
+          $xfer += $input->readMapBegin(\$_ktype137, \$_vtype138, \$_size136);
+          for (my $_i140 = 0; $_i140 < $_size136; ++$_i140)
           {
-            my $key130 = '';
-            my $val131 = '';
-            $xfer += $input->readString(\$key130);
-            $xfer += $input->readString(\$val131);
-            $self->{defaultMissingFieldProps}->{$key130} = $val131;
+            my $key141 = '';
+            my $val142 = '';
+            $xfer += $input->readString(\$key141);
+            $xfer += $input->readString(\$val142);
+            $self->{defaultMissingFieldProps}->{$key141} = $val142;
           }
           $xfer += $input->readMapEnd();
         }
@@ -2901,9 +3070,9 @@ sub write {
     {
       $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{blockCachingFileTypes}}));
       {
-        foreach my $iter132 (@{$self->{blockCachingFileTypes}})
+        foreach my $iter143 (@{$self->{blockCachingFileTypes}})
         {
-          $xfer += $output->writeString($iter132);
+          $xfer += $output->writeString($iter143);
         }
       }
       $xfer += $output->writeSetEnd();
@@ -2920,9 +3089,9 @@ sub write {
     {
       $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{preCacheCols}}));
       {
-        foreach my $iter133 (@{$self->{preCacheCols}}) 
+        foreach my $iter144 (@{$self->{preCacheCols}}) 
         {
-          $xfer += $output->writeString($iter133);
+          $xfer += $output->writeString($iter144);
         }
       }
       $xfer += $output->writeListEnd();
@@ -2934,10 +3103,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{tableProperties}}));
       {
-        while( my ($kiter134,$viter135) = each %{$self->{tableProperties}}) 
+        while( my ($kiter145,$viter146) = each %{$self->{tableProperties}}) 
         {
-          $xfer += $output->writeString($kiter134);
-          $xfer += $output->writeString($viter135);
+          $xfer += $output->writeString($kiter145);
+          $xfer += $output->writeString($viter146);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -2964,10 +3133,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{defaultMissingFieldProps}}));
       {
-        while( my ($kiter136,$viter137) = each %{$self->{defaultMissingFieldProps}}) 
+        while( my ($kiter147,$viter148) = each %{$self->{defaultMissingFieldProps}}) 
         {
-          $xfer += $output->writeString($kiter136);
-          $xfer += $output->writeString($viter137);
+          $xfer += $output->writeString($kiter147);
+          $xfer += $output->writeString($viter148);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -3035,18 +3204,18 @@ sub read {
       last; };
       /^2$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size138 = 0;
+          my $_size149 = 0;
           $self->{strMap} = {};
-          my $_ktype139 = 0;
-          my $_vtype140 = 0;
-          $xfer += $input->readMapBegin(\$_ktype139, \$_vtype140, \$_size138);
-          for (my $_i142 = 0; $_i142 < $_size138; ++$_i142)
+          my $_ktype150 = 0;
+          my $_vtype151 = 0;
+          $xfer += $input->readMapBegin(\$_ktype150, \$_vtype151, \$_size149);
+          for (my $_i153 = 0; $_i153 < $_size149; ++$_i153)
           {
-            my $key143 = '';
-            my $val144 = '';
-            $xfer += $input->readString(\$key143);
-            $xfer += $input->readString(\$val144);
-            $self->{strMap}->{$key143} = $val144;
+            my $key154 = '';
+            my $val155 = '';
+            $xfer += $input->readString(\$key154);
+            $xfer += $input->readString(\$val155);
+            $self->{strMap}->{$key154} = $val155;
           }
           $xfer += $input->readMapEnd();
         }
@@ -3056,18 +3225,18 @@ sub read {
       last; };
       /^3$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size145 = 0;
+          my $_size156 = 0;
           $self->{longMap} = {};
-          my $_ktype146 = 0;
-          my $_vtype147 = 0;
-          $xfer += $input->readMapBegin(\$_ktype146, \$_vtype147, \$_size145);
-          for (my $_i149 = 0; $_i149 < $_size145; ++$_i149)
+          my $_ktype157 = 0;
+          my $_vtype158 = 0;
+          $xfer += $input->readMapBegin(\$_ktype157, \$_vtype158, \$_size156);
+          for (my $_i160 = 0; $_i160 < $_size156; ++$_i160)
           {
-            my $key150 = '';
-            my $val151 = 0;
-            $xfer += $input->readString(\$key150);
-            $xfer += $input->readI64(\$val151);
-            $self->{longMap}->{$key150} = $val151;
+            my $key161 = '';
+            my $val162 = 0;
+            $xfer += $input->readString(\$key161);
+            $xfer += $input->readI64(\$val162);
+            $self->{longMap}->{$key161} = $val162;
           }
           $xfer += $input->readMapEnd();
         }
@@ -3077,18 +3246,18 @@ sub read {
       last; };
       /^4$/ && do{      if ($ftype == TType::MAP) {
         {
-          my $_size152 = 0;
+          my $_size163 = 0;
           $self->{doubleMap} = {};
-          my $_ktype153 = 0;
-          my $_vtype154 = 0;
-          $xfer += $input->readMapBegin(\$_ktype153, \$_vtype154, \$_size152);
-          for (my $_i156 = 0; $_i156 < $_size152; ++$_i156)
+          my $_ktype164 = 0;
+          my $_vtype165 = 0;
+          $xfer += $input->readMapBegin(\$_ktype164, \$_vtype165, \$_size163);
+          for (my $_i167 = 0; $_i167 < $_size163; ++$_i167)
           {
-            my $key157 = '';
-            my $val158 = 0.0;
-            $xfer += $input->readString(\$key157);
-            $xfer += $input->readDouble(\$val158);
-            $self->{doubleMap}->{$key157} = $val158;
+            my $key168 = '';
+            my $val169 = 0.0;
+            $xfer += $input->readString(\$key168);
+            $xfer += $input->readDouble(\$val169);
+            $self->{doubleMap}->{$key168} = $val169;
           }
           $xfer += $input->readMapEnd();
         }
@@ -3118,10 +3287,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{strMap}}));
       {
-        while( my ($kiter159,$viter160) = each %{$self->{strMap}}) 
+        while( my ($kiter170,$viter171) = each %{$self->{strMap}}) 
         {
-          $xfer += $output->writeString($kiter159);
-          $xfer += $output->writeString($viter160);
+          $xfer += $output->writeString($kiter170);
+          $xfer += $output->writeString($viter171);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -3133,10 +3302,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::I64, scalar(keys %{$self->{longMap}}));
       {
-        while( my ($kiter161,$viter162) = each %{$self->{longMap}}) 
+        while( my ($kiter172,$viter173) = each %{$self->{longMap}}) 
         {
-          $xfer += $output->writeString($kiter161);
-          $xfer += $output->writeI64($viter162);
+          $xfer += $output->writeString($kiter172);
+          $xfer += $output->writeI64($viter173);
         }
       }
       $xfer += $output->writeMapEnd();
@@ -3148,174 +3317,10 @@ sub write {
     {
       $xfer += $output->writeMapBegin(TType::STRING, TType::DOUBLE, scalar(keys %{$self->{doubleMap}}));
       {
-        while( my ($kiter163,$viter164) = each %{$self->{doubleMap}}) 
-        {
-          $xfer += $output->writeString($kiter163);
-          $xfer += $output->writeDouble($viter164);
-        }
-      }
-      $xfer += $output->writeMapEnd();
-    }
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::ColumnDefinition;
-use base qw(Class::Accessor);
-Blur::ColumnDefinition->mk_accessors( qw( family columnName subColumnName fieldLessIndexing fieldType properties ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{family} = undef;
-  $self->{columnName} = undef;
-  $self->{subColumnName} = undef;
-  $self->{fieldLessIndexing} = undef;
-  $self->{fieldType} = undef;
-  $self->{properties} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{family}) {
-      $self->{family} = $vals->{family};
-    }
-    if (defined $vals->{columnName}) {
-      $self->{columnName} = $vals->{columnName};
-    }
-    if (defined $vals->{subColumnName}) {
-      $self->{subColumnName} = $vals->{subColumnName};
-    }
-    if (defined $vals->{fieldLessIndexing}) {
-      $self->{fieldLessIndexing} = $vals->{fieldLessIndexing};
-    }
-    if (defined $vals->{fieldType}) {
-      $self->{fieldType} = $vals->{fieldType};
-    }
-    if (defined $vals->{properties}) {
-      $self->{properties} = $vals->{properties};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'ColumnDefinition';
-}
-
-sub read {
-  my ($self, $input) = @_;
-  my $xfer  = 0;
-  my $fname;
-  my $ftype = 0;
-  my $fid   = 0;
-  $xfer += $input->readStructBegin(\$fname);
-  while (1) 
-  {
-    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-    if ($ftype == TType::STOP) {
-      last;
-    }
-    SWITCH: for($fid)
-    {
-      /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{family});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{columnName});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{subColumnName});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^4$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{fieldLessIndexing});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^5$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{fieldType});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^6$/ && do{      if ($ftype == TType::MAP) {
-        {
-          my $_size165 = 0;
-          $self->{properties} = {};
-          my $_ktype166 = 0;
-          my $_vtype167 = 0;
-          $xfer += $input->readMapBegin(\$_ktype166, \$_vtype167, \$_size165);
-          for (my $_i169 = 0; $_i169 < $_size165; ++$_i169)
-          {
-            my $key170 = '';
-            my $val171 = '';
-            $xfer += $input->readString(\$key170);
-            $xfer += $input->readString(\$val171);
-            $self->{properties}->{$key170} = $val171;
-          }
-          $xfer += $input->readMapEnd();
-        }
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-        $xfer += $input->skip($ftype);
-    }
-    $xfer += $input->readFieldEnd();
-  }
-  $xfer += $input->readStructEnd();
-  return $xfer;
-}
-
-sub write {
-  my ($self, $output) = @_;
-  my $xfer   = 0;
-  $xfer += $output->writeStructBegin('ColumnDefinition');
-  if (defined $self->{family}) {
-    $xfer += $output->writeFieldBegin('family', TType::STRING, 1);
-    $xfer += $output->writeString($self->{family});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{columnName}) {
-    $xfer += $output->writeFieldBegin('columnName', TType::STRING, 2);
-    $xfer += $output->writeString($self->{columnName});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{subColumnName}) {
-    $xfer += $output->writeFieldBegin('subColumnName', TType::STRING, 3);
-    $xfer += $output->writeString($self->{subColumnName});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{fieldLessIndexing}) {
-    $xfer += $output->writeFieldBegin('fieldLessIndexing', TType::BOOL, 4);
-    $xfer += $output->writeBool($self->{fieldLessIndexing});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{fieldType}) {
-    $xfer += $output->writeFieldBegin('fieldType', TType::STRING, 5);
-    $xfer += $output->writeString($self->{fieldType});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{properties}) {
-    $xfer += $output->writeFieldBegin('properties', TType::MAP, 6);
-    {
-      $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{properties}}));
-      {
-        while( my ($kiter172,$viter173) = each %{$self->{properties}}) 
+        while( my ($kiter174,$viter175) = each %{$self->{doubleMap}}) 
         {
-          $xfer += $output->writeString($kiter172);
-          $xfer += $output->writeString($viter173);
+          $xfer += $output->writeString($kiter174);
+          $xfer += $output->writeDouble($viter175);
         }
       }
       $xfer += $output->writeMapEnd();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/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 59e9974..217bbe3 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
@@ -645,17 +645,60 @@ module Blur
     ::Thrift::Struct.generate_accessors self
   end
 
-  # 
+  # The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
+  class ColumnDefinition
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    FAMILY = 1
+    COLUMNNAME = 2
+    SUBCOLUMNNAME = 3
+    FIELDLESSINDEXED = 4
+    FIELDTYPE = 5
+    PROPERTIES = 6
+
+    FIELDS = {
+      # Required. The family the this column existing within.
+      FAMILY => {:type => ::Thrift::Types::STRING, :name => 'family'},
+      # Required. The column name.
+      COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
+      # If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+      SUBCOLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'subColumnName'},
+      # If this column should be searchable without having to specify the name of the column in the query.
+# NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+      FIELDLESSINDEXED => {:type => ::Thrift::Types::BOOL, :name => 'fieldLessIndexed'},
+      # The field type for the column.  The built in types are:
+# <ul>
+# <li>text - Full text indexing.</li>
+# <li>string - Indexed string literal</li>
+# <li>int - Converted to an integer and indexed numerically.</li>
+# <li>long - Converted to an long and indexed numerically.</li>
+# <li>float - Converted to an float and indexed numerically.</li>
+# <li>double - Converted to an double and indexed numerically.</li>
+# <li>stored - Not indexed, only stored.</li>
+# </ul>
+      FIELDTYPE => {:type => ::Thrift::Types::STRING, :name => 'fieldType'},
+      # For any custom field types, you can pass in configuration properties.
+      PROPERTIES => {:type => ::Thrift::Types::MAP, :name => 'properties', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  # The current schema of the table.
   class Schema
     include ::Thrift::Struct, ::Thrift::Struct_Union
     TABLE = 1
-    COLUMNFAMILIES = 2
+    FAMILIES = 2
 
     FIELDS = {
-      # 
+      # The table name.
       TABLE => {:type => ::Thrift::Types::STRING, :name => 'table'},
-      # 
-      COLUMNFAMILIES => {:type => ::Thrift::Types::MAP, :name => 'columnFamilies', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::SET, :element => {:type => ::Thrift::Types::STRING}}}
+      # Families and the column definitions within them.
+      FAMILIES => {:type => ::Thrift::Types::MAP, :name => 'families', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::MAP, :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::ColumnDefinition}}}
     }
 
     def struct_fields; FIELDS; end
@@ -754,47 +797,4 @@ module Blur
     ::Thrift::Struct.generate_accessors self
   end
 
-  # The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
-  class ColumnDefinition
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    FAMILY = 1
-    COLUMNNAME = 2
-    SUBCOLUMNNAME = 3
-    FIELDLESSINDEXING = 4
-    FIELDTYPE = 5
-    PROPERTIES = 6
-
-    FIELDS = {
-      # Required. The family the this column existing within.
-      FAMILY => {:type => ::Thrift::Types::STRING, :name => 'family'},
-      # Required. The column name.
-      COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'},
-      # If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
-      SUBCOLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'subColumnName'},
-      # If this column should be searchable without having to specify the name of the column in the query.
-# NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
-      FIELDLESSINDEXING => {:type => ::Thrift::Types::BOOL, :name => 'fieldLessIndexing'},
-      # The field type for the column.  The built in types are:
-# <ul>
-# <li>text - Full text indexing.</li>
-# <li>string - Indexed string literal</li>
-# <li>int - Converted to an integer and indexed numerically.</li>
-# <li>long - Converted to an long and indexed numerically.</li>
-# <li>float - Converted to an float and indexed numerically.</li>
-# <li>double - Converted to an double and indexed numerically.</li>
-# <li>stored - Not indexed, only stored.</li>
-# </ul>
-      FIELDTYPE => {:type => ::Thrift::Types::STRING, :name => 'fieldType'},
-      # For any custom field types, you can pass in configuration properties.
-      PROPERTIES => {:type => ::Thrift::Types::MAP, :name => 'properties', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
 end


Mime
View raw message