Skip to content

Commit 068f8ce

Browse files
rfecherrfecher
committed
GEOWAVE-859: hbase field flattening; core store refactor
1 parent cda0aab commit 068f8ce

172 files changed

Lines changed: 1407 additions & 1245 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎analytics/api/src/main/java/mil/nga/giat/geowave/analytic/GeometryDataSetGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
import mil.nga.giat.geowave.analytic.distance.DistanceFn;
3737
import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
3838
import mil.nga.giat.geowave.core.store.DataStore;
39-
import mil.nga.giat.geowave.core.store.IndexWriter;
4039
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
40+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
4141

4242
/**
4343
* Generate clusters of geometries.

‎analytics/api/src/main/java/mil/nga/giat/geowave/analytic/clustering/CentroidManagerGeoWave.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
import mil.nga.giat.geowave.core.index.StringUtils;
6060
import mil.nga.giat.geowave.core.store.CloseableIterator;
6161
import mil.nga.giat.geowave.core.store.DataStore;
62-
import mil.nga.giat.geowave.core.store.IndexWriter;
6362
import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
6463
import mil.nga.giat.geowave.core.store.adapter.DataAdapter;
6564
import mil.nga.giat.geowave.core.store.index.IndexStore;
6665
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
66+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
6767
import mil.nga.giat.geowave.core.store.query.DataIdQuery;
6868
import mil.nga.giat.geowave.core.store.query.QueryOptions;
6969
import mil.nga.giat.geowave.mapreduce.GeoWaveConfiguratorBase;

‎analytics/api/src/main/java/mil/nga/giat/geowave/analytic/clustering/ClusteringUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import mil.nga.giat.geowave.core.store.index.Index;
2828
import mil.nga.giat.geowave.core.store.index.IndexStore;
2929
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
30-
import mil.nga.giat.geowave.core.store.memory.DataStoreUtils;
30+
import mil.nga.giat.geowave.core.store.util.DataStoreUtils;
3131

3232
public class ClusteringUtils
3333
{

‎analytics/api/src/test/java/mil/nga/giat/geowave/analytic/clustering/CentroidManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
2323
import mil.nga.giat.geowave.core.index.StringUtils;
2424
import mil.nga.giat.geowave.core.store.DataStore;
25-
import mil.nga.giat.geowave.core.store.IndexWriter;
2625
import mil.nga.giat.geowave.core.store.StoreFactoryFamilySpi;
2726
import mil.nga.giat.geowave.core.store.StoreFactoryOptions;
2827
import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
2928
import mil.nga.giat.geowave.core.store.index.IndexStore;
3029
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
30+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
3131
import mil.nga.giat.geowave.core.store.memory.MemoryStoreFactoryFamily;
3232

3333
public class CentroidManagerTest

‎analytics/api/src/test/java/mil/nga/giat/geowave/analytic/clustering/DistortionGroupManagementTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
2525
import mil.nga.giat.geowave.core.index.StringUtils;
2626
import mil.nga.giat.geowave.core.store.DataStore;
27-
import mil.nga.giat.geowave.core.store.IndexWriter;
2827
import mil.nga.giat.geowave.core.store.StoreFactoryFamilySpi;
2928
import mil.nga.giat.geowave.core.store.StoreFactoryOptions;
3029
import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
3130
import mil.nga.giat.geowave.core.store.adapter.WritableDataAdapter;
3231
import mil.nga.giat.geowave.core.store.index.IndexStore;
3332
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
33+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
3434
import mil.nga.giat.geowave.core.store.memory.MemoryStoreFactoryFamily;
3535

3636
public class DistortionGroupManagementTest

‎analytics/api/src/test/java/mil/nga/giat/geowave/analytic/clustering/NestedGroupCentroidAssignmentTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
2323
import mil.nga.giat.geowave.core.index.StringUtils;
2424
import mil.nga.giat.geowave.core.store.DataStore;
25-
import mil.nga.giat.geowave.core.store.IndexWriter;
2625
import mil.nga.giat.geowave.core.store.StoreFactoryFamilySpi;
2726
import mil.nga.giat.geowave.core.store.StoreFactoryOptions;
2827
import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
2928
import mil.nga.giat.geowave.core.store.adapter.WritableDataAdapter;
3029
import mil.nga.giat.geowave.core.store.index.IndexStore;
3130
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
31+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
3232
import mil.nga.giat.geowave.core.store.memory.MemoryStoreFactoryFamily;
3333

3434
public class NestedGroupCentroidAssignmentTest

‎analytics/mapreduce/src/main/java/mil/nga/giat/geowave/analytic/mapreduce/kde/KDEJobRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider.SpatialIndexBuilder;
4040
import mil.nga.giat.geowave.core.geotime.store.query.SpatialQuery;
4141
import mil.nga.giat.geowave.core.index.ByteArrayId;
42-
import mil.nga.giat.geowave.core.store.IndexWriter;
4342
import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
4443
import mil.nga.giat.geowave.core.store.adapter.WritableDataAdapter;
4544
import mil.nga.giat.geowave.core.store.index.Index;
4645
import mil.nga.giat.geowave.core.store.index.IndexStore;
4746
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
47+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
4848
import mil.nga.giat.geowave.core.store.operations.remote.options.DataStorePluginOptions;
4949
import mil.nga.giat.geowave.core.store.query.QueryOptions;
5050
import mil.nga.giat.geowave.mapreduce.GeoWaveConfiguratorBase;

‎analytics/mapreduce/src/test/java/mil/nga/giat/geowave/analytic/mapreduce/kmeans/KMeansDistortionMapReduceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import mil.nga.giat.geowave.core.index.ByteArrayId;
4444
import mil.nga.giat.geowave.core.store.DataStore;
4545
import mil.nga.giat.geowave.core.store.GeoWaveStoreFinder;
46-
import mil.nga.giat.geowave.core.store.IndexWriter;
4746
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
47+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
4848
import mil.nga.giat.geowave.core.store.memory.MemoryRequiredOptions;
4949
import mil.nga.giat.geowave.core.store.memory.MemoryStoreFactoryFamily;
5050
import mil.nga.giat.geowave.core.store.operations.remote.options.DataStorePluginOptions;

‎core/geotime/src/main/java/mil/nga/giat/geowave/core/geotime/store/statistics/BoundingBoxDataStatistics.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import mil.nga.giat.geowave.core.index.Mergeable;
1313
import mil.nga.giat.geowave.core.index.dimension.NumericDimensionDefinition;
1414
import mil.nga.giat.geowave.core.index.sfc.data.NumericRange;
15-
import mil.nga.giat.geowave.core.store.DataStoreEntryInfo;
1615
import mil.nga.giat.geowave.core.store.adapter.statistics.AbstractDataStatistics;
16+
import mil.nga.giat.geowave.core.store.base.DataStoreEntryInfo;
1717
import mil.nga.giat.geowave.core.store.query.BasicQuery.ConstraintData;
1818
import mil.nga.giat.geowave.core.store.query.BasicQuery.ConstraintSet;
1919
import mil.nga.giat.geowave.core.store.query.BasicQuery.Constraints;

‎core/ingest/src/main/java/mil/nga/giat/geowave/core/ingest/kafka/IngestFromKafkaDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import mil.nga.giat.geowave.core.ingest.index.IndexProvider;
3030
import mil.nga.giat.geowave.core.store.CloseableIterator;
3131
import mil.nga.giat.geowave.core.store.DataStore;
32-
import mil.nga.giat.geowave.core.store.IndexWriter;
3332
import mil.nga.giat.geowave.core.store.adapter.WritableDataAdapter;
3433
import mil.nga.giat.geowave.core.store.index.PrimaryIndex;
34+
import mil.nga.giat.geowave.core.store.index.writer.IndexWriter;
3535
import mil.nga.giat.geowave.core.store.operations.remote.options.DataStorePluginOptions;
3636
import mil.nga.giat.geowave.core.store.operations.remote.options.IndexPluginOptions;
3737
import mil.nga.giat.geowave.core.store.operations.remote.options.VisibilityOptions;

0 commit comments

Comments
 (0)