This is an automated email from the ASF dual-hosted git repository.

lujingshang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new ca0aa84267c JDBCStore For Narayana does not drop tables by default 
(#18126)
ca0aa84267c is described below

commit ca0aa84267cf3e0736d0ce1c4381c1c273d35824
Author: natehuang <[email protected]>
AuthorDate: Wed Jun 1 18:12:00 2022 +0800

    JDBCStore For Narayana does not drop tables by default (#18126)
---
 .../xa/narayana/config/NarayanaConfigurationFileGenerator.java      | 6 +++---
 .../xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGenerator.java
 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-x
 [...]
index 5fde9892c20..957ec0fc2f0 100644
--- 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGenerator.java
+++ 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/main/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGenerator.java
@@ -129,15 +129,15 @@ public final class NarayanaConfigurationFileGenerator 
implements TransactionConf
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.objectStoreType",
 JDBCStore.class.getName()));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.jdbcAccess", 
jdbcAccess));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.tablePrefix", 
"Action"));
-        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.dropTable", 
Boolean.TRUE.toString()));
+        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.dropTable", 
Boolean.FALSE.toString()));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.stateStore.objectStoreType",
 JDBCStore.class.getName()));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.stateStore.jdbcAccess",
 jdbcAccess));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.stateStore.tablePrefix",
 "stateStore"));
-        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.stateStore.dropTable",
 Boolean.TRUE.toString()));
+        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.stateStore.dropTable",
 Boolean.FALSE.toString()));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.communicationStore.objectStoreType",
 JDBCStore.class.getName()));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.communicationStore.jdbcAccess",
 jdbcAccess));
         
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.communicationStore.tablePrefix",
 "Communication"));
-        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.communicationStore.dropTable",
 Boolean.TRUE.toString()));
+        
config.getEntries().add(createEntry("ObjectStoreEnvironmentBean.communicationStore.dropTable",
 Boolean.FALSE.toString()));
     }
     
     @Override
diff --git 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transacti
 [...]
index d35b16eb519..42ce233aaae 100644
--- 
a/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
+++ 
b/shardingsphere-kernel/shardingsphere-transaction/shardingsphere-transaction-type/shardingsphere-transaction-xa/shardingsphere-transaction-xa-provider/shardingsphere-transaction-xa-narayana/src/test/java/org/apache/shardingsphere/transaction/xa/narayana/config/NarayanaConfigurationFileGeneratorTest.java
@@ -226,7 +226,7 @@ public final class NarayanaConfigurationFileGeneratorTest {
         Optional<NarayanaConfigEntry> entry = 
narayanaConfig.getEntries().stream().filter(each -> 
"ObjectStoreEnvironmentBean.dropTable".equals(each.getKey())).findFirst();
         assertTrue(entry.isPresent());
         assertThat(entry.get().getValue().size(), is(1));
-        assertTrue(entry.get().getValue().contains(Boolean.TRUE.toString()));
+        assertTrue(entry.get().getValue().contains(Boolean.FALSE.toString()));
     }
     
     private void assertStateStoreJdbcAccess(final NarayanaConfiguration 
narayanaConfig) {
@@ -254,7 +254,7 @@ public final class NarayanaConfigurationFileGeneratorTest {
         Optional<NarayanaConfigEntry> entry = 
narayanaConfig.getEntries().stream().filter(each -> 
"ObjectStoreEnvironmentBean.stateStore.dropTable".equals(each.getKey())).findFirst();
         assertTrue(entry.isPresent());
         assertThat(entry.get().getValue().size(), is(1));
-        assertTrue(entry.get().getValue().contains(Boolean.TRUE.toString()));
+        assertTrue(entry.get().getValue().contains(Boolean.FALSE.toString()));
     }
     
     private void assertCommunicationStoreObjectStoreType(final 
NarayanaConfiguration narayanaConfig) {
@@ -282,6 +282,6 @@ public final class NarayanaConfigurationFileGeneratorTest {
         Optional<NarayanaConfigEntry> entry = 
narayanaConfig.getEntries().stream().filter(each -> 
"ObjectStoreEnvironmentBean.communicationStore.dropTable".equals(each.getKey())).findFirst();
         assertTrue(entry.isPresent());
         assertThat(entry.get().getValue().size(), is(1));
-        assertTrue(entry.get().getValue().contains(Boolean.TRUE.toString()));
+        assertTrue(entry.get().getValue().contains(Boolean.FALSE.toString()));
     }
 }

Reply via email to