database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

EsTable without partition info (#511)

Browse Source
This commit is contained in:
yiguolei
2019-01-09 11:14:19 +08:00
committed by lide
parent 92b138121b
commit 69f9987abd
8 changed files with 1590 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/src/test/java/org/apache/doris/catalog/CatalogTestUtil.java
View File

@ -279,7 +279,7 @@ public class CatalogTestUtil {
.newArrayList("100")),
null));
RangePartitionInfo partitionInfo = new RangePartitionInfo(partitionColumns);
SinglePartitionInfo partitionInfo = new SinglePartitionInfo();
Map<String, String> properties = Maps.newHashMap();
properties.put(EsTable.HOSTS, "xxx");
properties.put(EsTable.INDEX, "indexa");

75
fe/src/test/java/org/apache/doris/es/EsStateStoreTest.java
View File

@ -62,6 +62,8 @@ public class EsStateStoreTest {
private static String clusterStateStr1 = "";
private static String clusterStateStr2 = "";
private static String clusterStateStr3 = "";
private static String clusterStateStr4 = "";
private static String clusterStateStr5 = "";
private EsStateStore esStateStore;
@BeforeClass
@ -79,6 +81,8 @@ public class EsStateStoreTest {
clusterStateStr1 = loadJsonFromFile("data/es/clusterstate1.json");
clusterStateStr2 = loadJsonFromFile("data/es/clusterstate2.json");
clusterStateStr3 = loadJsonFromFile("data/es/clusterstate3.json");
clusterStateStr4 = loadJsonFromFile("data/es/clusterstate4.json");
clusterStateStr5 = loadJsonFromFile("data/es/clusterstate5.json");
}
@Before
@ -90,7 +94,6 @@ public class EsStateStoreTest {
* partitioned es table schema: k1(date), k2(int), v(double)
* @throws AnalysisException
*/
@Ignore
@Test
public void testParsePartitionedClusterState() throws AnalysisException {
EsTable esTable = (EsTable) Catalog.getCurrentCatalog()
@ -138,7 +141,6 @@ public class EsStateStoreTest {
* 2 indices, one with partition desc, the other does not contains partition desc
* @throws AnalysisException
*/
@Ignore
@Test
public void testParsePartitionedClusterStateTwoIndices() throws AnalysisException {
EsTable esTable = (EsTable) Catalog.getCurrentCatalog()
@ -180,6 +182,75 @@ public class EsStateStoreTest {
assertEquals(6, esIndexState2.getShardRoutings().size());
}
/**
* partitioned es table schema: k1(date), k2(int), v(double)
* scenario desc:
* 2 indices, both of them does not contains partition desc and es table does not have partition info
* but cluster state have partition info
* @throws AnalysisException
*/
@Test
public void testParseUnPartitionedClusterStateTwoIndices() throws AnalysisException {
EsTable esTable = (EsTable) Catalog.getCurrentCatalog()
.getDb(CatalogTestUtil.testDb1)
.getTable(CatalogTestUtil.testUnPartitionedEsTableId1);
boolean hasException = false;
EsTableState esTableState = null;
try {
esTableState = esStateStore.parseClusterState55(clusterStateStr4, esTable);
} catch (Exception e) {
e.printStackTrace();
hasException = true;
}
assertFalse(hasException);
assertNotNull(esTableState);
// check
assertEquals(0, esTableState.getPartitionedIndexStates().size());
assertEquals(2, esTableState.getUnPartitionedIndexStates().size());
// check index with no partition desc
EsIndexState esIndexState1 = esTableState.getUnPartitionedIndexStates().get("index1");
assertEquals("index1", esIndexState1.getIndexName());
EsIndexState esIndexState2 = esTableState.getUnPartitionedIndexStates().get("index2");
assertEquals("index2", esIndexState2.getIndexName());
assertEquals(6, esIndexState2.getShardRoutings().size());
}
/**
* test node without thrift info, parse without error, but es index state is empty
* @throws AnalysisException
*/
@Test
public void testParseUnPartitionedWithoutThriftInfo() throws AnalysisException {
EsTable esTable = (EsTable) Catalog.getCurrentCatalog()
.getDb(CatalogTestUtil.testDb1)
.getTable(CatalogTestUtil.testUnPartitionedEsTableId1);
boolean hasException = false;
EsTableState esTableState = null;
try {
esTableState = esStateStore.parseClusterState55(clusterStateStr5, esTable);
} catch (Exception e) {
e.printStackTrace();
hasException = true;
}
assertFalse(hasException);
assertNotNull(esTableState);
// check
assertEquals(0, esTableState.getPartitionedIndexStates().size());
assertEquals(2, esTableState.getUnPartitionedIndexStates().size());
// check index with no partition desc
EsIndexState esIndexState1 = esTableState.getUnPartitionedIndexStates().get("index1");
assertEquals("index1", esIndexState1.getIndexName());
EsIndexState esIndexState2 = esTableState.getUnPartitionedIndexStates().get("index2");
assertEquals("index2", esIndexState2.getIndexName());
assertEquals(6, esIndexState2.getShardRoutings().size());
assertEquals(0, esIndexState1.getShardRoutings().get(1).size());
}
/**
* partitioned es table schema: k1(date), k2(int), v(double)
* "upperbound": "2018" is not a valid date value, so parsing procedure will fail