fix redis trans bug

Author: junphine

examples/redis/redis-stream-example.py

@@ -383,15 +383,15 @@ def safe_add_message(stream_name, fields, max_retries=3):
 def example_batch_operations():
     """Batch operations for better performance"""
     print("\n=== Batch Operations Example ===")
-    stream_name = "batch200-stream"
+    stream_name = "batch300-stream"
 
     # Clear existing data
     clear_stream(stream_name)
 
     # 1. Batch add using pipeline
     print("Batch adding 100 messages using pipeline...")
     pipeline = r.pipeline(transaction=True)
-    for i in range(100):
+    for i in range(10):
         pipeline.xadd(stream_name, {
             'index': str(i),
             'data': f'Batch data {i}',
@@ -450,7 +450,7 @@ def main():
         #example_pagination()
         #example_reverse_reading()
         #example_stream_monitoring()
-        example_error_handling()
+        #example_error_handling()
         example_batch_operations()
 
         print("\n" + "=" * 60)

modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java

@@ -259,35 +259,33 @@ else if(x){
         		ctx.grid().getOrCreateCache(ccfg);
         	}
             //end@
-            
-            // 开始事务，事务往往和pipeline同时开启
-            List<GridRedisMessage> queued = ses.meta(SESS_TX_QUEUED_META_KEY);
-        	if(queued!=null && !cmd.equals("MULTI") && !cmd.equals("EXEC") && !cmd.equals("DISCARD")) {
-        		queued.add(msg);
-        		msg.setResponse(GridRedisProtocolParser.toSimpleString("QUEUED"));
-        		sendResponse(ses, msg);
-        		
-        	}
-        	else {
-        		if(redisCmd==GridRedisCommand.INFO) {
-        			updateStateInfo(ses);
-        		}
-                // modify@byron use StripedExecutorService handle session awared handler
-                ctx.pools().getStripedRebalanceExecutorService().execute(()->{
+
+            if(redisCmd==GridRedisCommand.INFO) {
+                updateStateInfo(ses);
+            }
+            // modify@byron use StripedExecutorService handle session awared handler
+            ctx.pools().getStripedRebalanceExecutorService().execute(()->{
+                // 开始事务，事务往往和pipeline同时开启
+                List<GridRedisMessage> queued = ses.meta(SESS_TX_QUEUED_META_KEY);
+                if(queued!=null && !cmd.equals("MULTI") && !cmd.equals("EXEC") && !cmd.equals("DISCARD")) {
+                    queued.add(msg);
+                    msg.setResponse(GridRedisProtocolParser.toSimpleString("QUEUED"));
+                    sendResponse(ses, msg);
+                }
+                else {
 
                     IgniteInternalFuture<GridRedisMessage> f = handlers.get(redisCmd).handleAsync(ses, msg);
                     try {
                         GridRedisMessage res = f.get();
                         sendResponse(ses, res);
                     } catch (IgniteCheckedException e) {
-                        log.error("Redis msg handler fail.",e);
+                        log.error("Redis msg handler fail.", e);
                         msg.setResponse(GridRedisProtocolParser.toGenericError(e.getMessage()));
                         sendResponse(ses, msg);
                     }
+                }
 
-                },ses.hashCode());
-
-        	}
+            },ses.hashCode());
         }
     }
 

modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridStaticRestHandler.java

@@ -218,7 +218,7 @@ public void handle(String target, RoutingContext rc, HttpServerRequest srvReq, H
             }
 
             res.setStatusCode(200);
-            res.putHeader("Content-Type", "image/svg");
+            res.putHeader("Content-Type", "image/svg+xml");
             res.putHeader("Content-Length", String.valueOf(logo.length));
             res.write(Buffer.buffer(logo));
             rc.end();