couchbase 3.2.5 → 3.2.6

package/deps/lcb/tools/cbc.cc

@@ -2023,6 +2023,35 @@ void AdminHandler::run()
     printf("%s\n", resbuf.c_str());
 }
 
+void BucketListHandler::run()
+{
+    fprintf(stderr, "Requesting %s\n", getURI().c_str());
+    HttpBaseHandler::run();
+    if (o_raw.result()) {
+        printf("%s\n", resbuf.c_str());
+    } else {
+        format();
+    }
+}
+
+void BucketListHandler::format()
+{
+    Json::Value json;
+    if (!Json::Reader().parse(resbuf, json)) {
+        fprintf(stderr, "Failed to parse response as JSON, falling back to raw mode\n");
+        printf("%s\n", resbuf.c_str());
+    }
+
+    printf("%-20s%-10s%s\n", "Name", "Type", "Items");
+
+    for (Json::Value::ArrayIndex i = 0; i < json.size(); ++i) {
+        const char *name = json[i]["name"].asString().c_str();
+        const char *bucketType = json[i]["bucketType"].asString().c_str();
+        const int itemCount = json[i]["basicStats"]["itemCount"].asInt();
+        printf("%-20s%-10s%i\n", name, bucketType, itemCount);
+    }
+}
+
 void BucketCreateHandler::run()
 {
     const string &name = getRequiredArg();
@@ -2278,6 +2307,7 @@ static const char *optionsOrder[] = {"help",
                                      "analytics",
                                      "search",
                                      "admin",
+                                     "bucket-list",
                                      "bucket-create",
                                      "bucket-delete",
                                      "bucket-flush",
@@ -2369,6 +2399,7 @@ static void setupHandlers()
     handlers_s["incr"] = new IncrHandler();
     handlers_s["decr"] = new DecrHandler();
     handlers_s["admin"] = new AdminHandler();
+    handlers_s["bucket-list"] = new BucketListHandler();
     handlers_s["bucket-create"] = new BucketCreateHandler();
     handlers_s["bucket-delete"] = new BucketDeleteHandler();
     handlers_s["bucket-flush"] = new BucketFlushHandler();

package/deps/lcb/tools/docgen/docgen.h

@@ -18,6 +18,7 @@
 #include "contrib/lcb-jsoncpp/lcb-jsoncpp.h"
 #include "placeholders.h"
 #include <algorithm>
+#include <memory>
 #include <stdexcept>
 
 namespace Pillowfight
@@ -78,8 +79,8 @@ class DocGeneratorBase
      * @param cur_gen The index of the current generator thread
      * @return An opaque state object. This should be deleted by the caller
      */
-    virtual GeneratorState *createState(int total_gens, int cur_gen) const = 0;
-    virtual SubdocGeneratorState *createSubdocState(int, int) const
+    virtual std::unique_ptr<GeneratorState> createState(int total_gens, int cur_gen) const = 0;
+    virtual std::unique_ptr<SubdocGeneratorState> createSubdocState(int, int) const
     {
         return NULL;
     }
@@ -164,9 +165,9 @@ class RawDocGenerator : public DocGeneratorBase
         }
     };
 
-    GeneratorState *createState(int, int) const
+    std::unique_ptr<GeneratorState> createState(int, int) const
     {
-        return new MyState(this);
+        return std::unique_ptr<GeneratorState>(new MyState(this));
     }
 
   private:
@@ -207,9 +208,9 @@ class PresetDocGenerator : public DocGeneratorBase
         const PresetDocGenerator *m_parent;
     };
 
-    GeneratorState *createState(int, int) const
+    std::unique_ptr<GeneratorState> createState(int, int) const
     {
-        return new MyState(this);
+        return std::unique_ptr<GeneratorState>(new MyState(this));
     }
 
   protected:
@@ -371,9 +372,9 @@ class JsonDocGenerator : public PresetDocGenerator
     };
 
   public:
-    virtual SubdocGeneratorState *createSubdocState(int, int) const
+    virtual std::unique_ptr<SubdocGeneratorState> createSubdocState(int, int) const
     {
-        return new SDGenstate(m_docs);
+        return std::unique_ptr<SubdocGeneratorState>(new SDGenstate(m_docs));
     }
 };
 
