@@ -75,30 +75,30 @@ public void testMemtablesSAI()
75
75
createTables ();
76
76
77
77
RowCountTest test = new RowCountTest (Operator .NEQ , 25 );
78
- test .doTest (Version .DB , INT , 97.0 );
79
- test .doTest (Version .EB , INT , 97.0 );
78
+ test .doTest (Version .DB , INT , 83.1 );
79
+ test .doTest (Version .EB , INT , 82.4 );
80
80
// Truncated numeric types planned differently
81
- test .doTest (Version .DB , DECIMAL , 97.0 );
82
- test .doTest (Version .EB , DECIMAL , 97.0 );
83
- test .doTest (Version .EB , VARINT , 97.0 );
81
+ test .doTest (Version .DB , DECIMAL , 117 );
82
+ test .doTest (Version .EB , DECIMAL , 117 );
83
+ test .doTest (Version .EB , VARINT , 119 );
84
84
85
85
test = new RowCountTest (Operator .LT , 50 );
86
- test .doTest (Version .DB , INT , 48 );
87
- test .doTest (Version .EB , INT , 48 );
88
- test .doTest (Version .DB , DECIMAL , 48 );
89
- test .doTest (Version .EB , DECIMAL , 48 );
86
+ test .doTest (Version .DB , INT , 50 );
87
+ test .doTest (Version .EB , INT , 50 );
88
+ test .doTest (Version .DB , DECIMAL , 51 );
89
+ test .doTest (Version .EB , DECIMAL , 51 );
90
90
91
91
test = new RowCountTest (Operator .LT , 150 );
92
- test .doTest (Version .DB , INT , 97 );
93
- test .doTest (Version .EB , INT , 97 );
94
- test .doTest (Version .DB , DECIMAL , 97 );
95
- test .doTest (Version .EB , DECIMAL , 97 );
92
+ test .doTest (Version .DB , INT , 100 );
93
+ test .doTest (Version .EB , INT , 99 );
94
+ test .doTest (Version .DB , DECIMAL , 100 );
95
+ test .doTest (Version .EB , DECIMAL , 99 );
96
96
97
97
test = new RowCountTest (Operator .EQ , 31 );
98
- test .doTest (Version .DB , INT , 15 );
99
- test .doTest (Version .EB , INT , 0 );
100
- test .doTest (Version .DB , DECIMAL , 15 );
101
- test .doTest (Version .EB , DECIMAL , 0 );
98
+ test .doTest (Version .DB , INT , 1 );
99
+ test .doTest (Version .EB , INT , 1 );
100
+ test .doTest (Version .DB , DECIMAL , 1 );
101
+ test .doTest (Version .EB , DECIMAL , 1 );
102
102
}
103
103
104
104
@@ -126,7 +126,7 @@ void populateTable(ColumnFamilyStore cfs)
126
126
for (int i = 0 ; i < 100 ; i ++)
127
127
{
128
128
String query = String .format ("INSERT INTO %s (pk, age) VALUES (?, " + i + ')' ,
129
- cfs .keyspace .getName () + '.' + cfs .name );
129
+ cfs .keyspace .getName () + '.' + cfs .name );
130
130
executeFormattedQuery (query , "key" + i );
131
131
}
132
132
});
@@ -155,9 +155,9 @@ void doTest(Version version, CQL3Type.Native type, double expectedRows)
155
155
rc ,
156
156
version .onDiskFormat ().indexFeatureSet (),
157
157
new QueryContext ());
158
+
158
159
long totalRows = controller .planFactory .tableMetrics .rows ;
159
160
assertEquals (0 , cfs .metrics ().liveSSTableCount .getValue ().intValue ());
160
- assertEquals (97 , totalRows );
161
161
162
162
Plan plan = controller .buildPlan ();
163
163
assert plan instanceof Plan .RowsIteration ;
0 commit comments