--no commit message

--no commit message

lib/bss/reader.js

@@ -23,6 +23,18 @@ Reader.prototype.moveTo = function(idx){
   }
 }
 
+Reader.prototype.next = function(cb){
+  var self=this;
+
+  this.readAt(++this.cursorIdx,function(err,obj){
+    if(!err && obj){
+      cb(null,obj)
+    }else{
+      cb(err,null);
+    }
+  });
+}
+
 Reader.prototype.nextObject = function(cb){
   var self=this;
 
@@ -70,7 +82,7 @@ Reader.prototype.readAt = function(seq,opt,cb){
 
   var oatNo = Math.ceil(seq / rootData.OATZ);
   var slotNo = (seq-1)%rootData.OATZ;
-  
+
   // var hobj3 = {
   //     "ID":new Buffer(12),
   //     "TY":3,

storage-service/ws/v0.1/service-storage.js

@@ -91,6 +91,14 @@ router.get('/:id/objects',function (req, res) {
       from_seq = Number(query.seq_from);
     }
 
+    var objOpt = {'meta':true,'data':true}
+    if(query.show == 'id'){
+      objOpt.meta = false;
+      objOpt.data = false;
+    }else if(query.show == 'meta'){
+      objOpt.data = false;
+    }
+
     fs.exists(bss_full_path,function(exists){
 
       if(exists){
@@ -124,7 +132,7 @@ router.get('/:id/objects',function (req, res) {
                   if(!obj){
                     cont=false;
                   }else{
-                    var dataout = JSON.stringify(obj_out(obj));
+                    var dataout = JSON.stringify(obj_out(obj,objOpt));
                     if(resultIdx>0){res.write(',');}
                     res.write(dataout);
                     counter+=dataout.length;
@@ -156,11 +164,15 @@ router.get('/:id/objects',function (req, res) {
 
 });
 
-function obj_out(obj){
-  return {"_id" : (new ObjId(obj.header.ID)).toString(),
-          "meta" : obj.meta,
-          "data" : obj.data
-        }
+function obj_out(obj,opt){
+  var ret = {
+              "_id" : (new ObjId(obj.header.ID)).toString()
+            }
+
+  if(opt.meta){ret.meta = obj.meta;}
+  if(opt.data){ret.data = obj.data;}
+
+  return ret
 }
 
 

test/bss_read.js

@@ -3,30 +3,74 @@ var async = require('async');
 
 var BinStream = ctx.getLib('lib/bss/binarystream_v1_1');
 
-var FNAME = "D:/testfile/gcs/file/test.bss";
+var FNAME = "D:/testfile/env.bss";
+
+
+// BinStream.open(FNAME,function(err,bss){
+//
+//   var rd = bss.reader();
+//   var cont = true;
+//   var idx=0;
+//   async.whilst(
+//       function() { return cont; },
+//       function(callback) {
+//
+//         rd.nextObject(function(err,obj){
+//           if(!obj){
+//             cont=false;
+//           }else{
+//             idx++;
+//             if(idx%100000 == 0){
+//               console.log(idx);
+//             }
+//             //meta = obj.meta;
+//             //console.log(obj.data);
+//           }
+//           callback();
+//         });
+//
+//       },function(err){
+//         bss.close(function(err){
+//           console.log('close');
+//         });
+//       });
+//
+// });
 
 
 BinStream.open(FNAME,function(err,bss){
 
   var rd = bss.reader();
   var cont = true;
+  var idx=0;
+  var tA = (new Date()).getTime();
 
   async.whilst(
       function() { return cont; },
       function(callback) {
 
-        rd.nextObject(function(err,obj){
+        rd.next(function(err,obj){
           if(!obj){
             cont=false;
+            callback();
           }else{
+            obj.readMeta(function(err,meta){
+              idx++;
+              if(idx%100000 == 0){
+                console.log(meta);
+              }
+              callback();
+            });
             //meta = obj.meta;
-            console.log(obj.data);
+            //console.log(obj.data);
           }
-          callback();
+          //callback();
         });
 
       },function(err){
         bss.close(function(err){
+          var tB = (new Date()).getTime();
+          console.log(tB-tA);
           console.log('close');
         });
       });