From bec1c0c2d82929a187cea425cb48ab4ce021c7c8 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 20 Apr 2023 21:47:01 +0800
Subject: [PATCH] =?UTF-8?q?DataSqlSource=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redkale/source/AbstractDataSqlSource.java |  6 +++---
 .../org/redkale/source/DataJdbcSource.java    |  8 +++----
 .../org/redkale/source/DataMemorySource.java  |  6 +++---
 .../org/redkale/source/DataSqlSource.java     | 21 ++++++++++++++++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/redkale/source/AbstractDataSqlSource.java b/src/main/java/org/redkale/source/AbstractDataSqlSource.java
index 51f53682e..9938abcba 100644
--- a/src/main/java/org/redkale/source/AbstractDataSqlSource.java
+++ b/src/main/java/org/redkale/source/AbstractDataSqlSource.java
@@ -668,15 +668,15 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement
 
     @Local
     @Override
-    public abstract int directExecute(String sql);
+    public abstract int nativeExecute(String sql);
 
     @Local
     @Override
-    public abstract int[] directExecute(String... sqls);
+    public abstract int[] nativeExecute(String... sqls);
 
     @Local
     @Override
-    public abstract <V> V directQuery(String sql, Function<DataResultSet, V> handler);
+    public abstract <V> V nativeQuery(String sql, Function<DataResultSet, V> handler);
 
     //是否异步
     protected abstract boolean isAsync();
diff --git a/src/main/java/org/redkale/source/DataJdbcSource.java b/src/main/java/org/redkale/source/DataJdbcSource.java
index fe71a2166..5e51211ce 100644
--- a/src/main/java/org/redkale/source/DataJdbcSource.java
+++ b/src/main/java/org/redkale/source/DataJdbcSource.java
@@ -2466,8 +2466,8 @@ public class DataJdbcSource extends AbstractDataSqlSource {
      */
     @Local
     @Override
-    public int directExecute(String sql) {
-        return directExecute(new String[]{sql})[0];
+    public int nativeExecute(String sql) {
+        return nativeExecute(new String[]{sql})[0];
     }
 
     /**
@@ -2480,7 +2480,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
      */
     @Local
     @Override
-    public int[] directExecute(String... sqls) {
+    public int[] nativeExecute(String... sqls) {
         if (sqls.length == 0) {
             return new int[0];
         }
@@ -2523,7 +2523,7 @@ public class DataJdbcSource extends AbstractDataSqlSource {
      */
     @Local
     @Override
-    public <V> V directQuery(String sql, Function<DataResultSet, V> handler) {
+    public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler) {
         final long s = System.currentTimeMillis();
         final Connection conn = readPool.pollConnection();
         try {
diff --git a/src/main/java/org/redkale/source/DataMemorySource.java b/src/main/java/org/redkale/source/DataMemorySource.java
index 6bc84e74f..b31372560 100644
--- a/src/main/java/org/redkale/source/DataMemorySource.java
+++ b/src/main/java/org/redkale/source/DataMemorySource.java
@@ -94,17 +94,17 @@ public class DataMemorySource extends AbstractDataSqlSource implements SearchSou
     }
 
     @Override
-    public int directExecute(String sql) {
+    public int nativeExecute(String sql) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public int[] directExecute(String... sqls) {
+    public int[] nativeExecute(String... sqls) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
     @Override
-    public <V> V directQuery(String sql, Function<DataResultSet, V> handler) {
+    public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
diff --git a/src/main/java/org/redkale/source/DataSqlSource.java b/src/main/java/org/redkale/source/DataSqlSource.java
index 3e0f09e2c..5392184a0 100644
--- a/src/main/java/org/redkale/source/DataSqlSource.java
+++ b/src/main/java/org/redkale/source/DataSqlSource.java
@@ -17,9 +17,24 @@ import java.util.function.Function;
  */
 public interface DataSqlSource extends DataSource {
 
-    public int directExecute(String sql);
+    public int nativeExecute(String sql);
 
-    public int[] directExecute(String... sqls);
+    public int[] nativeExecute(String... sqls);
 
-    public <V> V directQuery(String sql, Function<DataResultSet, V> handler);
+    public <V> V nativeQuery(String sql, Function<DataResultSet, V> handler);
+
+    @Deprecated
+    default int directExecute(String sql) {
+        return nativeExecute(sql);
+    }
+
+    @Deprecated
+    default int[] directExecute(String... sqls) {
+        return nativeExecute(sqls);
+    }
+
+    @Deprecated
+    default <V> V directQuery(String sql, Function<DataResultSet, V> handler) {
+        return nativeQuery(sql, handler);
+    }
 }