sql复制代码SELECT fields
FROM table
WHERE condition-expression

sql复制代码SELECT Interns FROM 
      (SELECT Name AS Interns FROM Sample.Employee WHERE Age<21) 
WHERE Interns %STARTSWITH 'A'

sql复制代码SELECT Name,Age,AvgAge
FROM (SELECT Name,Age,AVG(Age) AS AvgAge FROM Sample.Person)
WHERE Age < AvgAge
ORDER BY Age

sql复制代码SELECT Name,FavoriteColors FROM Sample.Person
WHERE %EXTERNAL(FavoriteColors)='Red'

sql复制代码SELECT Name,FavoriteColors FROM Sample.Person
WHERE %EXTERNAL(FavoriteColors)='Orange'||CHAR(13)||CHAR(10)||'Black'

kotlin复制代码public class UDF implements UDF2<Long, Long, Long> {

    Map<Long, TreeMap<Long, Long>> map;

    public TripUDF(Broadcast<Map<Long, TreeMap<Long, Long>>> bmap) {
        this.map = bmap.getValue();
    }

    @Override
    public Long call(Long id, Long time) throws Exception {
        if (map.containsKey(terminalId)) {
            Map.Entry<Long, Long> a = map.get(id).floorEntry(time);
            Map.Entry<Long, Long> b = map.get(id).ceilingEntry(time);
            if (null != a && null != b) {
                if (a.getValue().equals(b.getValue())) {
                    return a.getValue();
                }
            }
        }
        return -1L;
    }
}

csharp复制代码tablea join tableb 
on tablea.id=tableb.id and 
tablea.time >= tableb.timeStart and 
tablea.time <= tableb.timeEnd

ini复制代码String udfMethod = "structureMap";
spark.udf().register(udfMethod, new UDF(broadcast1), DataTypes.StringType);

python复制代码select id,time,structureMap(id,time) as tag from tablea

java复制代码public Object invokeForRequest(NativeWebRequest request, @Nullable ModelAndViewContainer mavContainer,
        Object... providedArgs) throws Exception {

    Object[] args = getMethodArgumentValues(request, mavContainer, providedArgs);
    if (logger.isTraceEnabled()) {
        logger.trace("Arguments: " + Arrays.toString(args));
    }
    return doInvoke(args);
}

java复制代码String[] paramValues = request.getParameterValues(name);
if (paramValues != null) {
    arg = (paramValues.length == 1 ? paramValues[0] : paramValues);
}

java复制代码if (conversionService.canConvert(sourceTypeDesc, typeDescriptor)) {
    try {
        return (T) conversionService.convert(newValue, sourceTypeDesc, typeDescriptor);
    }
    catch (ConversionFailedException ex) {
        // fallback to default conversion logic below
        conversionAttemptEx = ex;
    }
}

java复制代码private final Map<ConverterCacheKey, GenericConverter> converterCache = new ConcurrentReferenceHashMap<>(64);

protected GenericConverter getConverter(TypeDescriptor sourceType, TypeDescriptor targetType) {
    ConverterCacheKey key = new ConverterCacheKey(sourceType, targetType);
    GenericConverter converter = this.converterCache.get(key);
    if (converter != null) {
        return (converter != NO_MATCH ? converter : null);
    }

    converter = this.converters.find(sourceType, targetType);
    if (converter == null) {
        converter = getDefaultConverter(sourceType, targetType);
    }

    if (converter != null) {
        this.converterCache.put(key, converter);
        return converter;
    }

    this.converterCache.put(key, NO_MATCH);
    return null;
}

java复制代码private final Map<ConvertiblePair, ConvertersForPair> converters = new ConcurrentHashMap<>(256);

@Nullable
public GenericConverter find(TypeDescriptor sourceType, TypeDescriptor targetType) {
    // Search the full type hierarchy
    List<Class<?>> sourceCandidates = getClassHierarchy(sourceType.getType());
    List<Class<?>> targetCandidates = getClassHierarchy(targetType.getType());
    for (Class<?> sourceCandidate : sourceCandidates) {
        for (Class<?> targetCandidate : targetCandidates) {
            ConvertiblePair convertiblePair = new ConvertiblePair(sourceCandidate, targetCandidate);
            GenericConverter converter = getRegisteredConverter(sourceType, targetType, convertiblePair);
            if (converter != null) {
                return converter;
            }
        }
    }
    return null;
}

