New library versions.

Author: ceos01

.gitignore

@@ -44,11 +44,11 @@ Licensed to the Apache Software Foundation (ASF) under one
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.device.Device;
-import org.apache.plc4x.java.modbus.field.ModbusFieldCoil;
-import org.apache.plc4x.java.modbus.field.ModbusField;
-import org.apache.plc4x.java.modbus.field.ModbusFieldHoldingRegister;
-import org.apache.plc4x.java.modbus.field.ModbusFieldInputRegister;
-import org.apache.plc4x.java.modbus.field.ModbusExtendedRegister;
+import org.apache.plc4x.java.modbus.base.field.ModbusFieldCoil;
+import org.apache.plc4x.java.modbus.base.field.ModbusField;
+import org.apache.plc4x.java.modbus.base.field.ModbusFieldHoldingRegister;
+import org.apache.plc4x.java.modbus.base.field.ModbusFieldInputRegister;
+import org.apache.plc4x.java.modbus.base.field.ModbusExtendedRegister;
 
 /**
  *

.project

@@ -25,7 +25,6 @@ Licensed to the Apache Software Foundation (ASF) under one
 import java.util.Map;
 import org.apache.plc4x.java.s7.events.S7ModeEvent;
 import org.apache.plc4x.java.s7.readwrite.ModeTransitionType;
-import org.apache.plc4x.java.s7.utils.S7EventHelper;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventAdmin;

.settings/org.eclipse.core.resources.prefs

@@ -282,12 +282,11 @@ dataSourceName=model
 
     <feature name='config_tsfile' description='${project.name}' version='${project.version}'>
         <feature>config_libs</feature>
-        <!-- <bundle>wrap:mvn:org.slf4j/slf4j-api/1.7.28/$Export-Package=*;version=&quot;1.7.28&quot;,!*</bundle> -->
-        <bundle>wrap:mvn:ch.qos.logback/logback-classic/1.1.11/$Export-Package=*;version=&quot;1.1.11&quot;,!*</bundle>
-        <bundle>wrap:mvn:ch.qos.logback/logback-core/1.1.11/$Export-Package=*;version=&quot;1.1.11&quot;,!*</bundle>    
-        <bundle>wrap:mvn:com.alibaba/fastjson/1.2.70/$Export-Package=*;version=&quot;1.2.70&quot;,!*</bundle>                       
-        <bundle>wrap:mvn:org.xerial.snappy/snappy-java/1.1.7.2/$Export-Package=*;version=&quot;1.1.7.2&quot;,!*</bundle>         
-        <!-- <bundle>wrap:mvn:commons-io/commons-io/2.5/$Export-Package=*;version=&quot;2.5&quot;,!*</bundle> -->
+        <bundle>wrap:mvn:ch.qos.logback/logback-classic/1.1.11/$Export-Package=*;version=&quot;1.1.11&quot;,!*</bundle>        
+        <bundle>wrap:mvn:org.xerial.snappy/snappy-java/1.1.7.2/$Export-Package=*;version=&quot;1.1.7.2&quot;,!*</bundle> 
+        <bundle>wrap:mvn:commons-io/commons-io/2.5/$Export-Package=*;version=&quot;2.5&quot;,!*</bundle>
+        <bundle>wrap:mvn:org.lz4/lz4-java/1.8.0/$Export-Package=*;version=&quot;1.8.0&quot;,!*</bundle>
+        <bundle>wrap:mvn:com.google.code.gson/gson/2.9.0/$Export-Package=*;version=&quot;2.9.0&quot;,!*</bundle>
         <bundle>wrap:mvn:org.apache.iotdb/tsfile/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>
     </feature>   
 
@@ -366,9 +365,16 @@ dataSourceName=model
         <bundle>wrap:mvn:commons-io/commons-io/2.5/$Export-Package=*;version=&quot;2.5&quot;,!*</bundle> -->        
 
         <!-- <bundle>wrap:mvn:org.apache.iotdb/tsfile/0.10.0/$Export-Package=*;version=&quot;0.10.0&quot;,!*</bundle> -->
+        <bundle>wrap:mvn:org.apache.iotdb/service-rpc/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle> 
+        <bundle>wrap:mvn:org.apache.iotdb/iotdb-antlr/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>  
+        
+        <bundle>wrap:mvn:org.apache.iotdb/iotdb-thrift-sync/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>  
+        <bundle>wrap:mvn:org.apache.iotdb/influxdb-thrift/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>                 
         <bundle>wrap:mvn:org.apache.iotdb/iotdb-cli/${apache.iotdb.client.version}/$Export-Package=*;version=&quot;${apache.iotdb.client.version}&quot;,!*</bundle>                                                                                                      
         <bundle>wrap:mvn:org.apache.iotdb/iotdb-server/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>  
-        <bundle>wrap:mvn:org.apache.iotdb/service-rpc/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle>  
+        <bundle>wrap:mvn:org.apache.iotdb/iotdb-thrift/${apache.iotdb.version}/$Export-Package=*;version=&quot;${apache.iotdb.version}&quot;,!*</bundle> 
+
+ 
 
         <!-- <bundle>wrap:mvn:org.apache.karaf.shell/org.apache.karaf.shell.core/${apache.karaf.version}/$Export-Package=*;version=&quot;${apache.karaf.version}&quot;,!*</bundle> -->
         <bundle>wrap:mvn:javax.servlet/javax.servlet-api/${servlet.api.version}/$Export-Package=*;version=&quot;${servlet.api.version}&quot;,!*</bundle>                                             

.settings/org.eclipse.m2e.core.prefs

@@ -230,7 +230,7 @@
         <dependency>
             <groupId>org.apache.iotdb</groupId>
             <artifactId>iotdb-session</artifactId>
-            <version>0.10.0</version>
+            <version>${apache.iotdb.version}</version>
             <classifier>jar-with-dependencies</classifier>
         </dependency>
 

LICENSE

@@ -25,6 +25,7 @@
 import java.util.List;
 import org.apache.iotdb.rpc.BatchExecutionException;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
+import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.Session;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.karaf.config.core.ConfigRepository;
@@ -290,7 +291,7 @@ private boolean SendAllItemsToServer(){
             LOGGER.info(ex.toString());
             connected = false;
             return false;
-        } catch (BatchExecutionException ex) {
+        } catch (StatementExecutionException ex) {
             LOGGER.info(ex.toString());
             return false;
         }

README.md

@@ -76,7 +76,7 @@ private void printConfig(){
         table.column("value");            
 
 
-        table.addRow().addContent("metrics_port",confIoTDB.getMetricsPort()); //=8181
+        //table.addRow().addContent("metrics_port",confIoTDB.getMetricsPort()); //=8181
 
         //RPC Configuration
         table.addRow().addContent("rpc_address", confIoTDB.getRpcAddress()); //=0.0.0.0
@@ -129,7 +129,7 @@ private void printConfig(){
         */
         table.addRow().addContent("wal_buffer_size", confIoTDB.getWalBufferSize()); //=16777216
         //table.addRow().addContent("time_zone", confIoTDB.getZoneID()); //=+08:00
