Repository: trafodion Updated Branches: refs/heads/master c0a125ed3 -> 0a6b61204
http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/regress/seabase/EXPECTED002 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED002 b/core/sql/regress/seabase/EXPECTED002 index add3de8..fc9a0f7 100644 --- a/core/sql/regress/seabase/EXPECTED002 +++ b/core/sql/regress/seabase/EXPECTED002 @@ -65,7 +65,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -76,10 +76,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -87,10 +87,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 2 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -98,10 +98,10 @@ Stats Details ReadRequestsCount: 1 WriteRequestsCount: 1 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 3 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -109,10 +109,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 4 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -134,7 +134,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -145,10 +145,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -156,10 +156,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 2 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -167,10 +167,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 3 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -178,10 +178,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 4 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -218,7 +218,7 @@ A B >>invoke table(region stats ()); -- Definition of Trafodion table TRAFODION.T002SCH.EXE_UTIL_REGION_STATS__ --- Definition current Fri Mar 16 20:35:17 2018 +-- Definition current Tue Jun 5 00:29:30 2018 ( CATALOG_NAME CHAR(256 BYTES) CHARACTER SET UTF8 COLLATE @@ -245,7 +245,7 @@ A B >>invoke table(region stats (t002t1)); -- Definition of Trafodion table TRAFODION.T002SCH.EXE_UTIL_REGION_STATS__ --- Definition current Fri Mar 16 20:35:18 2018 +-- Definition current Tue Jun 5 00:29:31 2018 ( CATALOG_NAME CHAR(256 BYTES) CHARACTER SET UTF8 COLLATE @@ -280,7 +280,7 @@ A B (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES STORE_FILE_UNCOMP_SIZE STORE_FILE_SIZE MEM_STORE_SIZE (EXPR) (EXPR) -------------------------------------------------------- -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- ---------------------- -------------------- -------------------- ----------------------------- ------------------------------ -T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1/1521232436741 1 0 0 0 0 ReadRequestsCount: 2 WriteRequestsCount: 1 +T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1/1528158469344 1 0 0 0 0 ReadRequestsCount: 2 WriteRequestsCount: 1 --- 1 row(s) selected. >> @@ -294,7 +294,7 @@ T002SCH.T002T1 1 (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES STORE_FILE_UNCOMP_SIZE STORE_FILE_SIZE MEM_STORE_SIZE (EXPR) (EXPR) -------------------------------------------------------- -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- ---------------------- -------------------- -------------------- ----------------------------- ------------------------------ -T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I1/1521232441739 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 +T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I1/1528158479307 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 --- 1 row(s) selected. >> @@ -308,10 +308,10 @@ T002SCH.T002T1 1 (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES STORE_FILE_UNCOMP_SIZE STORE_FILE_SIZE MEM_STORE_SIZE (EXPR) (EXPR) -------------------------------------------------------- -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- ---------------------- -------------------- -------------------- ----------------------------- ------------------------------ -T002SCH.T002T2 1 TRAFODION.T002SCH.T002T2/1521232475166 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 -T002SCH.T002T2 2 TRAFODION.T002SCH.T002T2/1521232475166 1 0 0 0 0 ReadRequestsCount: 1 WriteRequestsCount: 1 -T002SCH.T002T2 3 TRAFODION.T002SCH.T002T2/1521232475166 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 -T002SCH.T002T2 4 TRAFODION.T002SCH.T002T2/1521232475166 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 +T002SCH.T002T2 1 TRAFODION.T002SCH.T002T2/1528158523869 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 +T002SCH.T002T2 2 TRAFODION.T002SCH.T002T2/1528158523869 1 0 0 0 0 ReadRequestsCount: 1 WriteRequestsCount: 1 +T002SCH.T002T2 3 TRAFODION.T002SCH.T002T2/1528158523869 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 +T002SCH.T002T2 4 TRAFODION.T002SCH.T002T2/1528158523869 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 0 --- 4 row(s) selected. >> @@ -325,7 +325,7 @@ T002SCH.T002T2 4 (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES STORE_FILE_UNCOMP_SIZE STORE_FILE_SIZE MEM_STORE_SIZE (EXPR) (EXPR) -------------------------------------------------------- -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- ---------------------- -------------------- -------------------- ----------------------------- ------------------------------ -T002SCH.T002T2 1 TRAFODION.T002SCH.T002T2I1/1521232479869 1 0 0 0 0 ReadRequestsCount: 1 WriteRequestsCount: 1 +T002SCH.T002T2 1 TRAFODION.T002SCH.T002T2I1/1528158529016 1 0 0 0 0 ReadRequestsCount: 1 WriteRequestsCount: 1 --- 1 row(s) selected. >> @@ -374,7 +374,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -385,10 +385,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1/1521232436741 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1/1528158469344 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -407,7 +407,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1I1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -418,10 +418,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1I1/1521232441739 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1I1/1528158479307 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -440,7 +440,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -451,10 +451,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -462,10 +462,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 2 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -473,10 +473,10 @@ Stats Details ReadRequestsCount: 1 WriteRequestsCount: 1 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 3 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -484,10 +484,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 4 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -506,7 +506,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2I1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -517,10 +517,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T2I1/1521232479869 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2I1/1528158529016 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -540,7 +540,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -551,10 +551,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1/1521232436741 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1/1528158469344 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -576,7 +576,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_HISTOGRAMS NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -587,10 +587,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.SB_HISTOGRAMS/1521232429374 - NumStores: 2 + RegionName: TRAFODION.T002SCH.SB_HISTOGRAMS/1528158446488 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -605,7 +605,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_HISTOGRAM_INTERVALS NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -616,10 +616,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.SB_HISTOGRAM_INTERVALS/1521232431811 - NumStores: 2 + RegionName: TRAFODION.T002SCH.SB_HISTOGRAM_INTERVALS/1528158454615 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -634,7 +634,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_PERSISTENT_SAMPLES NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -645,10 +645,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.SB_PERSISTENT_SAMPLES/1521232434388 - NumStores: 2 + RegionName: TRAFODION.T002SCH.SB_PERSISTENT_SAMPLES/1528158460979 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -663,7 +663,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -674,10 +674,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1/1521232436741 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1/1528158469344 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -692,7 +692,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -703,10 +703,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -714,10 +714,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 2 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -725,10 +725,10 @@ Stats Details ReadRequestsCount: 1 WriteRequestsCount: 1 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 3 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -736,10 +736,10 @@ Stats Details ReadRequestsCount: 0 WriteRequestsCount: 0 - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 4 - RegionName: TRAFODION.T002SCH.T002T2/1521232475166 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T2/1528158523869 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -762,8 +762,8 @@ Stats Details (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES STORE_FILE_UNCOMP_SIZE STORE_FILE_SIZE MEM_STORE_SIZE (EXPR) (EXPR) -------------------------------------------------------- -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- ---------------------- -------------------- -------------------- ----------------------------- ------------------------------ -T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I1/1521232441739 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 -T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I2/1521232446363 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 +T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I1/1528158479307 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 +T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1I2/1528158488210 1 0 0 0 0 ReadRequestsCount: 0 WriteRequestsCount: 1 --- 2 row(s) selected. >>get region stats for @@ -777,7 +777,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1I1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -788,10 +788,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1I1/1521232441739 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1I1/1528158479307 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -806,7 +806,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1I2 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -817,10 +817,10 @@ Stats Summary Stats Details ============= - RegionServer: ansharma-4:49525 + RegionServer: edev06:35100 RegionNum: 1 - RegionName: TRAFODION.T002SCH.T002T1I2/1521232446363 - NumStores: 2 + RegionName: TRAFODION.T002SCH.T002T1I2/1528158488210 + NumStores: 1 NumStoreFiles: 0 UncompressedSize: 0 (less than 1MB) StoreFileSize: 0 (less than 1MB) @@ -841,7 +841,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -859,7 +859,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1I1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -877,7 +877,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -895,7 +895,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2I1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -916,7 +916,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_HISTOGRAMS NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -930,7 +930,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_HISTOGRAM_INTERVALS NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -944,7 +944,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.SB_PERSISTENT_SAMPLES NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -958,7 +958,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T1 NumRegions: 1 RegionsLocation: /hbase/data/default - TotalNumStores: 2 + TotalNumStores: 1 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -972,7 +972,7 @@ Stats Summary ObjectName: TRAFODION.T002SCH.T002T2 NumRegions: 4 RegionsLocation: /hbase/data/default - TotalNumStores: 8 + TotalNumStores: 4 TotalNumStoreFiles: 0 TotalUncompressedSize: 0 TotalStoreFileSize: 0 @@ -991,7 +991,7 @@ Stats Summary (EXPR) REGION_NUM REGION_NAME NUM_STORES NUM_STORE_FILES ------------------------------ -------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------- --------------- -T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1/1521232436741 1 0 +T002SCH.T002T1 1 TRAFODION.T002SCH.T002T1/1528158469344 1 0 --- 1 row(s) selected. >> @@ -1013,7 +1013,7 @@ T002T1 0 >>invoke table(cluster stats()); -- Definition of Trafodion table TRAFODION.T002SCH.EXE_UTIL_CLUSTER_STATS__ --- Definition current Fri Mar 16 20:35:23 2018 +-- Definition current Tue Jun 5 00:29:37 2018 ( REGION_SERVER CHAR(256 BYTES) CHARACTER SET UTF8 COLLATE @@ -1066,14 +1066,14 @@ T002SCH.T002T2I1 0 (EXPR) (EXPR) ------------------------------ -------------------- -RegionName: 1521232434388 0 -RegionName: 1521232441739 0 -RegionName: 1521232436741 0 -RegionName: 1521232429374 0 -RegionName: 1521232475166 0 -RegionName: 1521232479869 0 -RegionName: 1521232446363 0 -RegionName: 1521232431811 0 +RegionName: 1528158446488 0 +RegionName: 1528158523869 0 +RegionName: 1528158488210 0 +RegionName: 1528158479307 0 +RegionName: 1528158469344 0 +RegionName: 1528158460979 0 +RegionName: 1528158454615 0 +RegionName: 1528158529016 0 --- 8 row(s) selected. >> @@ -1084,7 +1084,7 @@ RegionName: 1521232431811 0 >>invoke table(hivemd(tables)); -- Definition of Trafodion table TRAFODION.T002SCH.HIVEMD_TABLES__ --- Definition current Fri Mar 16 20:35:24 2018 +-- Definition current Tue Jun 5 00:29:38 2018 ( CATALOG_NAME CHAR(256 BYTES) CHARACTER SET UTF8 COLLATE @@ -1116,7 +1116,7 @@ RegionName: 1521232431811 0 >>invoke table(hivemd(columns)); -- Definition of Trafodion table TRAFODION.T002SCH.HIVEMD_COLUMNS__ --- Definition current Fri Mar 16 20:35:24 2018 +-- Definition current Tue Jun 5 00:29:38 2018 ( CATALOG_NAME CHAR(256 BYTES) CHARACTER SET UTF8 COLLATE @@ -1285,7 +1285,7 @@ FS_DATA_TYPE SQL_DATA_TYPE DISPLAY_DATA_TYPE 0 CHARACTER CHAR(10 CHARS) CHARACTER SET UTF8 char(10) -1 -1 40 64 VARCHAR VARCHAR(7 CHARS) CHARACTER SET UTF8 varchar(7) -1 -1 28 192 DATETIME DATE date 1 0 4 - 192 DATETIME TIMESTAMP(6) timestamp 3 6 11 + 192 DATETIME TIMESTAMP(9) timestamp 3 6 11 --- 9 row(s) selected. >> http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/regress/udr/EXPECTED100.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/udr/EXPECTED100.SB b/core/sql/regress/udr/EXPECTED100.SB index f2c0ea8..f06bdec 100644 --- a/core/sql/regress/udr/EXPECTED100.SB +++ b/core/sql/regress/udr/EXPECTED100.SB @@ -153,6 +153,12 @@ --- SQL operation complete. >> +>>create procedure T100_io_mmm(IN IN1 timestamp(9), OUT OUT2 timestamp(9)) ++>external name 't100.T100_io_mmm' language java parameter style java no sql ++>library T100; + +--- SQL operation complete. +>> >>create procedure T100_iii_iii(IN IN1 int, IN IN2 int, IN IN3 int) +>external name 't100.T100_iii_iii' language java parameter style java +>library T100 no sql; @@ -1087,6 +1093,14 @@ OUT2 1999-12-31 23:59:59 --- SQL operation complete. +>>call T100_io_mmm(cast(timestamp'12/31/1999 11:59:59.987654321 pm' as TIMESTAMP(9)), ?x); + +OUT2 +----------------------------- + +1999-12-31 23:59:59.987654321 + +--- SQL operation complete. >> >>obey TEST100(all_datatypes2); >>-- @@ -1236,6 +1250,14 @@ OUT2 *** ERROR[8416] A datetime expression evaluated to an invalid datetime value. --- SQL operation failed with errors. +>>call T100_io_mmm(interval'0.123456789'second(1,9) + timestamp'12/31/9999 11:59:59.123456789', ?x); + +OUT2 +----------------------------- + +9999-12-31 11:59:59.246913578 + +--- SQL operation complete. >> >>obey TEST100(prepexec); >>-------------------------------------------------------------------------- @@ -1776,8 +1798,8 @@ OUT2 >> >>obey TEST100(udrtrace); >>log; -Apache Trafodion Conversational Interface 2.1.0 -Copyright (c) 2015-2016 Apache Software Foundation +Apache Trafodion Conversational Interface 2.3.0 +Copyright (c) 2015-2017 Apache Software Foundation >>?section udrtrace2 >>-- >>-- This section will be executed by the mxci fired off while executing http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/regress/udr/TEST100 ---------------------------------------------------------------------- diff --git a/core/sql/regress/udr/TEST100 b/core/sql/regress/udr/TEST100 index 9f736f9..9a9e7b3 100755 --- a/core/sql/regress/udr/TEST100 +++ b/core/sql/regress/udr/TEST100 @@ -76,9 +76,9 @@ obey TEST100(java_compile); obey TEST100(set_up); obey TEST100(tests); log; -obey TEST100(clean_up_procs); -obey TEST100(clean_up_tables); -obey TEST100(clean_up_files); +--obey TEST100(clean_up_procs); +--obey TEST100(clean_up_tables); +--obey TEST100(clean_up_files); exit; ?section clean_up_files @@ -120,6 +120,7 @@ drop procedure T100_io_vv; drop procedure T100_io_dd; drop procedure T100_io_tt; drop procedure T100_io_mm; +drop procedure T100_io_mmm; drop procedure T100_iii_iii; drop procedure T100_xxx_iii; drop procedure T100_ooo_iii; @@ -239,6 +240,10 @@ create procedure T100_io_mm(IN IN1 timestamp(0), OUT OUT2 timestamp(0)) external name 't100.T100_io_mm' language java parameter style java no sql library T100; +create procedure T100_io_mmm(IN IN1 timestamp(9), OUT OUT2 timestamp(9)) +external name 't100.T100_io_mmm' language java parameter style java no sql +library T100; + create procedure T100_iii_iii(IN IN1 int, IN IN2 int, IN IN3 int) external name 't100.T100_iii_iii' language java parameter style java library T100 no sql; @@ -415,7 +420,11 @@ create procedure T100_PARAM_many ( INOUT INOUT7000 decimal(9,0), INOUT INOUT8000 largeint, IN IN9000 double precision, IN IN10000 smallint, OUT OUT9000 double precision, OUT OUT10000 smallint, - INOUT INOUT9000 double precision, INOUT INOUT10000 smallint + INOUT INOUT9000 double precision, INOUT INOUT10000 smallint, + + IN IN4000 timestamp(9), + OUT OUT4000 timestamp(9), + INOUT INOUT4000 timestamp(9), ) external name 't100.T100_many' language java parameter style java no sql library T100; @@ -598,6 +607,7 @@ call T100_io_mm(cast(timestamp'12/31/1999 11:59:59 pm' as TIMESTAMP), ?x); call T100_io_mm(cast(timestamp'12/31/1999 11:59:59 pm' as TIMESTAMP(0)), ?x); call T100_io_mm(cast(timestamp'12/31/1999 11:59:59 pm' as TIMESTAMP(2)), ?x); call T100_io_mm(cast(timestamp'12/31/1999 11:59:59 pm' as TIMESTAMP(6)), ?x); +call T100_io_mmm(cast(timestamp'12/31/1999 11:59:59.987654321 pm' as TIMESTAMP(9)), ?x); ?section all_datatypes2 -- @@ -658,6 +668,7 @@ call T100_io_ss(cast(32768 as smallint), ?x); call T100_io_ss(cast(-32769 as smallint), ?x); call T100_io_ii(1 + 1 / 0, ?x); call T100_io_mm(interval'0.1'second + timestamp'12/31/9999 11:59:59.9 pm', ?x); +call T100_io_mmm(interval'0.123456789'second(1,9) + timestamp'12/31/9999 11:59:59.123456789', ?x); ?section prepexec -------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/regress/udr/t100.java ---------------------------------------------------------------------- diff --git a/core/sql/regress/udr/t100.java b/core/sql/regress/udr/t100.java index 9e5670c..c95bc5a 100755 --- a/core/sql/regress/udr/t100.java +++ b/core/sql/regress/udr/t100.java @@ -95,6 +95,10 @@ class t100 { OUT2[0] = IN1; } + public static void T100_io_mmm(Timestamp IN1, Timestamp[] OUT2) + { + OUT2[0] = IN1; + } // // IN, INOUT http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/sqlci/SqlCmd.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlci/SqlCmd.cpp b/core/sql/sqlci/SqlCmd.cpp index 8370aa8..d2b5176 100644 --- a/core/sql/sqlci/SqlCmd.cpp +++ b/core/sql/sqlci/SqlCmd.cpp @@ -1671,6 +1671,7 @@ short SqlCmd::doDescribeInput(SqlciEnv * sqlci_env, rec_datetime_field dtStartField = REC_DATE_YEAR; rec_datetime_field dtEndField = REC_DATE_SECOND; + Lng32 intLeadPrec = SQLInterval::DEFAULT_LEADING_PRECISION; if (datatype == REC_DATETIME) { Lng32 dtCode; @@ -1701,12 +1702,28 @@ short SqlCmd::doDescribeInput(SqlciEnv * sqlci_env, dtEndField = REC_DATE_SECOND; } } + else if (DFS2REC::isInterval(datatype)) + { + getIntervalFields(datatype, dtStartField, dtEndField); + + // this will get fractional precision + retcode = SQL_EXEC_GetDescItem(input_desc, entry, + SQLDESC_PRECISION, + &precision, 0, 0, 0, 0); + HandleCLIError(retcode, sqlci_env); + + // this will get interval leading precision + retcode = SQL_EXEC_GetDescItem(input_desc, entry, + SQLDESC_INT_LEAD_PREC, + &intLeadPrec, 0, 0, 0, 0); + HandleCLIError(retcode, sqlci_env); + } NAType::convertTypeToText(tgttype, datatype, length, precision, scale, dtStartField, dtEndField, (short)precision, - SQLInterval::DEFAULT_LEADING_PRECISION, + (short)intLeadPrec, FALSE/*upshift*/, FALSE/*caseinsensitive*/, (CharInfo::CharSet) charSet, http://git-wip-us.apache.org/repos/asf/trafodion/blob/319abf81/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java b/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java index 392f7bd..747bdee 100644 --- a/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java +++ b/core/sql/src/main/java/org/trafodion/sql/udr/TypeInfo.java @@ -396,22 +396,22 @@ public class TypeInfo extends TMUDRSerializableObject { break; case TIME: - // string hh:mm:ss + // string hh:mm:ss[.fffffffff] length_ = 8; if (scale > 0) length_ += scale+1; - if (scale < 0 || scale > 6) - throw new UDRException(38900,"Scale %d of time in TypeInfo::TypeInfo is outside the allowed range of 0-6", scale); + if (scale < 0 || scale > 9) + throw new UDRException(38900,"Scale %d of time in TypeInfo::TypeInfo is outside the allowed range of 0-9", scale); break; case TIMESTAMP: - // string yyyy-mm-dd hh:mm:ss.ffffff - // 12345678901234567890123456 + // string yyyy-mm-dd hh:mm:ss[.fffffffff] + // 1234567890123456789 0123456789 length_ = 19; if (scale > 0) length_ += scale+1; - if (scale < 0 || scale > 6) - throw new UDRException(38900,"Scale %d of timestamp in TypeInfo::TypeInfo is outside the allowed range of 0-6", scale); + if (scale < 0 || scale > 9) + throw new UDRException(38900,"Scale %d of timestamp in TypeInfo::TypeInfo is outside the allowed range of 0-9", scale); break; case INTERVAL: @@ -421,8 +421,8 @@ public class TypeInfo extends TMUDRSerializableObject { if (intervalCode_ == SQLIntervalCode.UNDEFINED_INTERVAL_CODE.getSQLIntervalCode()) throw new UDRException(38900,"Interval code in TypeInfo::TypeInfo is undefined"); - if (scale < 0 || scale > 6) - throw new UDRException(38900,"Scale %d of interval in TypeInfo::TypeInfo is outside the allowed range of 0-6", sqlType); + if (scale < 0 || scale > 9) + throw new UDRException(38900,"Scale %d of interval in TypeInfo::TypeInfo is outside the allowed range of 0-9", sqlType); // all intervals are treated like signed numbers, need to compute // the length from the combined precision of all parts, see method