@Nullable
private GenericConverter getRegisteredConverter(TypeDescriptor sourceType,
        TypeDescriptor targetType, ConvertiblePair convertiblePair) {

    // Check specifically registered converters
    ConvertersForPair convertersForPair = this.converters.get(convertiblePair);
    if (convertersForPair != null) {
        GenericConverter converter = convertersForPair.getConverter(sourceType, targetType);
        if (converter != null) {
            return converter;
        }
    }
    // Check ConditionalConverters for a dynamic match
    for (GenericConverter globalConverter : this.globalConverters) {
        if (((ConditionalConverter) globalConverter).matches(sourceType, targetType)) {
            return globalConverter;
        }
    }
    return null;
}

java复制代码private final ConverterFactory<Object, Object> converterFactory;

public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
    boolean matches = true;
    if (this.converterFactory instanceof ConditionalConverter) {
        matches = ((ConditionalConverter) this.converterFactory).matches(sourceType, targetType);
    }
    if (matches) {
        Converter<?, ?> converter = this.converterFactory.getConverter(targetType.getType());
        if (converter instanceof ConditionalConverter) {
            matches = ((ConditionalConverter) converter).matches(sourceType, targetType);
        }
    }
    return matches;
}

java复制代码public Object convert(@Nullable Object source, @Nullable TypeDescriptor sourceType, TypeDescriptor targetType) {
    Assert.notNull(targetType, "Target type to convert to cannot be null");
    if (sourceType == null) {
        Assert.isTrue(source == null, "Source must be [null] if source type == [null]");
        return handleResult(null, targetType, convertNullSource(null, targetType));
    }
    if (source != null && !sourceType.getObjectType().isInstance(source)) {
        throw new IllegalArgumentException("Source to convert from must be an instance of [" +
                sourceType + "]; instead it was a [" + source.getClass().getName() + "]");
    }
    GenericConverter converter = getConverter(sourceType, targetType);
    if (converter != null) {
        Object result = ConversionUtils.invokeConverter(converter, source, sourceType, targetType);
        return handleResult(sourceType, targetType, result);
    }
    return handleConverterNotFound(source, sourceType, targetType);
}

java复制代码public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
    if (source == null) {
        return convertNullSource(sourceType, targetType);
    }
    return this.converterFactory.getConverter(targetType.getObjectType()).convert(source);
}

handlebars复制代码def describe_pet(animal_type, pet_name):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet('hamster', 'harry')

handlebars复制代码I have a hamster.
My hamster's name is Harry.

handlebars复制代码def describe_pet(animal_type, pet_name):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet('hamster', 'harry')
describe_pet('dog', 'willie')

handlebars复制代码I have a hamster.
My hamster's name is Harry.
I have a dog.
My dog's name is Willie.

handlebars复制代码def describe_pet(animal_type, pet_name):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet('harry', 'hamster')

handlebars复制代码I have a harry.
My harry's name is Hamster.

handlebars复制代码def describe_pet(animal_type, pet_name):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet(animal_type='hamster', pet_name='harry')

handlebars复制代码I have a hamster.
My hamster's name is Harry.

handlebars复制代码def describe_pet(pet_name, animal_type='dog'):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet(pet_name='willie')

handlebars复制代码I have a dog.
My dog's name is Willie.

handlebars复制代码describe_pet('willie')

handlebars复制代码describe_pet(pet_name='harry', animal_type='hamster')

handlebars复制代码def describe_pet(pet_name, animal_type='dog'):

handlebars复制代码# 一条名为Willie的小狗
describe_pet('willie')
describe_pet(pet_name='willie')
# 一只名为Harry的仓鼠
describe_pet('harry', 'hamster')
describe_pet(pet_name='harry', animal_type='hamster')
describe_pet(animal_type='hamster', pet_name='harry')

handlebars复制代码def describe_pet(animal_type, pet_name):
    """显示宠物的信息"""
    print("\nI have a "+animal_type+".")
    print("My "+animal_type+"'s name is "+pet_name.title()+".")
describe_pet()
Python发现该函数调用缺少必要的信息，而traceback指出了这一点：
Traceback (most recent call last):
  File "pets.py", line 6, in <module>
    describe_pet()
TypeError: describe_pet() missing 2 required positional arguments: 'animal_
type' and 'pet_name'

