infinispan 0.9.0 → 0.10.0

package/lib/protostream/query.proto

@@ -0,0 +1,122 @@
+/**********************************************************************************************************************
+ *                                  REMOTE QUERY RELATED PROTOBUF DEFINITIONS                                         *
+ *                                                                                                                    *
+ *         Allocated TypeId range is: [4400 .. 4599] (see org.infinispan.commons.marshall.ProtoStreamTypeIds)         *
+ *         Actually used range is: [4400 .. 4403]                                                                     *
+ *********************************************************************************************************************/
+syntax = "proto2";
+import "Protos/message-wrapping.proto";
+
+package org.infinispan.query.remote.client;
+
+/**
+ * @TypeId(4400)
+ */
+message QueryRequest {
+
+   /**
+    * The query string, in Infinispan's query language aka Ickle (a JP-QL micro-subset with full-text enhancements).
+    */
+   required string queryString = 1;
+
+
+   /**
+    * The number of matching results to skip before the first returned result.
+    */
+   optional int64 startOffset = 3;
+
+   /**
+    * Maximum number of matching results to return.
+    */
+   optional int32 maxResults = 4;
+
+   /**
+    * Multiple, optional, named parameters. Each name must occur only once.
+    */
+   repeated NamedParameter namedParameters = 5;
+   /**
+    * Whether the query is limited to the data from node that receives the request
+    */
+   optional bool local = 6;
+
+   message NamedParameter {
+
+      /**
+       * Parameter unique name.
+       */
+      required string name = 1;
+
+      /**
+       * Parameter value.
+       */
+      required org.infinispan.protostream.WrappedMessage value = 2;
+   }
+}
+
+/**
+ * @TypeId(4401)
+ */
+message QueryResponse {
+
+   /**
+    * The number of returned results.
+    */
+   required int32 numResults = 1;
+
+   /**
+    * Indicates presence and size of projections.
+    *
+    *      0 - no projection
+    * 1 .. N - projection with N components
+    *    < 0 - illegal value
+    */
+   required int32 projectionSize = 2;
+
+   /**
+    * The list of matching results. The size should be either numResults, if no projections are used, or numResults *
+    * projectionSize otherwise. If projections are used, then each group of projectionSize consecutive elements
+    * represent together a row from the result. We use this simple schema in order to avoid bi-dimensional arrays when
+    * projections are present.
+    */
+   repeated org.infinispan.protostream.WrappedMessage results = 3;
+
+   /**
+    * Total number of results that match the query. This is usually larger than numResults due to
+    * QueryRequest.startOffset and QueryRequest.maxResults.
+    */
+   required int64 totalResults = 4;
+}
+
+/**
+ * @TypeId(4402)
+ */
+message FilterResult {
+
+   optional bytes instance = 1;
+
+   repeated org.infinispan.protostream.WrappedMessage projection = 2;
+
+   repeated org.infinispan.protostream.WrappedMessage sortProjection = 3;
+}
+
+/**
+ * @TypeId(4403)
+ */
+message ContinuousQueryResult {
+
+   enum ResultType {
+      LEAVING = 0;
+      JOINING = 1;
+      UPDATED = 2;
+   }
+
+   required ResultType resultType = 1;
+
+   required bytes key = 2;
+
+   /* Only present if resultType is JOINING or UPDATED and 'projection' field is missing */
+   optional bytes value = 3;
+
+   /* Only present if resultType is JOINING or UPDATED and 'value' field is missing */
+   repeated org.infinispan.protostream.WrappedMessage projection = 4;
+}

package/lib/sasl/bitops.js