-        table.addRow().addContent("tsfile_size_threshold", confIoTDB.getTsFileSizeThreshold()); //=536870912
+        //table.addRow().addContent("tsfile_size_threshold", confIoTDB.getTsFileSizeThreshold()); //=536870912
         table.addRow().addContent("memtable_size_threshold", confIoTDB.getMemtableSizeThreshold()); //=134217728
         table.addRow().addContent("concurrent_flush_thread", confIoTDB.getConcurrentFlushThread()); //=0
         table.addRow().addContent("chunk_buffer_pool_enable", confIoTDB.isChunkBufferPoolEnable()); //=false
@@ -139,21 +139,21 @@ private void printConfig(){
         table.addRow().addContent("upgrade_thread_num", confIoTDB.getUpgradeThreadNum()); //=1
 
         //Merge Configurations
-        table.addRow().addContent("merge_thread_num", confIoTDB.getMergeThreadNum()); //=1
-        table.addRow().addContent("merge_chunk_subthread_num", confIoTDB.getMergeChunkSubThreadNum()); //=4
-        table.addRow().addContent("merge_fileSelection_time_budget", confIoTDB.getMergeFileSelectionTimeBudget()); //=30000
-        table.addRow().addContent("merge_memory_budget", confIoTDB.getMergeMemoryBudget()); //=2147483648
-        table.addRow().addContent("continue_merge_after_reboot", confIoTDB.isContinueMergeAfterReboot()); //=false
+        //table.addRow().addContent("merge_thread_num", confIoTDB.getMergeThreadNum()); //=1
+        //table.addRow().addContent("merge_chunk_subthread_num", confIoTDB.getMergeChunkSubThreadNum()); //=4
+        //table.addRow().addContent("merge_fileSelection_time_budget", confIoTDB.getMergeFileSelectionTimeBudget()); //=30000
+        //table.addRow().addContent("merge_memory_budget", confIoTDB.getMergeMemoryBudget()); //=2147483648
+        //table.addRow().addContent("continue_merge_after_reboot", confIoTDB.isContinueMergeAfterReboot()); //=false
         table.addRow().addContent("merge_interval_sec", confIoTDB.getMergeIntervalSec()); //=3600
-        table.addRow().addContent("force_full_merge", confIoTDB.isForceFullMerge()); //=false
+        //table.addRow().addContent("force_full_merge", confIoTDB.isForceFullMerge()); //=false
         //table.addRow().addContent("chunk_merge_point_threshold", confIoTDB.getChunkMergePointThreshold()); //=20480
 
         //Metadata Cache Configuration
         table.addRow().addContent("meta_data_cache_enable", confIoTDB.isMetaDataCacheEnable()); //=true
         table.addRow().addContent("filemeta_chunkmeta_free_memory_proportion", "***"); //=3:6:10
 
         //Statistics Monitor configuration
-        table.addRow().addContent("enable_stat_monitor", confIoTDB.isEnableStatMonitor()); //=false
+        //table.addRow().addContent("enable_stat_monitor", confIoTDB.isEnableStatMonitor()); //=false
         //table.addRow().addContent("back_loop_period_in_second", confIoTDB.getBackLoopPeriodSec()); //=5
         //table.addRow().addContent("stat_monitor_detect_freq_in_second", confIoTDB.getStatMonitorDetectFreqSec()); //=600
         //table.addRow().addContent("stat_monitor_retain_interval_in_second", confIoTDB.getStatMonitorRetainIntervalSec()); //=600
@@ -169,9 +169,9 @@ private void printConfig(){
         table.addRow().addContent("ip_white_list", confIoTDB.getIpWhiteList()); //=0.0.0.0/0
 
         //performance statistic configuration
-        table.addRow().addContent("enable_performance_stat", confIoTDB.isEnablePerformanceStat()); //=false
-        table.addRow().addContent("performance_stat_display_interval", confIoTDB.getPerformanceStatDisplayInterval()); //=60000
-        table.addRow().addContent("performance_stat_memory_in_kb", confIoTDB.getPerformanceStatMemoryInKB()); //=20
+        //table.addRow().addContent("enable_performance_stat", confIoTDB.isEnablePerformanceStat()); //=false
+        //table.addRow().addContent("performance_stat_display_interval", confIoTDB.getPerformanceStatDisplayInterval()); //=60000
+        //table.addRow().addContent("performance_stat_memory_in_kb", confIoTDB.getPerformanceStatMemoryInKB()); //=20
 
         //Configurations for watermark module
         table.addRow().addContent("watermark_module_opened", confIoTDB.isEnableWatermark()); //=false