css复制代码1 <= a.length, b.length <= 10^5
a.length == b.length
a and b consist of lowercase English letters

python复制代码class Solution(object):
    def checkPalindromeFormation(self, a, b):
        """
        :type a: str
        :type b: str
        :rtype: bool
        """
        return self.check(a, b) or self.check(b,a)
    
    def check(self, a, b):
        if len(a) == 1 : return True
        i = 0
        j = len(a) - 1
        while i<=j and a[i]==b[j]:
            i+=1
            j-=1
        if i>j:return True
        return self.isPalindrome(a[i:j+1]) or self.isPalindrome(b[i:j+1])
    
    def isPalindrome(self, s):
        i = 0
        j = len(s)-1
        while i<=j and s[i]==s[j]:
            i+=1
            j-=1
        return i>j

erlang复制代码Runtime: 119 ms, faster than 66.67% of Python online submissions for Split Two Strings to Make Palindrome.
Memory Usage: 15.6 MB, less than 38.10% of Python online submissions for Split Two Strings to Make Palindrome.

java复制代码final class Animal {

}

java复制代码public class FinalExample {
    public final void sayHi() {
        System.out.println("Hi~");
    }
}

java复制代码public class FinalExample {
    private static final String MSG = "hello";
	//......
}

java复制代码public class FinalExample {
    public void sayHi(final String name) {
        System.out.println("Hi," + name);
    }
}

java复制代码public class NettyClient {

    private String host;
    private int port;
    private Bootstrap bootstrap;
    private EventLoopGroup group;

    public static void main(String[] args) throws Exception {
        NettyClient nettyClient = new NettyClient("localhost", 9000);
        nettyClient.connect();
    }

    public NettyClient(String host, int port) {
        this.host = host;
        this.port = port;
        init();
    }

    private void init() {
        //客户端需要一个事件循环组
        group = new NioEventLoopGroup();
        //创建客户端启动对象
        // bootstrap 可重用, 只需在NettyClient实例化的时候初始化即可.
        bootstrap = new Bootstrap();
        bootstrap.group(group)
                .channel(NioSocketChannel.class)
                .handler(new ChannelInitializer<SocketChannel>() {
                    @Override
                    protected void initChannel(SocketChannel ch) throws Exception {
                        //加入处理器
                        ch.pipeline().addLast(new NettyClientHandler(NettyClient.this));
                    }
                });
    }

    public void connect() throws Exception {
        System.out.println("netty client start。。");
        //启动客户端去连接服务器端
        ChannelFuture cf = bootstrap.connect(host, port);
        cf.addListener(new ChannelFutureListener() {
            @Override
            public void operationComplete(ChannelFuture future) throws Exception {
                if (!future.isSuccess()) {
                    //重连交给后端线程执行
                    future.channel().eventLoop().schedule(() -> {
                        System.err.println("重连服务端...");
                        try {
                            connect();
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                    }, 3000, TimeUnit.MILLISECONDS);
                } else {
                    System.out.println("服务端连接成功...");
                }
            }
        });
        //对通道关闭进行监听
        cf.channel().closeFuture().sync();
    }
}

java复制代码public class NettyClientHandler extends ChannelInboundHandlerAdapter {
    private NettyClient nettyClient;

    public NettyClientHandler(NettyClient nettyClient) {
        this.nettyClient = nettyClient;
    }

    /**
     * 当客户端连接服务器完成就会触发该方法
     *
     * @param ctx
     * @throws Exception
     */
    @Override
    public void channelActive(ChannelHandlerContext ctx) throws Exception {
        ByteBuf buf = Unpooled.copiedBuffer("HelloServer".getBytes(CharsetUtil.UTF_8));
        ctx.writeAndFlush(buf);
    }

    //当通道有读取事件时会触发，即服务端发送数据给客户端
    @Override
    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
        ByteBuf buf = (ByteBuf) msg;
        System.out.println("收到服务端的消息:" + buf.toString(CharsetUtil.UTF_8));
        System.out.println("服务端的地址： " + ctx.channel().remoteAddress());
    }

    // channel 处于不活动状态时调用
    @Override
    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
        System.err.println("运行中断开重连。。。");
        nettyClient.connect();
    }

    @Override
    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
        cause.printStackTrace();
        ctx.close();
    }
}