@@ -1,21 +1,19 @@
-var createHash = require('create-hash');
-var createHmac = require('create-hmac');
-var xor = require('bitwise-xor');
-
+var crypto = require('crypto');
+var xor = require('buffer-xor');
 
 exports.XOR = xor;
 
 exports.H = function (algorithm, str) {
-    return createHash(algorithm).update(str).digest();
+    return crypto.createHash(algorithm).update(str).digest();
 };
 
 exports.HMAC = function (algorithm, key, str) {
-    return createHmac(algorithm, key).update(str).digest();
+    return crypto.createHmac(algorithm, key).update(str).digest();
 };
 
 exports.Hi = function (algorithm, str, salt, iterations) {
     var INT1 = Buffer.from([0, 0, 0, 1], 'binary');
-    var ui1 = createHmac(algorithm, str).update(salt).update(INT1).digest();
+    var ui1 = crypto.createHmac(algorithm, str).update(salt).update(INT1).digest();
     var ui = ui1;
     for (var i = 1; i < iterations; i++) {
         ui1 = exports.HMAC(algorithm, str, ui1);

package/lib/sasl/factory.js

@@ -0,0 +1,71 @@
+(function(root, factory) {
+    if (typeof exports === 'object') {
+      // CommonJS
+      factory(exports, module);
+    } else if (typeof define === 'function' && define.amd) {
+      // AMD
+      define(['exports', 'module'], factory);
+    }
+  }(this, function(exports, module) {
+    
+    /**
+     * `Factory` constructor.
+     *
+     * @api public
+     */
+    function Factory() {
+      this._mechs = [];
+    }
+    
+    /**
+     * Utilize the given `mech` with optional `name`, overridding the mechanism's
+     * default name.
+     *
+     * Examples:
+     *
+     *     factory.use(FooMechanism);
+     *
+     *     factory.use('XFOO', FooMechanism);
+     *
+     * @param {String|Mechanism} name
+     * @param {Mechanism} mech
+     * @return {Factory} for chaining
+     * @api public
+     */
+    Factory.prototype.use = function(name, mech) {
+      if (!mech) {
+        mech = name;
+        name = mech.prototype.name;
+      }
+      this._mechs.push({ name: name, mech: mech });
+      return this;
+    };
+    
+    /**
+     * Create a new mechanism from supported list of `mechs`.
+     *
+     * If no mechanisms are supported, returns `null`.
+     *
+     * Examples:
+     *
+     *     var mech = factory.create(['FOO', 'BAR']);
+     *
+     * @param {Array} mechs
+     * @return {Mechanism}
+     * @api public
+     */
+    Factory.prototype.create = function(mechs) {
+      for (var i = 0, len = this._mechs.length; i < len; i++) {
+        for (var j = 0, jlen = mechs.length; j < jlen; j++) {
+          var entry = this._mechs[i];
+          if (entry.name == mechs[j]) {
+            return new entry.mech();
+          }
+        }
+      }
+      return null;
+    };
+  
+    exports = module.exports = Factory;
+    
+  }));

package/lib/utils.js

@@ -2,7 +2,7 @@
 
   var _ = require('underscore');
   var log4js = require('log4js');
-  var randomBytes = require('randombytes');
+  var randomBytes = require('crypto').randomBytes;
 
   var f = require('./functional');
 

package/memory-profiling/helper.js

@@ -0,0 +1,9 @@
+const fs = require('fs');
+const v8 = require('v8');
+
+exports.createHeapSnapshot = function() {
+  const snapshotStream = v8.getHeapSnapshot();
+  const fileName = `${Date.now()}.heapsnapshot`;
+  const fileStream = fs.createWriteStream('/tmp/' + fileName);
+  snapshotStream.pipe(fileStream);
+}

package/memory-profiling/infinispan_memory_many_get.js

@@ -1,7 +1,6 @@
 var _ = require('underscore');
 var infinispan = require('../lib/infinispan');
-
-var heapdump = require('heapdump');
+var helper = require('./helper');
 
 var connected = infinispan.client({port: 11222, host: '127.0.0.1'},{cacheName: 'namedCache'});
 console.log("Connected to JDG server");
@@ -12,7 +11,6 @@ connected.then(function (client) {
 
   return put.then(function() {
     var heapUseAfterPut = process.memoryUsage().heapUsed;
-    //heapdump.writeSnapshot('/tmp/' + Date.now() + '.heapsnapshot');
 
     var temp = [];
     var numOps = 10000; // 500000

package/memory-profiling/infinispan_memory_one_get.js

@@ -1,7 +1,9 @@
 var _ = require('underscore');
 var infinispan = require('../lib/infinispan');
+var helper = require('./helper');
 
-var heapdump = require('heapdump');
+const fs = require('fs');
+const v8 = require('v8');
 
 var connected = infinispan.client({port: 11222, host: '127.0.0.1'},{cacheName: 'namedCache'});
 console.log("Connected to JDG server");
@@ -12,7 +14,7 @@ connected.then(function (client) {
   var afterPut = put.then(function() {
     //console.log("After put, heapUsed: "+process.memoryUsage().heapUsed);
 
-    heapdump.writeSnapshot('/tmp/' + Date.now() + '.heapsnapshot');
+    helper.createHeapSnapshot();
   });
 
   var get1 = afterPut.then(function test_get1() {
@@ -27,7 +29,7 @@ connected.then(function (client) {
     global.gc();
     //console.log("After get1, heapUsed: "+process.memoryUsage().heapUsed);
 
-    heapdump.writeSnapshot('/tmp/' + Date.now() + '.heapsnapshot');
+    helper.createHeapSnapshot();
   });
 
   var get2 = dumpAfterGet1.then(function test_get2() {
@@ -42,7 +44,7 @@ connected.then(function (client) {
     global.gc();
     //console.log("After get2, heapUsed: "+process.memoryUsage().heapUsed);
 
-    heapdump.writeSnapshot('/tmp/' + Date.now() + '.heapsnapshot');
+    helper.createHeapSnapshot();
   });
 
   return dumpAfterGet2.then(function test_disconnect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "infinispan",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Infinispan Javascript client",
   "main": "index",
   "directories": {
@@ -25,20 +25,15 @@
     "url": "https://github.com/infinispan/js-client"
   },
   "dependencies": {
-    "bitwise-xor": "0.0.0",
-    "create-hash": "^1.1.0",
-    "create-hmac": "^1.1.3",
-    "log4js": "^3.0.5",
-    "promise.prototype.finally": "^3.1.0",
-    "randombytes": "^2.0.1",
-    "saslmechanisms": "^0.1.1",
-    "underscore": "^1.9.1"
+    "buffer-xor": "^2.0.2",
+    "log4js": "^6.4.6",
+    "protobufjs": "^7.0.0",
+    "underscore": "^1.13.3"
   },
   "devDependencies": {
     "growl": "^1.10.5",
-    "heapdump": "^0.3.9",
-    "jasmine-node": "^1.16.2",
-    "jsdoc": "^3.6.6",
+    "jasmine-node": "^3.0.0",
+    "jsdoc": "^3.6.10",
     "request": "^2.88.0"
   }
 }

package/run-servers.sh

@@ -9,7 +9,7 @@ else
 fi
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SERVER_VERSION="${SERVER_VERSION:-"12.1.4.Final"}"
+SERVER_VERSION="${SERVER_VERSION:-"13.0.0.Final"}"
 SERVER_HOME=${SCRIPT_DIR}/server/original-server
 SERVER_ZIP=${SCRIPT_DIR}/server/${SERVER_VERSION}.zip
 CLUSTER_SIZE_MAIN="$SERVER_HOME/bin/cli.sh -c http://admin:pass@localhost:11322 -f batch "

package/spec/codec_spec.js

@@ -120,7 +120,7 @@ function strSize(str) {
 
 describe('Variable number encode/decode', function() {
   it('can resize buffer when encoding a VInt', function() {
-    assert(Math.pow(2, 31) - 1, 5, singleVIntEncode(Math.pow(2, 31) - 1), singleVIntDecode, 1);
+    assert(Math.pow(2, 32) - 1, 5, singleVIntEncode(Math.pow(2, 32) - 1), singleVIntDecode, 1);
   });
   it('can resize buffer when encoding a VLong', function() {
     assert(Math.pow(2, 53) - 1, 8, singleVLongEncode(Math.pow(2, 53) - 1), singleVLongDecode, 1);
@@ -134,12 +134,12 @@ describe('Variable number encode/decode', function() {
   it('can encode 2^21', function() { encodeDecodeVNum(Math.pow(2, 21)); });
   it('can encode 2^28 - 1', function() { encodeDecodeVNum(Math.pow(2, 28) - 1); });
   it('can encode 2^28', function() { encodeDecodeVNum(Math.pow(2, 28)); });
-  it('can encode 2^31 - 1', function() { encodeDecodeVNum(Math.pow(2, 31) - 1); });
-  it('fails to encode 2^31 as a VInt because it is out of bounds', function() {
-    var encode = f.actions([codec.encodeVInt(Math.pow(2, 31))], codec.bytesEncoded);
-    expect(function() { encode(t.newByteBuf()) }).toThrow('must be less than 2^31');
+  it('can encode 2^32 - 1', function() { encodeDecodeVNum(Math.pow(2, 32) - 1); });
+  it('fails to encode 2^32 as a VInt because it is out of bounds', function() {
+    var encode = f.actions([codec.encodeVInt(Math.pow(2, 32))], codec.bytesEncoded);
+    expect(function() { encode(t.newByteBuf()) }).toThrow('must be less than 2^32');
   });
-  it('can encode 2^31', function() { encodeDecodeVLong(Math.pow(2, 31)); });
+  it('can encode 2^32', function() { encodeDecodeVLong(Math.pow(2, 32)); });
   it('can encode 2^35 - 1', function() { encodeDecodeVLong(Math.pow(2, 35) - 1); });
   it('can encode 2^35', function() { encodeDecodeVLong(Math.pow(2, 35)); });
   it('can encode 2^42 - 1', function() { encodeDecodeVLong(Math.pow(2, 42) - 1); });
@@ -155,7 +155,7 @@ describe('Variable number encode/decode', function() {
   it('fails to encode a number when it is not a number', function() {
     var encode = f.actions([codec.encodeVInt('blah')], codec.bytesEncoded);
     expect(function() { encode(t.newByteBuf()) })
-        .toThrow('must be a number, must be >= 0, must be less than 2^31');
+        .toThrow('must be a number, must be >= 0, must be less than 2^32');
   });
   it('fails to encode a number when it is negative', function() {
     var encode = f.actions([codec.encodeVInt(-1)], codec.bytesEncoded);

package/spec/configs/infinispan-clustered.xml

@@ -1,9 +1,9 @@
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:infinispan:config:12.1 https://infinispan.org/schemas/infinispan-config-12.1.xsd
-                            urn:infinispan:server:12.1 https://infinispan.org/schemas/infinispan-server-12.1.xsd"
-        xmlns="urn:infinispan:config:12.1"
-        xmlns:server="urn:infinispan:server:12.1">
+        xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
+                            urn:infinispan:server:13.0 https://infinispan.org/schemas/infinispan-server-13.0.xsd"
+        xmlns="urn:infinispan:config:13.0"
+        xmlns:server="urn:infinispan:server:13.0">
 
     <cache-container name="clustered" default-cache="default">
 <!--        <security>-->
@@ -11,13 +11,14 @@
 <!--        </security>-->
         <transport cluster="${infinispan.cluster.name}" stack="${infinispan.cluster.stack:tcp}" node-name="${infinispan.node.name:}"/>
         <!--<global-state/>-->
+        <metrics accurate-size="true"/>
         <distributed-cache name="default" segments="20" remote-timeout="30000">
             <locking acquire-timeout="30000" concurrency-level="1000" />
             <encoding media-type="text/plain"/>
         </distributed-cache>
     </cache-container>
 
-    <server xmlns="urn:infinispan:server:12.0">
+    <server xmlns="urn:infinispan:server:13.0">
         <interfaces>
             <interface name="public">
                 <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
@@ -47,14 +48,16 @@
             </security-realms>
         </security>
 
-        <endpoints socket-binding="default" security-realm="default">
-            <hotrod-connector name="hotrod">
-                <authentication>
-                    <sasl mechanisms="PLAIN"
-                          server-name="infinispan"/>
-                </authentication>
-            </hotrod-connector>
-            <rest-connector name="rest"/>
+	<endpoints>
+            <endpoint socket-binding="default" security-realm="default">
+                <hotrod-connector name="hotrod">
+                    <authentication>
+                        <sasl mechanisms="PLAIN"
+                              server-name="infinispan"/>
+                    </authentication>
+                </hotrod-connector>
+                <rest-connector name="rest"/>
+            </endpoint>
         </endpoints>
     </server>
-</infinispan>
+</infinispan>

package/spec/configs/infinispan-ssl.xml

@@ -1,12 +1,13 @@
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:infinispan:config:12.1 https://infinispan.org/schemas/infinispan-config-12.1.xsd
-                            urn:infinispan:server:12.1 https://infinispan.org/schemas/infinispan-server-12.1.xsd"
-        xmlns="urn:infinispan:config:12.1"
-        xmlns:server="urn:infinispan:server:12.1">
+        xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
+                            urn:infinispan:server:13.0 https://infinispan.org/schemas/infinispan-server-13.0.xsd"
+        xmlns="urn:infinispan:config:13.0"
+        xmlns:server="urn:infinispan:server:13.0">
 
     <cache-container name="local" default-cache="default" statistics="true">
         <global-state/>
+        <metrics accurate-size="true"/>
         <security>
             <authorization/>
         </security>
@@ -23,7 +24,7 @@
         </local-cache>
     </cache-container>
 
-    <server xmlns="urn:infinispan:server:12.1">
+    <server xmlns="urn:infinispan:server:13.0">
         <interfaces>
             <interface name="public">
                 <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
@@ -89,24 +90,26 @@
             </security-realms>
         </security>
 
-        <endpoints socket-binding="default" security-realm="default">
-            <hotrod-connector>
-                <authentication>
-                    <sasl mechanisms="PLAIN"
-                          server-name="infinispan"/>
-                </authentication>
-            </hotrod-connector>
-            <rest-connector/>
+        <endpoints>
+            <endpoint socket-binding="default" security-realm="default">
+                <hotrod-connector>
+                    <authentication>
+                        <sasl mechanisms="PLAIN"
+                              server-name="infinispan"/>
+                    </authentication>
+                </hotrod-connector>
+                <rest-connector/>
+            </endpoint>
+            <endpoint socket-binding="hotrod-trust" security-realm="client-cert">
+                <hotrod-connector>
+                    <authentication>
+                        <sasl mechanisms="PLAIN"
+                              server-name="infinispan"/>
+                    </authentication>
+                </hotrod-connector>
+                <rest-connector/>
+            </endpoint>
         </endpoints>
 
-        <endpoints socket-binding="hotrod-trust" security-realm="client-cert">
-            <hotrod-connector>
-                <authentication>
-                    <sasl mechanisms="PLAIN"
-                          server-name="infinispan"/>
-                </authentication>
-            </hotrod-connector>
-            <rest-connector/>
-        </endpoints>
     </server>
 </infinispan>

package/spec/configs/infinispan-xsite-EARTH.xml

@@ -1,10 +1,10 @@
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:infinispan:config:12.1 https://infinispan.org/schemas/infinispan-config-12.1.xsd
-                            urn:infinispan:server:12.1 https://infinispan.org/schemas/infinispan-server-12.1.xsd
+        xsi:schemaLocation="urn:infinispan:config:13.0 https://infinispan.org/schemas/infinispan-config-13.0.xsd
+                            urn:infinispan:server:13.0 https://infinispan.org/schemas/infinispan-server-13.0.xsd
                             urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd"
-        xmlns="urn:infinispan:config:12.1"
-        xmlns:server="urn:infinispan:server:12.1"
+        xmlns="urn:infinispan:config:13.0"
+        xmlns:server="urn:infinispan:server:13.0">
 >
 
     <jgroups>
@@ -132,6 +132,7 @@
         <security>
             <authorization/>
         </security>
+        <metrics accurate-size="true"/>
         <distributed-cache name="xsiteCache" segments="20" remote-timeout="30000" >
             <locking acquire-timeout="30000" concurrency-level="1000" />
             <backups>
@@ -141,7 +142,7 @@
         </distributed-cache>
     </cache-container>
 
-    <server xmlns="urn:infinispan:server:12.1">
+    <server xmlns="urn:infinispan:server:13.0">
         <interfaces>
             <interface name="public">
                 <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
@@ -174,15 +175,17 @@
         </security>
 
         <!-- not secured -->
-        <endpoints socket-binding="default" security-realm="default">
-            <hotrod-connector name="hotrod">
-                <authentication>
-                    <sasl mechanisms="PLAIN"/>
-                </authentication>
-            </hotrod-connector>
-            <rest-connector name="rest"/>
-            <!-- Uncomment to enable the memcached connector -->
-            <!-- memcached-connector socket-binding="memcached" / -->
+        <endpoints>
+            <endpoint socket-binding="default" security-realm="default">
+                <hotrod-connector name="hotrod">
+                    <authentication>
+                        <sasl mechanisms="PLAIN"/>
+                    </authentication>
+                </hotrod-connector>
+                <rest-connector name="rest"/>
+                <!-- Uncomment to enable the memcached connector -->
+                <!-- memcached-connector socket-binding="memcached" / -->
+            </endpoint>
         </endpoints>
     </server>
 </infinispan>

package/spec/configs/infinispan-xsite-MOON.xml

@@ -2,7 +2,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:infinispan:config:12.1 https://infinispan.org/schemas/infinispan-config-12.1.xsd
                             urn:infinispan:server:12.1 https://infinispan.org/schemas/infinispan-server-12.1.xsd
-                             urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd"
+                            urn:org:jgroups http://www.jgroups.org/schema/jgroups-4.0.xsd"
         xmlns="urn:infinispan:config:12.1"
         xmlns:server="urn:infinispan:server:12.1">
 
@@ -132,6 +132,7 @@
         <security>
             <authorization/>
         </security>
+        <metrics accurate-size="true"/>
         <distributed-cache name="xsiteCache" segments="20" remote-timeout="30000" >
             <locking acquire-timeout="30000" concurrency-level="1000"/>
             <backups>
@@ -143,7 +144,7 @@
         </distributed-cache>
     </cache-container>
 
-    <server xmlns="urn:infinispan:server:12.1">
+    <server xmlns="urn:infinispan:server:13.0">
         <interfaces>
             <interface name="public">
                 <inet-address value="${infinispan.bind.address:127.0.0.1}"/>
@@ -176,15 +177,17 @@
         </security>
 
         <!-- not secured -->
-        <endpoints socket-binding="default" security-realm="default">
-            <hotrod-connector name="hotrod">
-                <authentication>
-                    <sasl mechanisms="PLAIN"/>
-                </authentication>
-            </hotrod-connector>
-            <rest-connector name="rest"/>
-            <!-- Uncomment to enable the memcached connector -->
-            <!-- memcached-connector socket-binding="memcached" / -->
+        <endpoints>
+            <endpoint socket-binding="default" security-realm="default">
+                <hotrod-connector name="hotrod">
+                    <authentication>
+                        <sasl mechanisms="PLAIN"/>
+                    </authentication>
+                </hotrod-connector>
+                <rest-connector name="rest"/>
+                <!-- Uncomment to enable the memcached connector -->
+                <!-- memcached-connector socket-binding="memcached" / -->
+            </endpoint>
         </endpoints>
     </server>
 </infinispan>