[Merge from dev] nats v2.10 support

.gitignore

@@ -10,6 +10,8 @@ cmake-build*/
 install/
 html/
 !doc/html/
+test/datastore_*/
+test/conf_*
 
 # Emacs
 *~

.travis.yml

@@ -1,5 +1,5 @@
 language: cpp
-dist: bionic
+dist: focal
 os: linux
 
 cache:
@@ -25,6 +25,34 @@ env:
 jobs:
   include:
 
+    - name: "NATS server - latest release"
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: ppa:ubuntu-toolchain-r/test
+          packages:
+            - g++-9
+      env:
+        - NATS_TEST_SERVER_VERSION=latest
+        - MATRIX_EVAL="CC=gcc-9"
+        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release" DO_COVERAGE="no"
+
+    - name: "NATS server - main"
+      compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: ppa:ubuntu-toolchain-r/test
+          packages:
+            - g++-9
+      env:
+        - NATS_TEST_SERVER_VERSION=main
+        - MATRIX_EVAL="CC=gcc-9"
+        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release" DO_COVERAGE="no"
+
     - name: "gcc-9 - TLS OFF"
       compiler: gcc
       addons:
@@ -62,7 +90,7 @@ jobs:
             - g++-9
       env:
         - MATRIX_EVAL="CC=gcc-9"
-        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
+        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
 
     - name: "gcc-9 - Lib msg delivery - sanitize address"
       compiler: gcc
@@ -75,7 +103,7 @@ jobs:
             - g++-9
       env:
         - MATRIX_EVAL="CC=gcc-9"
-        - NATS_DEFAULT_TO_LIB_MSG_DELIVERY=yes BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
+        - NATS_DEFAULT_TO_LIB_MSG_DELIVERY=yes BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fsanitize=address" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
 
     - name: "gcc-9 - Write deadline - sanitize address"
       compiler: gcc
@@ -101,7 +129,7 @@ jobs:
             - g++-9
       env:
         - MATRIX_EVAL="CC=gcc-9"
-        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" DO_COVERAGE="no"
+        - BUILD_OPT="-DNATS_BUILD_ARCH=64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fsanitize=thread" NATS_TEST_VALGRIND=yes DO_COVERAGE="no"
 
     - name: "clang-8 - TLS OFF"
       compiler: clang

buildOnTravis.sh

@@ -10,6 +10,23 @@ echo "coverage   = " $2
 echo "build opts = " $3
 echo "test opts  = " $4
 
+if [ "$NATS_TEST_SERVER_VERSION" != "" ]; then
+  rel=$NATS_TEST_SERVER_VERSION
+  mkdir -p $HOME/nats-server-$rel
+  if [ "$rel" = "latest" ]; then
+    rel=$(curl -s https://api.github.com/repos/nats-io/nats-server/releases/latest | jq -r '.tag_name')
+  fi
+
+  if [ "$rel" != "${rel#v}" ] && wget https://github.com/nats-io/nats-server/releases/download/$rel/nats-server-$rel-linux-amd64.tar.gz; then
+    tar -xzf nats-server-$rel-linux-amd64.tar.gz
+    mv nats-server-$rel-linux-amd64 $HOME/nats-server-$rel
+  else
+    curl -sf "https://binaries.nats.dev/nats-io/nats-server/v2@$rel" | PREFIX=. sh
+    mv nats-server $HOME/nats-server-$rel
+  fi
+  PATH=$HOME/nats-server-$rel:$PATH
+fi
+
 if [ "$1" != "gcc" ]; then
   if [ "$2" = "coverage" ]; then
     # only coverage for gcc compiler
@@ -35,8 +52,10 @@ res=$?
 if [ $res -ne 0 ]; then
   exit $res
 fi
-export NATS_TEST_SERVER_VERSION="$(nats-server -v)"
+
 export NATS_TEST_TRAVIS=yes
+export NATS_TEST_SERVER_VERSION="$(nats-server -v)"
+echo "Using NATS server version: $NATS_TEST_SERVER_VERSION"
 ctest --timeout 60 --output-on-failure $4
 res=$?
 if [ $res -ne 0 ]; then

src/js.c

@@ -2201,18 +2201,34 @@ _processConsInfo(const char **dlvSubject, jsConsumerInfo *info, jsConsumerConfig
     jsConsumerConfig    *ccfg        = info->Config;
     const char          *dg          = NULL;
     natsStatus          s            = NATS_OK;
+    bool                matches      = false;
+    int                 i;
 
     *dlvSubject = NULL;
 
     // Make sure this new subject matches or is a subset.
-    if (!nats_IsStringEmpty(subj)
-        && !nats_IsStringEmpty(ccfg->FilterSubject)
-        && (strcmp(subj, ccfg->FilterSubject) != 0))
+    if (!nats_IsStringEmpty(subj))
     {
-        return nats_setError(NATS_ERR, "subject '%s' does not match consumer filter subject '%s'",
-                             subj, ccfg->FilterSubject);
+        if (nats_IsStringEmpty(ccfg->FilterSubject) && (ccfg->FilterSubjectsLen == 0))
+        {
+            matches = true;
+        }
+        else if (!nats_IsStringEmpty(ccfg->FilterSubject) && nats_HasPrefix(subj, ccfg->FilterSubject))
+        {
+            matches = true;
+        }
+        else if (ccfg->FilterSubjectsLen > 0)
+        {
+            for (i = 0; (i < ccfg->FilterSubjectsLen) && !matches; i++)
+            {
+                matches = nats_HasPrefix(subj, ccfg->FilterSubjects[i]);
+            }
+        }
+        if (!matches)
+        {
+            return nats_setError(NATS_ERR, "subject '%s' does not match any consumer filter subjects.", subj);
+        }
     }
-
     // Check that if user wants to create a queue sub,
     // the consumer has no HB nor FC.
     queue = (nats_IsStringEmpty(queue) ? NULL : queue);

src/js.h

@@ -80,6 +80,9 @@ extern const int64_t    jsDefaultRequestWait;
 #define jsStorageTypeFileStr    "file"
 #define jsStorageTypeMemStr     "memory"
 
+#define jsStorageCompressionNoneStr "none"
+#define jsStorageCompressionS2Str   "s2"
+
 #define jsDeliverAllStr             "all"
 #define jsDeliverLastStr            "last"
 #define jsDeliverNewStr             "new"