java复制代码public class InvokerInvocationHandler implements InvocationHandler {
    private final Invoker<?> invoker;
​
    public InvokerInvocationHandler(Invoker<?> handler) {
        this.invoker = handler;
    }
​
    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
        ~~~
        /**
        * 此处为rpc服务调用的开始
        * 此时的invoker 为MockClusterInoker 
        * 在服务引用的时候包装
        */
        this.invoker.invoke(new RpcInvocation(method, args)).recreate()
        ~~~
    }
}

java复制代码public class MockClusterInvoker<T> implements Invoker<T> {
  ···
    public Result invoke(Invocation invocation) throws RpcException {
        Result result = null;
        //  从URL里面获取mock配置
        String value = this.directory.getUrl()
          .getMethodParameter(invocation.getMethodName(), "mock",Boolean.FALSE.toString()).trim();
        if (value.length() != 0 && !value.equalsIgnoreCase("false")) {
            if (value.startsWith("force")) {
              // 强制mock场景调用
                result = this.doMockInvoke(invocation, (RpcException)null);
            } else {
              //  失败进入mock场景
                try {
                    result = this.invoker.invoke(invocation);
                } catch (RpcException var5) {
                  //发生异常进入mock
                    result = this.doMockInvoke(invocation, var5);
                }
            }
        } else {
            //无mock场景直接调用
            result = this.invoker.invoke(invocation);
        }
        return result;
    }

java复制代码public abstract class AbstractClusterInvoker<T> implements Invoker<T> {
  ...
   public Result invoke(Invocation invocation) throws RpcException {
      // 检验节点是否销毁
        this.checkWhetherDestroyed();
        LoadBalance loadbalance = null;
      /**
      * 调用Directory -》 调用Rou
      * 生成invoker对象
      * 获取invoker列表
      ***/ 
        List<Invoker<T>> invokers = this.list(invocation);
        if (invokers != null && !invokers.isEmpty()) {
            // 获取第一个服务提供者的invoker的负载均衡策略，默认为random
            loadbalance = (LoadBalance)ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(((Invoker)invokers.get(0)).getUrl().getMethodParameter(RpcUtils.getMethodName(invocation), "loadbalance", "random"));
        }
        RpcUtils.attachInvocationIdIfAsync(this.getUrl(), invocation);
        return this.doInvoke(invocation, invokers, loadbalance);
    }
  ...
}

java复制代码public class FailoverClusterInvoker<T> extends AbstractClusterInvoker<T> {
  public Result doInvoke(Invocation invocation, List<Invoker<T>> invokers, LoadBalance loadbalance) throws RpcException {
        List<Invoker<T>> copyinvokers = invokers;
        // invoker空校验
        this.checkInvokers(invokers, invocation);
        // 获取重试次数，默认重试一次
        int len = this.getUrl().getMethodParameter(invocation.getMethodName(), "retries", 2) + 1;
        if (len <= 0) {
            len = 1;
        }
        RpcException le = null;
        List<Invoker<T>> invoked = new ArrayList(invokers.size());
        Set<String> providers = new HashSet(len);
​
        for(int i = 0; i < len; ++i) {
            if (i > 0) {
              // 有过一次失败之后，需要重新校验节点是否被销毁，invokkers是否为空
                this.checkWhetherDestroyed();
                copyinvokers = this.list(invocation);
                this.checkInvokers(copyinvokers, invocation);
            }
            // 重新负载均衡
            Invoker<T> invoker = this.select(loadbalance, invocation, copyinvokers, invoked);
            invoked.add(invoker);
            RpcContext.getContext().setInvokers(invoked);
            try {
              // 进行远程调用
                Result result = invoker.invoke(invocation);
                return var12;
            } catch (RpcException var17) {
                if (var17.isBiz()) {
                    throw var17;
                }
                le = var17;
            } catch (Throwable var18) {
                le = new RpcException(var18.getMessage(), var18);
            } finally {
                providers.add(invoker.getUrl().getAddress());
            }
        }
      ···
    }
}
​

java复制代码private static <T> Invoker<T> buildInvokerChain(final Invoker<T> invoker, String key, String group) {
    Invoker<T> last = invoker;
    // 根据key和group获取自动激活的Filter
    List<Filter> filters = ExtensionLoader.getExtensionLoader(Filter.class).getActivateExtension(invoker.getUrl(), key, group);
    if (!filters.isEmpty()) {
        // 这里是倒排遍历，因为只有倒排，最外层的Invoker才能使第一个过滤器
        for (int i = filters.size() - 1; i >= 0; i--) {
            final Filter filter = filters.get(i);
            // 会把真实的Invoker（服务对象ref）放到拦截器的末尾
            final Invoker<T> next = last;
            // 为每一个filter生成一个exporter，依次串起来
            last = new Invoker<T>() {
               ...
                @Override
                public Result invoke(Invocation invocation) throws RpcException {
                    // $-- 每次调用都会传递给下一个拦截器
                    return filter.invoke(next, invocation);
                }
                ...
            };
        }
    }
    return last;
}

java复制代码public class ConsumerContextFilter implements Filter {
    public ConsumerContextFilter() {
    }
​
    public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
    RpcContext.getContext().setInvoker(invoker).setInvocation(invocation).setLocalAddress(NetUtils.getLocalHost(), 0).setRemoteAddress(invoker.getUrl().getHost(), invoker.getUrl().getPort());
        if (invocation instanceof RpcInvocation) {
            ((RpcInvocation)invocation).setInvoker(invoker);
        }
​
        RpcResult var4;
        try {
            RpcResult result = (RpcResult)invoker.invoke(invocation);
            RpcContext.getServerContext().setAttachments(result.getAttachments());
            var4 = result;
        } finally {
            RpcContext.getContext().clearAttachments();
        }
​
        return var4;
    }
}