@@ -424,9 +425,9 @@ class PlaceholderDocGenerator : public DocGeneratorBase
     }
 
   public:
-    GeneratorState *createState(int total, int cur) const
+    std::unique_ptr<GeneratorState> createState(int total, int cur) const
     {
-        return new MyState(this, total, cur);
+        return std::unique_ptr<GeneratorState>(new MyState(this, total, cur));
     }
 
   private:

package/dist/httpexecutor.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Connection } from './connection';
 import { HttpErrorContext } from './errorcontexts';
 import { RequestSpan } from './tracing';

package/package.json

@@ -1 +1 @@
-{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=10.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","debug":"^4.3.4","nan":"^2.15.0","parse-duration":"^1.0.2","prebuild-install":"^7.0.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^3.2.0","@tsconfig/node10":"^1.0.8","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^17.0.23","@typescript-eslint/eslint-plugin":"^5.18.0","@typescript-eslint/parser":"^5.18.0","chai":"^4.3.6","eslint":"^8.12.0","eslint-config-prettier":"^8.5.0","eslint-plugin-jsdoc":"^38.1.6","eslint-plugin-mocha":"^10.0.3","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^9.2.2","npm-check-updates":"^12.5.8","nyc":"^15.1.0","prebuild":"^11.0.3","prettier":"^2.6.2","segfault-handler":"^1.3.0","semver":"^7.3.6","ts-mocha":"^9.0.2","ts-node":"^10.7.0","typedoc":"^0.22.13","typescript":"^4.6.3","uuid":"^8.3.2"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.5","config":{"native":false},"scripts":{"install":"prebuild-install || node-gyp rebuild","build":"node-gyp build && tsc","rebuild":"node-gyp rebuild && tsc","prebuild":"prebuild --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"}}
+{"bugs":{"url":"http://www.couchbase.com/issues/browse/JSCBC"},"description":"The official Couchbase Node.js Client Library.","engines":{"node":">=10.0.0"},"homepage":"http://www.couchbase.com/communities/nodejs","keywords":["couchbase","libcouchbase","memcached","nosql","json","document"],"main":"dist/couchbase.js","types":"dist/couchbase.d.ts","license":"Apache-2.0","name":"couchbase","dependencies":{"bindings":"^1.5.0","debug":"^4.3.4","nan":"^2.17.0","parse-duration":"^1.0.2","prebuild-install":"^7.1.1"},"devDependencies":{"@trivago/prettier-plugin-sort-imports":"^3.4.0","@tsconfig/node10":"^1.0.9","@types/bindings":"^1.5.1","@types/debug":"^4.1.7","@types/node":"^18.11.9","@typescript-eslint/eslint-plugin":"^5.42.0","@typescript-eslint/parser":"^5.42.0","chai":"^4.3.6","eslint":"^8.26.0","eslint-config-prettier":"^8.5.0","eslint-plugin-jsdoc":"^39.6.2","eslint-plugin-mocha":"^10.1.0","eslint-plugin-node":"^11.1.0","expose-gc":"^1.0.0","mocha":"^10.1.0","npm-check-updates":"^16.3.16","nyc":"^15.1.0","prebuild":"^11.0.4","prettier":"^2.7.1","segfault-handler":"^1.3.0","semver":"^7.3.8","ts-mocha":"^10.0.0","ts-node":"^10.9.1","typedoc":"^0.23.20","typescript":"^4.8.4","uuid":"^9.0.0"},"repository":{"type":"git","url":"http://github.com/couchbase/couchnode.git"},"version":"3.2.6","config":{"native":false},"scripts":{"install":"prebuild-install || node-gyp rebuild","build":"node-gyp build && tsc","rebuild":"node-gyp rebuild && tsc","prebuild":"prebuild --verbose --strip","prepare":"tsc","build-docs":"typedoc","test":"ts-mocha test/*.test.*","test-fast":"ts-mocha test/*.test.* -ig '(slow)'","cover":"nyc ts-mocha test/*.test.*","cover-fast":"nyc ts-mocha test/*.test.* -ig '(slow)'","lint":"eslint ./lib/ ./test/","check-deps":"ncu"}}