infinispan 0.8.0 → 0.10.0

package/run-servers.sh

@@ -8,11 +8,13 @@ else
   trap "trap - SIGTERM && kill -- -$$" SIGINT SIGTERM EXIT
 fi
 
-
-SERVER_VERSION="12.1.2.Final"
-SERVER_HOME=server/infinispan-server-$SERVER_VERSION
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+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 "
 ZIP_ROOT="http://downloads.jboss.org/infinispan"
+DOWNLOAD_URL="${DOWNLOAD_URL:-"$ZIP_ROOT/$SERVER_VERSION/infinispan-server-$SERVER_VERSION.zip"}"
 
 CONF_DIR_TO_COPY_FROM="spec/configs/"
 IS_SSL_PROCESSED=0
@@ -42,10 +44,18 @@ function prepareServerDir()
     local dirName=${4}
 
     echo ${isSsl}
-    if [ ! -f server/infinispan-server-$SERVER_VERSION.zip ]; then
+    if [ ! -f "${SERVER_ZIP}" ]; then
         cd server
-        wget $ZIP_ROOT/$SERVER_VERSION/infinispan-server-$SERVER_VERSION.zip
-        unzip  infinispan-server-$SERVER_VERSION.zip
+        wget "${DOWNLOAD_URL}" -O "${SERVER_ZIP}" --no-check-certificate
+        unzip  "${SERVER_ZIP}"
+
+        if [[ ${DOWNLOAD_URL} == *"redhat-datagrid"* ]]; then
+          datagrid=$(cd "${SCRIPT_DIR}"/server/redhat-datagrid-*/; pwd)
+          mv "$datagrid" "${SERVER_HOME}"
+        else
+          datagrid=$(cd "${SCRIPT_DIR}"/server/infinispan-server-*/; pwd)
+          mv "$datagrid" "${SERVER_HOME}"
+        fi
         cd ..
     fi
 
@@ -105,7 +115,7 @@ function startServer()
     echo 'Run server '$nodeName' in '$SERVER_TMP''
 
     if [[ ${isCi} = "--ci" ]]; then
-      nohup $SERVER_TMP/bin/server.sh -Djavax.net.debug -Dorg.infinispan.openssl=false -c ${confPath} -s ${SERVER_TMP}/${nodeName} ${portStr:-""}  --node-name=${nodeName} ${jvmParam:-} &
+      nohup $SERVER_TMP/bin/server.sh -Djavax.net.debug -Dorg.infinispan.openssl=false -c ${confPath} -s ${SERVER_TMP}/${nodeName} ${portStr:-""}  --node-name=${nodeName} ${jvmParam:-} -Djgroups.bind.address=127.0.0.1 &
     else
       ${SERVER_TMP}/bin/server.sh -Djavax.net.debug -Dorg.infinispan.openssl=false -c ${confPath} -s ${SERVER_TMP}/${nodeName} ${portStr:-} --node-name=${nodeName} ${jvmParam:-} &
     fi
@@ -144,4 +154,3 @@ else
     sleep 5
   done
 fi
-

package/run-testsuite.sh

@@ -3,4 +3,4 @@
 # Stop if any errors found
 set -e
 
-node --trace-deprecation node_modules/jasmine-node/lib/jasmine-node/cli.js spec/* --captureExceptions
+node --trace-deprecation node_modules/jasmine-node/lib/jasmine-node/cli.js spec/* --captureExceptions --forceexit --junitreport

package/smoke-tests.sh

@@ -6,9 +6,15 @@ node \
   --trace-deprecation \
   node_modules/jasmine-node/lib/jasmine-node/cli.js \
   spec/codec_spec.js \
+  spec/functional_spec.js \
+  spec/infinispan_auth_spec.js \
   spec/infinispan_cluster_spec.js \
-  spec/infinispan_local_spec.js \
+  spec/infinispan_expiry_spec.js \
   spec/infinispan_json_spec.js \
+  spec/infinispan_local_spec.js \
   spec/infinispan_ssl_spec.js \
+  spec/infinispan_stress_spec.js \
   spec/protocols_spec.js \
-  --captureExceptions
+  spec/tests.js \
+  spec/utils_spec.js \
+  --captureExceptions --junitreport --forceexit

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>

package/spec/configs/infinispan.xml

@@ -1,14 +1,15 @@
 <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="default" statistics="true" default-cache="default">
 <!--      <security>-->
 <!--         <authorization/>-->
 <!--      </security>-->
+      <metrics accurate-size="true"/>
       <local-cache name="default">
          <locking acquire-timeout="30000" concurrency-level="1000" />
          <encoding media-type="text/plain"/>
@@ -23,9 +24,15 @@
       <local-cache name="jsonCache">
          <encoding media-type="text/plain"/>
       </local-cache>
+      <local-cache name="protoStreamCache">
+         <encoding>
+             <key media-type="text/plain"/>
+	     <value media-type="application/x-protostream"/>
+         </encoding>
+      </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}"/>
@@ -55,14 +62,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 DIGEST-MD5 SCRAM-SHA-1 SCRAM-SHA-256 SCRAM-SHA-384 SCRAM-SHA-512"
+                        server-name="infinispan"/>
+               </authentication>
+            </hotrod-connector>
+            <rest-connector name="rest"/>
+         </endpoint>
       </endpoints>
    </server>
 </infinispan>

package/spec/infinispan_auth_spec.js

@@ -1,40 +1,19 @@
 var t = require('./utils/testing'); // Testing dependency
 
-describe('Infinispan local client', function() {
-    it('PLAIN', function(done) {t.client(t.local, {authentication: {
-            enabled: true,
-            saslMechanism: 'PLAIN',
-            userName: 'admin',
-            password: 'pass'
-        }})
-        .then(t.assert(t.put('key', 'value')))
-        .then(t.disconnect())
-        .catch(t.failed(done))
-        .finally(done);
-    });
-
-    // it('SCRAM-SHA-512', function(done) {t.client(t.local, {authentication: {
-    //         enabled: true,
-    //         saslMechanism: 'SCRAM-SHA-1',
-    //         userName: 'admin',
-    //         password: 'pass'
-    //     }})
-    //   .then(t.assert(t.put('key', 'value')))
-    //   .then(t.disconnect())
-    //   .catch(t.failed(done))
-    //   .finally(done);
-    // });
-
-    // it('DIGEST-MD5', function(done) {t.client(t.local, {authentication: {
-    //         enabled: true,
-    //         saslMechanism: 'DIGEST-MD5',
-    //         userName: 'admin',
-    //         password: 'pass'
-    //     }})
-    //     .then(t.assert(t.put('key', 'value')))
-    //     .then(t.disconnect())
-    //     .catch(t.failed(done))
-    //     .finally(done);
-    // });
-
+describe('Infinispan local client', function () {
+  [ 'SCRAM-SHA-1', 'SCRAM-SHA-256', 'SCRAM-SHA-384', 'SCRAM-SHA-512', 'PLAIN', 'DIGEST-MD5'].forEach(m => 
+  it(m, function (done) {
+    t.client(t.local, {
+      authentication: {
+        enabled: true,
+        saslMechanism: m,
+        userName: 'admin',
+        password: 'pass'
+      }
+    })
+    .then(t.assert(t.put('key', 'value')))
+    .then(t.disconnect())
+    .catch(t.failed(done))
+    .finally(done);
+  }));
 });