java复制代码public abstract class AbstractInvoker<T> implements Invoker<T> {
public Result invoke(Invocation inv) throws RpcException {
        if (this.destroyed.get()) {
           ···
        } else {
            RpcInvocation invocation = (RpcInvocation)inv;
            invocation.setInvoker(this);
            ···
            try {
                return this.doInvoke(invocation);
            } catch (InvocationTargetException var6) {
                ···
            } catch (RpcException var7) {
                ···
            } catch (Throwable var8) {
                return new RpcResult(var8);
            }
        }
    }
}

java复制代码public class DubboInvoker<T> extends AbstractInvoker<T> {
 protected Result doInvoke(Invocation invocation) throws Throwable {
        RpcInvocation inv = (RpcInvocation)invocation;
        String methodName = RpcUtils.getMethodName(invocation);
        inv.setAttachment("path", this.getUrl().getPath());
        inv.setAttachment("version", this.version);
        ExchangeClient currentClient;
        if (this.clients.length == 1) {
            currentClient = this.clients[0];
        } else {
            currentClient = this.clients[this.index.getAndIncrement() % this.clients.length];
        }
​
        try {
            boolean isAsync = RpcUtils.isAsync(this.getUrl(), invocation);
            boolean isOneway = RpcUtils.isOneway(this.getUrl(), invocation);
            int timeout = this.getUrl().getMethodParameter(methodName, "timeout", 1000);
            if (isOneway) {
                boolean isSent = this.getUrl().getMethodParameter(methodName, "sent", false);
                currentClient.send(inv, isSent);
                RpcContext.getContext().setFuture((Future)null);
                return new RpcResult();
            } else if (isAsync) {
                ResponseFuture future = currentClient.request(inv, timeout);
                RpcContext.getContext().setFuture(new FutureAdapter(future));
                return new RpcResult();
            } else {
                RpcContext.getContext().setFuture((Future)null);
                return (Result)currentClient.request(inv, timeout).get();
            }
        } catch (TimeoutException var9) {
          ···
        } catch (RemotingException var10) {
          ···
        }
    }
}

java复制代码@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
    try {
        Result result = invoker.invoke(invocation);
        // 不会处理GenericService类型invoker的异常
        if (result.hasException() && GenericService.class != invoker.getInterface()) {
        ····
        }
    }
}

java复制代码/**
 * JdkRpcProxyFactory
 */
