Merge branch 'backend'

client/rsh/R/rsh.R

@@ -89,6 +89,10 @@ rsh_compile <- function(f, options) {
     options$tier <- "optimized"
   }
 
+  if(is.null(options$cache)) {
+    options$cache <- TRUE
+  }
+
   invisible(.Call(C_compile, f, options))
 }
 

client/rsh/src/client.cpp

@@ -58,6 +58,7 @@ Client::remote_compile(std::vector<uint8_t> const &rds_closure,
   request.set_bc_opt(options.bc_opt);
   request.mutable_function()->set_name(options.name);
   request.set_cc_opt(options.cc_opt);
+  request.set_no_cache(!options.cache);
   request.mutable_function()->set_body(rds_closure.data(), rds_closure.size());
 
   // We replace the body of a function with its compiled version so it would not

client/rsh/src/compiler.cpp

@@ -99,6 +99,9 @@ CompilerOptions CompilerOptions::from_list(SEXP listsxp) {
     } else if (!strcmp(name, "inplace")) {
       opts.inplace =
           vec_element_as_bool(listsxp, i, "inplace option must be a logical");
+    } else if (!strcmp(name, "cache")) {
+      opts.cache =
+          vec_element_as_bool(listsxp, i, "cache option must be a logical");
     } else if (!strcmp(name, "tier")) {
       SEXP tier_sxp = VECTOR_ELT(listsxp, i);
       if (TYPEOF(tier_sxp) != STRSXP) {

client/rsh/src/compiler.hpp

@@ -12,6 +12,7 @@ struct CompilerOptions {
   int bc_opt = 3;
   int cc_opt = 3;
   bool inplace;
+  bool cache = true;
   protocol::Tier tier = protocol::Tier::OPTIMIZED;
 
   static CompilerOptions from_list(SEXP listsxp);

proto/messages.proto

@@ -34,6 +34,7 @@ message CompileRequest {
   optional int32 bc_opt = 6;// for the bytecode. Native does bytecode first so this is also need when compiling to native
   optional Context context = 7;
   optional Environment environment = 8;//The values of all the bindings that statically appear in the function
+  bool no_cache = 9;//If true, the server will not cache the result
 }
 
 message CompileResponse {

server/src/main/java/org/prlprg/server/CompileService.java

@@ -90,13 +90,18 @@ public void compile(
             + " Serialized size = "
             + request.getSerializedSize());
 
+    if (request.getNoCache()) {
+      logger.info("This closure will not be cached (but it might vae already been).");
+    }
+
     // Compile the code and build response
     Messages.CompileResponse.Builder response = Messages.CompileResponse.newBuilder();
     response.setTier(tier);
     response.setHash(function.getHash());
 
     // Cache requests
     NativeClosure ccCached = null;
+
     var nativeKey = Triple.of(function.getHash(), bcOpt, ccOpt);
     if (tier.equals(Messages.Tier.OPTIMIZED)) {
       ccCached = nativeCache.get(nativeKey);
@@ -146,7 +151,7 @@ public void compile(
                     + function.getName()
                     + ". Not caching and returning the original body.");
             // We will keep the code field empty
-          } else {
+          } else if (!request.getNoCache()) { // We do not cache if the client does not want to
             serializedBc = RDSWriter.writeByteString(SEXPs.bcode(bc.get()));
             response.setCode(serializedBc);
             bcCached =
@@ -202,7 +207,10 @@ public void compile(
           ccCached =
               new NativeClosure(
                   ByteString.copyFrom(res), module.topLevelFunName(), serializedConstantPool);
-          nativeCache.put(nativeKey, ccCached);
+
+          if (!request.getNoCache()) {
+            nativeCache.put(nativeKey, ccCached);
+          }
           response.setCode(ccCached.code());
           response.setConstants(ccCached.constantPool());
         } catch (Exception e) {

server/src/main/proto/messages.proto

@@ -34,6 +34,7 @@ message CompileRequest {
   optional int32 bc_opt = 6;// for the bytecode. Native does bytecode first so this is also need when compiling to native
   optional Context context = 7;
   optional Environment environment = 8;//The values of all the bindings that statically appear in the function
+  bool no_cache = 9;//If true, the server will not cache the result
 }
 
 message CompileResponse {