public class JdkProxyFactory extends AbstractProxyFactory {
​
    @Override
    @SuppressWarnings("unchecked")
    public <T> T getProxy(Invoker<T> invoker, Class<?>[] interfaces) {
        return (T) Proxy.newProxyInstance(invoker.getInterface().getClassLoader(), interfaces, new InvokerInvocationHandler(invoker));
    }
​
    @Override
    public <T> Invoker<T> getInvoker(T proxy, Class<T> type, URL url) {
        return new AbstractProxyInvoker<T>(proxy, type, url) {
            @Override
            protected Object doInvoke(T proxy, String methodName,
                                      Class<?>[] parameterTypes,
                                      Object[] arguments) throws Throwable {
                Method method = proxy.getClass().getMethod(methodName, parameterTypes);
                return method.invoke(proxy, arguments);
            }
        };
    }
​
}
​

sh复制代码>git status
On branch dev
Your branch is up to date with 'origin/dev'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/main/java/com/wqy/TaskOperation.java

sh复制代码>git add .

sh复制代码>git branch -v
* dev                8b5310f Merge branch 'feature/name' into dev
  feature/wwa b7bee2 feat: <E6><8E><A8><E8><8D><90>-<E5><8F><91><E7><8E><B0><E9><A1><B5> - <E6><A0>
  feature/name 1b9c1a4 feat: <E6><8E><A8><E8><8D><90><E5><AE><A1><E6><A0><B8>
  master             162d523 1.<E8><AE><B2><E8><82><A1><E5><A0><82><E6><95><B0><E6><8D><AE><E5><90>
  pdt                a133379 feat: <E5><A2><9E><E5><8A><A0>pdt<E5><88><86><E6><94><AF>

sh复制代码>git checkout feature/name
Switched to branch 'feature/name'
D       src/main/java/com/wqy/service/package-info.java
A       src/test/java/com/wqy/mapper/NameMapperTest.java
A       src/test/java/com/wqy/util/RedisListTest.java
Your branch is up to date with 'origin/feature/name'.

sh复制代码>git branch aa

sh复制代码>git stash
Saved working directory and index state WIP on dev: 8b533kk Merge branch 'feature/name' into dev

sh复制代码>git stash list
stash@{0}: WIP on dev: 8b3330f Merge branch 'feature/name' into dev
stash@{1}: WIP on name: d161368 feat: <E5><8F><91><E7><8E><B0><E9><A1><B5>-<E6>B4><E6><96><B0><E9><95><BF><E7><9F><A2><E5><BC><95>
stash@{2}: On dev: Uncommitted changes before Update at 2021/11/25 10:19

sh复制代码>git stash pop stash@{2}
Auto-merging src/main/resources/generator.properties
Removing src/main/java/com/wqy/service/package-info.java
On branch dev
Your branch is up to date with 'origin/dev'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   src/test/java/com/wqy/mapper/QQMapperTest.java
        new file:   src/test/java/com/wqy/mapper/AMapperTest.java
        new file:   src/test/java/com/wqy/util/RedisListTest.java

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    src/main/java/com/wqy/service/package-info.java

Dropped stash@{2} (30feafb08ef0efaa58995311417ecfee86de05)

sh复制代码# 切换前查看分支
>git status
On branch dev
Your branch is up to date with 'origin/dev'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   src/main/java/com/wqy/TaskOperation.java
# 将内容放入本地暂存区        
>git add .       
# 添加到stash
>git stash
Saved working directory and index state WIP on dev: 8b533kk Merge branch 'feature/name' into dev
# 切换分支
>git checkout feature/name
Switched to branch 'feature/name'
D       src/main/java/com/wqy/service/package-info.java
A       src/test/java/com/wqy/mapper/NameMapperTest.java
A       src/test/java/com/wqy/util/RedisListTest.java
Your branch is up to date with 'origin/feature/name'.
# 切换分支，切换回上个分支
>git checkout dev
Switched to branch 'dev'
D       src/main/java/com/wqy/service/package-info.java
A       src/test/java/com/wqy/mapper/QQMapperTest.java
A       src/test/java/com/wqy/mapper/AMapperTest.java
A       src/test/java/com/wqy/util/RedisListTest.java
Your branch is up to date with 'origin/dev'.
# 查看stash集合
>git stash list
stash@{0}: WIP on dev: 8b3330f Merge branch 'feature/name' into dev
stash@{1}: WIP on name: d161368 feat: <E5><8F><91><E7><8E><B0><E9><A1><B5>-<E6>B4><E6><96><B0><E9><95><BF><E7><9F><A2><E5><BC><95>
stash@{2}: On dev: Uncommitted changes before Update at 2021/11/25 10:19
# 恢复stash内容
>git stash pop stash@{2}